This is an archive of the discontinued Mercurial Phabricator instance.

Differential D10832

rewriteutil: add pointer to help text when rewrite would cause divergence
ClosedPublic

Authored by martinvonz on Jun 3 2021, 1:50 PM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG8125bcd28a5c: rewriteutil: add pointer to help text when rewrite would cause divergence
Summary

The evolve extension's version of the hint has this pointer. I missed
it when I moved it to core. This is pretty much the same as
D10723. Turns out I missed two places :(

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

martinvonz created this revision.Jun 3 2021, 1:50 PM
pulkit accepted this revision.Jun 4 2021, 5:59 AM
This revision is now accepted and ready to land.Jun 4 2021, 5:59 AM

Revision Contents
Changeset List

PathPackages
Mmercurial/rewriteutil.py (7 lines)
Mtests/test-amend.t (7 lines)

Diff 28463

mercurial/rewriteutil.py

msg += _( msg += _(
b'\n changeset %s already has a successor in ' b'\n changeset %s already has a successor in '
b'changeset %s\n' b'changeset %s\n'
b' rewriting changeset %s would create ' b' rewriting changeset %s would create '
b'"content-divergence"\n' b'"content-divergence"\n'
b' set experimental.evolution.allowdivergence=True to ' b' set experimental.evolution.allowdivergence=True to '
b'skip this check' b'skip this check'
) % (base_ctx, other_ctx, local_ctx) ) % (base_ctx, other_ctx, local_ctx)
raise error.InputError(msg) raise error.InputError(
msg,
hint=_(
b"see 'hg help evolution.instability' for details on content-divergence"
),
)
else: else:
raise error.InputError( raise error.InputError(
msg, msg,
hint=_( hint=_(
b"add --verbose for details or see " b"add --verbose for details or see "
b"'hg help evolution.instability'" b"'hg help evolution.instability'"
), ),
) )

tests/test-amend.t

Cannot cause divergence by default Cannot cause divergence by default
$ hg co --hidden 1 $ hg co --hidden 1
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 amend -m divergent $ hg amend -m divergent
abort: cannot amend 112478962961, as that creates content-divergence with 16084da537dd abort: cannot amend 112478962961, as that creates content-divergence with 16084da537dd
(add --verbose for details or see 'hg help evolution.instability') (add --verbose for details or see 'hg help evolution.instability')
[10] [10]
$ hg amend -m divergent --verbose
abort: cannot amend 112478962961, as that creates content-divergence with 16084da537dd
changeset 112478962961 already has a successor in changeset 16084da537dd
rewriting changeset 112478962961 would create "content-divergence"
set experimental.evolution.allowdivergence=True to skip this check
(see 'hg help evolution.instability' for details on content-divergence)
[10]
$ hg amend -m divergent --config experimental.evolution.allowdivergence=true $ hg amend -m divergent --config experimental.evolution.allowdivergence=true
2 new content-divergent changesets 2 new content-divergent changesets
#endif #endif
Cannot amend public changeset Cannot amend public changeset
$ hg phase -r A --public $ hg phase -r A --public
$ hg update -C -q A $ hg update -C -q A