##// END OF EJS Templates
mq: use dirstateguard instead of dirstate.invalidate (qpush)...
mq: use dirstateguard instead of dirstate.invalidate (qpush) Before this patch, "mq.queue.apply()" uses "dirstate.invalidate()" as a kind of "restore .hg/dirstate to the original status" during afailure. But it just discards changes in memory, and doesn't actually restore ".hg/dirstate". Then, it can't work as expected, if "dirstate.write()" is executed while processing. This patch uses "dirstateguard" instead of "dirstate.invalidate()" to restore ".hg/dirstate" at failure even if "dirstate.write()" is executed before failure. This is a part of preparations to fix the issue that the recent (in memory) dirstate isn't visible to external processes (e.g. "precommit" hook).

File last commit:

r16948:a0cbbf78 default
r24996:58308dde default
Show More
test-convert-authormap.t
58 lines | 1.2 KiB | text/troff | Tads3Lexer
/ tests / test-convert-authormap.t
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
Mads Kiilerich
tests: reintroduce globs in test-convert-authormap.t...
r16948 writing author map file $TESTTMP/new/.hg/authormap (glob)
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
Mads Kiilerich
tests: reintroduce globs in test-convert-authormap.t...
r16948 ignoring bad line in author map file $TESTTMP/new/.hg/authormap: this line is ignored (glob)
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