This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9392

errors: raise StateError when there are unresolves merge conflicts
ClosedPublic

Authored by martinvonz on Nov 24 2020, 1:05 PM.

Details

Reviewers
mharbison72
Group Reviewers
hg-reviewers
Commits
rHGfa87536d3d70: errors: raise StateError when there are unresolves merge conflicts

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Revision Contents
Changeset List

Diff 23676

mercurial/mergeutil.py

# mergeutil.py - help for merge processing in mercurial # mergeutil.py - help for merge processing in mercurial
# #
# Copyright 2005-2007 Matt Mackall <mpm@selenic.com> # Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
# #
# This software may be used and distributed according to the terms of the # This software may be used and distributed according to the terms of the
# GNU General Public License version 2 or any later version. # GNU General Public License version 2 or any later version.
from __future__ import absolute_import from __future__ import absolute_import
from .i18n import _ from .i18n import _
from . import error from . import error
def checkunresolved(ms): def checkunresolved(ms):
if list(ms.unresolved()): if list(ms.unresolved()):
raise error.Abort( raise error.StateError(
_(b"unresolved merge conflicts (see 'hg help resolve')") _(b"unresolved merge conflicts (see 'hg help resolve')")
) )

tests/test-commit-amend.t

0 files updated, 0 files merged, 0 files removed, 1 files unresolved 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
use 'hg resolve' to retry unresolved file merges use 'hg resolve' to retry unresolved file merges
[1] [1]
$ hg resolve -l $ hg resolve -l
U a U a
$ hg ci --amend $ hg ci --amend
abort: unresolved merge conflicts (see 'hg help resolve') abort: unresolved merge conflicts (see 'hg help resolve')
[255] [20]
$ hg up -qC . $ hg up -qC .
Follow copies/renames: Follow copies/renames:
$ hg mv b c $ hg mv b c
$ hg ci -m 'b -> c' $ hg ci -m 'b -> c'
$ hg mv c d $ hg mv c d

tests/test-commit-unresolved.t

use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
[1] [1]
Correct the conflict without marking the file as resolved Correct the conflict without marking the file as resolved
$ echo "ABCD" > A $ echo "ABCD" > A
$ hg commit -m "Merged" $ hg commit -m "Merged"
abort: unresolved merge conflicts (see 'hg help resolve') abort: unresolved merge conflicts (see 'hg help resolve')
[255] [20]
Mark the conflict as resolved and commit Mark the conflict as resolved and commit
$ hg resolve -m A $ hg resolve -m A
(no more unresolved files) (no more unresolved files)
$ hg commit -m "Merged" $ hg commit -m "Merged"
Test that if a file is removed but not marked resolved, the commit still fails Test that if a file is removed but not marked resolved, the commit still fails
(issue4972) (issue4972)
$ hg up ".^" $ hg up ".^"
1 files updated, 0 files merged, 1 files removed, 0 files unresolved 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ hg merge 2 $ hg merge 2
merging A merging A
warning: conflicts while merging A! (edit, then use 'hg resolve --mark') warning: conflicts while merging A! (edit, then use 'hg resolve --mark')
1 files updated, 0 files merged, 0 files removed, 1 files unresolved 1 files updated, 0 files merged, 0 files removed, 1 files unresolved
use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
[1] [1]
$ hg rm --force A $ hg rm --force A
$ hg commit -m merged $ hg commit -m merged
abort: unresolved merge conflicts (see 'hg help resolve') abort: unresolved merge conflicts (see 'hg help resolve')
[255] [20]
$ hg resolve -ma $ hg resolve -ma
(no more unresolved files) (no more unresolved files)
$ hg commit -m merged $ hg commit -m merged
created new head created new head
Testing the abort functionality in case of no conflicts Testing the abort functionality in case of no conflicts

tests/test-graft.t

(use 'hg resolve' and 'hg graft --continue') (use 'hg resolve' and 'hg graft --continue')
[1] [1]
Continue without resolve should fail: Continue without resolve should fail:
$ hg graft -c $ hg graft -c
grafting 4:9c233e8e184d "4" grafting 4:9c233e8e184d "4"
abort: unresolved merge conflicts (see 'hg help resolve') abort: unresolved merge conflicts (see 'hg help resolve')
[255] [20]
Fix up: Fix up:
$ echo b > e $ echo b > e
$ hg resolve -m e $ hg resolve -m e
(no more unresolved files) (no more unresolved files)
continue: hg graft --continue continue: hg graft --continue

tests/test-rebase-conflicts.t

# To abort: hg rebase --abort # To abort: hg rebase --abort
# To stop: hg rebase --stop # To stop: hg rebase --stop
Try to continue without solving the conflict: Try to continue without solving the conflict:
$ hg rebase --continue $ hg rebase --continue
abort: unresolved merge conflicts (see 'hg help resolve') abort: unresolved merge conflicts (see 'hg help resolve')
[255] [20]
Conclude rebase: Conclude rebase:
$ echo 'resolved merge' >common $ echo 'resolved merge' >common
$ hg resolve -m common $ hg resolve -m common
(no more unresolved files) (no more unresolved files)
continue: hg rebase --continue continue: hg rebase --continue
$ hg rebase --continue $ hg rebase --continue

tests/test-update-branches.t

$ hg resolve -l $ hg resolve -l
U a U a
Try to make empty commit while there are conflicts Try to make empty commit while there are conflicts
$ hg revert -r . a $ hg revert -r . a
$ rm a.orig $ rm a.orig
$ hg ci -m empty $ hg ci -m empty
abort: unresolved merge conflicts (see 'hg help resolve') abort: unresolved merge conflicts (see 'hg help resolve')
[255] [20]
$ hg resolve -m a $ hg resolve -m a
(no more unresolved files) (no more unresolved files)
$ hg resolve -l $ hg resolve -l
R a R a
$ hg ci -m empty $ hg ci -m empty
nothing changed nothing changed
[1] [1]
$ hg resolve -l $ hg resolve -l