1. TortoiseHg
  2. TortoiseHg
  3. thg

Commits

Yuya Nishihara  committed fe8330b

repowidget: allow graft or rebase of applied patches

Mercurial can 3-way merge applied MQ patches, and "rebase" explicitly
implements handling of MQ states.

  • Participants
  • Parent commits 22ea6af
  • Branches stable

Comments (0)

Files changed (1)

File tortoisehg/hgqt/repowidget.py

View file
  • Ignore whitespace
             entry(submenu, None, isrev, pname).setData(pnum)
         entry(menu)
 
-        entry(menu, None, fixed, _('&Graft to Local...'), 'hg-transplant',
+        entry(menu, None, isrev, _('&Graft to Local...'), 'hg-transplant',
               self.graftRevisions)
 
         if 'mq' in exs or 'rebase' in exs:
             entry(submenu, 'mq', applied, _('Re&name Patch...'), None,
                   self.qrename)
             entry(submenu, 'mq')
-            entry(submenu, 'rebase', fixed, _('&Rebase...'), 'hg-rebase',
+            entry(submenu, 'rebase', isrev, _('&Rebase...'), 'hg-rebase',
                   self.rebaseRevision)
             entry(submenu, 'rebase')
             entry(submenu, 'mq', fixed, _('&Strip...'), 'menudelete',