##// 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.
Mads Kiilerich - - Load All Authors

File last commit:

r16948:a0cbbf78 default
r41198:0101a35d default
Show More
test-convert-authormap.t
58 lines | 1.2 KiB | text/troff | Tads3Lexer
/ tests / test-convert-authormap.t
History | Source | Raw |Copy content |Copy permalink
Matt Mackall
tests: unify test-convert-authormap
 r12511
$ cat >> $HGRCPATH <<EOF
> [extensions]
> convert=
> EOF
Prepare orig repo
$ hg init orig
$ cd orig
$ echo foo > foo
$ HGUSER='user name' hg ci -qAm 'foo'
$ cd ..
Explicit --authors
$ cat > authormap.txt <<EOF
> user name = Long User Name
>
> # comment
> this line is ignored
> EOF
$ hg convert --authors authormap.txt orig new
initializing destination new repository
Martin Geisler
convert: lowercase status and abort messages
 r16925 ignoring bad line in author map file authormap.txt: this line is ignored
Matt Mackall
tests: unify test-convert-authormap
 r12511 scanning source...
sorting...
converting...
0 foo
Matt Harbison
tests: remove (glob) annotations that were only for '\' matches...
 r35394 writing author map file $TESTTMP/new/.hg/authormap
Matt Mackall
tests: unify test-convert-authormap
 r12511 $ cat new/.hg/authormap
user name=Long User Name
$ hg -Rnew log
changeset: 0:d89716e88087
tag: tip
user: Long User Name
date: Thu Jan 01 00:00:00 1970 +0000
summary: foo
$ rm -rf new
Implicit .hg/authormap
$ hg init new
$ mv authormap.txt new/.hg/authormap
$ hg convert orig new
Matt Harbison
tests: remove (glob) annotations that were only for '\' matches...
 r35394 ignoring bad line in author map file $TESTTMP/new/.hg/authormap: this line is ignored
Matt Mackall
tests: unify test-convert-authormap
 r12511 scanning source...
sorting...
converting...
0 foo
$ hg -Rnew log
changeset: 0:d89716e88087
tag: tip
user: Long User Name
date: Thu Jan 01 00:00:00 1970 +0000
summary: foo