This is an archive of the discontinued Mercurial Phabricator instance.

Differential D1074

branch: add a --rev flag to change branch name of given revisions
ClosedPublic

Authored by pulkit on Oct 14 2017, 10:41 AM.

Details

Reviewers
dlax
ryanmce
lothiraldan
durin42
Group Reviewers
hg-reviewers
Commits
rHG3bd8ab4c80a5: branch: add a --rev flag to change branch name of given revisions
Summary

This patch adds a new --rev flag to hg branch which can be used to change branch
of revisions. This is motivated from topic extension where you can change topic
on revisions but this one has few restrictions which are:

  1. You cannot change branch name in between the stack
  2. You cannot change branch name and set it to an existing name
  3. You cannot change branch of non-linear set of commits
  4. You cannot change branch of merge commits.

Tests are added for the same.

.. feature::

An experimental flag `--rev` to `hg branch` which can be used to change
branch of changesets.

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.Oct 14 2017, 10:41 AM
dlax added a subscriber: dlax.Oct 15 2017, 5:02 AM
dlax added inline comments.
mercurial/cmdutil.py
729

typo: betwen

Also, I'm not sure "between" is appropriate here. Maybe "cannot change branch in the middle of a stack"?

750

nit: with % on the continuation line and alignment with opening parenthesis, it'd be more readable.

pulkit updated this revision to Diff 2789.Oct 15 2017, 1:56 PM
dlax requested changes to this revision.Oct 16 2017, 3:57 AM

This looks correct to me overall.
I use this feature with topics a lot and find it pretty convenient so I guess it might make sense for named branches in some workflows.

mercurial/cmdutil.py
750

This message is not tested, maybe add a --debug call to one of the tests?

772

That comment isn't really helpful as is. Maybe explain how you handle phase instead?

780

Isn't rewrote == len(replacements)?

mercurial/commands.py
1006

Nit: could you move the closing ] on the next line and add a , at the end of the new line? This way next time we add an option, there will be only a one-line + diff.

1045

Maybe _().

tests/test-branch-change.t
42

Not sure why, but many titles' underlines are either too long or too short. Could you make these consistent?

68

"in the middle of the stack"

256

typo: mutliple

This revision now requires changes to proceed.Oct 16 2017, 3:57 AM
pulkit updated this revision to Diff 2807.Oct 16 2017, 8:30 AM
pulkit marked 9 inline comments as done.Oct 16 2017, 8:31 AM
dlax accepted this revision.Oct 16 2017, 8:36 AM
ryanmce requested changes to this revision.Oct 17 2017, 8:53 AM
ryanmce added a subscriber: ryanmce.
ryanmce added inline comments.
mercurial/cmdutil.py
720–729

What about an unclean working copy? It looks like that's supported -- could we make sure it's tested?

731–732

In theory, the phase boundary could move after our check but before we take the repolock. Can we guard against that please?

Two ways to accomplish this:

1/ Take the repo lock earlier
2/ Check before repo lock (fast path) and again after the repo lock is held (in case something changed)

789–790

Seems like we need a refactor? (out of scope for this change though)

tests/test-branch-change.t
9

nit: I'd prefer no newline in the glog output so things are more compact

11

This test needs to include a case where we strip commits, especially with a merge, just so the behavior is clear in this change.

That will probably (in my understanding of the current code) expose an issue that needs to be fixed.

18–35

Not sure we need this many commits for the test to be useful.

305–306

Hm, I think I'd prefer this to be an error about public changesets rather than a no-op with a 0 return value. Trying to modify the branch of public changesets -- even if the change is a no-op, still seems like an error to me. Thoughts?

This revision now requires changes to proceed.Oct 17 2017, 8:53 AM
pulkit added inline comments.Oct 17 2017, 9:26 AM
mercurial/cmdutil.py
789–790

Yeah, I will be happy to do that in next cycle. Can you suggest a name for file in which we can split cmdutil.py.

tests/test-branch-change.t
305–306

Oh, no. They are not public changesets. The test for public changeset is just above it. I will plug the phase info in the glog output in next version.

