##// END OF EJS Templates
localrepo: make journal.dirstate contain in-memory changes before transaction...
localrepo: make journal.dirstate contain in-memory changes before transaction Before this patch, in-memory dirstate changes aren't written out at opening transaction, even though 'journal.dirstate' is created directly from '.hg/dirstate'. Therefore, subsequent 'hg rollback' uses incomplete 'undo.dirstate' to restore dirstate, if dirstate is changed and isn't written out before opening transaction. In cases below, the condition "dirstate is changed and isn't written out before opening transaction" isn't satisfied and this problem doesn't appear: - "wlock scope" and "transaction scope" are almost equivalent e.g. 'commit --amend', 'import' and so on - dirstate changes are written out before opening transaction e.g. 'rebase' (via 'dirstateguard') and 'commit -A' (by separated wlock scopes) On the other hand, 'backout' may satisfy the condition above. To make 'journal.dirstate' contain in-memory changes before opening transaction, this patch explicitly invokes 'dirstate.write()' in 'localrepository.transaction()'. 'dirstate.write()' is placed before not "writing journal files out" but "invoking pretxnopen hooks" for visibility of dirstate changes to external hook processes. BTW, in the test script, 'touch -t 200001010000' and 'hg status' are invoked to make file 'c' surely clean in dirstate, because "clean but unsure" files indirectly cause 'dirstate.write()' at 'repo.status()' in 'repo.commit()' (see fe03f522dda9 for detail) and prevents from certainly reproducing the issue.

File last commit:

r21955:6dfb78f1 stable
r25878:800e090e stable
Show More
test-committer.t
85 lines | 2.0 KiB | text/troff | Tads3Lexer
Nicolas Dumazet
tests: unify test-committer
r11801 $ unset HGUSER
$ EMAIL="My Name <myname@example.com>"
$ export EMAIL
$ hg init test
$ cd test
$ touch asdf
$ hg add asdf
Martin Geisler
tests: remove unneeded -d flags...
r12156 $ hg commit -m commit-1
Nicolas Dumazet
tests: unify test-committer
r11801 $ hg tip
Martin Geisler
tests: remove unneeded -d flags...
r12156 changeset: 0:53f268a58230
Nicolas Dumazet
tests: unify test-committer
r11801 tag: tip
user: My Name <myname@example.com>
Martin Geisler
tests: remove unneeded -d flags...
r12156 date: Thu Jan 01 00:00:00 1970 +0000
Nicolas Dumazet
tests: unify test-committer
r11801 summary: commit-1
$ unset EMAIL
$ echo 1234 > asdf
Martin Geisler
tests: remove unneeded -d flags...
r12156 $ hg commit -u "foo@bar.com" -m commit-1
Nicolas Dumazet
tests: unify test-committer
r11801 $ hg tip
Martin Geisler
tests: remove unneeded -d flags...
r12156 changeset: 1:3871b2a9e9bf
Nicolas Dumazet
tests: unify test-committer
r11801 tag: tip
user: foo@bar.com
Martin Geisler
tests: remove unneeded -d flags...
r12156 date: Thu Jan 01 00:00:00 1970 +0000
Nicolas Dumazet
tests: unify test-committer
r11801 summary: commit-1
$ echo "[ui]" >> .hg/hgrc
$ echo "username = foobar <foo@bar.com>" >> .hg/hgrc
$ echo 12 > asdf
Martin Geisler
tests: remove unneeded -d flags...
r12156 $ hg commit -m commit-1
Nicolas Dumazet
tests: unify test-committer
r11801 $ hg tip
Martin Geisler
tests: remove unneeded -d flags...
r12156 changeset: 2:8eeac6695c1c
Nicolas Dumazet
tests: unify test-committer
r11801 tag: tip
user: foobar <foo@bar.com>
Martin Geisler
tests: remove unneeded -d flags...
r12156 date: Thu Jan 01 00:00:00 1970 +0000
Nicolas Dumazet
tests: unify test-committer
r11801 summary: commit-1
$ echo 1 > asdf
Martin Geisler
tests: remove unneeded -d flags...
r12156 $ hg commit -u "foo@bar.com" -m commit-1
Nicolas Dumazet
tests: unify test-committer
r11801 $ hg tip
Martin Geisler
tests: remove unneeded -d flags...
r12156 changeset: 3:957606a725e4
Nicolas Dumazet
tests: unify test-committer
r11801 tag: tip
user: foo@bar.com
Martin Geisler
tests: remove unneeded -d flags...
r12156 date: Thu Jan 01 00:00:00 1970 +0000
Nicolas Dumazet
tests: unify test-committer
r11801 summary: commit-1
$ echo 123 > asdf
$ echo "[ui]" > .hg/hgrc
$ echo "username = " >> .hg/hgrc
Martin Geisler
tests: remove unneeded -d flags...
r12156 $ hg commit -m commit-1
Matt Mackall
tests: fix up config --edit breakage
r20579 abort: no username supplied
Matt Mackall
ui: fix extra space in username abort
r20580 (use "hg config --edit" to set your username)
Matt Mackall
tests: add exit codes to unified tests
r12316 [255]
anatoly techtonik
config: allow 'user' in .hgrc ui section (issue3169)
r21955
# test alternate config var
$ echo 1234 > asdf
$ echo "[ui]" > .hg/hgrc
$ echo "user = Foo Bar II <foo2@bar.com>" >> .hg/hgrc
$ hg commit -m commit-1
$ hg tip
changeset: 4:6f24bfb4c617
tag: tip
user: Foo Bar II <foo2@bar.com>
date: Thu Jan 01 00:00:00 1970 +0000
summary: commit-1
# test no .hg/hgrc (uses generated non-interactive username)
$ echo space > asdf
Nicolas Dumazet
tests: unify test-committer
r11801 $ rm .hg/hgrc
Martin Geisler
tests: remove unneeded -d flags...
r12156 $ hg commit -m commit-1 2>&1
Martin Geisler
ui: lowercase "no username" warning
r16940 no username found, using '[^']*' instead (re)
Nicolas Dumazet
tests: unify test-committer
r11801
anatoly techtonik
config: allow 'user' in .hgrc ui section (issue3169)
r21955 $ echo space2 > asdf
Martin Geisler
tests: remove unneeded -d flags...
r12156 $ hg commit -u ' ' -m commit-1
Nicolas Dumazet
tests: unify test-committer
r11801 transaction abort!
rollback completed
abort: empty username!
Matt Mackall
tests: add exit codes to unified tests
r12316 [255]
Mads Kiilerich
tests: add missing trailing 'cd ..'...
r16913
anatoly techtonik
config: allow 'user' in .hgrc ui section (issue3169)
r21955 # don't add tests here, previous test is unstable
Mads Kiilerich
tests: add missing trailing 'cd ..'...
r16913 $ cd ..