hgext/mq.py

14265:e4ab5ae193f2

                wcfiles = set(mm + aa + rr + dd)
                if wcfiles:
                    for patchname in s:
                        pf = os.path.join(self.path, patchname)
                        patchfiles = patchmod.changedfiles(pf, strip=1)
                        if not wcfiles.isdisjoint(patchfiles):
                            self.localchangesfound(self.applied)
            elif mergeq:
                self.check_localchanges(refresh=self.applied)

            all_files = set()

                m, a, r, d = repo.status(qp, top)[:4]
                parentfiles = set(m + a + r + d)
                if not force and parentfiles:
                    mm, aa, rr, dd = repo.status()[:4]
                    wcfiles = set(mm + aa + rr + dd)
                    if not wcfiles.isdisjoint(parentfiles):
                        self.localchangesfound()
                if d:
                    raise util.Abort(_("deletions found between repo revs"))
                for f in a:
                    try:

14267:6332c02b3d68

                wcfiles = set(mm + aa + rr + dd)
                if wcfiles:
                    for patchname in s:
                        pf = os.path.join(self.path, patchname)
                        patchfiles = patchmod.changedfiles(pf, strip=1)
                        if wcfiles.intersection(patchfiles):
                            self.localchangesfound(self.applied)
            elif mergeq:
                self.check_localchanges(refresh=self.applied)

            all_files = set()

                m, a, r, d = repo.status(qp, top)[:4]
                parentfiles = set(m + a + r + d)
                if not force and parentfiles:
                    mm, aa, rr, dd = repo.status()[:4]
                    wcfiles = set(mm + aa + rr + dd)
                    if wcfiles.intersection(parentfiles):
                        self.localchangesfound()
                if d:
                    raise util.Abort(_("deletions found between repo revs"))
                for f in a:
                    try: