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

login
register
mail settings
Submitter phabricator
Date June 12, 2018, 12:26 p.m.
Message ID <2758ad9afb6d1c407ed55943e029c54c@localhost.localdomain>
Download mbox | patch
Permalink /patch/32074/
State Not Applicable
Headers show

Comments

phabricator - June 12, 2018, 12:26 p.m.
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




To: martinvonz, #hg-reviewers
Cc: mercurial-devel

Patch

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: