equal
deleted
inserted
replaced
1763 % rev[0]) |
1763 % rev[0]) |
1764 lastparent = None |
1764 lastparent = None |
1765 |
1765 |
1766 diffopts = self.diffopts({'git': git}) |
1766 diffopts = self.diffopts({'git': git}) |
1767 for r in rev: |
1767 for r in rev: |
|
1768 if not repo[r].mutable(): |
|
1769 raise util.Abort(_('revision %d is not mutable') % r, |
|
1770 hint=_('see "hg help phases" for details')) |
1768 p1, p2 = repo.changelog.parentrevs(r) |
1771 p1, p2 = repo.changelog.parentrevs(r) |
1769 n = repo.changelog.node(r) |
1772 n = repo.changelog.node(r) |
1770 if p2 != nullrev: |
1773 if p2 != nullrev: |
1771 raise util.Abort(_('cannot import merge revision %d') % r) |
1774 raise util.Abort(_('cannot import merge revision %d') % r) |
1772 if lastparent and lastparent != r: |
1775 if lastparent and lastparent != r: |