taapas1128 updated this revision to Diff 14534. taapas1128 marked 4 inline comments as done.
REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6038?vs=14507&id=14534 REVISION DETAIL https://phab.mercurial-scm.org/D6038 AFFECTED FILES mercurial/discovery.py tests/test-push-warn.t CHANGE DETAILS diff --git a/tests/test-push-warn.t b/tests/test-push-warn.t --- a/tests/test-push-warn.t +++ b/tests/test-push-warn.t @@ -791,3 +791,57 @@ [255] $ cd .. + +Test regarding pushing of closed branch/branches(Issue6080) + + $ hg init x + $ cd x + $ hg -q branch a + $ echo 0 > foo + $ hg -q ci -Am 0 + $ hg -q up 0 + $ cd .. + + $ hg -q clone x z + $ cd z + +When there is a single closed branch + + $ hg -q branch foo + $ echo 0 > foo + $ hg -q ci -Am 0 + $ hg ci --close-branch -m 'closing branch foo' + $ hg -q up 0 + $ hg push ../x + pushing to ../x + searching for changes + abort: push creates new remote branches: foo (1 closed)! + (use 'hg push --new-branch' to create new remote branches) + [255] + +When there is more than one closed branches + $ hg -q branch bar + $ echo 0 > bar + $ hg -q ci -Am 0 + $ hg ci --close-branch -m 'closing branch bar' + $ hg -q up 0 + $ hg push ../x + pushing to ../x + searching for changes + abort: push creates new remote branches: bar, foo (2 closed)! + (use 'hg push --new-branch' to create new remote branches) + [255] + +When there are more than one new branches and not all are closed + $ hg -q branch bar1 + $ echo 0 > bar1 + $ hg -q ci -Am 0 + $ hg -q up 0 + $ hg push ../x + pushing to ../x + searching for changes + abort: push creates new remote branches: bar, bar1, foo (2 closed)! + (use 'hg push --new-branch' to create new remote branches) + [255] + + $ cd .. diff --git a/mercurial/discovery.py b/mercurial/discovery.py --- a/mercurial/discovery.py +++ b/mercurial/discovery.py @@ -344,13 +344,22 @@ 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)) - raise error.Abort(_("push creates new remote branches: %s!") - % branchnames, - hint=_("use 'hg push --new-branch' to create" - " new remote branches")) + if closedbranches: + errmsg = (_("push creates new remote branches: %s (%d closed)!") + % (branchnames, len(closedbranches))) + else: + errmsg = (_("push creates new remote branches: %s!")% branchnames) + hint=_("use 'hg push --new-branch' to create new remote branches") + raise error.Abort(errmsg, hint=hint) # 2. Find heads that we need not warn about nowarnheads = _nowarnheads(pushop) To: taapas1128, #hg-reviewers Cc: pulkit, mharbison72, mercurial-devel _______________________________________________ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel