Patchwork [v3] commit: amending with --close-branch (issue3445)

login
register
mail settings
Submitter Iulian Stana
Date May 7, 2013, 9:05 p.m.
Message ID <77cd996405eeade9d0b2.1367960737@doppler>
Download mbox | patch
Permalink /patch/1582/
State Superseded
Commit b500a663a2c7543e9e8484e58753fefd71b2aa17
Headers show

Comments

Iulian Stana - May 7, 2013, 9:05 p.m.
# HG changeset patch
# User Iulian Stana <julian.stana@gmail.com>
# Date 1367512607 -10800
#      Thu May 02 19:36:47 2013 +0300
# Branch stable
# Node ID 77cd996405eeade9d0b2b9a2293126c8fcbf1da0
# Parent  90f4587801ed6c525d1264d8f5b9285fb5cb71cc
commit: amending with --close-branch (issue3445)

You can't close a branch that hasn't got a head.
newbranch + commit --close-branch must fail
newbranch + commit + commit --amend --close-branch must fail

You must not be allowed to close a branch that is not defined.

Patch

diff --git a/mercurial/commands.py b/mercurial/commands.py
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
@@ -1297,12 +1297,19 @@ 
         # Let --subrepos on the command line override config setting.
         ui.setconfig('ui', 'commitsubrepos', True)
 
+    branch = repo[None].branch()
+    bheads = repo.branchheads(branch)
+
     extra = {}
     if opts.get('close_branch'):
         extra['close'] = 1
 
-    branch = repo[None].branch()
-    bheads = repo.branchheads(branch)
+        if not bheads:
+            raise util.Abort(_('can only close branch heads'))
+        elif opts.get('amend'):
+            if repo.parents()[0].p1().branch() != branch and \
+                    repo.parents()[0].p2().branch() != branch:
+                raise util.Abort(_('can only close branch heads'))
 
     if opts.get('amend'):
         if ui.configbool('ui', 'commitsubrepos'):
diff --git a/tests/test-commit-amend.t b/tests/test-commit-amend.t
--- a/tests/test-commit-amend.t
+++ b/tests/test-commit-amend.t
@@ -743,3 +743,75 @@ 
   -aa
   -aa
   
+
+  $ cd ..
+
+
+Issue 3445: amending with --close-branch a commit that created a new head should fail
+This shouldn't be possible:
+
+  $ hg init issue3445
+  $ cd issue3445
+  $ echo a >> a
+  $ hg ci -Am.
+  adding a
+  $ echo a >> a
+  $ hg branch foo
+  marked working directory as branch foo
+  (branches are permanent and global, did you want a bookmark?)
+  $ hg ci -Am..
+  $ hg ci --amend --close-branch -m 'closing'
+  abort: can only close branch heads
+  [255]
+
+
+This silliness fails:
+
+  $ hg branch newbranch
+  marked working directory as branch newbranch
+  (branches are permanent and global, did you want a bookmark?)
+  $ echo b >> b
+  $ hg ci --close-branch -m'open and close'
+  abort: can only close branch heads
+  [255]
+
+Correct close with commit:
+
+  $ hg branch correctclose
+  marked working directory as branch correctclose
+  (branches are permanent and global, did you want a bookmark?)
+  $ echo b >> b
+  $ hg ci -Am.
+  adding b
+  $ hg ci --close-branch -m'open and close'
+
+Correct close with commit and amend:
+
+  $ hg branch amendclose
+  marked working directory as branch amendclose
+  (branches are permanent and global, did you want a bookmark?)
+  $ echo c >> c
+  $ hg ci -Am.
+  adding c
+  $ echo a >> a
+  $ hg ci -Am.
+  $ hg ci --amend --close-branch -m'open and close'
+
+Merge with amend close:
+
+  $ hg up -C default
+  1 files updated, 0 files merged, 2 files removed, 0 files unresolved
+  $ hg branch mergewithclose
+  marked working directory as branch mergewithclose
+  (branches are permanent and global, did you want a bookmark?)
+  $ echo d >> d
+  $ hg ci -A -m "adding d"
+  adding d
+  $ hg merge -r 5 
+  2 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  (branch merge, don't forget to commit)
+  $ hg ci --amend --close-branch -m'open and close'
+  abort: can only close branch heads
+  [255]
+  $ cd ..
+