pulkit edited the summary of this revision. (Show Details)Oct 17 2017, 4:52 PM
pulkit updated this revision to Diff 2944.
pulkit marked 4 inline comments as done.Oct 17 2017, 5:01 PM
pulkit added inline comments.
mercurial/cmdutil.py
720–729

It's not supported. Handled that case and added a test. Thanks!

731–732

Improved the implementation by taking lock earlier. Thanks!

tests/test-branch-change.t
11

Oh, I didn't know that. Just banned merge revisions for now.

pulkit added a comment.Nov 2 2017, 2:14 PM

Re-requesting review since the freeze is over.

lothiraldan added a subscriber: lothiraldan.Nov 17 2017, 5:38 AM

Looking good, should we allow changing the branch if any changeset is unstable or obsolete?

mercurial/cmdutil.py
721

Small typo, missing space between in and case

772

For safety, I would add a check that p1 and p2 are not obsolete here.

pulkit added a comment.Nov 28 2017, 5:49 PM
In D1074#23972, @lothiraldan wrote:

Looking good, should we allow changing the branch if any changeset is unstable or obsolete?

For unstable yes, for obsolete no. Will add a check and test for obsolete case.

mercurial/cmdutil.py
772

A user may want to change branch of an unstable changeset which I think is okay. I am not sure why you want that check?

pulkit updated this revision to Diff 4082.Dec 2 2017, 1:26 PM
pulkit added a comment.Dec 4 2017, 9:38 AM

This was send before the code freeze of last major release but since it was late in the release, it was not taken. Let's iterate on it now.

pulkit added subscribers: indygreg, yuja, krbullock, durin42.Jan 15 2018, 1:45 PM

@durin42 @yuja @indygreg @krbullock this one is lying here for months. Does this conflict with anything or is a BC or something else, or was just missed for the review?

lothiraldan added a comment.Jan 16 2018, 3:56 AM

Apart from my review, it looks good to me.

Also I don't think you have a test when trying to change the branch of several changesets on different branches. If not, could you add one?

mercurial/cmdutil.py
732

Might be helpful to precise which changeset is a merge commit.

734

Might be helpful to precise which changeset is am obsolete commit.

tests/test-branch-change.t
144

You should update the revset to use the same as the next glog call (.^)::

martinvonz added a subscriber: martinvonz.Jan 18 2018, 2:26 PM
martinvonz added inline comments.
mercurial/cmdutil.py
721

"in case of uncommited merge or dirty wdir"? (note that there are 4 fixes there)

723

may want to check if revs is empty (e.g. hg branch -r 'draft() - all()' foo)

729

maybe if not root.mutable():

738–742

children() can be expensive because it iterates over all later revisions (in revlog order). So when you want to call children() for many revisions (especially old revisions), it can be better to do a single scan. This *might* be better:

if repo.revs('(%ld::head()) - %ld', heads, heads):
  raise error.Abort(_("cannot change branch in middle of a stack"))

I'm not sure it will be, or if it's even correct, so please test (or just tell me that this command will be used rarely enough that no one cares).

mercurial/commands.py
1065–1070

Does this need to be modified to work with --rev? I've never used hg branch, but it sounds like hg branch foo (without --force) is supposed to fail if foo is already taken unless one of the working directory parents already has that name. Should we do the corresponding check for --rev? If not, it seems like we should at least *not* do the check (in its current form) when --rev is given. If I'm doing hg branch --rev deadbeef foo, it doesn't seem relevant what the branch names in my working directory parents are. Would be good to add a test case or two for this too.

pulkit updated this revision to Diff 4934.Jan 19 2018, 2:44 AM
pulkit marked 5 inline comments as done.Jan 19 2018, 2:57 AM
pulkit removed subscribers: durin42, krbullock, yuja, indygreg.
pulkit added inline comments.
mercurial/commands.py
1065–1070

This is a very basic and experimental implementation, hence I have changed the logic to not accept a new name if any such name already exists. Test cases are also added.

lothiraldan accepted this revision.Jan 19 2018, 3:32 AM
pulkit added inline comments.Jan 19 2018, 9:31 AM
mercurial/cmdutil.py
740

After some more testing, I found this is not correct and raise the error even in cases when it should not. For example:

