upstream/mercurial-mirror Files · tests/test-gpg.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.

Matt Mackall - - Load All Authors

File last commit:

r22046:7a9cbb31 default


                r22284:72b37865

default

Download file

             test-gpg.t
        
                    47 lines
            
             | 1.0 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-gpg.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      #require gpg

      Test the GPG extension

        $ cat <<EOF >> $HGRCPATH

        > [extensions]

        > gpg=

        > 

        > [gpg]

        > cmd=gpg --no-permission-warning --no-secmem-warning --no-auto-check-trustdb --homedir "$TESTDIR/gpg"

        > EOF

        $ hg init r

        $ cd r

        $ echo foo > foo

        $ hg ci -Amfoo

        adding foo

        $ hg sigs

        $ HGEDITOR=cat hg sign -e 0

        signing 0:e63c23eaa88a

        Added signature for changeset e63c23eaa88a

        HG: Enter commit message.  Lines beginning with 'HG:' are removed.

        HG: Leave message empty to abort commit.

        HG: --

        HG: user: test

        HG: branch 'default'

        HG: added .hgsigs

        $ hg sigs

        hgtest                             0:e63c23eaa88ae77967edcf4ea194d31167c478b0

        $ hg sigcheck 0

        e63c23eaa88a is signed by:

         hgtest

      verify that this test has not modified the trustdb.gpg file back in

      the main hg working dir

        $ "$TESTDIR/md5sum.py" "$TESTDIR/gpg/trustdb.gpg"

        f6b9c78c65fa9536e7512bb2ceb338ae  */gpg/trustdb.gpg (glob)

      don't leak any state to next test run

        $ rm -f "$TESTDIR/gpg/random_seed"

        $ 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

				#require gpg

				Test the GPG extension

				$ cat <<EOF >> $HGRCPATH
				> [extensions]
				> gpg=
				>
				> [gpg]
				> cmd=gpg --no-permission-warning --no-secmem-warning --no-auto-check-trustdb --homedir "$TESTDIR/gpg"
				> EOF
				$ hg init r
				$ cd r
				$ echo foo > foo
				$ hg ci -Amfoo
				adding foo

				$ hg sigs

				$ HGEDITOR=cat hg sign -e 0
				signing 0:e63c23eaa88a
				Added signature for changeset e63c23eaa88a


				HG: Enter commit message. Lines beginning with 'HG:' are removed.
				HG: Leave message empty to abort commit.
				HG: --
				HG: user: test
				HG: branch 'default'
				HG: added .hgsigs

				$ hg sigs
				hgtest 0:e63c23eaa88ae77967edcf4ea194d31167c478b0

				$ hg sigcheck 0
				e63c23eaa88a is signed by:
				hgtest

				verify that this test has not modified the trustdb.gpg file back in
				the main hg working dir
				$ "$TESTDIR/md5sum.py" "$TESTDIR/gpg/trustdb.gpg"
				f6b9c78c65fa9536e7512bb2ceb338ae */gpg/trustdb.gpg (glob)

				don't leak any state to next test run
				$ rm -f "$TESTDIR/gpg/random_seed"

				$ cd ..