##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

phabricator: warn if unable to amend, instead of aborting after posting...
phabricator: warn if unable to amend, instead of aborting after posting There was a divergence in behavior here between obsolete and strip based amending. I first noticed the abort when testing outside of the test harness, but then had trouble recreating it here after reverting the code changes. It turns out, strip based amend was successfully amending the public commit after it was posted! It looks like the protection is in the `commit --amend` command, not in the underlying code that it calls. I considered doing a preflight check and aborting. But the locks are only acquired at the end, if amending, and this is too large a section of code to be wrapped in a maybe-it's-held-or-not context manager for my tastes. Additionally, some people do post-push reviews, and amending is the default behavior, so they shouldn't see a misleading error message. The lack of a 'Differential Revision' entry in the commit message breaks a {phabreview} test, so it had to be partially conditionalized.
Augie Fackler - - Load All Authors

File last commit:

r39156:d7007b80 default
r41198:0101a35d default
Show More
test-patchbomb-bookmark.t
168 lines | 4.6 KiB | text/troff | Tads3Lexer
/ tests / test-patchbomb-bookmark.t
History | Source | Raw |Copy content |Copy permalink
David Demelier
patchbomb: add -B option to select a bookmark...
 r32639 Create @ bookmark as main reference
$ hg init repo
$ cd repo
$ echo "[extensions]" >> $HGRCPATH
$ echo "patchbomb=" >> $HGRCPATH
$ hg book @
Create a dummy revision that must never be exported
$ echo no > no
$ hg ci -Amno -d '6 0'
adding no
Create a feature and use -B
$ hg book booktest
$ echo first > a
$ hg ci -Amfirst -d '7 0'
adding a
$ echo second > b
$ hg ci -Amsecond -d '8 0'
adding b
$ hg email --date '1981-1-1 0:1' -n -t foo -s bookmark -B booktest
From [test]: test
this patch series consists of 2 patches.
Write the introductory message for the patch series.
Cc:
displaying [PATCH 0 of 2] bookmark ...
Igor Ippolitov
mail: encode long unicode lines in emails properly (issue5687)...
 r34311 MIME-Version: 1.0
David Demelier
patchbomb: add -B option to select a bookmark...
 r32639 Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Subject: [PATCH 0 of 2] bookmark
Augie Fackler
tests: un-glob patchbomb test lines that were only globbing a hostname...
 r39156 Message-Id: <patchbomb.347155260@test-hostname>
