##// END OF EJS Templates
match: remove explicitdir attribute...
Martin von Zweigbergk -
r44114:5e1b0470 default
parent child Browse files
Show More
@@ -375,10 +375,6 b' class basematcher(object):'
375 375 '''Callback from dirstate.walk for each explicit file that can't be
376 376 found/accessed, with an error message.'''
377 377
378 # If an explicitdir is set, it will be called when an explicitly listed
379 # directory is visited.
380 explicitdir = None
381
382 378 # If an traversedir is set, it will be called when a directory discovered
383 379 # by recursive traversal is visited.
384 380 traversedir = None
@@ -792,8 +788,7 b' class differencematcher(basematcher):'
792 788 '''Composes two matchers by matching if the first matches and the second
793 789 does not.
794 790
795 The second matcher's non-matching-attributes (bad, explicitdir,
796 traversedir) are ignored.
791 The second matcher's non-matching-attributes (bad, traversedir) are ignored.
797 792 '''
798 793
799 794 def __init__(self, m1, m2):
@@ -801,7 +796,6 b' class differencematcher(basematcher):'
801 796 self._m1 = m1
802 797 self._m2 = m2
803 798 self.bad = m1.bad
804 self.explicitdir = m1.explicitdir
805 799 self.traversedir = m1.traversedir
806 800
807 801 def matchfn(self, f):
@@ -862,8 +856,7 b' class differencematcher(basematcher):'
862 856 def intersectmatchers(m1, m2):
863 857 '''Composes two matchers by matching if both of them match.
864 858
865 The second matcher's non-matching-attributes (bad, explicitdir,
866 traversedir) are ignored.
859 The second matcher's non-matching-attributes (bad, traversedir) are ignored.
867 860 '''
868 861 if m1 is None or m2 is None:
869 862 return m1 or m2
@@ -872,7 +865,6 b' def intersectmatchers(m1, m2):'
872 865 # TODO: Consider encapsulating these things in a class so there's only
873 866 # one thing to copy from m1.
874 867 m.bad = m1.bad
875 m.explicitdir = m1.explicitdir
876 868 m.traversedir = m1.traversedir
877 869 return m
878 870 if m2.always():
@@ -887,7 +879,6 b' class intersectionmatcher(basematcher):'
887 879 self._m1 = m1
888 880 self._m2 = m2
889 881 self.bad = m1.bad
890 self.explicitdir = m1.explicitdir
891 882 self.traversedir = m1.traversedir
892 883
893 884 @propertycache
@@ -1028,8 +1019,7 b' class subdirmatcher(basematcher):'
1028 1019 class prefixdirmatcher(basematcher):
1029 1020 """Adapt a matcher to work on a parent directory.
1030 1021
1031 The matcher's non-matching-attributes (bad, explicitdir, traversedir) are
1032 ignored.
1022 The matcher's non-matching-attributes (bad, traversedir) are ignored.
1033 1023
1034 1024 The prefix path should usually be the relative path from the root of
1035 1025 this matcher to the root of the wrapped matcher.
@@ -1112,14 +1102,13 b' class prefixdirmatcher(basematcher):'
1112 1102 class unionmatcher(basematcher):
1113 1103 """A matcher that is the union of several matchers.
1114 1104
1115 The non-matching-attributes (bad, explicitdir, traversedir) are taken from
1116 the first matcher.
1105 The non-matching-attributes (bad, traversedir) are taken from the first
1106 matcher.
1117 1107 """
1118 1108
1119 1109 def __init__(self, matchers):
1120 1110 m1 = matchers[0]
1121 1111 super(unionmatcher, self).__init__()
1122 self.explicitdir = m1.explicitdir
1123 1112 self.traversedir = m1.traversedir
1124 1113 self._matchers = matchers
1125 1114
General Comments 0
You need to be logged in to leave comments. Login now