This is an archive of the discontinued Mercurial Phabricator instance.

_('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 ?

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

Revision Contents
Changeset List

			Path	Packages
M			mercurial/commands.py (6 lines)

Commit	Parents	Author	Summary	Date
		Navaneeth Suresh		Dec 23 2018, 5:19 AM

Diff 12961

mercurial/commands.py

	else:			else:
	raise error.ProgrammingError('invalid action: %s' % action)			raise error.ProgrammingError('invalid action: %s' % action)

	@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)')),			('r', 'rev', [], _('change branches of the given revs (EXPERIMENTAL)')),
				('s', 'show', None, _('show branch name of the given rev'))
	],			],
	_('[-fC] [NAME]'),			_('[-fC] [NAME]'),
	helpcategory=command.CATEGORY_CHANGE_ORGANIZATION)			helpcategory=command.CATEGORY_CHANGE_ORGANIZATION)
	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::

	label = label.strip()			label = label.strip()

	if not opts.get('clean') and not label:			if not opts.get('clean') and not label:
	if revs:			if revs:
	raise error.Abort(_("no branch name specified for the revisions"))			raise error.Abort(_("no branch name specified for the revisions"))
	ui.write("%s\n" % repo.dirstate.branch())			ui.write("%s\n" % repo.dirstate.branch())
	return			return

				elif opts.get('show') and label:
				ctx = scmutil.revsingle(repo, label)
				ui.write("%s\n" % ctx.branch())
				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')			scmutil.checknewlabel(repo, label, 'branch')

Diff	ID	Base	Description	Created	Lint	Unit
Base			Base
Diff 1	12961			Dec 23 2018, 5:21 AM	★	★

This is an archive of the discontinued Mercurial Phabricator instance.

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

Details

Diff Detail

Event Timeline

Revision ContentsChangeset List

Diff 12961

mercurial/commands.py

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

Revision Contents
Changeset List