Mercurial > hg-stable
changeset 24667:19c5b0913960
manifest.walk: join nested if-conditions
This makes it more closely match the similar condition in
manifestdict.matches().
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Tue, 07 Apr 2015 22:35:44 -0700 |
| parents | 3092885b5b32 |
| children | 81873bb2a01d |
| files | mercurial/manifest.py |
| diffstat | 1 files changed, 4 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- 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: