This is an archive of the discontinued Mercurial Phabricator instance.

Differential D12105

merge: break up a not-so-one-liner for readability
ClosedPublic

Authored by marmoute on Jan 29 2022, 9:13 AM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHGec23b0ba85c2: merge: break up a not-so-one-liner for readability

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.

Event Timeline

marmoute created this revision.Jan 29 2022, 9:13 AM
Alphare accepted this revision.Feb 3 2022, 3:51 AM
This revision is now accepted and ready to land.Feb 3 2022, 3:51 AM
marmoute added a commit: rHGec23b0ba85c2: merge: break up a not-so-one-liner for readability.Feb 4 2022, 5:28 AM
Closed by commit rHGec23b0ba85c2: merge: break up a not-so-one-liner for readability (authored by marmoute). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/merge.py (5 lines)

Diff 32063

mercurial/merge.py

elif action[0] in nonconflicttypes: elif action[0] in nonconflicttypes:
msg = _( msg = _(
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'
) )
hint = _(b'merging in the other direction may work') hint = _(b'merging in the other direction may work')
raise error.Abort(msg % f, hint=hint) raise error.Abort(msg % f, hint=hint)
else: else:
raise error.StateError( msg = _(b'conflict in file \'%s\' is outside narrow clone')
_(b'conflict in file \'%s\' is outside narrow clone') % f raise error.StateError(msg % 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
mapping of divergent renames and other such cases.""" mapping of divergent renames and other such cases."""