Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 1.0, 1.0.1, and 1.0.2

bookmark: can make bookmark moved to working dir rev current

Expanded the option in the Add/Move/Remove Bookmark dialog, which
allowed setting new bookmarks made on the working dir parent as
the current bookmark, to now be able to set bookmarks MOVED
to the working dir parent as current as well

Changeset 554da6185638…

Parent 44677ae12b83…

by Paul Molodowitch

Changes to one file · Browse files at 554da6185638 Showing diff from parent 44677ae12b83 Diff from another changeset...

Change 1 of 3 Show Entire File tortoisehg/​hgtk/​bookmark.py Stacked
 
89
90
91
92
 
93
94
95
 
218
219
220
221
 
222
223
224
 
245
246
247
 
 
 
 
248
249
250
 
89
90
91
 
92
93
94
95
 
218
219
220
 
221
222
223
224
 
245
246
247
248
249
250
251
252
253
254
@@ -89,7 +89,7 @@
  # Option to make new bookmark the active one   trackcurrent = self.repo.ui.configbool('bookmarks', 'track.current')   if type == TYPE_ADDREMOVE and trackcurrent: - check = gtk.CheckButton(_('Make new bookmark current')) + check = gtk.CheckButton(_('Make new/moved bookmark current'))   self.opt_newcurrent = check   check.set_sensitive(hglib.is_rev_current(self.repo, rev))   table.add_row(None, check) @@ -218,7 +218,7 @@
  if (hasattr(self, 'opt_newcurrent') and   self.opt_newcurrent.get_property('sensitive') and   self.opt_newcurrent.get_active()): - self._current_hg_bookmark(name) + self._current_hg_bookmark(name)   self._refresh()   except util.Abort, inst:   dialog.error_dialog(self, _('Error in bookmarking'), str(inst)) @@ -245,6 +245,10 @@
  self._move_hg_bookmark(name, rev)   dialog.info_dialog(self, _('Bookmarking completed'),   _('Bookmark "%s" has been moved') % name) + if (hasattr(self, 'opt_newcurrent') and + self.opt_newcurrent.get_property('sensitive') and + self.opt_newcurrent.get_active()): + self._current_hg_bookmark(name)   self._refresh()   except util.Abort, inst:   dialog.error_dialog(self, _('Error in bookmarking'), str(inst))