This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7439

dirstate: include explicit matches in match.traversedir calls
ClosedPublic

Authored by martinvonz on Nov 15 2019, 7:34 PM.

Details

Reviewers
Alphare
pulkit
Group Reviewers
hg-reviewers
Commits
rHG95d2eab0a7b9: dirstate: include explicit matches in match.traversedir calls
Summary

The caller should not have to register to get both explicit and
non-explicit matches.

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

martinvonz created this revision.Nov 15 2019, 7:34 PM
Alphare added a subscriber: Alphare.Nov 18 2019, 4:27 AM
Alphare added inline comments.
mercurial/dirstate.py
942

Where is matchtdir defined? I don't see it on any of the patches in the stack.

martinvonz marked an inline comment as done.Nov 18 2019, 8:58 AM
martinvonz added inline comments.
mercurial/dirstate.py
942

It's on line 916 in this file.

Alphare accepted this revision.Nov 18 2019, 8:59 AM
Alphare added inline comments.
mercurial/dirstate.py
942

Indeed. Don't know what happened. Thanks

pulkit accepted this revision.Nov 19 2019, 7:42 AM
This revision is now accepted and ready to land.Nov 19 2019, 7:42 AM
martinvonz marked an inline comment as done.Nov 19 2019, 8:13 AM
martinvonz added a commit: rHG95d2eab0a7b9: dirstate: include explicit matches in match.traversedir calls.
Closed by commit rHG95d2eab0a7b9: dirstate: include explicit matches in match.traversedir calls (authored by martinvonz). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/dirstate.py (5 lines)
Mmercurial/merge.py (4 lines)

Diff 18236

mercurial/dirstate.py

normalizefile = self._normalizefile normalizefile = self._normalizefile
skipstep3 = False skipstep3 = False
else: else:
normalize = self._normalize normalize = self._normalize
normalizefile = None normalizefile = None
# step 1: find all explicit files # step 1: find all explicit files
results, work, dirsnotfound = self._walkexplicit(match, subrepos) results, work, dirsnotfound = self._walkexplicit(match, subrepos)
if matchtdir:
AlphareUnsubmitted
Done

Where is matchtdir defined? I don't see it on any of the patches in the stack.

Alphare: Where is `matchtdir` defined? I don't see it on any of the patches in the stack.
martinvonzAuthorUnsubmitted
Done

It's on line 916 in this file.

martinvonz: It's on line 916 in this file.
AlphareUnsubmitted
Not Done

Indeed. Don't know what happened. Thanks

Alphare: Indeed. Don't know what happened. Thanks
for d in work:
matchtdir(d[0])
for d in dirsnotfound:
matchtdir(d)
skipstep3 = skipstep3 and not (work or dirsnotfound) skipstep3 = skipstep3 and not (work or dirsnotfound)
work = [d for d in work if not dirignore(d[0])] work = [d for d in work if not dirignore(d[0])]
# step 2: visit subdirectories # step 2: visit subdirectories
def traverse(work, alreadynormed): def traverse(work, alreadynormed):
wadd = work.append wadd = work.append
while work: while work:

mercurial/merge.py

m = _(b'%s cannot be removed') % path m = _(b'%s cannot be removed') % path
if abortonerror: if abortonerror:
raise error.Abort(m) raise error.Abort(m)
else: else:
repo.ui.warn(_(b'warning: %s\n') % m) repo.ui.warn(_(b'warning: %s\n') % m)
# There's no API to copy a matcher. So mutate the passed matcher and # There's no API to copy a matcher. So mutate the passed matcher and
# restore it when we're done. # restore it when we're done.
oldexplicitdir = matcher.explicitdir
oldtraversedir = matcher.traversedir oldtraversedir = matcher.traversedir
res = [] res = []
try: try:
if removeemptydirs: if removeemptydirs:
directories = [] directories = []
matcher.explicitdir = matcher.traversedir = directories.append matcher.traversedir = directories.append
status = repo.status(match=matcher, ignored=ignored, unknown=True) status = repo.status(match=matcher, ignored=ignored, unknown=True)
if removefiles: if removefiles:
for f in sorted(status.unknown + status.ignored): for f in sorted(status.unknown + status.ignored):
if not noop: if not noop:
repo.ui.note(_(b'removing file %s\n') % f) repo.ui.note(_(b'removing file %s\n') % f)
remove(repo.wvfs.unlink, f) remove(repo.wvfs.unlink, f)
res.append(f) res.append(f)
if removeemptydirs: if removeemptydirs:
for f in sorted(directories, reverse=True): for f in sorted(directories, reverse=True):
if matcher(f) and not repo.wvfs.listdir(f): if matcher(f) and not repo.wvfs.listdir(f):
if not noop: if not noop:
repo.ui.note(_(b'removing directory %s\n') % f) repo.ui.note(_(b'removing directory %s\n') % f)
remove(repo.wvfs.rmdir, f) remove(repo.wvfs.rmdir, f)
res.append(f) res.append(f)
return res return res
finally: finally:
matcher.explicitdir = oldexplicitdir
matcher.traversedir = oldtraversedir matcher.traversedir = oldtraversedir