This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7983

merge: move definition of `partial` closer to where it's used
ClosedPublic

Authored by martinvonz on Jan 24 2020, 11:43 AM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHGae9310709c13: merge: move definition of `partial` closer to where it's used

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.

Revision Contents
Changeset List

PathPackages
Mmercurial/merge.py (14 lines)

Diff 19576

mercurial/merge.py

updatecheck, updatecheck,
( (
UPDATECHECK_NONE, UPDATECHECK_NONE,
UPDATECHECK_LINEAR, UPDATECHECK_LINEAR,
UPDATECHECK_NO_CONFLICT, UPDATECHECK_NO_CONFLICT,
), ),
) )
) )
# If we're doing a partial update, we need to skip updating
# the dirstate, so make a note of any partial-ness to the
# update here.
if matcher is None or matcher.always():
partial = False
else:
partial = True
with repo.wlock(): with repo.wlock():
if wc is None: if wc is None:
wc = repo[None] wc = repo[None]
pl = wc.parents() pl = wc.parents()
p1 = pl[0] p1 = pl[0]
p2 = repo[node] p2 = repo[node]
if ancestor is not None: if ancestor is not None:
pas = [repo[ancestor]] pas = [repo[ancestor]]
% f % f
) )
for nf in sorted(fl): for nf in sorted(fl):
repo.ui.warn(b" %s\n" % nf) repo.ui.warn(b" %s\n" % nf)
### apply phase ### apply phase
if not branchmerge: # just jump to the new rev if not branchmerge: # just jump to the new rev
fp1, fp2, xp1, xp2 = fp2, nullid, xp2, b'' fp1, fp2, xp1, xp2 = fp2, nullid, xp2, b''
# If we're doing a partial update, we need to skip updating
# the dirstate, so make a note of any partial-ness to the
# update here.
if matcher is None or matcher.always():
partial = False
else:
partial = True
updatedirstate = not partial and not wc.isinmemory() updatedirstate = not partial and not wc.isinmemory()
if updatedirstate: if updatedirstate:
repo.hook(b'preupdate', throw=True, parent1=xp1, parent2=xp2) repo.hook(b'preupdate', throw=True, parent1=xp1, parent2=xp2)
# note that we're in the middle of an update # note that we're in the middle of an update
repo.vfs.write(b'updatestate', p2.hex()) repo.vfs.write(b'updatestate', p2.hex())
# Advertise fsmonitor when its presence could be useful. # Advertise fsmonitor when its presence could be useful.
# #