From: Paul Molodowitch 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 diff -r 545b26528233 -r 8426ccbb13a8 tortoisehg/hgtk/bookmark.py --- a/tortoisehg/hgtk/bookmark.py Thu Dec 17 16:51:22 2009 -0800 +++ b/tortoisehg/hgtk/bookmark.py Thu Dec 17 18:02:38 2009 -0800 @@ -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))