Mercurial > hg
changeset 24643:a8e6897dffbe
graft: allow creating sibling grafts
Previously it was impossible to graft a commit onto it's own parent (i.e. create
a copy of the commit). This is useful when wanting to create a backup of the
commit before continuing to amend it. This patch enables that behavior.
The change to the histedit test is because histedit uses graft to apply commits.
The test in question moves a commit backwards onto an ancestor. Since the graft
logic now more explicitly supports this, it knows to simply accept the incoming
changes (since they are more recent), instead of prompting.
| author | Durham Goode <durham@fb.com> |
|---|---|
| date | Sun, 05 Apr 2015 11:55:38 -0700 |
| parents | 54e5c239c2d9 |
| children | 51930a7180bd |
| files | mercurial/merge.py tests/test-graft.t tests/test-histedit-non-commute-abort.t |
| diffstat | 3 files changed, 35 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/merge.py Mon Apr 06 16:07:18 2015 -0700 +++ b/mercurial/merge.py Sun Apr 05 11:55:38 2015 -0700 @@ -1184,9 +1184,17 @@ labels - merge labels eg ['local', 'graft'] """ + # If we're grafting a descendant onto an ancestor, be sure to pass + # mergeancestor=True to update. This does two things: 1) allows the merge if + # the destination is the same as the parent of the ctx (so we can use graft + # to copy commits), and 2) informs update that the incoming changes are + # newer than the destination so it doesn't prompt about "remote changed foo + # which local deleted". + mergeancestor = repo.changelog.isancestor(repo['.'].node(), ctx.node()) stats = update(repo, ctx.node(), True, True, False, pctx.node(), - labels=labels) + mergeancestor=mergeancestor, labels=labels) + # drop the second merge parent repo.dirstate.beginparentchange() repo.setparents(repo['.'].node(), nullid)
--- a/tests/test-graft.t Mon Apr 06 16:07:18 2015 -0700 +++ b/tests/test-graft.t Sun Apr 05 11:55:38 2015 -0700 @@ -730,3 +730,29 @@ $ hg graft -f 27 grafting 27:3d35c4c79e5a "28" note: graft of 27:3d35c4c79e5a created no changes to commit + + $ cd .. + +Graft to duplicate a commit + + $ hg init graftsibling + $ cd graftsibling + $ touch a + $ hg commit -qAm a + $ touch b + $ hg commit -qAm b + $ hg log -G -T '{rev}\n' + @ 1 + | + o 0 + + $ hg up -q 0 + $ hg graft -r 1 + grafting 1:0e067c57feba "b" (tip) + $ hg log -G -T '{rev}\n' + @ 2 + | + | o 1 + |/ + o 0 +
--- a/tests/test-histedit-non-commute-abort.t Mon Apr 06 16:07:18 2015 -0700 +++ b/tests/test-histedit-non-commute-abort.t Sun Apr 05 11:55:38 2015 -0700 @@ -70,8 +70,6 @@ > pick 652413bf663e f > EOF 0 files updated, 0 files merged, 2 files removed, 0 files unresolved - remote changed e which local deleted - use (c)hanged version or leave (d)eleted? c 0 files updated, 0 files merged, 0 files removed, 0 files unresolved merging e warning: conflicts during merge.