Show More
@@ -277,10 +277,6 b' class basematcher(object):' | |||||
277 | # by recursive traversal is visited. |
|
277 | # by recursive traversal is visited. | |
278 | traversedir = None |
|
278 | traversedir = None | |
279 |
|
279 | |||
280 | def rel(self, f): |
|
|||
281 | '''Convert repo path back to path that is relative to cwd of matcher.''' |
|
|||
282 | return util.pathto(self._root, self._cwd, f) |
|
|||
283 |
|
||||
284 | @propertycache |
|
280 | @propertycache | |
285 | def _files(self): |
|
281 | def _files(self): | |
286 | return [] |
|
282 | return [] | |
@@ -710,7 +706,6 b' def intersectmatchers(m1, m2):' | |||||
710 | m.bad = m1.bad |
|
706 | m.bad = m1.bad | |
711 | m.explicitdir = m1.explicitdir |
|
707 | m.explicitdir = m1.explicitdir | |
712 | m.traversedir = m1.traversedir |
|
708 | m.traversedir = m1.traversedir | |
713 | m.rel = m1.rel |
|
|||
714 | return m |
|
709 | return m | |
715 | if m2.always(): |
|
710 | if m2.always(): | |
716 | m = copy.copy(m1) |
|
711 | m = copy.copy(m1) | |
@@ -798,8 +793,6 b' class subdirmatcher(basematcher):' | |||||
798 | ['b.txt'] |
|
793 | ['b.txt'] | |
799 | >>> m2.exact(b'b.txt') |
|
794 | >>> m2.exact(b'b.txt') | |
800 | True |
|
795 | True | |
801 | >>> util.pconvert(m2.rel(b'b.txt')) |
|
|||
802 | 'sub/b.txt' |
|
|||
803 | >>> def bad(f, msg): |
|
796 | >>> def bad(f, msg): | |
804 | ... print(pycompat.sysstr(b"%s: %s" % (f, msg))) |
|
797 | ... print(pycompat.sysstr(b"%s: %s" % (f, msg))) | |
805 | >>> m1.bad = bad |
|
798 | >>> m1.bad = bad | |
@@ -824,9 +817,6 b' class subdirmatcher(basematcher):' | |||||
824 | def bad(self, f, msg): |
|
817 | def bad(self, f, msg): | |
825 | self._matcher.bad(self._path + "/" + f, msg) |
|
818 | self._matcher.bad(self._path + "/" + f, msg) | |
826 |
|
819 | |||
827 | def rel(self, f): |
|
|||
828 | return self._matcher.rel(self._path + "/" + f) |
|
|||
829 |
|
||||
830 | def matchfn(self, f): |
|
820 | def matchfn(self, f): | |
831 | # Some information is lost in the superclass's constructor, so we |
|
821 | # Some information is lost in the superclass's constructor, so we | |
832 | # can not accurately create the matching function for the subdirectory |
|
822 | # can not accurately create the matching function for the subdirectory |
General Comments 0
You need to be logged in to leave comments.
Login now