o 3

o 2
/

o 1
o 0

Here if I want to change the branch of 1::2, this will raise error however this should be completely fine if we have allowunstable enabled. So in next version, I am going to add a test for allowunstable and if that's enabled, allow to change branch of 1::2.

durin42 accepted this revision.Jan 19 2018, 2:54 PM
durin42 added a comment.Jan 19 2018, 2:56 PM

Accepting this since it seems generally liked and is marked experimental. We can always rip it out if it turns out to be a mistake.

Closed by commit rHG3bd8ab4c80a5: branch: add a --rev flag to change branch name of given revisions (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 (87 lines)
Mmercurial/commands.py (19 lines)
AMtests/test-branch-change.t (296 lines)
Mtests/test-completion.t (2 lines)

Diff 4944

mercurial/cmdutil.py

obsolete, obsolete,
patch, patch,
pathutil, pathutil,
pycompat, pycompat,
registrar, registrar,
revlog, revlog,
revset, revset,
revsetlang, revsetlang,
rewriteutil,
scmutil, scmutil,
smartset, smartset,
templatekw, templatekw,
templater, templater,
util, util,
vfs as vfsmod, vfs as vfsmod,
) )
stringio = util.stringio stringio = util.stringio
clist = sorted(choice) clist = sorted(choice)
raise error.AmbiguousCommand(cmd, clist) raise error.AmbiguousCommand(cmd, clist)
if choice: if choice:
return list(choice.values())[0] return list(choice.values())[0]
raise error.UnknownCommand(cmd, allcmds) raise error.UnknownCommand(cmd, allcmds)
def changebranch(ui, repo, revs, label):
""" Change the branch name of given revs to label """
with repo.wlock(), repo.lock(), repo.transaction('branches'):
# abort in case of uncommitted merge or dirty wdir
lothiraldanUnsubmitted
Not Done

Small typo, missing space between in and case

lothiraldan: Small typo, missing space between `in` and `case`
martinvonzUnsubmitted
Done

"in case of uncommited merge or dirty wdir"? (note that there are 4 fixes there)

martinvonz: "in case of uncommited merge or dirty wdir"? (note that there are 4 fixes there)
bailifchanged(repo)
revs = scmutil.revrange(repo, revs)
martinvonzUnsubmitted
Done

may want to check if revs is empty (e.g. hg branch -r 'draft() - all()' foo)

martinvonz: may want to check if revs is empty (e.g. `hg branch -r 'draft() - all()' foo`)
if not revs:
raise error.Abort("empty revision set")
roots = repo.revs('roots(%ld)', revs)
if len(roots) > 1:
raise error.Abort(_("cannot change branch of non-linear revisions"))
rewriteutil.precheck(repo, revs, 'change branch of')
dlaxUnsubmitted
Done

typo: betwen

Also, I'm not sure "between" is appropriate here. Maybe "cannot change branch in the middle of a stack"?

dlax: typo: betwen Also, I'm not sure "between" is appropriate here. Maybe "cannot change branch in…
ryanmceUnsubmitted
Not Done

What about an unclean working copy? It looks like that's supported -- could we make sure it's tested?

ryanmce: What about an unclean working copy? It looks like that's supported -- could we make sure it's…
pulkitAuthorUnsubmitted
Not Done

It's not supported. Handled that case and added a test. Thanks!

pulkit: It's not supported. Handled that case and added a test. Thanks!
martinvonzUnsubmitted
Done

maybe if not root.mutable():

martinvonz: maybe `if not root.mutable():`
if repo.revs('merge() and %ld', revs):
raise error.Abort(_("cannot change branch of a merge commit"))
if repo.revs('obsolete() and %ld', revs):
ryanmceUnsubmitted
Not Done

In theory, the phase boundary could move after our check but before we take the repolock. Can we guard against that please?

Two ways to accomplish this:

1/ Take the repo lock earlier
2/ Check before repo lock (fast path) and again after the repo lock is held (in case something changed)

ryanmce: In theory, the phase boundary could move after our check but before we take the repolock. Can…
pulkitAuthorUnsubmitted
Not Done

Improved the implementation by taking lock earlier. Thanks!

