D3710: locate: explicitly use dirstate.matches() for working copy
martinvonz (Martin von Zweigbergk)
phabricator at mercurial-scm.org
Tue Jun 12 08:26:52 EDT 2018
This revision was automatically updated to reflect the committed changes.
Closed by commit rHGfa4a286410a5: locate: explicitly use dirstate.matches() for working copy (authored by martinvonz, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D3710?vs=9009&id=9018
REVISION DETAIL
https://phab.mercurial-scm.org/D3710
AFFECTED FILES
mercurial/commands.py
CHANGE DETAILS
diff --git a/mercurial/commands.py b/mercurial/commands.py
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
@@ -3333,7 +3333,13 @@
badfn=lambda x, y: False)
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'):
ui.write(repo.wjoin(abs), end)
else:
To: martinvonz, #hg-reviewers
Cc: mercurial-devel
More information about the Mercurial-devel
mailing list