This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3710

locate: explicitly use dirstate.matches() for working copy
ClosedPublic

Authored by martinvonz on Jun 11 2018, 1:38 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGfa4a286410a5: locate: explicitly use dirstate.matches() for working copy
Summary

hg locate is odd in that it includes files that have been removed
from the working copy. It relies on workingctx.matches() for that. I
want to make workingctx.matches() not include removed files, so this
patch makes hg locate handle the working copy differently instead.

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/commands.py (8 lines)

Diff 9018

mercurial/commands.py

end = '\n' end = '\n'
ctx = scmutil.revsingle(repo, opts.get('rev'), None) ctx = scmutil.revsingle(repo, opts.get('rev'), None)
ret = 1 ret = 1
m = scmutil.match(ctx, pats, opts, default='relglob', m = scmutil.match(ctx, pats, opts, default='relglob',
badfn=lambda x, y: False) badfn=lambda x, y: False)
ui.pager('locate') ui.pager('locate')
for abs in ctx.matches(m): if ctx.rev() is None:
# When run on the working copy, "locate" includes removed files, so
# we get the list of files from the dirstate.
filesgen = sorted(repo.dirstate.matches(m))
else:
filesgen = ctx.matches(m)
for abs in filesgen:
if opts.get('fullpath'): if opts.get('fullpath'):
ui.write(repo.wjoin(abs), end) ui.write(repo.wjoin(abs), end)
else: else:
ui.write(((pats and m.rel(abs)) or abs), end) ui.write(((pats and m.rel(abs)) or abs), end)
ret = 0 ret = 0
return ret return ret