upstream/mercurial-mirror Files · tests/test-committer.t

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 for detail) and prevents from certainly reproducing the issue.

anatoly techtonik - - Load All Authors

File last commit:

r21955:6dfb78f1 stable


                r25878:800e090e

stable

Download file

             test-committer.t
        
                    85 lines
            
             | 2.0 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-committer.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

        $ unset HGUSER

        $ EMAIL="My Name <myname@example.com>"

        $ export EMAIL

        $ hg init test

        $ cd test

        $ touch asdf

        $ hg add asdf

        $ hg commit -m commit-1

        $ hg tip

        changeset:   0:53f268a58230

        tag:         tip

        user:        My Name <myname@example.com>

        date:        Thu Jan 01 00:00:00 1970 +0000

        summary:     commit-1

        $ unset EMAIL

        $ echo 1234 > asdf

        $ hg commit -u "foo@bar.com" -m commit-1

        $ hg tip

        changeset:   1:3871b2a9e9bf

        tag:         tip

        user:        foo@bar.com

        date:        Thu Jan 01 00:00:00 1970 +0000

        summary:     commit-1

        $ echo "[ui]" >> .hg/hgrc

        $ echo "username = foobar <foo@bar.com>" >> .hg/hgrc

        $ echo 12 > asdf

        $ hg commit -m commit-1

        $ hg tip

        changeset:   2:8eeac6695c1c

        tag:         tip

        user:        foobar <foo@bar.com>

        date:        Thu Jan 01 00:00:00 1970 +0000

        summary:     commit-1

        $ echo 1 > asdf

        $ hg commit -u "foo@bar.com" -m commit-1

        $ hg tip

        changeset:   3:957606a725e4

        tag:         tip

        user:        foo@bar.com

        date:        Thu Jan 01 00:00:00 1970 +0000

        summary:     commit-1

        $ echo 123 > asdf

        $ echo "[ui]" > .hg/hgrc

        $ echo "username = " >> .hg/hgrc

        $ hg commit -m commit-1

        abort: no username supplied

        (use "hg config --edit" to set your username)

        [255]

      # 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

        $ rm .hg/hgrc

        $ hg commit -m commit-1 2>&1

        no username found, using '[^']*' instead (re)

        $ echo space2 > asdf

        $ hg commit -u ' ' -m commit-1

        transaction abort!

        rollback completed

        abort: empty username!

        [255]

      # don't add tests here, previous test is unstable

        $ cd ..

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages

				$ unset HGUSER
				$ EMAIL="My Name <myname@example.com>"
				$ export EMAIL

				$ hg init test
				$ cd test
				$ touch asdf
				$ hg add asdf
				$ hg commit -m commit-1
				$ hg tip
				changeset: 0:53f268a58230
				tag: tip
				user: My Name <myname@example.com>
				date: Thu Jan 01 00:00:00 1970 +0000
				summary: commit-1


				$ unset EMAIL
				$ echo 1234 > asdf
				$ hg commit -u "foo@bar.com" -m commit-1
				$ hg tip
				changeset: 1:3871b2a9e9bf
				tag: tip
				user: foo@bar.com
				date: Thu Jan 01 00:00:00 1970 +0000
				summary: commit-1

				$ echo "[ui]" >> .hg/hgrc
				$ echo "username = foobar <foo@bar.com>" >> .hg/hgrc
				$ echo 12 > asdf
				$ hg commit -m commit-1
				$ hg tip
				changeset: 2:8eeac6695c1c
				tag: tip
				user: foobar <foo@bar.com>
				date: Thu Jan 01 00:00:00 1970 +0000
				summary: commit-1

				$ echo 1 > asdf
				$ hg commit -u "foo@bar.com" -m commit-1
				$ hg tip
				changeset: 3:957606a725e4
				tag: tip
				user: foo@bar.com
				date: Thu Jan 01 00:00:00 1970 +0000
				summary: commit-1

				$ echo 123 > asdf
				$ echo "[ui]" > .hg/hgrc
				$ echo "username = " >> .hg/hgrc
				$ hg commit -m commit-1
				abort: no username supplied
				(use "hg config --edit" to set your username)
				[255]

				# 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
				$ rm .hg/hgrc
				$ hg commit -m commit-1 2>&1
				no username found, using '[^']*' instead (re)

				$ echo space2 > asdf
				$ hg commit -u ' ' -m commit-1
				transaction abort!
				rollback completed
				abort: empty username!
				[255]

				# don't add tests here, previous test is unstable

				$ cd ..