This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6314

discovery: only calculate closed branches if required
ClosedPublic

Authored by pulkit on Apr 27 2019, 7:44 AM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGd0e773ad9077: discovery: only calculate closed branches if required
Summary

The number of new closed branches is required for printing in error message. So
let's only calculate them if we need to print error about new 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 27 2019, 7:44 AM
Closed by commit rHGd0e773ad9077: discovery: only calculate closed branches if required (authored by pulkit). · Explain WhyApr 29 2019, 7:36 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/discovery.py (12 lines)

Diff 14973

mercurial/discovery.py

if remote.capable('branchmap'): if remote.capable('branchmap'):
headssum = _headssummary(pushop) headssum = _headssummary(pushop)
else: else:
headssum = _oldheadssummary(repo, remoteheads, outgoing, inc) headssum = _oldheadssummary(repo, remoteheads, outgoing, inc)
pushop.pushbranchmap = headssum pushop.pushbranchmap = headssum
newbranches = [branch for branch, heads in headssum.iteritems() newbranches = [branch for branch, heads in headssum.iteritems()
if heads[0] is None] if heads[0] is None]
# Makes a set of closed branches # 1. Check for new branches on the remote.
if newbranches and not newbranch: # new branch requires --new-branch
branchnames = ', '.join(sorted(newbranches))
# Calculate how many of the new branches are closed branches
closedbranches = set() closedbranches = set()
for tag, heads, tip, isclosed in repo.branchmap().iterbranches(): for tag, heads, tip, isclosed in repo.branchmap().iterbranches():
if isclosed: if isclosed:
closedbranches.add(tag) closedbranches.add(tag)
closedbranches = (closedbranches & set(newbranches)) closedbranches = (closedbranches & set(newbranches))
# 1. Check for new branches on the remote.
if newbranches and not newbranch: # new branch requires --new-branch
branchnames = ', '.join(sorted(newbranches))
if closedbranches: if closedbranches:
errmsg = (_("push creates new remote branches: %s (%d closed)!") errmsg = (_("push creates new remote branches: %s (%d closed)!")
% (branchnames, len(closedbranches))) % (branchnames, len(closedbranches)))
else: else:
errmsg = (_("push creates new remote branches: %s!")% branchnames) errmsg = (_("push creates new remote branches: %s!")% branchnames)
hint=_("use 'hg push --new-branch' to create new remote branches") hint=_("use 'hg push --new-branch' to create new remote branches")
raise error.Abort(errmsg, hint=hint) raise error.Abort(errmsg, hint=hint)