Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 0.9, 0.9.1, and 0.9.1.1

status: update call to gdialog.CustomPrompt

Changeset 20915a7b9e07…

Parent 6438c214fed6…

by Steve Borho

Changes to one file · Browse files at 20915a7b9e07 Showing diff from parent 6438c214fed6 Diff from another changeset...

Change 1 of 1 Show Entire File hggtk/​status.py Stacked
 
1120
1121
1122
1123
1124
 
 
1125
1126
 
1127
1128
1129
 
1120
1121
1122
 
 
1123
1124
1125
 
1126
1127
1128
1129
@@ -1120,10 +1120,10 @@
  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')): + self, (_('&local'), _('&other')), 0).run() + if resp == 0:   revertopts['rev'] = self.repo[None].p1().rev() - elif resp == ord(_('o')): + elif resp == 1:   revertopts['rev'] = self.repo[None].p2().rev()   else:   return