pulkit: Improved the implementation by taking lock earlier. Thanks!
lothiraldanUnsubmitted
Not Done

Might be helpful to precise which changeset is a merge commit.

lothiraldan: Might be helpful to precise which changeset is a merge commit.
raise error.Abort(_("cannot change branch of a obsolete changeset"))
lothiraldanUnsubmitted
Not Done

Might be helpful to precise which changeset is am obsolete commit.

lothiraldan: Might be helpful to precise which changeset is am obsolete commit.
# make sure only topological heads
if repo.revs('heads(%ld) - head()', revs):
raise error.Abort(_("cannot change branch in middle of a stack"))
replacements = {}
# avoid import cycle mercurial.cmdutil -> mercurial.context ->
pulkitAuthorUnsubmitted
Not Done

After some more testing, I found this is not correct and raise the error even in cases when it should not. For example:

o 3

o 2
/

o 1
o 0

Here if I want to change the branch of 1::2, this will raise error however this should be completely fine if we have allowunstable enabled. So in next version, I am going to add a test for allowunstable and if that's enabled, allow to change branch of 1::2.

pulkit: After some more testing, I found this is not correct and raise the error even in cases when it…
# mercurial.subrepo -> mercurial.cmdutil
from . import context
martinvonzUnsubmitted
Done

children() can be expensive because it iterates over all later revisions (in revlog order). So when you want to call children() for many revisions (especially old revisions), it can be better to do a single scan. This *might* be better:

if repo.revs('(%ld::head()) - %ld', heads, heads):
  raise error.Abort(_("cannot change branch in middle of a stack"))

I'm not sure it will be, or if it's even correct, so please test (or just tell me that this command will be used rarely enough that no one cares).

martinvonz: children() can be expensive because it iterates over all later revisions (in revlog order). So…
for rev in revs:
ctx = repo[rev]
oldbranch = ctx.branch()
# check if ctx has same branch
if oldbranch == label:
continue
def filectxfn(repo, newctx, path):
dlaxUnsubmitted
Done

nit: with % on the continuation line and alignment with opening parenthesis, it'd be more readable.

dlax: nit: with `%` on the continuation line and alignment with opening parenthesis, it'd be more…
dlaxUnsubmitted
Done

This message is not tested, maybe add a --debug call to one of the tests?

dlax: This message is not tested, maybe add a `--debug` call to one of the tests?
try:
return ctx[path]
except error.ManifestLookupError:
return None
ui.debug("changing branch of '%s' from '%s' to '%s'\n"
% (hex(ctx.node()), oldbranch, label))
extra = ctx.extra()
extra['branch_change'] = hex(ctx.node())
# While changing branch of set of linear commits, make sure that
# we base our commits on new parent rather than old parent which
# was obsoleted while changing the branch
p1 = ctx.p1().node()
p2 = ctx.p2().node()
if p1 in replacements:
p1 = replacements[p1][0]
if p2 in replacements:
p2 = replacements[p2][0]
mc = context.memctx(repo, (p1, p2),
ctx.description(),
ctx.files(),
dlaxUnsubmitted
Not Done

That comment isn't really helpful as is. Maybe explain how you handle phase instead?

dlax: That comment isn't really helpful as is. Maybe explain how you handle phase instead?
lothiraldanUnsubmitted
Not Done

For safety, I would add a check that p1 and p2 are not obsolete here.

lothiraldan: For safety, I would add a check that p1 and p2 are not obsolete here.
pulkitAuthorUnsubmitted
Not Done

A user may want to change branch of an unstable changeset which I think is okay. I am not sure why you want that check?

pulkit: A user may want to change branch of an unstable changeset which I think is okay. I am not sure…
filectxfn,
user=ctx.user(),
date=ctx.date(),
extra=extra,
branch=label)
commitphase = ctx.phase()
overrides = {('phases', 'new-commit'): commitphase}
dlaxUnsubmitted
Done

Isn't rewrote == len(replacements)?

