##// END OF EJS Templates
mq: unused variables, improper usage of 'is [not]', undefined variable
Benoit Boissinot -
r2797:a3c6e788 default
parent child Browse files
Show More
@@ -539,7 +539,6 b' class queue:'
539 539 saveheads = []
540 540 savebases = {}
541 541
542 tip = chlog.tip()
543 542 heads = limitheads(chlog, rev)
544 543 seen = {}
545 544
@@ -570,7 +569,7 b' class queue:'
570 569 savebases[x] = 1
571 570
572 571 # create a changegroup for all the branches we need to keep
573 if backup is "all":
572 if backup == "all":
574 573 backupch = repo.changegroupsubset([rev], chlog.heads(), 'strip')
575 574 bundle(backupch)
576 575 if saveheads:
@@ -585,7 +584,7 b' class queue:'
585 584 if saveheads:
586 585 self.ui.status("adding branch\n")
587 586 commands.unbundle(self.ui, repo, chgrpfile, update=False)
588 if backup is not "strip":
587 if backup != "strip":
589 588 os.unlink(chgrpfile)
590 589
591 590 def isapplied(self, patch):
@@ -805,7 +804,6 b' class queue:'
805 804 return
806 805 wlock = repo.wlock()
807 806 self.check_toppatch(repo)
808 qp = self.qparents(repo)
809 807 (top, patch) = (self.applied[-1].rev, self.applied[-1].name)
810 808 top = revlog.bin(top)
811 809 cparents = repo.changelog.parents(top)
@@ -1341,7 +1339,7 b' def fold(ui, repo, *files, **opts):'
1341 1339 for f in files:
1342 1340 patch = q.lookup(f)
1343 1341 if patch in patches or patch == parent:
1344 self.ui.warn(_('Skipping already folded patch %s') % patch)
1342 ui.warn(_('Skipping already folded patch %s') % patch)
1345 1343 if q.isapplied(patch):
1346 1344 raise util.Abort(_('qfold cannot fold already applied patch %s') % patch)
1347 1345 patches.append(patch)
General Comments 0
You need to be logged in to leave comments. Login now