Changeset 492c2ba74d3b…
Parent 5621d711fa0c…
by
Changes to one file · Browse files at 492c2ba74d3b Showing diff from parent 5621d711fa0c Diff from another changeset...
@@ -424,7 +424,9 @@ m.append(create_menu(_('e_mail patch'), self.email_patch))
m.append(create_menu(_('_bundle rev:tip'), self.bundle_rev_to_tip))
m.append(create_menu(_('add/remove _tag'), self.add_tag))
- m.append(create_menu(_('backout revision'), self.backout_rev))
+ self.cmenu_backout = create_menu(_('backout revision'),
+ self.backout_rev)
+ m.append(self.cmenu_backout)
m.append(create_menu(_('_revert'), self.revert))
m.append(create_menu(_('_archive'), self.archive))
@@ -868,6 +870,11 @@ can_merge = selrev not in parents and len(parents) < 2
self.cmenu_merge.set_sensitive(can_merge)
+ op1, op2 = self.repo.dirstate.parents()
+ node = self.repo[selrev].node()
+ a = self.repo.changelog.ancestor(op1, node)
+ self.cmenu_backout.set_sensitive(a == node)
+
# display the context menu
self._menu.popup(None, None, None, button, time)
return True
|
Loading...