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