Mercurial > public > mercurial-scm > hg-stable
comparison mercurial/localrepo.py @ 30286:3d38a0bc774f
cmdutil: refactor checkunresolved
localrepo.commit had code to check for unresolved merge conflicts,
it would be helpful for at least rebase to be able to use that
code without calling commit().
| author | timeless <timeless@mozdev.org> |
|---|---|
| date | Wed, 02 Nov 2016 18:45:53 +0000 |
| parents | 3c8811efdddc |
| children | 318a24b52eeb |
comparison
equal
deleted
inserted
replaced
| 30285:0fa1a41d04e4 | 30286:3d38a0bc774f |
|---|---|
| 1631 | 1631 |
| 1632 if merge and cctx.deleted(): | 1632 if merge and cctx.deleted(): |
| 1633 raise error.Abort(_("cannot commit merge with missing files")) | 1633 raise error.Abort(_("cannot commit merge with missing files")) |
| 1634 | 1634 |
| 1635 ms = mergemod.mergestate.read(self) | 1635 ms = mergemod.mergestate.read(self) |
| 1636 | 1636 cmdutil.checkunresolved(ms) |
| 1637 if list(ms.unresolved()): | |
| 1638 raise error.Abort(_("unresolved merge conflicts " | |
| 1639 "(see 'hg help resolve')")) | |
| 1640 if ms.mdstate() != 's' or list(ms.driverresolved()): | |
| 1641 raise error.Abort(_('driver-resolved merge conflicts'), | |
| 1642 hint=_('run "hg resolve --all" to resolve')) | |
| 1643 | 1637 |
| 1644 if editor: | 1638 if editor: |
| 1645 cctx._text = editor(self, cctx, subs) | 1639 cctx._text = editor(self, cctx, subs) |
| 1646 edited = (text != cctx._text) | 1640 edited = (text != cctx._text) |
| 1647 | 1641 |