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

filemerge: add internal merge tool to dump files forcibly...

filemerge: add internal merge tool to dump files forcibly Internal merge tool :dump implies premerge. Therefore, files aren't dumped, if premerge runs successfully. This undocumented behavior might confuse users, if they want to always dump files. But just making :dump omit premerge might cause backward compatibility issue for existing automation. This patch adds new internal merge tool :forcedump, which works as same as :dump, but omits premerge always. Internal tools annotated with "nomerge" should merge "change and delete" correctly, but _forcedump() can't. Therefore, it is annotated with "mergeonly" to always omit premerge, even though it doesn't merge files actually. This patch also adds explanation about premerge to :dump, to clarify how :dump actually works. BTW, this patch specifies internal tools with "internal:" prefix in newly added test scenario in test-merge-tools.t, even though this prefix is already deprecated. This is only for similarity to other tests in test-merge-tools.t.

Yuya Nishihara - - Load All Authors

File last commit:

r29873:80ba176b default


                r32255:7e35d31b

default

Download file

             test-gpg.t
        
                    56 lines
            
             | 1.1 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

        > EOF

        $ GNUPGHOME="$TESTTMP/gpg"; export GNUPGHOME

        $ cp -R "$TESTDIR/gpg" "$GNUPGHOME"

      Start gpg-agent, which is required by GnuPG v2

      #if gpg21

        $ gpg-connect-agent -q --subst /serverpid '/echo ${get serverpid}' /bye \

        > >> $DAEMON_PIDS

      #endif

      and migrate secret keys

      #if gpg2

        $ gpg --no-permission-warning --no-secmem-warning --list-secret-keys \

        > > /dev/null 2>&1

      #endif

        $ 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

        $ 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
				> EOF
				$ GNUPGHOME="$TESTTMP/gpg"; export GNUPGHOME
				$ cp -R "$TESTDIR/gpg" "$GNUPGHOME"

				Start gpg-agent, which is required by GnuPG v2

				#if gpg21
				$ gpg-connect-agent -q --subst /serverpid '/echo ${get serverpid}' /bye \
				> >> $DAEMON_PIDS
				#endif

				and migrate secret keys

				#if gpg2
				$ gpg --no-permission-warning --no-secmem-warning --list-secret-keys \
				> > /dev/null 2>&1
				#endif

				$ 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

				$ cd ..