equal
deleted
inserted
replaced
559 p.close() |
559 p.close() |
560 wlock = None |
560 wlock = None |
561 r = self.qrepo() |
561 r = self.qrepo() |
562 if r: r.add([patch]) |
562 if r: r.add([patch]) |
563 if commitfiles: |
563 if commitfiles: |
564 self.refresh(repo, msg=None, short=True) |
564 self.refresh(repo, short=True) |
565 |
565 |
566 def strip(self, repo, rev, update=True, backup="all", wlock=None): |
566 def strip(self, repo, rev, update=True, backup="all", wlock=None): |
567 def limitheads(chlog, stop): |
567 def limitheads(chlog, stop): |
568 """return the list of all nodes that have no children""" |
568 """return the list of all nodes that have no children""" |
569 p = {} |
569 p = {} |
919 self.ui.write("No patches applied\n") |
919 self.ui.write("No patches applied\n") |
920 return |
920 return |
921 qp = self.qparents(repo, top) |
921 qp = self.qparents(repo, top) |
922 commands.dodiff(sys.stdout, self.ui, repo, qp, None, files) |
922 commands.dodiff(sys.stdout, self.ui, repo, qp, None, files) |
923 |
923 |
924 def refresh(self, repo, msg=None, short=False): |
924 def refresh(self, repo, msg='', short=False): |
925 if len(self.applied) == 0: |
925 if len(self.applied) == 0: |
926 self.ui.write("No patches applied\n") |
926 self.ui.write("No patches applied\n") |
927 return |
927 return |
928 wlock = repo.wlock() |
928 wlock = repo.wlock() |
929 self.check_toppatch(repo) |
929 self.check_toppatch(repo) |