This is an archive of the discontinued Mercurial Phabricator instance.

Differential D10519

branch: delete obsolete message about changing branch of obsolete commit
ClosedPublic

Authored by martinvonz on Apr 27 2021, 6:53 PM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG45dcb63f8ead: branch: delete obsolete message about changing branch of obsolete commit
Summary

We now rely on rewriteutil.precheck() to check for divergence, so we
don't need the extra check in cmdutil.changebranch(). The former
check is a little less strict in that it allows you to rewrite a
commit without non-obsolete successors.

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.Apr 27 2021, 6:53 PM
pulkit accepted this revision.Apr 28 2021, 6:24 AM
This revision is now accepted and ready to land.Apr 28 2021, 6:24 AM

Revision Contents
Changeset List

PathPackages
Mmercurial/cmdutil.py (5 lines)

Diff 27250

mercurial/cmdutil.py

not opts.get(b'force') not opts.get(b'force')
and label not in rpb and label not in rpb
and label in repo.branchmap() and label in repo.branchmap()
): ):
raise error.InputError( raise error.InputError(
_(b"a branch of the same name already exists") _(b"a branch of the same name already exists")
) )
if repo.revs(b'obsolete() and %ld', revs):
raise error.InputError(
_(b"cannot change branch of a obsolete changeset")
)
# make sure only topological heads # make sure only topological heads
if repo.revs(b'heads(%ld) - head()', revs): if repo.revs(b'heads(%ld) - head()', revs):
raise error.InputError( raise error.InputError(
_(b"cannot change branch in middle of a stack") _(b"cannot change branch in middle of a stack")
) )
replacements = {} replacements = {}
# avoid import cycle mercurial.cmdutil -> mercurial.context -> # avoid import cycle mercurial.cmdutil -> mercurial.context ->