walk: return a single value

mercurial/cmdutil.py

@@ -271,11 +271,11 b' def addremove(repo, pats=[], opts={}, dr'
     add, remove = [], []
     mapping = {}
     m = match(repo, pats, opts)
-    for src, abs in repo.walk(m):
+    for abs in repo.walk(m):
         target = repo.wjoin(abs)
         rel = m.rel(abs)
         exact = m.exact(abs)
-        if src == 'f' and abs not in repo.dirstate:
+        if abs not in repo.dirstate:
             add.append(abs)
             mapping[abs] = rel, m.exact(abs)
             if repo.ui.verbose or not exact:
@@ -313,7 +313,7 b' def copy(ui, repo, pats, opts, rename=Fa'
     def walkpat(pat):
         srcs = []
         m = match(repo, [pat], opts, globbed=True)
-        for tag, abs in repo.walk(m):
+        for abs in repo.walk(m):
             state = repo.dirstate[abs]
             rel = m.rel(abs)
             exact = m.exact(abs)

mercurial/commands.py

@@ -33,7 +33,7 b' def add(ui, repo, *pats, **opts):'
     names = []
     m = cmdutil.match(repo, pats, opts)
     m.bad = lambda x,y: True
-    for src, abs in repo.walk(m):
+    for abs in repo.walk(m):
         if m.exact(abs):
             if ui.verbose:
                 ui.status(_('adding %s\n') % m.rel(abs))
@@ -110,7 +110,7 b' def annotate(ui, repo, *pats, **opts):'
     ctx = repo.changectx(opts['rev'])
 
     m = cmdutil.match(repo, pats, opts)
-    for src, abs in repo.walk(m, ctx.node()):
+    for abs in repo.walk(m, ctx.node()):
         fctx = ctx.filectx(abs)
         if not opts['text'] and util.binary(fctx.data()):
             ui.write(_("%s: binary file\n") % ((pats and m.rel(abs)) or abs))
@@ -489,7 +489,7 b' def cat(ui, repo, file1, *pats, **opts):'
     ctx = repo.changectx(opts['rev'])
     err = 1
     m = cmdutil.match(repo, (file1,) + pats, opts)
-    for src, abs in repo.walk(m, ctx.node()):
+    for abs in repo.walk(m, ctx.node()):
         fp = cmdutil.make_file(repo, opts['output'], ctx.node(), pathname=abs)
         data = ctx.filectx(abs).data()
         if opts.get('decode'):
@@ -915,7 +915,7 b' def debugrename(ui, repo, file1, *pats, '
 
     ctx = repo.changectx(opts.get('rev', 'tip'))
     m = cmdutil.match(repo, (file1,) + pats, opts)
-    for src, abs in repo.walk(m, ctx.node()):
+    for abs in repo.walk(m, ctx.node()):
         fctx = ctx.filectx(abs)
         o = fctx.filelog().renamed(fctx.filenode())
         rel = m.rel(abs)
@@ -930,11 +930,11 b' def debugwalk(ui, repo, *pats, **opts):'
     items = list(repo.walk(m))
     if not items:
         return
-    fmt = '%%s  %%-%ds  %%-%ds  %%s' % (
-        max([len(abs) for (src, abs) in items]),
-        max([len(m.rel(abs)) for (src, abs) in items]))
-    for src, abs in items:
-        line = fmt % (src, abs, m.rel(abs), m.exact(abs) and 'exact' or '')
+    fmt = 'f  %%-%ds  %%-%ds  %%s' % (
+        max([len(abs) for abs in items]),
+        max([len(m.rel(abs)) for abs in items]))
+    for abs in items:
+        line = fmt % (abs, m.rel(abs), m.exact(abs) and 'exact' or '')
         ui.write("%s\n" % line.rstrip())
 
 def diff(ui, repo, *pats, **opts):
@@ -1699,7 +1699,7 b' def locate(ui, repo, *pats, **opts):'
     ret = 1
     m = cmdutil.match(repo, pats, opts, default='relglob')
     m.bad = lambda x,y: False
-    for src, abs in repo.walk(m, node):
+    for abs in repo.walk(m, node):
         if not node and abs not in repo.dirstate:
             continue
         if opts['fullpath']:
@@ -2185,7 +2185,7 b' def remove(ui, repo, *pats, **opts):'
     modified, added, removed, deleted, unknown = mardu
 
     remove, forget = [], []
-    for src, abs in repo.walk(m):
+    for abs in repo.walk(m):
 
         reason = None
         if abs in removed or abs in unknown:
@@ -2342,7 +2342,7 b' def revert(ui, repo, *pats, **opts):'
 
         m = cmdutil.match(repo, pats, opts)
         m.bad = lambda x,y: False
-        for src, abs in repo.walk(m):
+        for abs in repo.walk(m):
             names[abs] = m.rel(abs), m.exact(abs)
 
         # walk target manifest.
@@ -2359,7 +2359,7 b' def revert(ui, repo, *pats, **opts):'
 
         m = cmdutil.match(repo, pats, opts)
         m.bad = badfn
-        for src, abs in repo.walk(m, node=node):
+        for abs in repo.walk(m, node=node):
             if abs not in names:
                 names[abs] = m.rel(abs), m.exact(abs)
 

mercurial/localrepo.py

@@ -936,11 +936,6 b' class localrepository(repo.repository):'
         walk recursively through the directory tree or a given
         changeset, finding all files matched by the match
         function
-
-        results are yielded in a tuple (src, filename), where src
-        is one of:
-        'f' the file was found in the directory tree
-        'm' the file was only in the dirstate and not in the tree
         '''
 
         if node:
@@ -958,16 +953,16 b' class localrepository(repo.repository):'
                         del fdict[ffn]
                         break
                 if match(fn):
-                    yield 'm', fn
+                    yield fn
             ffiles = fdict.keys()
             ffiles.sort()
             for fn in ffiles:
                 if match.bad(fn, 'No such file in rev ' + short(node)) \
                         and match(fn):
-                    yield 'f', fn
+                    yield fn
         else:
             for src, fn in self.dirstate.walk(match):
-                yield src, fn
+                yield fn
 
     def status(self, node1=None, node2=None, files=[], match=util.always,
                list_ignored=False, list_clean=False, list_unknown=True):

tests/test-walk.out

@@ -275,10 +275,10 b' hg debugwalk fifo'
 fifo: unsupported file type (type is fifo)
 
 hg debugwalk fenugreek
-m  fenugreek  fenugreek  exact
+f  fenugreek  fenugreek  exact
 
 hg debugwalk fenugreek
-m  fenugreek  fenugreek  exact
+f  fenugreek  fenugreek  exact
 
 hg debugwalk new
 f  new  new  exact