This is an archive of the discontinued Mercurial Phabricator instance.

Differential D12023

histedit: attempt to make merge labels more helpful
ClosedPublic

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

Details

Reviewers
durin42
Alphare
Group Reviewers
hg-reviewers
Commits
rHGf1162b125991: histedit: attempt to make merge labels more helpful

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:39 AM
This revision is now accepted and ready to land.Jan 24 2022, 5:39 AM
martinvonz added a commit: rHGf1162b125991: histedit: attempt to make merge labels more helpful.Jan 24 2022, 12:34 PM
Closed by commit rHGf1162b125991: histedit: attempt to make merge labels more helpful (authored by martinvonz). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 31836

hgext/histedit.py

cmdutil.revert(ui, repo, ctx, all=True) cmdutil.revert(ui, repo, ctx, all=True)
stats = mergemod.updateresult(0, 0, 0, 0) stats = mergemod.updateresult(0, 0, 0, 0)
else: else:
try: try:
# ui.forcemerge is an internal variable, do not document # ui.forcemerge is an internal variable, do not document
repo.ui.setconfig( repo.ui.setconfig(
b'ui', b'forcemerge', opts.get(b'tool', b''), b'histedit' b'ui', b'forcemerge', opts.get(b'tool', b''), b'histedit'
) )
stats = mergemod.graft(repo, ctx, labels=[b'local', b'histedit']) stats = mergemod.graft(
repo,
ctx,
labels=[
b'already edited',
b'current change',
b'parent of current change',
],
)
finally: finally:
repo.ui.setconfig(b'ui', b'forcemerge', b'', b'histedit') repo.ui.setconfig(b'ui', b'forcemerge', b'', b'histedit')
return stats return stats
def collapse(repo, firstctx, lastctx, commitopts, skipprompt=False): def collapse(repo, firstctx, lastctx, commitopts, skipprompt=False):
"""collapse the set of revisions from first to last as new one. """collapse the set of revisions from first to last as new one.

tests/test-histedit-non-commute-abort.t

merging e merging e
warning: conflicts while merging e! (edit, then use 'hg resolve --mark') warning: conflicts while merging e! (edit, then use 'hg resolve --mark')
Fix up the change (pick e860deea161a) Fix up the change (pick e860deea161a)
(hg histedit --continue to resume) (hg histedit --continue to resume)
insert unsupported advisory merge record insert unsupported advisory merge record
$ hg --config extensions.fakemergerecord=$TESTDIR/fakemergerecord.py fakemergerecord -x $ hg --config extensions.fakemergerecord=$TESTDIR/fakemergerecord.py fakemergerecord -x
$ hg debugmergestate $ hg debugmergestate
local (local): 8f7551c7e4a2f2efe0bc8c741baf7f227d65d758 local (already edited): 8f7551c7e4a2f2efe0bc8c741baf7f227d65d758
other (histedit): e860deea161a2f77de56603b340ebbb4536308ae other (current change): e860deea161a2f77de56603b340ebbb4536308ae
file: e (state "u") file: e (state "u")
local path: e (hash 58e6b3a414a1e090dfc6029add0f3555ccba127f, flags "") local path: e (hash 58e6b3a414a1e090dfc6029add0f3555ccba127f, flags "")
ancestor path: e (node 0000000000000000000000000000000000000000) ancestor path: e (node 0000000000000000000000000000000000000000)
other path: e (node 6b67ccefd5ce6de77e7ead4f5292843a0255329f) other path: e (node 6b67ccefd5ce6de77e7ead4f5292843a0255329f)
extra: ancestorlinknode = 0000000000000000000000000000000000000000 extra: ancestorlinknode = 0000000000000000000000000000000000000000
extra: merged = yes extra: merged = yes
$ hg resolve -l $ hg resolve -l
U e U e