commit: fix complaint about branch merge creating new heads (issue2186)

mercurial/commands.py

@@ -766,7 +766,8 b' def commit(ui, repo, *pats, **opts):'
     ctx = repo[node]
     parents = ctx.parents()
 
-    if bheads and [x for x in parents if x.node() not in bheads]:
+    if bheads and [x for x in parents
+                   if x.node() not in bheads and x.branch() == branch]:
         ui.status(_('created new head\n'))
 
     if not opts.get('close_branch'):

tests/test-backout.out

@@ -73,7 +73,6 b' adding file1'
 marked working directory as branch branch2
 adding file2
 removing file1
-created new head
 changeset 3:d4e8f6db59fb backs out changeset 1:bf1602f437f3
 the backout changeset is a new head - do not forget to merge
 (use "backout --merge" if you want to auto-merge)

tests/test-branch-option.out

@@ -13,7 +13,6 b' 0 files updated, 0 files merged, 0 files'
 marked working directory as branch b
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 marked working directory as branch b
-created new head
 in rev c branch a
 1:dd6e60a716c6
 2:f25d57ab0566

tests/test-command-template.out

@@ -1,4 +1,3 b''
-created new head
 0 files updated, 0 files merged, 4 files removed, 0 files unresolved
 created new head
 # default style is like normal output

tests/test-fetch.out

@@ -155,7 +155,6 b' 1 files updated, 0 files merged, 0 files'
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 (branch merge, don't forget to commit)
-created new head
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 created new head
@@ -183,7 +182,6 b' marked working directory as branch secon'
 adding b
 marked working directory as branch default
 adding c
-created new head
 updating to branch default
 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
 % fetch should succeed

tests/test-issue619.out

@@ -5,7 +5,6 b' 0 files updated, 0 files merged, 1 files'
 fast-forward
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 (branch merge, don't forget to commit)
-created new head
 bogus fast-forward should fail
 abort: can't merge with ancestor
 done

tests/test-mq-safety.out

@@ -21,7 +21,6 b' marked working directory as branch b'
 adding c
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 (branch merge, don't forget to commit)
-created new head
 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
 changeset:   2:65309210bf4e
 branch:      b

tests/test-newbranch.out

@@ -4,7 +4,6 b' marked working directory as branch bar'
 % branch shadowing
 abort: a branch of the same name already exists (use 'hg update' to switch to it)
 marked working directory as branch default
-created new head
 % there should be only one default branch head
 changeset:   3:bf1bc2f45e83
 tag:         tip
@@ -17,7 +16,6 b' foo'
 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
 (branch merge, don't forget to commit)
 foo
-created new head
 changeset:   5:5f8fb06e083e
 branch:      foo
 tag:         tip
@@ -113,7 +111,6 b' 0 files updated, 0 files merged, 1 files'
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 (branch merge, don't forget to commit)
 foo
-created new head
 changeset:   6:f0c74f92a385
 branch:      foo
 tag:         tip

tests/test-push-warn.out

@@ -169,7 +169,6 b' marked working directory as branch b'
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 (branch merge, don't forget to commit)
-created new head
 pushing to j
 searching for changes
 abort: push creates new remote branches: b!
@@ -266,10 +265,8 b' updating to branch B'
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
 marked working directory as branch B
-created new head
 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
 marked working directory as branch A
-created new head
 %% glog of local
 @  5: A b3
 |

tests/test-subrepo.out

@@ -226,13 +226,11 b' adding b'
 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 (branch merge, don't forget to commit)
-created new head
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 adding c
 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 (branch merge, don't forget to commit)
-created new head
 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
 adding .hgsub
 committing subrepository s
@@ -245,7 +243,6 b' adding c'
 2 files updated, 0 files merged, 1 files removed, 0 files unresolved
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 (branch merge, don't forget to commit)
-created new head
 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 adding d