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

run-tests: use regex when searching for $HGPORT in test output...

run-tests: use regex when searching for $HGPORT in test output This prevents spurious errors when a changeset hash happens to match the port number. Before, this invocation gave a test failure: $ ./run-tests.py test-log.t --port 24427 ERROR: /home/mg/src/mercurial-crew/tests/test-log.t output changed --- /home/mg/src/mercurial-crew/tests/test-log.t +++ /home/mg/src/mercurial-crew/tests/test-log.t.err @@ -626,12 +626,12 @@ $ hg log -b default changeset: 2:c3a4f03cc9a7 - parent: 0:24427303d56f + parent: 0:$HGPORT303d56f user: test date: Thu Jan 01 00:00:00 1970 +0000 summary: commit on default ...

Mads Kiilerich - - Load All Authors

File last commit:

r12642:bb35840e default


                r12895:53cfde2b

stable

Download file

             test-rollback.t
        
                    92 lines
            
             | 2.1 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-rollback.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

        $ mkdir t

        $ cd t

        $ hg init

        $ echo a > a

        $ hg add a

        $ hg commit -m "test"

        $ hg verify

        checking changesets

        checking manifests

        crosschecking files in changesets and manifests

        checking files

        1 files, 1 changesets, 1 total revisions

        $ hg parents

        changeset:   0:acb14030fe0a

        tag:         tip

        user:        test

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

        summary:     test

        $ hg status

        $ hg rollback

        rolling back to revision -1 (undo commit)

        $ hg verify

        checking changesets

        checking manifests

        crosschecking files in changesets and manifests

        checking files

        0 files, 0 changesets, 0 total revisions

        $ hg parents

        $ hg status

        A a

      Test issue 902

        $ hg commit -m "test2"

        $ hg branch test

        marked working directory as branch test

        $ hg rollback

        rolling back to revision -1 (undo commit)

        $ hg branch

        default

      Test issue 1635 (commit message saved)

      .hg/last-message.txt:

        $ cat .hg/last-message.txt ; echo

        test2

      Test rollback of hg before issue 902 was fixed

        $ hg commit -m "test3"

        $ hg branch test

        marked working directory as branch test

        $ rm .hg/undo.branch

        $ hg rollback

        rolling back to revision -1 (undo commit)

        Named branch could not be reset, current branch still is: test

        $ hg branch

        test

      rollback by pretxncommit saves commit message (issue 1635)

        $ echo a >> a

        $ hg --config hooks.pretxncommit=false commit -m"precious commit message"

        transaction abort!

        rollback completed

        abort: pretxncommit hook exited with status * (glob)

        [255]

      .hg/last-message.txt:

        $ cat .hg/last-message.txt ; echo

        precious commit message

        $ echo '% same thing, but run $EDITOR'

        % same thing, but run $EDITOR

        $ cat > editor << '__EOF__'

        > #!/bin/sh

        > echo "another precious commit message" > "$1"

        > __EOF__

        $ chmod +x editor

        $ HGEDITOR="'`pwd`'"/editor hg --config hooks.pretxncommit=false commit 2>&1

        transaction abort!

        rollback completed

        note: commit message saved in .hg/last-message.txt

        abort: pretxncommit hook exited with status * (glob)

        [255]

        $ cat .hg/last-message.txt

        another precious commit message

      .hg/last-message.txt:

	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


				$ mkdir t
				$ cd t
				$ hg init
				$ echo a > a
				$ hg add a
				$ hg commit -m "test"
				$ hg verify
				checking changesets
				checking manifests
				crosschecking files in changesets and manifests
				checking files
				1 files, 1 changesets, 1 total revisions
				$ hg parents
				changeset: 0:acb14030fe0a
				tag: tip
				user: test
				date: Thu Jan 01 00:00:00 1970 +0000
				summary: test

				$ hg status
				$ hg rollback
				rolling back to revision -1 (undo commit)
				$ hg verify
				checking changesets
				checking manifests
				crosschecking files in changesets and manifests
				checking files
				0 files, 0 changesets, 0 total revisions
				$ hg parents
				$ hg status
				A a

				Test issue 902

				$ hg commit -m "test2"
				$ hg branch test
				marked working directory as branch test
				$ hg rollback
				rolling back to revision -1 (undo commit)
				$ hg branch
				default

				Test issue 1635 (commit message saved)
				.hg/last-message.txt:

				$ cat .hg/last-message.txt ; echo
				test2

				Test rollback of hg before issue 902 was fixed

				$ hg commit -m "test3"
				$ hg branch test
				marked working directory as branch test
				$ rm .hg/undo.branch
				$ hg rollback
				rolling back to revision -1 (undo commit)
				Named branch could not be reset, current branch still is: test
				$ hg branch
				test

				rollback by pretxncommit saves commit message (issue 1635)

				$ echo a >> a
				$ hg --config hooks.pretxncommit=false commit -m"precious commit message"
				transaction abort!
				rollback completed
				abort: pretxncommit hook exited with status * (glob)
				[255]

				.hg/last-message.txt:

				$ cat .hg/last-message.txt ; echo
				precious commit message
				$ echo '% same thing, but run $EDITOR'
				% same thing, but run $EDITOR
				$ cat > editor << '__EOF__'
				> #!/bin/sh
				> echo "another precious commit message" > "$1"
				> __EOF__
				$ chmod +x editor
				$ HGEDITOR="'`pwd`'"/editor hg --config hooks.pretxncommit=false commit 2>&1
				transaction abort!
				rollback completed
				note: commit message saved in .hg/last-message.txt
				abort: pretxncommit hook exited with status * (glob)
				[255]
				$ cat .hg/last-message.txt
				another precious commit message

				.hg/last-message.txt: