Patchwork cmdutil: remove duplicated badmatch call in cat()

login
register
mail settings
Submitter Hannes Oldenburg
Date Aug. 7, 2016, 3:52 p.m.
Message ID <12c72545f8627845c56b.1470585173@localhost.localdomain>
Download mbox | patch
Permalink /patch/16178/
State Accepted
Headers show

Comments

Hannes Oldenburg - Aug. 7, 2016, 3:52 p.m.
# HG changeset patch
# User Hannes Oldenburg <hannes.christian.oldenburg@gmail.com>
# Date 1470578780 0
#      Sun Aug 07 14:06:20 2016 +0000
# Node ID 12c72545f8627845c56b070a27eff88adefd7c16
# Parent  37b6f0ec6241a62de90737409458cd622e2fac0d
cmdutil: remove duplicated badmatch call in cat()

Subrepo logic is handled in ctx.walk().
Pierre-Yves David - Aug. 8, 2016, 12:12 a.m.
On 08/07/2016 05:52 PM, Hannes Oldenburg wrote:
> # HG changeset patch
> # User Hannes Oldenburg <hannes.christian.oldenburg@gmail.com>
> # Date 1470578780 0
> #      Sun Aug 07 14:06:20 2016 +0000
> # Node ID 12c72545f8627845c56b070a27eff88adefd7c16
> # Parent  37b6f0ec6241a62de90737409458cd622e2fac0d
> cmdutil: remove duplicated badmatch call in cat()

Seems correct and tests agree. Pushed. Thanks.

Patch

diff -r 37b6f0ec6241 -r 12c72545f862 mercurial/cmdutil.py
--- a/mercurial/cmdutil.py	Fri Aug 05 17:27:51 2016 -0400
+++ b/mercurial/cmdutil.py	Sun Aug 07 14:06:20 2016 +0000
@@ -2581,14 +2581,7 @@ 
             write(file)
             return 0
 
-    # Don't warn about "missing" files that are really in subrepos
-    def badfn(path, msg):
-        for subpath in ctx.substate:
-            if path.startswith(subpath + '/'):
-                return
-        matcher.bad(path, msg)
-
-    for abs in ctx.walk(matchmod.badmatch(matcher, badfn)):
+    for abs in ctx.walk(matcher):
         write(abs)
         err = 0