dlax: Isn't `rewrote == len(replacements)`?
with repo.ui.configoverride(overrides, 'branch-change'):
newnode = repo.commitctx(mc)
replacements[ctx.node()] = (newnode,)
ui.debug('new node id is %s\n' % hex(newnode))
# create obsmarkers and move bookmarks
scmutil.cleanupnodes(repo, replacements, 'branch-change')
# move the working copy too
ryanmceUnsubmitted
Not Done

Seems like we need a refactor? (out of scope for this change though)

ryanmce: Seems like we need a refactor? (out of scope for this change though)
pulkitAuthorUnsubmitted
Not Done

Yeah, I will be happy to do that in next cycle. Can you suggest a name for file in which we can split cmdutil.py.

pulkit: Yeah, I will be happy to do that in next cycle. Can you suggest a name for file in which we can…
wctx = repo[None]
# in-progress merge is a bit too complex for now.
if len(wctx.parents()) == 1:
newid = replacements.get(wctx.p1().node())
if newid is not None:
# avoid import cycle mercurial.cmdutil -> mercurial.hg ->
# mercurial.cmdutil
from . import hg
hg.update(repo, newid[0], quietempty=True)
ui.status(_("changed branch on %d changesets\n") % len(replacements))
def findrepo(p): def findrepo(p):
while not os.path.isdir(os.path.join(p, ".hg")): while not os.path.isdir(os.path.join(p, ".hg")):
oldp, p = p, os.path.dirname(p) oldp, p = p, os.path.dirname(p)
if p == oldp: if p == oldp:
return None return None
return p return p

mercurial/commands.py

else: else:
bookmarks.deactivate(repo) bookmarks.deactivate(repo)
else: # show bookmarks else: # show bookmarks
bookmarks.printbookmarks(ui, repo, **opts) bookmarks.printbookmarks(ui, repo, **opts)
@command('branch', @command('branch',
[('f', 'force', None, [('f', 'force', None,
_('set branch name even if it shadows an existing branch')), _('set branch name even if it shadows an existing branch')),
('C', 'clean', None, _('reset branch name to parent branch name'))], ('C', 'clean', None, _('reset branch name to parent branch name')),
('r', 'rev', [], _('change branches of the given revs (EXPERIMENTAL)')),
dlaxUnsubmitted
Done

Nit: could you move the closing ] on the next line and add a , at the end of the new line? This way next time we add an option, there will be only a one-line + diff.

dlax: Nit: could you move the closing `]` on the next line and add a `,` at the end of the new line?
],
_('[-fC] [NAME]')) _('[-fC] [NAME]'))
def branch(ui, repo, label=None, **opts): def branch(ui, repo, label=None, **opts):
"""set or show the current branch name """set or show the current branch name
.. note:: .. note::
Branch names are permanent and global. Use :hg:`bookmark` to create a Branch names are permanent and global. Use :hg:`bookmark` to create a
light-weight bookmark instead. See :hg:`help glossary` for more light-weight bookmark instead. See :hg:`help glossary` for more
Use the command :hg:`update` to switch to an existing branch. Use Use the command :hg:`update` to switch to an existing branch. Use
:hg:`commit --close-branch` to mark this branch head as closed. :hg:`commit --close-branch` to mark this branch head as closed.
When all heads of a branch are closed, the branch will be When all heads of a branch are closed, the branch will be
considered closed. considered closed.
Returns 0 on success. Returns 0 on success.
""" """
opts = pycompat.byteskwargs(opts) opts = pycompat.byteskwargs(opts)
revs = opts.get('rev')
if label: if label:
label = label.strip() label = label.strip()
if not opts.get('clean') and not label: if not opts.get('clean') and not label:
if revs:
raise error.Abort(_("no branch name specified for the revisions"))
dlaxUnsubmitted
Done

Maybe _().

dlax: Maybe `_()`.
ui.write("%s\n" % repo.dirstate.branch()) ui.write("%s\n" % repo.dirstate.branch())
return return
with repo.wlock(): with repo.wlock():
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')
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)
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"))
martinvonzUnsubmitted
Not Done

Does this need to be modified to work with --rev? I've never used hg branch, but it sounds like hg branch foo (without --force) is supposed to fail if foo is already taken unless one of the working directory parents already has that name. Should we do the corresponding check for --rev? If not, it seems like we should at least *not* do the check (in its current form) when --rev is given. If I'm doing hg branch --rev deadbeef foo, it doesn't seem relevant what the branch names in my working directory parents are. Would be good to add a test case or two for this too.

