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

merge: further workflow improvements

Current steps to perform a merge:

1) open merge tool from hgtk merge -r or from hgtk log cmenu
2) 'merge' button in dialog has focus, hit return
3) hgcmd window opens and merge is performed, close has focus when done, hit return
** log window is updated in background to show both parents (underlined, bold) **
4) hgcmd closes, undo and commit buttons now sensitive in merge window, commit has focus, hit return
5) commit tool launches, focus is on message text after 'merge' msg stub. hit ctrl-enter
6) hgcmd window opens and commit is performed, close has focus when done, hit return

** log window is automatically updated to show merge changeset **
** commit tool is closed automatically **
** merge dialog is closed automatically **

Would be nice to get rid of the hgcmd windows, but that'll have to wait till 0.9 or later.

Changeset f6d1c1d72730…

Parent 1fd77196ca68…

by Steve Borho

Changes to one file · Browse files at f6d1c1d72730 Showing diff from parent 1fd77196ca68 Diff from another changeset...

Change 1 of 1 Show Entire File hggtk/​merge.py Stacked
 
139
140
141
142
 
143
144
 
 
 
 
 
 
 
 
 
145
146
147
 
139
140
141
 
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
@@ -139,9 +139,18 @@
  import commit   dlg = commit.run(ui.ui())   dlg.set_modal(True) - dlg.set_notify_func(self.notify_func, self.notify_args) + dlg.set_notify_func(self.commit_notify, dlg)   dlg.display()   + def commit_notify(self, dlg): + # refresh the log tool + if self.notify_func: + self.notify_func(self.notify_args) + # close merge dialog + self.destroy() + # close commit tool after allowing it to finish post-processing + gobject.idle_add(dlg.destroy) +   def undo(self, button, local, merge, commit):   response = gdialog.Confirm(_('undo merge'), [], self,   _('Clean checkout of original revision?')).run()