Page MenuHomePhabricator

branch:Added option to show branch name of a given rev (Issue5948)
AbandonedPublic

Authored by navaneeth.suresh on Dec 23 2018, 5:22 AM.

Details

Reviewers
None
Group Reviewers
hg-reviewers

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

yuja added subscribers: pulkit, yuja.Dec 23 2018, 9:01 AM
_('set branch name even if it shadows an existing branch')),
('C', 'clean', None, _('reset branch name to parent branch name')),
('r', 'rev', [], _('change branches of the given revs (EXPERIMENTAL)')),

+ ('s', 'show', None, _('show branch name of the given rev'))

],
_('[-fC] [NAME]'),
helpcategory=command.CATEGORY_CHANGE_ORGANIZATION)

@@ -1097,6 +1098,11 @@

ui.write("%s\n" % repo.dirstate.branch())
return

+ elif opts.get('show') and label:
+ ctx = scmutil.revsingle(repo, label)
+ ui.write("%s\n" % ctx.branch())
+ return

How about adding the -r/--rev option to the branches command instead?

I came to this idea while working on the issue4505, tag sorting. I haven't sent
the patch yet because I noticed we would also want to sort tags
lexicographically, which can't be achieved by the revset. But at least, tags,
branches, and bookmarks can be filtered by the -r/--rev option.

https://bz.mercurial-scm.org/show_bug.cgi?id=4505

branch, tag, and bookmark (without -l) are basically the commands to mutate
the repository, and the -r option of the branch command is highly experimental.
IIRC, @pulkit regrets of adding branch -r.

In D5475#81060, @yuja wrote:
_('set branch name even if it shadows an existing branch')),
('C', 'clean', None, _('reset branch name to parent branch name')),
('r', 'rev', [], _('change branches of the given revs (EXPERIMENTAL)')),

+ ('s', 'show', None, _('show branch name of the given rev'))

],
_('[-fC] [NAME]'),
helpcategory=command.CATEGORY_CHANGE_ORGANIZATION)

@@ -1097,6 +1098,11 @@

ui.write("%s\n" % repo.dirstate.branch())
return

+ elif opts.get('show') and label:
+ ctx = scmutil.revsingle(repo, label)
+ ui.write("%s\n" % ctx.branch())
+ return

How about adding the -r/--rev option to the branches command instead?
I came to this idea while working on the issue4505, tag sorting. I haven't sent
the patch yet because I noticed we would also want to sort tags
lexicographically, which can't be achieved by the revset. But at least, tags,
branches, and bookmarks can be filtered by the -r/--rev option.
https://bz.mercurial-scm.org/show_bug.cgi?id=4505
branch, tag, and bookmark (without -l) are basically the commands to mutate
the repository, and the -r option of the branch command is highly experimental.
IIRC, @pulkit regrets of adding branch -r.

Yep I do. I don't think it's a good UI. It should either be part of commands like metaedit, or should be moved to a change-branch extension for now.

Thanks for the info @yuja. I'm thinking to move --rev/-r to branches command and replacing --show/-s that I've made to --rev/-r in the branch command itself. How's that sound to you guys, @pulkit @yuja ?

yuja added a comment.Dec 23 2018, 10:22 PM
Thanks for the info @yuja. I'm thinking to move --rev/-r to branches command and replacing --show/-s that I've made to --rev/-r in the branch command itself.

I'm not sure if I get it, but my idea is to add hg branches -r/--rev
that selects branches to be listed by revisions. So, hg branch -srREV in
your original patch will be equivalent to hg branches -qrREV (-q to
suppress detailed output.)

In D5475#81071, @yuja wrote:
Thanks for the info @yuja. I'm thinking to move --rev/-r to branches command and replacing --show/-s that I've made to --rev/-r in the branch command itself.

I'm not sure if I get it, but my idea is to add hg branches -r/--rev
that selects branches to be listed by revisions. So, hg branch -srREV in
your original patch will be equivalent to hg branches -qrREV (-q to
suppress detailed output.)

I've made the suggested changes in D5477 @yuja. Please see.

navaneeth.suresh abandoned this revision.Dec 27 2018, 1:34 PM