[PATCH 4 of 4] manifest.walk: join nested if-conditions
Martin von Zweigbergk
martinvonz at google.com
Wed Apr 8 14:58:05 CDT 2015
# HG changeset patch
# User Martin von Zweigbergk <martinvonz at google.com>
# Date 1428471344 25200
# Tue Apr 07 22:35:44 2015 -0700
# Node ID 3d4cfad760d58cd96809ed93c23822f0e47ed9e5
# Parent 0ea055b50b25af563a7f0956acf6ee465217f10b
manifest.walk: join nested if-conditions
This makes it more closely match the similar condition in
manifestdict.matches().
diff -r 0ea055b50b25 -r 3d4cfad760d5 mercurial/manifest.py
--- a/mercurial/manifest.py Wed Apr 08 10:01:31 2015 -0700
+++ b/mercurial/manifest.py Tue Apr 07 22:35:44 2015 -0700
@@ -225,11 +225,10 @@
fset = set(match.files())
# avoid the entire walk if we're only looking for specific files
- if fset and not match.anypats():
- if util.all(fn in self for fn in fset):
- for fn in sorted(fset):
- yield fn
- raise StopIteration
+ if fset and not match.anypats() and util.all(fn in self for fn in fset):
+ for fn in sorted(fset):
+ yield fn
+ raise StopIteration
for fn in self:
if fn in fset:
More information about the Mercurial-devel
mailing list