Mercurial > hg
comparison hgext/mq.py @ 29968:0342bf292f73
mq: use single quotes in use warning
| author | timeless <timeless@mozdev.org> |
|---|---|
| date | Tue, 20 Sep 2016 23:44:59 +0000 |
| parents | d5883fd055c6 |
| children | 3006d0d26ad3 |
comparison
equal
deleted
inserted
replaced
| 29967:bd55d98027ee | 29968:0342bf292f73 |
|---|---|
| 1560 raise error.Abort(_("popping would remove a revision not " | 1560 raise error.Abort(_("popping would remove a revision not " |
| 1561 "managed by this patch queue")) | 1561 "managed by this patch queue")) |
| 1562 if not repo[self.applied[-1].node].mutable(): | 1562 if not repo[self.applied[-1].node].mutable(): |
| 1563 raise error.Abort( | 1563 raise error.Abort( |
| 1564 _("popping would remove a public revision"), | 1564 _("popping would remove a public revision"), |
| 1565 hint=_('see "hg help phases" for details')) | 1565 hint=_("see 'hg help phases' for details")) |
| 1566 | 1566 |
| 1567 # we know there are no local changes, so we can make a simplified | 1567 # we know there are no local changes, so we can make a simplified |
| 1568 # form of hg.update. | 1568 # form of hg.update. |
| 1569 if update: | 1569 if update: |
| 1570 qp = self.qparents(repo, rev) | 1570 qp = self.qparents(repo, rev) |
| 1629 (top, patchfn) = (self.applied[-1].node, self.applied[-1].name) | 1629 (top, patchfn) = (self.applied[-1].node, self.applied[-1].name) |
| 1630 if repo.changelog.heads(top) != [top]: | 1630 if repo.changelog.heads(top) != [top]: |
| 1631 raise error.Abort(_("cannot qrefresh a revision with children")) | 1631 raise error.Abort(_("cannot qrefresh a revision with children")) |
| 1632 if not repo[top].mutable(): | 1632 if not repo[top].mutable(): |
| 1633 raise error.Abort(_("cannot qrefresh public revision"), | 1633 raise error.Abort(_("cannot qrefresh public revision"), |
| 1634 hint=_('see "hg help phases" for details')) | 1634 hint=_("see 'hg help phases' for details")) |
| 1635 | 1635 |
| 1636 cparents = repo.changelog.parents(top) | 1636 cparents = repo.changelog.parents(top) |
| 1637 patchparent = self.qparents(repo, top) | 1637 patchparent = self.qparents(repo, top) |
| 1638 | 1638 |
| 1639 inclsubs = checksubstate(repo, hex(patchparent)) | 1639 inclsubs = checksubstate(repo, hex(patchparent)) |
| 2115 diffopts = self.diffopts({'git': git}) | 2115 diffopts = self.diffopts({'git': git}) |
| 2116 with repo.transaction('qimport') as tr: | 2116 with repo.transaction('qimport') as tr: |
| 2117 for r in rev: | 2117 for r in rev: |
| 2118 if not repo[r].mutable(): | 2118 if not repo[r].mutable(): |
| 2119 raise error.Abort(_('revision %d is not mutable') % r, | 2119 raise error.Abort(_('revision %d is not mutable') % r, |
| 2120 hint=_('see "hg help phases" ' | 2120 hint=_("see 'hg help phases' " |
| 2121 'for details')) | 2121 'for details')) |
| 2122 p1, p2 = repo.changelog.parentrevs(r) | 2122 p1, p2 = repo.changelog.parentrevs(r) |
| 2123 n = repo.changelog.node(r) | 2123 n = repo.changelog.node(r) |
| 2124 if p2 != nullrev: | 2124 if p2 != nullrev: |
| 2125 raise error.Abort(_('cannot import merge revision %d') | 2125 raise error.Abort(_('cannot import merge revision %d') |