D6314: discovery: only calculate closed branches if required
pulkit (Pulkit Goyal)
phabricator at mercurial-scm.org
Sat Apr 27 11:44:24 UTC 2019
pulkit created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION 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.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D6314
AFFECTED FILES
mercurial/discovery.py
CHANGE DETAILS
diff --git a/mercurial/discovery.py b/mercurial/discovery.py
--- a/mercurial/discovery.py
+++ b/mercurial/discovery.py
@@ -340,15 +340,15 @@
pushop.pushbranchmap = headssum
newbranches = [branch for branch, heads in headssum.iteritems()
if heads[0] is None]
- # Makes a set of closed branches
- closedbranches = set()
- for tag, heads, tip, isclosed in repo.branchmap().iterbranches():
- if isclosed:
- closedbranches.add(tag)
- 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))
+ # Calculate how many of the new branches are closed branches
+ closedbranches = set()
+ for tag, heads, tip, isclosed in repo.branchmap().iterbranches():
+ if isclosed:
+ closedbranches.add(tag)
+ closedbranches = (closedbranches & set(newbranches))
if closedbranches:
errmsg = (_("push creates new remote branches: %s (%d closed)!")
% (branchnames, len(closedbranches)))
To: pulkit, #hg-reviewers
Cc: mercurial-devel
More information about the Mercurial-devel
mailing list