Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 1.9, 1.9.1, and 1.9.2

Merge with stable

Changeset 002d33cb4923…

Parents a30502187b67…

Parents 9609a2febe4c…

by Steve Borho

Changes to 3 files · Browse files at 002d33cb4923 Showing diff from parent a30502187b67 9609a2febe4c Diff from another changeset...

Change 1 of 1 Show Entire File .hgignore Stacked
 
7
8
9
 
10
11
12
 
7
8
9
10
11
12
13
@@ -7,6 +7,7 @@
 build/  build-ja/  build-cs/ +rpmbuild/  dist/  Output/  .*.swp
Change 1 of 1 Show Entire File contrib/​tortoisehg.spec Stacked
 
85
86
87
88
89
90
91
92
 
85
86
87
 
 
88
89
90
@@ -85,8 +85,6 @@
 # Instead we just claim ownership of the zsh top folder ...  %{_datadir}/zsh   -%dir %{_sysconfdir}/mercurial -%dir %{_sysconfdir}/mercurial/hgrc.d  %config(noreplace) %{_sysconfdir}/mercurial/hgrc.d/thgmergetools.rc    %files nautilus
Change 1 of 1 Show Entire File tortoisehg/​hgtk/​statusact.py Stacked
 
137
138
139
 
140
141
142
143
144
145
146
 
 
 
 
 
 
 
147
148
149
 
137
138
139
140
141
 
 
 
 
 
 
142
143
144
145
146
147
148
149
150
151
@@ -137,13 +137,15 @@
  revs = revertopts['rev']   if revs and type(revs) == list:   revertopts['rev'] = revs[0] + msg = _('Revert files to revision %s?') % revs[0]   else: - revertopts['rev'] = str(self.stat.repo['.'].rev()) - response = gdialog.CustomPrompt(_('Confirm Revert'), - _('Revert files to revision %s?\n\n%s') % (revertopts['rev'], - filelist(files)), self.stat, (_('&Yes (backup changes)'), - _('Yes (&discard changes)'), - _('&Cancel')), 2, 2).run() + revertopts['rev'] = '.' + msg = _('Revert files?') + msg += '\n\n' + msg += filelist(files) + response = gdialog.CustomPrompt(_('Confirm Revert'), msg, + self.stat, (_('&Yes (backup changes)'), + _('Yes (&discard changes)'), _('&Cancel')), 2, 2).run()   if response in (None, 0, 1):   if response == 1:   revertopts['no_backup'] = True