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

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.

timeless - - Load All Authors

File last commit:

r28962:ad2cd2ef default


                r41198:0101a35d

default

Download file

             test-committer.t
        
                    110 lines
            
             | 2.5 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 prompt username

        $ cat > .hg/hgrc <<EOF

        > [ui]

        > askusername = True

        > EOF

        $ echo 12345 > asdf

        $ hg commit --config ui.interactive=False -m ask

        enter a commit username: 

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

        $ hg rollback -q

        $ hg commit --config ui.interactive=True -m ask <<EOF

        > Asked User <ask@example.com>

        > EOF

        enter a commit username: Asked User <ask@example.com>

        $ hg tip

        changeset:   5:84c91d963b70

        tag:         tip

        user:        Asked User <ask@example.com>

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

        summary:     ask

      # 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 prompt username

				$ cat > .hg/hgrc <<EOF
				> [ui]
				> askusername = True
				> EOF

				$ echo 12345 > asdf
				$ hg commit --config ui.interactive=False -m ask
				enter a commit username:
				no username found, using '[^']*' instead (re)
				$ hg rollback -q

				$ hg commit --config ui.interactive=True -m ask <<EOF
				> Asked User <ask@example.com>
				> EOF
				enter a commit username: Asked User <ask@example.com>
				$ hg tip
				changeset: 5:84c91d963b70
				tag: tip
				user: Asked User <ask@example.com>
				date: Thu Jan 01 00:00:00 1970 +0000
				summary: ask


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