This is an archive of the discontinued Mercurial Phabricator instance.

Differential D12109

merge: break up a not-so-one-liner for readability
ClosedPublic

Authored by marmoute on Jan 29 2022, 9:13 AM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHG00bfd920169d: merge: break up a not-so-one-liner for readability

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

marmoute created this revision.Jan 29 2022, 9:13 AM
Alphare accepted this revision.Feb 3 2022, 3:53 AM
This revision is now accepted and ready to land.Feb 3 2022, 3:53 AM
marmoute added a commit: rHG00bfd920169d: merge: break up a not-so-one-liner for readability.Feb 4 2022, 5:29 AM
Closed by commit rHG00bfd920169d: merge: break up a not-so-one-liner for readability (authored by marmoute). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/merge.py (7 lines)

Diff 32067

mercurial/merge.py

if pas == [p2]: if pas == [p2]:
raise error.Abort(m_a) raise error.Abort(m_a)
elif pas == [p1]: elif pas == [p1]:
if not mergeancestor and wc.branch() == p2.branch(): if not mergeancestor and wc.branch() == p2.branch():
msg = _(b"nothing to merge") msg = _(b"nothing to merge")
hint = _(b"use 'hg update' or check 'hg heads'") hint = _(b"use 'hg update' or check 'hg heads'")
raise error.Abort(msg, hint=hint) raise error.Abort(msg, hint=hint)
if not force and (wc.files() or wc.deleted()): if not force and (wc.files() or wc.deleted()):
raise error.StateError( msg = _(b"uncommitted changes")
_(b"uncommitted changes"), hint = _(b"use 'hg status' to list changes")
hint=_(b"use 'hg status' to list changes"), raise error.StateError(msg, hint=hint)
)
if not wc.isinmemory(): if not wc.isinmemory():
for s in sorted(wc.substate): for s in sorted(wc.substate):
wc.sub(s).bailifchanged() wc.sub(s).bailifchanged()
elif not overwrite: elif not overwrite:
if p1 == p2: # no-op update if p1 == p2: # no-op update
# call the hooks and exit early # call the hooks and exit early
repo.hook(b'preupdate', throw=True, parent1=xp2, parent2=b'') repo.hook(b'preupdate', throw=True, parent1=xp2, parent2=b'')