##// END OF EJS Templates
check-code: complain about set.isdisjoint
Matt Mackall -
r14267:6332c02b default
parent child Browse files
Show More
@@ -139,6 +139,7 b' pypats = ['
139 (r'[\x80-\xff]', "non-ASCII character literal"),
139 (r'[\x80-\xff]', "non-ASCII character literal"),
140 (r'("\')\.format\(', "str.format() not available in Python 2.4"),
140 (r'("\')\.format\(', "str.format() not available in Python 2.4"),
141 (r'^\s*with\s+', "with not available in Python 2.4"),
141 (r'^\s*with\s+', "with not available in Python 2.4"),
142 (r'\.isdisjoint\(', "set.isdisjoint not available in Python 2.4"),
142 (r'^\s*except.* as .*:', "except as not available in Python 2.4"),
143 (r'^\s*except.* as .*:', "except as not available in Python 2.4"),
143 (r'^\s*os\.path\.relpath', "relpath not available in Python 2.4"),
144 (r'^\s*os\.path\.relpath', "relpath not available in Python 2.4"),
144 (r'(?<!def)\s+(any|all|format)\(',
145 (r'(?<!def)\s+(any|all|format)\(',
@@ -1174,7 +1174,7 b' class queue(object):'
1174 for patchname in s:
1174 for patchname in s:
1175 pf = os.path.join(self.path, patchname)
1175 pf = os.path.join(self.path, patchname)
1176 patchfiles = patchmod.changedfiles(pf, strip=1)
1176 patchfiles = patchmod.changedfiles(pf, strip=1)
1177 if not wcfiles.isdisjoint(patchfiles):
1177 if wcfiles.intersection(patchfiles):
1178 self.localchangesfound(self.applied)
1178 self.localchangesfound(self.applied)
1179 elif mergeq:
1179 elif mergeq:
1180 self.check_localchanges(refresh=self.applied)
1180 self.check_localchanges(refresh=self.applied)
@@ -1285,7 +1285,7 b' class queue(object):'
1285 if not force and parentfiles:
1285 if not force and parentfiles:
1286 mm, aa, rr, dd = repo.status()[:4]
1286 mm, aa, rr, dd = repo.status()[:4]
1287 wcfiles = set(mm + aa + rr + dd)
1287 wcfiles = set(mm + aa + rr + dd)
1288 if not wcfiles.isdisjoint(parentfiles):
1288 if wcfiles.intersection(parentfiles):
1289 self.localchangesfound()
1289 self.localchangesfound()
1290 if d:
1290 if d:
1291 raise util.Abort(_("deletions found between repo revs"))
1291 raise util.Abort(_("deletions found between repo revs"))
General Comments 0
You need to be logged in to leave comments. Login now