This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6211

branch: return early if we find an open named branch apart from default
ClosedPublic

Authored by pulkit on Apr 5 2019, 9:32 AM.

Download Raw Diff

Details

Reviewers

None

Group Reviewers

hg-reviewers

Commits

rHGd6437f414437: branch: return early if we find an open named branch apart from default

Summary

The current code builds a list of all the open named branches except default and
then bool that. This is mostly fine until you get a repo which has thousands of
named 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.Apr 5 2019, 9:32 AM

Herald added a reviewer: hg-reviewers. · View Herald TranscriptApr 5 2019, 9:32 AM

Herald added a subscriber: mercurial-devel. · View Herald Transcript

pulkit updated this revision to Diff 14742.Apr 15 2019, 12:15 PM

pulkit added a child revision: D6236: branchcache: lazily validate nodes in iteritems().Apr 15 2019, 12:28 PM

Closed by commit rHGd6437f414437: branch: return early if we find an open named branch apart from default (authored by pulkit). · Explain WhyApr 15 2019, 7:41 PM

This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

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

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	14680		Apr 5 2019, 9:32 AM	★	★
Diff 2	14742		Apr 15 2019, 12:15 PM	★	★
Diff 3	14754	rHGd6437f4144377b0c4bc25798c8f072bce99835f0	Apr 5 2019, 9:05 AM	★	★

Status	Author	Revision
Closed	pulkit	D6236 branchcache: lazily validate nodes in iteritems()
Closed	pulkit	D6211 branch: return early if we find an open named branch apart from default
Closed	pulkit	D6210 branchcache: don't verify closed nodes in _branchtip()
Closed	pulkit	D6209 branchcache: don't verify closed nodes in iteropen()
Closed	pulkit	D6208 branchcache: lazily validate nodes from the branchmap
Closed	pulkit	D6207 branchcache: add functions to validate changelog nodes
Closed	pulkit	D6206 branchmap: implement __contains__()
Closed	pulkit	D6205 branchmap: prevent using __getitem__() in branchheads()
Closed	pulkit	D6204 branchmap: dynamically resolve type of branchcache class
Closed	pulkit	D6240 branchcache: only iterate over branches which needs to be verified
Closed	pulkit	D6239 branchcache: fix the docstring of _verifybranch()
Closed	pulkit	D6238 branchcache: don't verify while creating a copy

Diff 14754

mercurial/commands.py

	' 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"))

	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()			for n, h, t, c in repo.branchmap().iterbranches():
	if n != "default" and not c]			if n != "default" and not c:
	if not others:			return 0
	ui.status(_('(branches are permanent and global, '			ui.status(_('(branches are permanent and global, '
	'did you want a bookmark?)\n'))			'did you want a bookmark?)\n'))

	@command('branches',			@command('branches',
	[('a', 'active', False,			[('a', 'active', False,
	_('show only branches that have unmerged heads (DEPRECATED)')),			_('show only branches that have unmerged heads (DEPRECATED)')),
	('c', 'closed', False, _('show normal and closed branches')),			('c', 'closed', False, _('show normal and closed branches')),
	('r', 'rev', [], _('show branch name(s) of the given rev'))			('r', 'rev', [], _('show branch name(s) of the given rev'))
	] + formatteropts,			] + formatteropts,
	_('[-c]'),			_('[-c]'),