This is an archive of the discontinued Mercurial Phabricator instance.

Differential D12106

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

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

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHG6c4b10d01af0: merge: break up two not-so-one-liner for extra 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:52 AM
This revision is now accepted and ready to land.Feb 3 2022, 3:52 AM

Revision Contents
Changeset List

PathPackages
Mmercurial/merge.py (28 lines)

Diff 32064

mercurial/merge.py

# that's now in destutil.py. # that's now in destutil.py.
assert node is not None assert node is not None
if not branchmerge and not force: if not branchmerge and not force:
# TODO: remove the default once all callers that pass branchmerge=False # TODO: remove the default once all callers that pass branchmerge=False
# and force=False pass a value for updatecheck. We may want to allow # and force=False pass a value for updatecheck. We may want to allow
# updatecheck='abort' to better suppport some of these callers. # updatecheck='abort' to better suppport some of these callers.
if updatecheck is None: if updatecheck is None:
updatecheck = UPDATECHECK_LINEAR updatecheck = UPDATECHECK_LINEAR
if updatecheck not in ( okay = (UPDATECHECK_NONE, UPDATECHECK_LINEAR, UPDATECHECK_NO_CONFLICT)
UPDATECHECK_NONE, if updatecheck not in okay:
UPDATECHECK_LINEAR, msg = r'Invalid updatecheck %r (can accept %r)'
UPDATECHECK_NO_CONFLICT, msg %= (updatecheck, okay)
): raise ValueError(msg)
raise ValueError(
r'Invalid updatecheck %r (can accept %r)'
% (
updatecheck,
(
UPDATECHECK_NONE,
UPDATECHECK_LINEAR,
UPDATECHECK_NO_CONFLICT,
),
)
)
if wc is not None and wc.isinmemory(): if wc is not None and wc.isinmemory():
maybe_wlock = util.nullcontextmanager() maybe_wlock = util.nullcontextmanager()
else: else:
maybe_wlock = repo.wlock() maybe_wlock = repo.wlock()
with maybe_wlock: with maybe_wlock:
if wc is None: if wc is None:
wc = repo[None] wc = repo[None]
pl = wc.parents() pl = wc.parents()
overwrite = force and not branchmerge overwrite = force and not branchmerge
### check phase ### check phase
if not overwrite: if not overwrite:
if len(pl) > 1: if len(pl) > 1:
raise error.StateError(_(b"outstanding uncommitted merge")) raise error.StateError(_(b"outstanding uncommitted merge"))
ms = wc.mergestate() ms = wc.mergestate()
if ms.unresolvedcount(): if ms.unresolvedcount():
raise error.StateError( msg = _(b"outstanding merge conflicts")
_(b"outstanding merge conflicts"), hint = _(b"use 'hg resolve' to resolve")
hint=_(b"use 'hg resolve' to resolve"), raise error.StateError(msg, hint=hint)
)
if branchmerge: if branchmerge:
if pas == [p2]: if pas == [p2]:
raise error.Abort( raise error.Abort(
_( _(
b"merging with a working directory ancestor" b"merging with a working directory ancestor"
b" has no effect" b" has no effect"
) )
) )