13 For more information: |
13 For more information: |
14 http://mercurial.selenic.com/wiki/RebaseExtension |
14 http://mercurial.selenic.com/wiki/RebaseExtension |
15 ''' |
15 ''' |
16 |
16 |
17 from mercurial import hg, util, repair, merge, cmdutil, commands, bookmarks |
17 from mercurial import hg, util, repair, merge, cmdutil, commands, bookmarks |
18 from mercurial import extensions, patch, scmutil, phases, obsolete |
18 from mercurial import extensions, patch, scmutil, phases, obsolete, error |
19 from mercurial.commands import templateopts |
19 from mercurial.commands import templateopts |
20 from mercurial.node import nullrev |
20 from mercurial.node import nullrev |
21 from mercurial.lock import release |
21 from mercurial.lock import release |
22 from mercurial.i18n import _ |
22 from mercurial.i18n import _ |
23 import os, errno |
23 import os, errno |
267 else: |
267 else: |
268 try: |
268 try: |
269 ui.setconfig('ui', 'forcemerge', opts.get('tool', '')) |
269 ui.setconfig('ui', 'forcemerge', opts.get('tool', '')) |
270 stats = rebasenode(repo, rev, p1, state, collapsef) |
270 stats = rebasenode(repo, rev, p1, state, collapsef) |
271 if stats and stats[3] > 0: |
271 if stats and stats[3] > 0: |
272 raise util.Abort(_('unresolved conflicts (see hg ' |
272 raise error.InterventionRequired( |
273 'resolve, then hg rebase --continue)')) |
273 _('unresolved conflicts (see hg ' |
|
274 'resolve, then hg rebase --continue)')) |
274 finally: |
275 finally: |
275 ui.setconfig('ui', 'forcemerge', '') |
276 ui.setconfig('ui', 'forcemerge', '') |
276 cmdutil.duplicatecopies(repo, rev, target) |
277 cmdutil.duplicatecopies(repo, rev, target) |
277 if not collapsef: |
278 if not collapsef: |
278 newrev = concludenode(repo, rev, p1, p2, extrafn=extrafn, |
279 newrev = concludenode(repo, rev, p1, p2, extrafn=extrafn, |