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

largefiles: restore standins according to restored dirstate...

largefiles: restore standins according to restored dirstate Before this patch, standins are restored from the NEW parent of the working directory at "hg rollback", and this causes: - standins removed in the rollback-ed revision are restored, and become orphan, because they are already marked as "R" in the restored dirstate and expected to be unlinked - standins added in the rollback-ed revision are left as they were before rollback, because they are not included in the new parent (this may not be so serious) This patch replaces the "merge.update" invocation with a specific implementation to restore standins according to restored dirstate. This is also the preparation to centralize the logic of updating largefiles into the function wrapping "merge.update" in the subsequent patch. After that patch, "merge.update" will also update largefiles in the working directory and be redundant for restoring standins only.

Matt Mackall - - Load All Authors

File last commit:

r22046:7a9cbb31 default


                r22285:85bded43

default

Download file

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

        Matt Mackall
    
tests: replace exit 80 with #require

              r22046
            
      #require gpg

        Matt Mackall
    
tests: unify test-gpg

              r12428
            
      Test the GPG extension

        $ cat <<EOF >> $HGRCPATH

        > [extensions]

        > gpg=

        > 

        > [gpg]

        Thomas Arendsen Hein
    
tests: make tests work if directory contains special characters...

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

        Matt Mackall
    
tests: unify test-gpg

              r12428
            
        > EOF

        $ hg init r

        $ cd r

        $ echo foo > foo

        $ hg ci -Amfoo

        adding foo

        $ hg sigs

        FUJIWARA Katsunori
    
gpg: accept '--edit' like other commands creating new changeset...

              r21711
            
        $ HGEDITOR=cat hg sign -e 0

        Martin Geisler
    
gpg: lowercase messages

              r16927
            
        signing 0:e63c23eaa88a

        FUJIWARA Katsunori
    
gpg: accept '--edit' like other commands creating new changeset...

              r21711
            
        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

        Matt Mackall
    
tests: unify test-gpg

              r12428
            
        $ hg sigs

        hgtest                             0:e63c23eaa88ae77967edcf4ea194d31167c478b0

        $ hg sigcheck 0

        e63c23eaa88a is signed by:

         hgtest

        Greg Ward
    
test-gpg: make sure gpg does not modify the trustdb.gpg file...

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

      the main hg working dir

        Thomas Arendsen Hein
    
test-gpg: replace 825565136235 by md5sum check...

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

        f6b9c78c65fa9536e7512bb2ceb338ae  */gpg/trustdb.gpg (glob)

        Mads Kiilerich
    
tests: add missing trailing 'cd ..'...

              r16913
            
        Mads Kiilerich
    
tests: stop tracking tests/gpg/random_seed...

              r20305
            
      don't leak any state to next test run

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

        Mads Kiilerich
    
tests: add missing trailing 'cd ..'...

              r16913
            
        $ 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

Matt Mackall tests: replace exit 80 with #require	r22046	#require gpg

Matt Mackall tests: unify test-gpg	r12428	Test the GPG extension

		$ cat <<EOF >> $HGRCPATH
		> [extensions]
		> gpg=
		>
		> [gpg]
Thomas Arendsen Hein tests: make tests work if directory contains special characters...	r16350	> cmd=gpg --no-permission-warning --no-secmem-warning --no-auto-check-trustdb --homedir "$TESTDIR/gpg"
Matt Mackall tests: unify test-gpg	r12428	> EOF
		$ hg init r
		$ cd r
		$ echo foo > foo
		$ hg ci -Amfoo
		adding foo

		$ hg sigs

FUJIWARA Katsunori gpg: accept '--edit' like other commands creating new changeset...	r21711	$ HGEDITOR=cat hg sign -e 0
Martin Geisler gpg: lowercase messages	r16927	signing 0:e63c23eaa88a
FUJIWARA Katsunori gpg: accept '--edit' like other commands creating new changeset...	r21711	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
Matt Mackall tests: unify test-gpg	r12428
		$ hg sigs
		hgtest 0:e63c23eaa88ae77967edcf4ea194d31167c478b0

		$ hg sigcheck 0
		e63c23eaa88a is signed by:
		hgtest
Greg Ward test-gpg: make sure gpg does not modify the trustdb.gpg file...	r16289
		verify that this test has not modified the trustdb.gpg file back in
		the main hg working dir
Thomas Arendsen Hein test-gpg: replace 825565136235 by md5sum check...	r16349	$ "$TESTDIR/md5sum.py" "$TESTDIR/gpg/trustdb.gpg"
		f6b9c78c65fa9536e7512bb2ceb338ae */gpg/trustdb.gpg (glob)
Mads Kiilerich tests: add missing trailing 'cd ..'...	r16913
Mads Kiilerich tests: stop tracking tests/gpg/random_seed...	r20305	don't leak any state to next test run
		$ rm -f "$TESTDIR/gpg/random_seed"

Mads Kiilerich tests: add missing trailing 'cd ..'...	r16913	$ cd ..