This is an archive of the discontinued Mercurial Phabricator instance.

Differential D1050

sparse: fix for upstreamed path conflicts changes
ClosedPublic

Authored by mbthomas on Oct 13 2017, 5:45 AM.
Tags
None
Subscribers
ryanmce

Details

Reviewers
ryanmce
Group Reviewers
Restricted Project
Commits
rFBHGX2de524a6b07e: sparse: fix for upstreamed path conflicts changes

Diff Detail

Repository
rFBHGX Facebook Mercurial Extensions
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
Mhgext3rd/sparse.py (3 lines)

Diff 2689

hgext3rd/sparse.py

for file, state in dirstate.iteritems(): for file, state in dirstate.iteritems():
if not file in files: if not file in files:
old = origsparsematch(file) old = origsparsematch(file)
new = sparsematch(file) new = sparsematch(file)
if old and not new: if old and not new:
dropped.append(file) dropped.append(file)
# Apply changes to disk # Apply changes to disk
typeactions = dict((m, []) for m in 'a f g am cd dc r dm dg m e k'.split()) typeactions = dict((m, [])
for m in 'a f g am cd dc r dm dg m e k p pr'.split())
for f, (m, args, msg) in actions.iteritems(): for f, (m, args, msg) in actions.iteritems():
if m not in typeactions: if m not in typeactions:
typeactions[m] = [] typeactions[m] = []
typeactions[m].append((f, args, msg)) typeactions[m].append((f, args, msg))
mergemod.applyupdates(repo, typeactions, repo[None], repo['.'], False) mergemod.applyupdates(repo, typeactions, repo[None], repo['.'], False)
# Fix dirstate # Fix dirstate
for file in added: for file in added: