This is an archive of the discontinued Mercurial Phabricator instance.

Differential D1913

branch: allow changing branch name to existing name if possible
ClosedPublic

Authored by pulkit on Jan 19 2018, 9:39 AM.

Details

Reviewers
durin42
Group Reviewers
hg-reviewers
Commits
rHGe5b6ba786d83: branch: allow changing branch name to existing name if possible
Summary

With the functionality added in previous patch we can change branches of a
revision but not everytime even if it's possible to do so. For example cosider
the following case:

o 3 added a (foo)
o 2 added b (foo)
o 1 added c (bar)
o 0 added d (bar)

Here if I want to change the branch of rev 2,3 to bar, it was not possible and
it will say, "a branch with same name exists".

This patch allows us to change branch of 2,3 to bar. The underlying logic for
changing branch finds the changesets from the revs passed which have no parents
in revs. We only support revsets which have only one such root, so to support
this we check whether the parent of the root has the same name as that of the
new name and if so, we can use the new name to change branches.

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

pulkit created this revision.Jan 19 2018, 9:39 AM
durin42 accepted this revision.Jan 19 2018, 3:00 PM
This revision is now accepted and ready to land.Jan 19 2018, 3:00 PM
Closed by commit rHGe5b6ba786d83: branch: allow changing branch name to existing name if possible (authored by pulkit). · Explain WhyJan 19 2018, 3:05 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/cmdutil.py (5 lines)
Mmercurial/commands.py (5 lines)
Mtests/test-branch-change.t (46 lines)

Diff 4945

mercurial/cmdutil.py

bailifchanged(repo) bailifchanged(repo)
revs = scmutil.revrange(repo, revs) revs = scmutil.revrange(repo, revs)
if not revs: if not revs:
raise error.Abort("empty revision set") raise error.Abort("empty revision set")
roots = repo.revs('roots(%ld)', revs) roots = repo.revs('roots(%ld)', revs)
if len(roots) > 1: if len(roots) > 1:
raise error.Abort(_("cannot change branch of non-linear revisions")) raise error.Abort(_("cannot change branch of non-linear revisions"))
rewriteutil.precheck(repo, revs, 'change branch of') rewriteutil.precheck(repo, revs, 'change branch of')
root = repo[roots.first()]
if not root.p1().branch() == label and label in repo.branchmap():
raise error.Abort(_("a branch of the same name already exists"))
if repo.revs('merge() and %ld', revs): if repo.revs('merge() and %ld', revs):
raise error.Abort(_("cannot change branch of a merge commit")) raise error.Abort(_("cannot change branch of a merge commit"))
if repo.revs('obsolete() and %ld', revs): if repo.revs('obsolete() and %ld', revs):
raise error.Abort(_("cannot change branch of a obsolete changeset")) raise error.Abort(_("cannot change branch of a obsolete changeset"))
# make sure only topological heads # make sure only topological heads
if repo.revs('heads(%ld) - head()', revs): if repo.revs('heads(%ld) - head()', revs):
raise error.Abort(_("cannot change branch in middle of a stack")) raise error.Abort(_("cannot change branch in middle of a stack"))

mercurial/commands.py

if opts.get('clean'): if opts.get('clean'):
label = repo[None].p1().branch() label = repo[None].p1().branch()
repo.dirstate.setbranch(label) repo.dirstate.setbranch(label)
ui.status(_('reset working directory to branch %s\n') % label) ui.status(_('reset working directory to branch %s\n') % label)
elif label: elif label:
scmutil.checknewlabel(repo, label, 'branch') scmutil.checknewlabel(repo, label, 'branch')
if revs: if revs:
# XXX: we should allow setting name to existing branch if the
# branch of root of the revs is same as the new branch name
if label in repo.branchmap():
raise error.Abort(_('a branch of the same'
' name already exists'))
return cmdutil.changebranch(ui, repo, revs, label) return cmdutil.changebranch(ui, repo, revs, label)
if not opts.get('force') and label in repo.branchmap(): if not opts.get('force') and label in repo.branchmap():
if label not in [p.branch() for p in repo[None].parents()]: if label not in [p.branch() for p in repo[None].parents()]:
raise error.Abort(_('a branch of the same name already' raise error.Abort(_('a branch of the same name already'
' exists'), ' exists'),
# i18n: "it" refers to an existing branch # i18n: "it" refers to an existing branch
hint=_("use 'hg update' to switch to it")) hint=_("use 'hg update' to switch to it"))

tests/test-branch-change.t

stable () stable ()
$ hg branches $ hg branches
stable 23:6a5ddbcfb870 stable 23:6a5ddbcfb870
$ hg branch $ hg branch
stable stable
Changing to same branch name does not work Changing to same branch is no-op
$ hg branch -r 19::21 stable $ hg branch -r 19::21 stable
abort: a branch of the same name already exists changed branch on 0 changesets
[255]
Changing branch name to existing branch name if the branch of parent of root of
revs is same as the new branch name
$ hg branch -r 20::21 bugfix
changed branch on 2 changesets
$ hg glog
o 25:714defe1cf34 Added d
| bugfix ()
o 24:98394def28fc Added c
| bugfix ()
| @ 23:6a5ddbcfb870 added bar
| | stable (b1)
| o 22:baedc6e98a67 Added e
|/ stable ()
o 19:fd45b986b109 Added b
| stable ()
o 18:204d2769eca2 Added a
stable ()
$ hg branch -r 24:25 stable
changed branch on 2 changesets
$ hg glog
o 27:4ec342341562 Added d
| stable ()
o 26:83f48859c2de Added c
| stable ()
| @ 23:6a5ddbcfb870 added bar
| | stable (b1)
| o 22:baedc6e98a67 Added e
|/ stable ()
o 19:fd45b986b109 Added b
| stable ()
o 18:204d2769eca2 Added a
stable ()
Testing on merge Testing on merge
$ hg merge -r 20 $ hg merge -r 26
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit) (branch merge, don't forget to commit)
$ hg branch -r . abcd $ hg branch -r . abcd
abort: outstanding uncommitted merge abort: outstanding uncommitted merge
[255] [255]
$ hg ci -m "Merge commit" $ hg ci -m "Merge commit"
$ hg branch -r '(.^)::' def $ hg branch -r '(.^)::' def
abort: cannot change branch of a merge commit abort: cannot change branch of a merge commit
[255] [255]
Changing branch on public changeset Changing branch on public changeset
$ hg phase -r 21 -p $ hg phase -r 27 -p
$ hg branch -r 21 def $ hg branch -r 27 def
abort: cannot change branch of public changesets abort: cannot change branch of public changesets
(see 'hg help phases' for details) (see 'hg help phases' for details)
[255] [255]