Show More
@@ -940,7 +940,7 b' class treemanifest(object):' | |||||
940 |
|
940 | |||
941 | def filesnotin(self, m2, match=None): |
|
941 | def filesnotin(self, m2, match=None): | |
942 | '''Set of files in this manifest that are not in the other''' |
|
942 | '''Set of files in this manifest that are not in the other''' | |
943 | if match: |
|
943 | if match and not match.always(): | |
944 | m1 = self.matches(match) |
|
944 | m1 = self.matches(match) | |
945 | m2 = m2.matches(match) |
|
945 | m2 = m2.matches(match) | |
946 | return m1.filesnotin(m2) |
|
946 | return m1.filesnotin(m2) | |
@@ -1085,7 +1085,7 b' class treemanifest(object):' | |||||
1085 | the nodeid will be None and the flags will be the empty |
|
1085 | the nodeid will be None and the flags will be the empty | |
1086 | string. |
|
1086 | string. | |
1087 | ''' |
|
1087 | ''' | |
1088 | if match: |
|
1088 | if match and not match.always(): | |
1089 | m1 = self.matches(match) |
|
1089 | m1 = self.matches(match) | |
1090 | m2 = m2.matches(match) |
|
1090 | m2 = m2.matches(match) | |
1091 | return m1.diff(m2, clean=clean) |
|
1091 | return m1.diff(m2, clean=clean) |
General Comments 0
You need to be logged in to leave comments.
Login now