equal
deleted
inserted
replaced
1524 if heads != [self.applied[-1].node]: |
1524 if heads != [self.applied[-1].node]: |
1525 raise util.Abort(_("popping would remove a revision not " |
1525 raise util.Abort(_("popping would remove a revision not " |
1526 "managed by this patch queue")) |
1526 "managed by this patch queue")) |
1527 if not repo[self.applied[-1].node].mutable(): |
1527 if not repo[self.applied[-1].node].mutable(): |
1528 raise util.Abort( |
1528 raise util.Abort( |
1529 _("popping would remove an immutable revision"), |
1529 _("popping would remove a public revision"), |
1530 hint=_('see "hg help phases" for details')) |
1530 hint=_('see "hg help phases" for details')) |
1531 |
1531 |
1532 # we know there are no local changes, so we can make a simplified |
1532 # we know there are no local changes, so we can make a simplified |
1533 # form of hg.update. |
1533 # form of hg.update. |
1534 if update: |
1534 if update: |
1595 self.checktoppatch(repo) |
1595 self.checktoppatch(repo) |
1596 (top, patchfn) = (self.applied[-1].node, self.applied[-1].name) |
1596 (top, patchfn) = (self.applied[-1].node, self.applied[-1].name) |
1597 if repo.changelog.heads(top) != [top]: |
1597 if repo.changelog.heads(top) != [top]: |
1598 raise util.Abort(_("cannot refresh a revision with children")) |
1598 raise util.Abort(_("cannot refresh a revision with children")) |
1599 if not repo[top].mutable(): |
1599 if not repo[top].mutable(): |
1600 raise util.Abort(_("cannot refresh immutable revision"), |
1600 raise util.Abort(_("cannot refresh public revision"), |
1601 hint=_('see "hg help phases" for details')) |
1601 hint=_('see "hg help phases" for details')) |
1602 |
1602 |
1603 cparents = repo.changelog.parents(top) |
1603 cparents = repo.changelog.parents(top) |
1604 patchparent = self.qparents(repo, top) |
1604 patchparent = self.qparents(repo, top) |
1605 |
1605 |