Mercurial > public > mercurial-scm > hg-stable

comparison mercurial/localrepo.py @ 26741:e1568d5eb052

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
localrepo.commit: disallow commit when driver-resolved files exist This code will not currently be activated because there's no code to mark files as driver-resolved in core. This point is also somewhat hard to plug into from extensions.
author Siddharth Agarwal <sid0@fb.com>
date Wed, 14 Oct 2015 16:04:43 -0700
parents ec182d109dce
children 5ba0a99ff27f
comparison
equal deleted inserted replaced
26740:f4a27c05c43f 26741:e1568d5eb052
1551 return None 1551 return None
1552 1552
1553 if merge and cctx.deleted(): 1553 if merge and cctx.deleted():
1554 raise error.Abort(_("cannot commit merge with missing files")) 1554 raise error.Abort(_("cannot commit merge with missing files"))
1555 1555
1556 unresolved, driverresolved = False, False
1556 ms = mergemod.mergestate(self) 1557 ms = mergemod.mergestate(self)
1557 for f in status.modified: 1558 for f in status.modified:
1558 if f in ms and ms[f] == 'u': 1559 if f in ms:
1559 raise error.Abort(_('unresolved merge conflicts ' 1560 if ms[f] == 'u':
1560 '(see "hg help resolve")')) 1561 unresolved = True
1562 elif ms[f] == 'd':
1563 driverresolved = True
1564
1565 if unresolved:
1566 raise error.Abort(_('unresolved merge conflicts '
1567 '(see "hg help resolve")'))
1568 if driverresolved:
1569 raise error.Abort(_('driver-resolved merge conflicts'),
1570 hint=_('run "hg resolve --all" to resolve'))
1561 1571
1562 if editor: 1572 if editor:
1563 cctx._text = editor(self, cctx, subs) 1573 cctx._text = editor(self, cctx, subs)
1564 edited = (text != cctx._text) 1574 edited = (text != cctx._text)
1565 1575