This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11827

errors: use detailed exit code when trying to merge file outside narrowspec
ClosedPublic

Authored by martinvonz on Nov 29 2021, 4:57 PM.

Details

Reviewers
durin42
Alphare
Group Reviewers
hg-reviewers
Commits
rHG8e855e9984a6: errors: use detailed exit code when trying to merge file outside narrowspec

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 31214

mercurial/merge.py

_( _(
b'merge affects file \'%s\' outside narrow, ' b'merge affects file \'%s\' outside narrow, '
b'which is not yet supported' b'which is not yet supported'
) )
% f, % f,
hint=_(b'merging in the other direction may work'), hint=_(b'merging in the other direction may work'),
) )
else: else:
raise error.Abort( raise error.StateError(
_(b'conflict in file \'%s\' is outside narrow clone') % f _(b'conflict in file \'%s\' is outside narrow clone') % f
) )
class mergeresult(object): class mergeresult(object):
"""An object representing result of merging manifests. """An object representing result of merging manifests.
It has information about what actions need to be performed on dirstate It has information about what actions need to be performed on dirstate

tests/test-narrow-merge.t

$ hg ci -m 'merge from inside to outside' $ hg ci -m 'merge from inside to outside'
Refuses merge of conflicting outside changes Refuses merge of conflicting outside changes
$ hg update -q 'desc("modify outside/f1")' $ hg update -q 'desc("modify outside/f1")'
$ hg merge 'desc("conflicting outside/f1")' $ hg merge 'desc("conflicting outside/f1")'
abort: conflict in file 'outside/f1' is outside narrow clone (flat !) abort: conflict in file 'outside/f1' is outside narrow clone (flat !)
abort: conflict in file 'outside/' is outside narrow clone (tree !) abort: conflict in file 'outside/' is outside narrow clone (tree !)
[255] [20]

tests/test-narrow-rebase.t

Rebase interrupts on conflicting changes outside narrow spec Rebase interrupts on conflicting changes outside narrow spec
$ hg update -q 'desc("conflicting outside/f1")' $ hg update -q 'desc("conflicting outside/f1")'
$ hg phase -f -d . $ hg phase -f -d .
$ hg rebase -d 'desc("modify outside/f1")' $ hg rebase -d 'desc("modify outside/f1")'
rebasing 4:707c035aadb6 "conflicting outside/f1" rebasing 4:707c035aadb6 "conflicting outside/f1"
abort: conflict in file 'outside/f1' is outside narrow clone abort: conflict in file 'outside/f1' is outside narrow clone
[255] [20]