Comments
Patch
@@ -138,7 +138,6 @@
skipped = set()
targetancestors = set()
- editor = cmdutil.getcommiteditor(editform='rebase.normal', **opts)
lock = wlock = None
try:
@@ -354,6 +353,9 @@
p1rev = repo[rev].p1().rev()
cmdutil.duplicatecopies(repo, rev, p1rev, skiprev=target)
if not collapsef:
+ merging = repo[p2].rev() != nullrev
+ editform = cmdutil.mergeeditform(merging, 'rebase')
+ editor = cmdutil.getcommiteditor(editform=editform, **opts)
newrev = concludenode(repo, rev, p1, p2, extrafn=extrafn,
editor=editor)
else:
@@ -413,7 +413,8 @@
- ``changeset.mq.qfold`` for :hg:`qfold`
- ``changeset.mq.qrefresh`` for :hg:`qrefresh`
- ``changeset.rebase.collapse`` for :hg:`rebase --collapse`
-- ``changeset.rebase.normal`` for :hg:`rebase` without ``--collapse``
+- ``changeset.rebase.merge`` for :hg:`rebase` on merges
+- ``changeset.rebase.normal`` for :hg:`rebase` on other
- ``changeset.shelve.shelve`` for :hg:`shelve`
- ``changeset.tag.add`` for :hg:`tag` without ``--remove``
- ``changeset.tag.remove`` for :hg:`tag --remove`
@@ -470,5 +470,11 @@
o 0 A public
- $ hg rebase --dest 7 --source 5
+ $ cat > $TESTTMP/checkeditform.sh <<EOF
+ > env | grep HGEDITFORM
+ > true
+ > EOF
+ $ HGEDITOR="sh $TESTTMP/checkeditform.sh" hg rebase --dest 7 --source 5 -e
+ HGEDITFORM=rebase.merge
+ HGEDITFORM=rebase.normal
saved backup bundle to $TESTTMP/a3/c4/.hg/strip-backup/*-backup.hg (glob)