David Demelier
patchbomb: add -B option to select a bookmark...
 r32639 User-Agent: Mercurial-patchbomb/* (glob)
Date: Thu, 01 Jan 1981 00:01:00 +0000
From: test
To: foo
displaying [PATCH 1 of 2] first ...
Igor Ippolitov
mail: encode long unicode lines in emails properly (issue5687)...
 r34311 MIME-Version: 1.0
David Demelier
patchbomb: add -B option to select a bookmark...
 r32639 Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Subject: [PATCH 1 of 2] first
X-Mercurial-Node: accde9b8b6dce861c185d0825c1affc09a79cb26
X-Mercurial-Series-Index: 1
X-Mercurial-Series-Total: 2
Augie Fackler
tests: un-glob patchbomb test lines that were only globbing a hostname...
 r39156 Message-Id: <accde9b8b6dce861c185.347155261@test-hostname>
X-Mercurial-Series-Id: <accde9b8b6dce861c185.347155261@test-hostname>
In-Reply-To: <patchbomb.347155260@test-hostname>
References: <patchbomb.347155260@test-hostname>
David Demelier
patchbomb: add -B option to select a bookmark...
 r32639 User-Agent: Mercurial-patchbomb/* (glob)
Date: Thu, 01 Jan 1981 00:01:01 +0000
From: test
To: foo
# HG changeset patch
# User test
# Date 7 0
# Thu Jan 01 00:00:07 1970 +0000
# Node ID accde9b8b6dce861c185d0825c1affc09a79cb26
# Parent 043bd3889e5aaf7d88fe3713cf425f782ad2fb71
first
diff -r 043bd3889e5a -r accde9b8b6dc a
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/a Thu Jan 01 00:00:07 1970 +0000
@@ -0,0 +1,1 @@
+first
displaying [PATCH 2 of 2] second ...
Igor Ippolitov
mail: encode long unicode lines in emails properly (issue5687)...
 r34311 MIME-Version: 1.0
David Demelier
patchbomb: add -B option to select a bookmark...
 r32639 Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Subject: [PATCH 2 of 2] second
X-Mercurial-Node: 417defd1559c396ba06a44dce8dc1c2d2d653f3f
X-Mercurial-Series-Index: 2
X-Mercurial-Series-Total: 2
Augie Fackler
tests: un-glob patchbomb test lines that were only globbing a hostname...
 r39156 Message-Id: <417defd1559c396ba06a.347155262@test-hostname>
X-Mercurial-Series-Id: <accde9b8b6dce861c185.347155261@test-hostname>
In-Reply-To: <patchbomb.347155260@test-hostname>
References: <patchbomb.347155260@test-hostname>
David Demelier
patchbomb: add -B option to select a bookmark...
 r32639 User-Agent: Mercurial-patchbomb/* (glob)
Date: Thu, 01 Jan 1981 00:01:02 +0000
From: test
To: foo
# HG changeset patch
# User test
# Date 8 0
# Thu Jan 01 00:00:08 1970 +0000
# Node ID 417defd1559c396ba06a44dce8dc1c2d2d653f3f
# Parent accde9b8b6dce861c185d0825c1affc09a79cb26
second
diff -r accde9b8b6dc -r 417defd1559c b
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/b Thu Jan 01 00:00:08 1970 +0000
@@ -0,0 +1,1 @@
+second
Do the same and combine with -o only one must be exported
$ cd ..
$ hg clone repo repo2
updating to bookmark @
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cd repo
$ hg up @
0 files updated, 0 files merged, 2 files removed, 0 files unresolved
(activating bookmark @)
$ hg book outgoing
$ echo 1 > x
$ hg ci -Am1 -d '8 0'
adding x
created new head
$ hg push ../repo2 -B outgoing
pushing to ../repo2
searching for changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
exporting bookmark outgoing
$ echo 2 > y
$ hg ci -Am2 -d '9 0'
adding y
$ hg email --date '1982-1-1 0:1' -n -t foo -s bookmark -B outgoing -o ../repo2
comparing with ../repo2
From [test]: test
this patch series consists of 1 patches.
Cc:
displaying [PATCH] bookmark ...
Igor Ippolitov
mail: encode long unicode lines in emails properly (issue5687)...
 r34311 MIME-Version: 1.0
David Demelier
patchbomb: add -B option to select a bookmark...
 r32639 Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Subject: [PATCH] bookmark
X-Mercurial-Node: 8dab2639fd35f1e337ad866c372a5c44f1064e3c
X-Mercurial-Series-Index: 1
X-Mercurial-Series-Total: 1
Augie Fackler
tests: un-glob patchbomb test lines that were only globbing a hostname...
 r39156 Message-Id: <8dab2639fd35f1e337ad.378691260@test-hostname>
X-Mercurial-Series-Id: <8dab2639fd35f1e337ad.378691260@test-hostname>
David Demelier
patchbomb: add -B option to select a bookmark...
 r32639 User-Agent: Mercurial-patchbomb/* (glob)
Date: Fri, 01 Jan 1982 00:01:00 +0000
From: test
To: foo
# HG changeset patch
# User test
# Date 9 0
# Thu Jan 01 00:00:09 1970 +0000
# Node ID 8dab2639fd35f1e337ad866c372a5c44f1064e3c
# Parent 0b24b8316483bf30bfc3e4d4168e922b169dbe66
2
diff -r 0b24b8316483 -r 8dab2639fd35 y
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/y Thu Jan 01 00:00:09 1970 +0000
@@ -0,0 +1,1 @@
+2