This is an archive of the discontinued Mercurial Phabricator instance.

Differential D12020

rebase: set custom conflict label for base commit
ClosedPublic

Authored by martinvonz on Jan 21 2022, 6:31 PM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHG402a6b6173e9: rebase: set custom conflict label for base commit

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

martinvonz created this revision.Jan 21 2022, 6:31 PM
Alphare accepted this revision.Jan 24 2022, 5:31 AM
Alphare added a subscriber: Alphare.

Thanks, this is something I've always found could use a more explicit name

This revision is now accepted and ready to land.Jan 24 2022, 5:31 AM
martinvonz added a commit: rHG402a6b6173e9: rebase: set custom conflict label for base commit.Jan 24 2022, 12:31 PM
Closed by commit rHG402a6b6173e9: rebase: set custom conflict label for base commit (authored by martinvonz). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 31833

hgext/rebase.py

mergeancestor = repo.changelog.isancestor(p1ctx.node(), ctx.node()) mergeancestor = repo.changelog.isancestor(p1ctx.node(), ctx.node())
stats = mergemod._update( stats = mergemod._update(
repo, repo,
rev, rev,
branchmerge=True, branchmerge=True,
force=True, force=True,
ancestor=base, ancestor=base,
mergeancestor=mergeancestor, mergeancestor=mergeancestor,
labels=[b'dest', b'source'], labels=[b'dest', b'source', b'parent of source'],
wc=wctx, wc=wctx,
) )
wctx.setparents(p1ctx.node(), repo[p2].node()) wctx.setparents(p1ctx.node(), repo[p2].node())
if collapse: if collapse:
copies.graftcopies(wctx, ctx, p1ctx) copies.graftcopies(wctx, ctx, p1ctx)
else: else:
# If we're not using --collapse, we need to # If we're not using --collapse, we need to
# duplicate copies between the revision we're # duplicate copies between the revision we're

tests/test-rebase-collapse.t

| |
| @ 2: 82b8abf9c185 'D' | @ 2: 82b8abf9c185 'D'
| | | |
% | 1: f899f3910ce7 'B' % | 1: f899f3910ce7 'B'
|/ |/
o 0: 4a2df7238c3b 'A' o 0: 4a2df7238c3b 'A'
$ cat A $ cat A
<<<<<<< dest: 82b8abf9c185 D - test: D <<<<<<< dest: 82b8abf9c185 D - test: D
D D
||||||| base: 4a2df7238c3b A - test: A ||||||| parent of source: 4a2df7238c3b A - test: A
A A
======= =======
B B
>>>>>>> source: f899f3910ce7 B - test: B >>>>>>> source: f899f3910ce7 B - test: B
$ echo BC > A $ echo BC > A
$ hg resolve -m $ hg resolve -m
(no more unresolved files) (no more unresolved files)
continue: hg rebase --continue continue: hg rebase --continue
$ hg rebase --continue $ hg rebase --continue
rebasing 1:f899f3910ce7 B "B" rebasing 1:f899f3910ce7 B "B"
rebasing 3:63668d570d21 C tip "C" rebasing 3:63668d570d21 C tip "C"
merging A merging A
warning: conflicts while merging A! (edit, then use 'hg resolve --mark') warning: conflicts while merging A! (edit, then use 'hg resolve --mark')
unresolved conflicts (see 'hg resolve', then 'hg rebase --continue') unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')
[240] [240]
$ hg tglog $ hg tglog
% 3: 63668d570d21 'C' % 3: 63668d570d21 'C'
| |
| @ 2: 82b8abf9c185 'D' | @ 2: 82b8abf9c185 'D'
| | | |
o | 1: f899f3910ce7 'B' o | 1: f899f3910ce7 'B'
|/ |/
o 0: 4a2df7238c3b 'A' o 0: 4a2df7238c3b 'A'
$ cat A $ cat A
<<<<<<< dest: 82b8abf9c185 D - test: D <<<<<<< dest: 82b8abf9c185 D - test: D
BC BC
||||||| base: f899f3910ce7 B - test: B ||||||| parent of source: f899f3910ce7 B - test: B
B B
======= =======
C C
>>>>>>> source: 63668d570d21 C tip - test: C >>>>>>> source: 63668d570d21 C tip - test: C
$ echo BD > A $ echo BD > A
$ hg resolve -m $ hg resolve -m
(no more unresolved files) (no more unresolved files)
continue: hg rebase --continue continue: hg rebase --continue
$ HGEDITOR=false hg rebase --continue --config ui.interactive=1 $ HGEDITOR=false hg rebase --continue --config ui.interactive=1
already rebased 1:f899f3910ce7 B "B" as 82b8abf9c185 already rebased 1:f899f3910ce7 B "B" as 82b8abf9c185
rebasing 3:63668d570d21 C tip "C" rebasing 3:63668d570d21 C tip "C"
abort: edit failed: false exited with status 1 abort: edit failed: false exited with status 1

tests/test-rebase-conflicts.t

unresolved conflicts (see 'hg resolve', then 'hg rebase --continue') unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')
[240] [240]
$ hg diff $ hg diff
diff -r 328e4ab1f7cc a diff -r 328e4ab1f7cc a
--- a/a Thu Jan 01 00:00:00 1970 +0000 --- a/a Thu Jan 01 00:00:00 1970 +0000
+++ b/a * (glob) +++ b/a * (glob)
@@ -1,2 +1,8 @@ @@ -1,2 +1,8 @@
a a
+<<<<<<< dest: 328e4ab1f7cc ab - test: ab +<<<<<<< dest: 328e4ab1f7cc ab - test: ab
b b
+||||||| base: cb9a9f314b8b - test: a +||||||| parent of source: cb9a9f314b8b - test: a
+======= +=======
+b +b
+c +c
+>>>>>>> source: 7bc217434fc1 - test: abc +>>>>>>> source: 7bc217434fc1 - test: abc
Test rebase with obsstore turned on and off (issue5606) Test rebase with obsstore turned on and off (issue5606)
$ cd $TESTTMP $ cd $TESTTMP
$ hg init b $ hg init b
$ cd b $ cd b
$ hg debugdrawdag <<'EOS' $ hg debugdrawdag <<'EOS'
> D > D

tests/test-sparse.t

$ hg debugsparse $ hg debugsparse
[exclude] [exclude]
hide* hide*
Temporarily Included Files (for merge/rebase): Temporarily Included Files (for merge/rebase):
hide hide
$ cat hide $ cat hide
<<<<<<< dest: 39278f7c08a9 - test: two <<<<<<< dest: 39278f7c08a9 - test: two
y y
======= =======
z z
>>>>>>> source: b91df4f39e75 - test: edit hide >>>>>>> source: b91df4f39e75 - test: edit hide
Verify aborting a rebase cleans up temporary files Verify aborting a rebase cleans up temporary files
$ hg rebase --abort --config extensions.rebase= $ hg rebase --abort --config extensions.rebase=
cleaned up 1 temporarily added file(s) from the sparse checkout cleaned up 1 temporarily added file(s) from the sparse checkout
rebase aborted rebase aborted
$ rm hide.orig $ rm hide.orig