upstream/mercurial-mirror Files · tests/wireprotohelpers.sh

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

Gregory Szorc - - Load All Authors

File last commit:

r37803:b4d85bc1 default


                r38817:bb54db4a

@96 default

Download file

             wireprotohelpers.sh
        
                    58 lines
            
             | 1.5 KiB
            
                | application/x-sh
            
             |
                BashLexer
            
             / tests / wireprotohelpers.sh
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      HTTPV2=exp-http-v2-0001

      MEDIATYPE=application/mercurial-exp-framing-0005

      sendhttpraw() {

        hg --verbose debugwireproto --peer raw http://$LOCALIP:$HGPORT/

      }

      sendhttpv2peer() {

        hg --verbose debugwireproto --nologhandshake --peer http2 http://$LOCALIP:$HGPORT/

      }

      sendhttpv2peerhandshake() {

        hg --verbose debugwireproto --peer http2 http://$LOCALIP:$HGPORT/

      }

      cat > dummycommands.py << EOF

      from mercurial import (

          wireprototypes,

          wireprotov1server,

          wireprotov2server,

      )

      @wireprotov1server.wireprotocommand('customreadonly', permission='pull')

      def customreadonlyv1(repo, proto):

          return wireprototypes.bytesresponse(b'customreadonly bytes response')

      @wireprotov2server.wireprotocommand('customreadonly', permission='pull')

      def customreadonlyv2(repo, proto):

          return wireprototypes.cborresponse(b'customreadonly bytes response')

      @wireprotov1server.wireprotocommand('customreadwrite', permission='push')

      def customreadwrite(repo, proto):

          return wireprototypes.bytesresponse(b'customreadwrite bytes response')

      @wireprotov2server.wireprotocommand('customreadwrite', permission='push')

      def customreadwritev2(repo, proto):

          return wireprototypes.cborresponse(b'customreadwrite bytes response')

      EOF

      cat >> $HGRCPATH << EOF

      [extensions]

      drawdag = $TESTDIR/drawdag.py

      EOF

      enabledummycommands() {

        cat >> $HGRCPATH << EOF

      [extensions]

      dummycommands = $TESTTMP/dummycommands.py

      EOF

      }

      enablehttpv2() {

        cat >> $1/.hg/hgrc << EOF

      [experimental]

      web.apiserver = true

      web.api.http-v2 = true

      EOF

      }

	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

				HTTPV2=exp-http-v2-0001
				MEDIATYPE=application/mercurial-exp-framing-0005

				sendhttpraw() {
				hg --verbose debugwireproto --peer raw http://$LOCALIP:$HGPORT/
				}

				sendhttpv2peer() {
				hg --verbose debugwireproto --nologhandshake --peer http2 http://$LOCALIP:$HGPORT/
				}

				sendhttpv2peerhandshake() {
				hg --verbose debugwireproto --peer http2 http://$LOCALIP:$HGPORT/
				}

				cat > dummycommands.py << EOF
				from mercurial import (
				wireprototypes,
				wireprotov1server,
				wireprotov2server,
				)

				@wireprotov1server.wireprotocommand('customreadonly', permission='pull')
				def customreadonlyv1(repo, proto):
				return wireprototypes.bytesresponse(b'customreadonly bytes response')

				@wireprotov2server.wireprotocommand('customreadonly', permission='pull')
				def customreadonlyv2(repo, proto):
				return wireprototypes.cborresponse(b'customreadonly bytes response')

				@wireprotov1server.wireprotocommand('customreadwrite', permission='push')
				def customreadwrite(repo, proto):
				return wireprototypes.bytesresponse(b'customreadwrite bytes response')

				@wireprotov2server.wireprotocommand('customreadwrite', permission='push')
				def customreadwritev2(repo, proto):
				return wireprototypes.cborresponse(b'customreadwrite bytes response')
				EOF

				cat >> $HGRCPATH << EOF
				[extensions]
				drawdag = $TESTDIR/drawdag.py
				EOF

				enabledummycommands() {
				cat >> $HGRCPATH << EOF
				[extensions]
				dummycommands = $TESTTMP/dummycommands.py
				EOF
				}

				enablehttpv2() {
				cat >> $1/.hg/hgrc << EOF
				[experimental]
				web.apiserver = true
				web.api.http-v2 = true
				EOF
				}