hgext/mq.py
changeset 14267 6332c02b3d68
parent 14260 00a881581400
child 14298 21719639276d
--- a/hgext/mq.py	Sun May 01 12:29:32 2011 +0200
+++ b/hgext/mq.py	Sun May 08 11:39:24 2011 -0500
@@ -1174,7 +1174,7 @@
                     for patchname in s:
                         pf = os.path.join(self.path, patchname)
                         patchfiles = patchmod.changedfiles(pf, strip=1)
-                        if not wcfiles.isdisjoint(patchfiles):
+                        if wcfiles.intersection(patchfiles):
                             self.localchangesfound(self.applied)
             elif mergeq:
                 self.check_localchanges(refresh=self.applied)
@@ -1285,7 +1285,7 @@
                 if not force and parentfiles:
                     mm, aa, rr, dd = repo.status()[:4]
                     wcfiles = set(mm + aa + rr + dd)
-                    if not wcfiles.isdisjoint(parentfiles):
+                    if wcfiles.intersection(parentfiles):
                         self.localchangesfound()
                 if d:
                     raise util.Abort(_("deletions found between repo revs"))