# HG changeset patch # User Vadim Gelfer # Date 1155507870 25200 # Node ID eab07a7b7491be8b065b1d67d5224a3de0293057 # Parent 51b8d1ca782011d9ae1d8a443205eecf079582bb fix patch.patch.filterfiles. now test-diff-subdir passes. diff -r 51b8d1ca7820 -r eab07a7b7491 mercurial/patch.py --- a/mercurial/patch.py Sun Aug 13 15:03:48 2006 -0700 +++ b/mercurial/patch.py Sun Aug 13 15:24:30 2006 -0700 @@ -277,16 +277,15 @@ modified, added, removed, deleted, unknown = changes if files: def filterfiles(filters): - l = [x for x in files if x in filters] + l = [x for x in filters if x in files] - for t in filters: - if t and t[-1] != "/": + for t in files: + if not t.endswith("/"): t += "/" - l += [x for x in files if x.startswith(t)] + l += [x for x in filters if x.startswith(t)] return l - modified, added, removed = map(lambda x: filterfiles(x), - (modified, added, removed)) + modified, added, removed = map(filterfiles, (modified, added, removed)) if not modified and not added and not removed: return