##// END OF EJS Templates
mq: rename explain_pushable to explainpushable
Adrian Buehlmann -
r14579:f7b25764 default
parent child Browse files
Show More
@@ -464,7 +464,7 b' class queue(object):'
464 return False, ' '.join(map(repr, pos))
464 return False, ' '.join(map(repr, pos))
465 return True, ''
465 return True, ''
466
466
467 def explain_pushable(self, idx, all_patches=False):
467 def explainpushable(self, idx, all_patches=False):
468 write = all_patches and self.ui.write or self.ui.warn
468 write = all_patches and self.ui.write or self.ui.warn
469 if all_patches or self.ui.verbose:
469 if all_patches or self.ui.verbose:
470 if isinstance(idx, str):
470 if isinstance(idx, str):
@@ -598,7 +598,7 b' class queue(object):'
598 return (1, None)
598 return (1, None)
599 pushable, reason = self.pushable(patch)
599 pushable, reason = self.pushable(patch)
600 if not pushable:
600 if not pushable:
601 self.explain_pushable(patch, all_patches=True)
601 self.explainpushable(patch, all_patches=True)
602 continue
602 continue
603 info = mergeq.isapplied(patch)
603 info = mergeq.isapplied(patch)
604 if not info:
604 if not info:
@@ -664,7 +664,7 b' class queue(object):'
664 for patchname in series:
664 for patchname in series:
665 pushable, reason = self.pushable(patchname)
665 pushable, reason = self.pushable(patchname)
666 if not pushable:
666 if not pushable:
667 self.explain_pushable(patchname, all_patches=True)
667 self.explainpushable(patchname, all_patches=True)
668 continue
668 continue
669 self.ui.status(_("applying %s\n") % patchname)
669 self.ui.status(_("applying %s\n") % patchname)
670 pf = os.path.join(patchdir, patchname)
670 pf = os.path.join(patchdir, patchname)
@@ -1542,7 +1542,7 b' class queue(object):'
1542 pushable, reason = self.pushable(i)
1542 pushable, reason = self.pushable(i)
1543 if pushable:
1543 if pushable:
1544 unapplied.append((i, self.series[i]))
1544 unapplied.append((i, self.series[i]))
1545 self.explain_pushable(i)
1545 self.explainpushable(i)
1546 return unapplied
1546 return unapplied
1547
1547
1548 def qseries(self, repo, missing=None, start=0, length=None, status=None,
1548 def qseries(self, repo, missing=None, start=0, length=None, status=None,
@@ -1715,7 +1715,7 b' class queue(object):'
1715 p, reason = self.pushable(i)
1715 p, reason = self.pushable(i)
1716 if p:
1716 if p:
1717 break
1717 break
1718 self.explain_pushable(i)
1718 self.explainpushable(i)
1719 return i
1719 return i
1720 if self.applied:
1720 if self.applied:
1721 p = self.applied[-1].name
1721 p = self.applied[-1].name
General Comments 0
You need to be logged in to leave comments. Login now