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

resolve: add option to warn/abort on -m with unresolved conflict markers...

resolve: add option to warn/abort on -m with unresolved conflict markers When a user is dropped out of Mercurial to a terminal to resolve files, we emit messages like: conflicts while merging file1! (edit, then use 'hg resolve --mark') conflicts while merging file2! (edit, then use 'hg resolve --mark') We don't mention a file name in the hint, so some users might do something like `$EDITOR file1; hg resolve --mark`, see that it says "(no more unresolved files)" and forget to deal with file2 before running the next command. Even if we did mention a file name in the hint, it's too easy to forget it (maybe the merge spans a couple days or something). This option lets us inform the user that they might have missed something. In the scenario above, the output would be something like: warning: the following files still have conflict markers: file2 (no more unresolved files) Differential Revision: https://phab.mercurial-scm.org/D4035

Yuya Nishihara - - Load All Authors

File last commit:

r29873:80ba176b default


                r38817:bb54db4a

@96 default

Download file

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

        Yuya Nishihara
    
test-gpg: make temporary copy of GNUPGHOME...

              r29789
            
        > cmd=gpg --no-permission-warning --no-secmem-warning --no-auto-check-trustdb

        Matt Mackall
    
tests: unify test-gpg

              r12428
            
        > EOF

        Yuya Nishihara
    
test-gpg: make temporary copy of GNUPGHOME...

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

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

        Yuya Nishihara
    
test-gpg: start gpg-agent by gpg-connect-agent only if GnuPG v2.1+ detected...

              r29873
            
      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

        Yuya Nishihara
    
test-gpg: start gpg-agent under control of the test runner...

              r29790
            
      #if gpg2

        Yuya Nishihara
    
test-gpg: run migration of v1 secret keys beforehand...

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

        > > /dev/null 2>&1

        Yuya Nishihara
    
test-gpg: start gpg-agent under control of the test runner...

              r29790
            
      #endif

        Matt Mackall
    
tests: unify test-gpg

              r12428
            
        $ 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
            
        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]
Yuya Nishihara test-gpg: make temporary copy of GNUPGHOME...	r29789	> cmd=gpg --no-permission-warning --no-secmem-warning --no-auto-check-trustdb
Matt Mackall tests: unify test-gpg	r12428	> EOF
Yuya Nishihara test-gpg: make temporary copy of GNUPGHOME...	r29789	$ GNUPGHOME="$TESTTMP/gpg"; export GNUPGHOME
		$ cp -R "$TESTDIR/gpg" "$GNUPGHOME"

Yuya Nishihara test-gpg: start gpg-agent by gpg-connect-agent only if GnuPG v2.1+ detected...	r29873	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
Yuya Nishihara test-gpg: start gpg-agent under control of the test runner...	r29790
		#if gpg2
Yuya Nishihara test-gpg: run migration of v1 secret keys beforehand...	r29791	$ gpg --no-permission-warning --no-secmem-warning --list-secret-keys \
		> > /dev/null 2>&1
Yuya Nishihara test-gpg: start gpg-agent under control of the test runner...	r29790	#endif

Matt Mackall tests: unify test-gpg	r12428	$ 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
Mads Kiilerich tests: add missing trailing 'cd ..'...	r16913	$ cd ..