Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 0.8, 0.8.1, and 0.8.2

merge with Adrian

Changeset e32407c7a099…

Parents cb03cecd4876…

Parents 2c98ae1e0f42…

by Steve Borho

Changes to 3 files · Browse files at e32407c7a099 Showing diff from parent cb03cecd4876 2c98ae1e0f42 Diff from another changeset...

Change 1 of 1 Show Entire File hggtk/​gdialog.py Stacked
 
532
533
534
 
535
536
537
 
532
533
534
535
536
537
538
@@ -532,6 +532,7 @@
  return self.runCompatible()     def runWindows(self): + import win32gui, win32con   fname, customfilter, flags=win32gui.GetSaveFileNameW(   InitialDir=self.InitialDir,   Flags=win32con.OFN_EXPLORER,
Change 1 of 1 Show Entire File hggtk/​history.py Stacked
 
618
619
620
 
 
 
 
 
621
622
623
 
618
619
620
621
622
623
624
625
626
627
628
@@ -618,6 +618,11 @@
    if result:   if os.path.exists(result): + res = Confirm(_('Confirm Overwrite'), [], self, + _('The file "%s" already exists!\n\n' + 'Do you want to overwrite it?') % result).run() + if res != gtk.RESPONSE_YES: + return   os.remove(result)     # In case new export args are added in the future, merge the
Change 1 of 1 Show Entire File hggtk/​thgconfig.py Stacked
 
98
99
100
101
 
102
103
104
 
98
99
100
 
101
102
103
104
@@ -98,7 +98,7 @@
  ' Default: False')))    _paths_info = ( - ('After pull operation', 'tortoisehg.postpull', + (_('After pull operation'), 'tortoisehg.postpull',   ['none', 'update', 'fetch', 'rebase'],   _('Operation which is performed directly after a successful pull.'   ' update equates to pull --update, fetch equates to the fetch'