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

status: when merging, ask user which parent to revert

Changeset de6e1529df1f…

Parent 58a967b13443…

by Steve Borho

Changes to one file · Browse files at de6e1529df1f Showing diff from parent 58a967b13443 Diff from another changeset...

Change 1 of 1 Show Entire File hggtk/​status.py Stacked
 
1103
1104
1105
 
 
 
 
 
 
 
 
 
 
 
1106
1107
1108
 
1103
1104
1105
1106
1107
1108
1109
1110
1111
1112
1113
1114
1115
1116
1117
1118
1119
@@ -1103,6 +1103,17 @@
  revertopts['rev'] = revertopts['rev'][0]   dlg = gdialog.Confirm(_('Confirm Revert'), files, self,   _('Revert files to revision ') + revertopts['rev'] + '?') + elif self.merging: + resp = gdialog.CustomPrompt(_('Which parent to revert to?'), + _('Revert file(s) to local or other parent?'), + self, (_('&local'), _('&other')), _('l')).run() + if resp == ord(_('l')): + revertopts['rev'] = self.repo[None].p1().rev() + elif resp == ord(_('o')): + revertopts['rev'] = self.repo[None].p2().rev() + else: + return + dlg = None   else:   # rev options needs extra tweaking since it must be an empty   # string when unspecified for revert command