martinvonz: Does this need to be modified to work with --rev? I've never used `hg branch`, but it sounds…
pulkitAuthorUnsubmitted
Not Done

This is a very basic and experimental implementation, hence I have changed the logic to not accept a new name if any such name already exists. Test cases are also added.

pulkit: This is a very basic and experimental implementation, hence I have changed the logic to not…
scmutil.checknewlabel(repo, label, 'branch')
repo.dirstate.setbranch(label) repo.dirstate.setbranch(label)
ui.status(_('marked working directory as branch %s\n') % label) ui.status(_('marked working directory as branch %s\n') % label)
# find any open named branches aside from default # find any open named branches aside from default
others = [n for n, h, t, c in repo.branchmap().iterbranches() others = [n for n, h, t, c in repo.branchmap().iterbranches()
if n != "default" and not c] if n != "default" and not c]
if not others: if not others:
ui.status(_('(branches are permanent and global, ' ui.status(_('(branches are permanent and global, '

tests/test-branch-change.t

  • This file was added.
Testing changing branch on commits
==================================
Setup
$ cat >> $HGRCPATH << EOF
> [alias]
> glog = log -G -T "{rev}:{node|short} {desc}\n{branch} ({bookmarks})"
> [experimental]
ryanmceUnsubmitted
Not Done

nit: I'd prefer no newline in the glog output so things are more compact

ryanmce: nit: I'd prefer no newline in the glog output so things are more compact
> evolution = createmarkers
> [extensions]
ryanmceUnsubmitted
Not Done

This test needs to include a case where we strip commits, especially with a merge, just so the behavior is clear in this change.

That will probably (in my understanding of the current code) expose an issue that needs to be fixed.

ryanmce: This test needs to include a case where we strip commits, especially with a merge, just so the…
pulkitAuthorUnsubmitted
Not Done

Oh, I didn't know that. Just banned merge revisions for now.

pulkit: Oh, I didn't know that. Just banned merge revisions for now.
> rebase=
> EOF
$ hg init repo
$ cd repo
$ for ch in a b c d e; do echo foo >> $ch; hg ci -Aqm "Added "$ch; done
$ hg glog
@ 4:aa98ab95a928 Added e
| default ()
o 3:62615734edd5 Added d
| default ()
o 2:28ad74487de9 Added c
| default ()
o 1:29becc82797a Added b
| default ()
o 0:18d04c59bb5d Added a
default ()
$ hg branches
default 4:aa98ab95a928
Try without passing a new branch name
$ hg branch -r .
ryanmceUnsubmitted
Done

Not sure we need this many commits for the test to be useful.

ryanmce: Not sure we need this many commits for the test to be useful.
abort: no branch name specified for the revisions
[255]
Setting an invalid branch name
$ hg branch -r . a:b
abort: ':' cannot be used in a name
dlaxUnsubmitted
Done

Not sure why, but many titles' underlines are either too long or too short. Could you make these consistent?

dlax: Not sure why, but many titles' underlines are either too long or too short. Could you make…
[255]
$ hg branch -r . tip
abort: the name 'tip' is reserved
[255]
$ hg branch -r . 1234
abort: cannot use an integer as a name
[255]
Change on non-linear set of commits
$ hg branch -r 2 -r 4 foo
abort: cannot change branch of non-linear revisions
[255]
Change in middle of the stack (linear commits)
$ hg branch -r 1::3 foo
abort: cannot change branch of changeset with children
[255]
Change with dirty working directory
$ echo bar > a
$ hg branch -r . foo
abort: uncommitted changes
[255]
dlaxUnsubmitted
Done

"in the middle of the stack"

dlax: "in the middle of the stack"
$ hg revert --all
reverting a
Change on empty revision set
$ hg branch -r 'draft() - all()' foo
abort: empty revision set
[255]
Changing branch on linear set of commits from head
Without obsmarkers
$ hg branch -r 3:4 foo --config experimental.evolution=!
changed branch on 2 changesets
saved backup bundle to $TESTTMP/repo/.hg/strip-backup/62615734edd5-e86bd13a-branch-change.hg (glob)
$ hg glog
@ 4:3938acfb5c0f Added e
| foo ()
o 3:9435da006bdc Added d
| foo ()
o 2:28ad74487de9 Added c
| default ()
o 1:29becc82797a Added b
| default ()
o 0:18d04c59bb5d Added a
default ()
$ hg branches
foo 4:3938acfb5c0f
default 2:28ad74487de9 (inactive)
With obsmarkers
$ hg branch -r 3::4 bar
changed branch on 2 changesets
$ hg glog
@ 6:7c1991464886 Added e
| bar ()
o 5:1ea05e93925f Added d
| bar ()
o 2:28ad74487de9 Added c
| default ()
o 1:29becc82797a Added b
| default ()
o 0:18d04c59bb5d Added a
default ()
$ hg branches
bar 6:7c1991464886
default 2:28ad74487de9 (inactive)
Change branch name to an existing branch
$ hg branch -r . default
abort: a branch of the same name already exists
[255]
Changing on a branch head which is not topological head
$ hg branch -r 2 stable
abort: cannot change branch of changeset with children
[255]
Enabling the allowunstable config and trying to change branch on a branch head
which is not a topological head
$ echo "[experimental]" >> .hg/hgrc
$ echo "evolution.allowunstable=yes" >> .hg/hgrc
$ hg branch -r 2 foo
changed branch on 1 changesets
2 new orphan changesets
Changing branch of an obsoleted changeset
lothiraldanUnsubmitted
Done

You should update the revset to use the same as the next glog call (.^)::

lothiraldan: You should update the revset to use the same as the next glog call `(.^)::`
$ hg branch -r 4 foobar
abort: hidden revision '4' was rewritten as: 7c1991464886!
(use --hidden to access hidden revisions)
[255]
$ hg branch -r 4 --hidden foobar
abort: cannot change branch of a obsolete changeset
[255]
Make sure bookmark movement is correct
$ hg bookmark b1
$ hg glog -r '.^::'
@ 6:7c1991464886 Added e
| bar (b1)
* 5:1ea05e93925f Added d
| bar ()
~
$ hg branch -r '(.^)::' wat --debug
changing branch of '1ea05e93925f806d875a2163f9b76764be644636' from 'bar' to 'wat'
committing files:
d
committing manifest
committing changelog
new node id is 343660ccab7400da637bd6a211d07f413536d718
changing branch of '7c19914648869f5b02fc7fed31ddee9783fdd680' from 'bar' to 'wat'
committing files:
e
committing manifest
committing changelog
new node id is de1404b45a69f8cc6437d7679033ee33e9efb4ba
moving bookmarks ['b1'] from 7c19914648869f5b02fc7fed31ddee9783fdd680 to de1404b45a69f8cc6437d7679033ee33e9efb4ba
resolving manifests
branchmerge: False, force: False, partial: False
ancestor: 7c1991464886, local: 7c1991464886+, remote: de1404b45a69
changed branch on 2 changesets
updating the branch cache
invalid branchheads cache (served): tip differs
$ hg glog -r '(.^)::'
@ 9:de1404b45a69 Added e
| wat (b1)
* 8:343660ccab74 Added d
| wat ()
~
Make sure phase handling is correct
$ echo foo >> bar
$ hg ci -Aqm "added bar" --secret
1 new orphan changesets
$ hg glog -r .
@ 10:8ad1294c1660 added bar
| wat (b1)
~
$ hg branch -r . secret
changed branch on 1 changesets
$ hg phase -r .
11: secret
$ hg branches
secret 11:38a9b2d53f98
foo 7:8a4729a5e2b8
wat 9:de1404b45a69 (inactive)
default 2:28ad74487de9 (inactive)
$ hg branch
secret
Changing branch of another head, different from one on which we are
$ hg glog
@ 11:38a9b2d53f98 added bar
| secret (b1)
* 9:de1404b45a69 Added e
| wat ()
* 8:343660ccab74 Added d
| wat ()
| o 7:8a4729a5e2b8 Added c
| | foo ()
x | 2:28ad74487de9 Added c
|/ default ()
o 1:29becc82797a Added b
| default ()
o 0:18d04c59bb5d Added a
default ()
$ hg branch
secret
$ hg branch -r 7 foobar
changed branch on 1 changesets
The current branch must be preserved
$ hg branch
secret
Changing branch on multiple heads at once
$ hg rebase -s 8 -d 12 --keepbranches -q
$ hg rebase -s 14 -d 1 --keepbranches -q
$ hg branch -r 0: stable
changed branch on 6 changesets
$ hg glog
@ 23:6a5ddbcfb870 added bar
| stable (b1)
o 22:baedc6e98a67 Added e
| stable ()
| o 21:99ac7bf8aad1 Added d
| | stable ()
dlaxUnsubmitted
Done

typo: mutliple

dlax: typo: mutliple
| o 20:0ecb4d39c4bd Added c
|/ stable ()
o 19:fd45b986b109 Added b
| stable ()
o 18:204d2769eca2 Added a
stable ()
$ hg branches
stable 23:6a5ddbcfb870
$ hg branch
stable
Changing to same branch name does not work
$ hg branch -r 19::21 stable
abort: a branch of the same name already exists
[255]
Testing on merge
$ hg merge -r 20
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
$ hg branch -r . abcd
abort: outstanding uncommitted merge
[255]
$ hg ci -m "Merge commit"
$ hg branch -r '(.^)::' def
abort: cannot change branch of a merge commit
[255]
Changing branch on public changeset
$ hg phase -r 21 -p
$ hg branch -r 21 def
abort: cannot change branch of public changesets
(see 'hg help phases' for details)
[255]
ryanmceUnsubmitted
Not Done

Hm, I think I'd prefer this to be an error about public changesets rather than a no-op with a 0 return value. Trying to modify the branch of public changesets -- even if the change is a no-op, still seems like an error to me. Thoughts?

ryanmce: Hm, I think I'd prefer this to be an error about public changesets rather than a no-op with a 0…
pulkitAuthorUnsubmitted
Not Done

Oh, no. They are not public changesets. The test for public changeset is just above it. I will plug the phase info in the glog output in next version.

pulkit: Oh, no. They are not public changesets. The test for public changeset is just above it. I will…

tests/test-completion.t

status: all, modified, added, removed, deleted, clean, unknown, ignored, no-status, terse, copies, print0, rev, change, include, exclude, subrepos, template status: all, modified, added, removed, deleted, clean, unknown, ignored, no-status, terse, copies, print0, rev, change, include, exclude, subrepos, template
summary: remote summary: remote
update: clean, check, merge, date, rev, tool update: clean, check, merge, date, rev, tool
addremove: similarity, subrepos, include, exclude, dry-run addremove: similarity, subrepos, include, exclude, dry-run
archive: no-decode, prefix, rev, type, subrepos, include, exclude archive: no-decode, prefix, rev, type, subrepos, include, exclude
backout: merge, commit, no-commit, parent, rev, edit, tool, include, exclude, message, logfile, date, user backout: merge, commit, no-commit, parent, rev, edit, tool, include, exclude, message, logfile, date, user
bisect: reset, good, bad, skip, extend, command, noupdate bisect: reset, good, bad, skip, extend, command, noupdate
bookmarks: force, rev, delete, rename, inactive, template bookmarks: force, rev, delete, rename, inactive, template
branch: force, clean branch: force, clean, rev
branches: active, closed, template branches: active, closed, template
bundle: force, rev, branch, base, all, type, ssh, remotecmd, insecure bundle: force, rev, branch, base, all, type, ssh, remotecmd, insecure
cat: output, rev, decode, include, exclude, template cat: output, rev, decode, include, exclude, template
config: untrusted, edit, local, global, template config: untrusted, edit, local, global, template
copy: after, force, include, exclude, dry-run copy: after, force, include, exclude, dry-run
debugancestor: debugancestor:
debugapplystreamclonebundle: debugapplystreamclonebundle:
debugbuilddag: mergeable-file, overwritten-file, new-file debugbuilddag: mergeable-file, overwritten-file, new-file