equal
deleted
inserted
replaced
1461 return ret[0] |
1461 return ret[0] |
1462 |
1462 |
1463 def pop(self, repo, patch=None, force=False, update=True, all=False, |
1463 def pop(self, repo, patch=None, force=False, update=True, all=False, |
1464 nobackup=False, keepchanges=False): |
1464 nobackup=False, keepchanges=False): |
1465 self.checkkeepchanges(keepchanges, force) |
1465 self.checkkeepchanges(keepchanges, force) |
1466 wlock = repo.wlock() |
1466 with repo.wlock(): |
1467 try: |
|
1468 if patch: |
1467 if patch: |
1469 # index, rev, patch |
1468 # index, rev, patch |
1470 info = self.isapplied(patch) |
1469 info = self.isapplied(patch) |
1471 if not info: |
1470 if not info: |
1472 patch = self.lookup(patch) |
1471 patch = self.lookup(patch) |
1566 repo['.'].sub(s).get(state) |
1565 repo['.'].sub(s).get(state) |
1567 if self.applied: |
1566 if self.applied: |
1568 self.ui.write(_("now at: %s\n") % self.applied[-1].name) |
1567 self.ui.write(_("now at: %s\n") % self.applied[-1].name) |
1569 else: |
1568 else: |
1570 self.ui.write(_("patch queue now empty\n")) |
1569 self.ui.write(_("patch queue now empty\n")) |
1571 finally: |
|
1572 wlock.release() |
|
1573 |
1570 |
1574 def diff(self, repo, pats, opts): |
1571 def diff(self, repo, pats, opts): |
1575 top, patch = self.checktoppatch(repo) |
1572 top, patch = self.checktoppatch(repo) |
1576 if not top: |
1573 if not top: |
1577 self.ui.write(_("no patches applied\n")) |
1574 self.ui.write(_("no patches applied\n")) |