This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7900

merge: avoid a negation in the definition of updatedirstate
ClosedPublic

Authored by martinvonz on Jan 15 2020, 8:21 PM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHGfaec51c76b7b: merge: avoid a negation in the definition of updatedirstate
Summary

We only use partial in one place: the definition of
updatedirstate. Let's simplify that a little.

Diff Detail

Repository
rHG Mercurial
Branch
default
Lint
No Linters Available
Unit
No Unit Test Coverage

Event Timeline

martinvonz created this revision.Jan 15 2020, 8:21 PM
pulkit added a subscriber: pulkit.Jan 24 2020, 7:57 AM
pulkit added inline comments.
mercurial/merge.py
2290–2291

This comment now looks misplaced.

martinvonz marked an inline comment as done.Jan 24 2020, 11:42 AM
martinvonz added inline comments.
mercurial/merge.py
2290–2291

I'll insert another patch before this one to help with that.

Unrelated to your comment, I'll also reorder D7901 and D7902 because I think D7902 is less controversial.

pulkit accepted this revision.Jan 24 2020, 12:01 PM
This revision is now accepted and ready to land.Jan 24 2020, 12:01 PM

Revision Contents
Changeset List

PathPackages
Mmercurial/merge.py (10 lines)

Diff 19554

mercurial/merge.py

% ( % (
updatecheck, updatecheck,
( (
UPDATECHECK_NONE, UPDATECHECK_NONE,
UPDATECHECK_LINEAR, UPDATECHECK_LINEAR,
UPDATECHECK_NO_CONFLICT, UPDATECHECK_NO_CONFLICT,
), ),
) )
) )
with repo.wlock(): with repo.wlock():
pulkitUnsubmitted
Done

This comment now looks misplaced.

pulkit: This comment now looks misplaced.
martinvonzAuthorUnsubmitted
Done

I'll insert another patch before this one to help with that.

Unrelated to your comment, I'll also reorder D7901 and D7902 because I think D7902 is less controversial.

martinvonz: I'll insert another patch before this one to help with that. Unrelated to your comment, I'll…
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]]
else: else:
) )
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 # If we're doing a partial update, we need to skip updating
# the dirstate, so make a note of any partial-ness to the # the dirstate.
# update here. always = matcher is None or matcher.always()
if matcher is None or matcher.always(): updatedirstate = always and not wc.isinmemory()
partial = False
else:
partial = True
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.
# #
# We only advertise when performing an update from an empty working # We only advertise when performing an update from an empty working