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

largefiles: restore standins from non branch-tip parent at rollback correctly...

largefiles: restore standins from non branch-tip parent at rollback correctly Before this patch, "hg rollback" can't restore standins correclty, if: - old parent of the working directory is rollback-ed, and - new parent of the working directory is not branch-tip "overriderollback" uses "merge.update" as a kind of "revert" utility to restore only standins with "node=None", and this makes "merge.update" choose "branch-tip" revision as the updating target unexpectedly. Then, "merge.update" restores standins from the branch-tip revision regardless of the parent of the working directory after rollback and this may cause unexpected behavior. This patch invokes "merge.update" with "node='.'" to restore standins from the parent revision of the working directory. In fact, this "merge.update" invocation will be replaced in the subsequent patch to fix another problem, but this change is usefull to inform reason why such complicated case should be tested.

anatoly techtonik - - Load All Authors

File last commit:

r21955:6dfb78f1 stable


                r22284:72b37865

default

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 ..