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

Gregory Szorc - - Load All Authors

File last commit:

r36175:2405ca78 default


                r38817:bb54db4a

@96 default

Download file

             test-pushvars.t
        
                    69 lines
            
             | 1.6 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-pushvars.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      Setup

        $ PYTHONPATH=$TESTDIR/..:$PYTHONPATH

        $ export PYTHONPATH

        $ cat > $TESTTMP/pretxnchangegroup.sh << EOF

        > #!/bin/sh

        > env | egrep "^HG_USERVAR_(DEBUG|BYPASS_REVIEW)" | sort

        > exit 0

        > EOF

        $ cat >> $HGRCPATH << EOF

        > [hooks]

        > pretxnchangegroup = sh $TESTTMP/pretxnchangegroup.sh

        > EOF

        $ hg init repo

        $ hg clone -q repo child

        $ cd child

      Test pushing vars to repo with pushvars.server not set

        $ echo b > a

        $ hg commit -Aqm a

        $ hg push --pushvars "DEBUG=1" --pushvars "BYPASS_REVIEW=true"

        pushing to $TESTTMP/repo

        searching for changes

        adding changesets

        adding manifests

        adding file changes

        added 1 changesets with 1 changes to 1 files

      Setting pushvars.sever = true and then pushing.

        $ echo [push] >> $HGRCPATH

        $ echo "pushvars.server = true" >> $HGRCPATH

        $ echo b >> a

        $ hg commit -Aqm a

        $ hg push --pushvars "DEBUG=1" --pushvars "BYPASS_REVIEW=true"

        pushing to $TESTTMP/repo

        searching for changes

        adding changesets

        adding manifests

        adding file changes

        added 1 changesets with 1 changes to 1 files

        HG_USERVAR_BYPASS_REVIEW=true

        HG_USERVAR_DEBUG=1

      Test pushing var with empty right-hand side

        $ echo b >> a

        $ hg commit -Aqm a

        $ hg push --pushvars "DEBUG="

        pushing to $TESTTMP/repo

        searching for changes

        adding changesets

        adding manifests

        adding file changes

        added 1 changesets with 1 changes to 1 files

        HG_USERVAR_DEBUG=

      Test pushing bad vars

        $ echo b >> a

        $ hg commit -Aqm b

        $ hg push --pushvars "DEBUG"

        pushing to $TESTTMP/repo

        searching for changes

        abort: unable to parse variable 'DEBUG', should follow 'KEY=VALUE' or 'KEY=' format

        [255]

	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

				Setup

				$ PYTHONPATH=$TESTDIR/..:$PYTHONPATH
				$ export PYTHONPATH

				$ cat > $TESTTMP/pretxnchangegroup.sh << EOF
				> #!/bin/sh
				> env \| egrep "^HG_USERVAR_(DEBUG\|BYPASS_REVIEW)" \| sort
				> exit 0
				> EOF
				$ cat >> $HGRCPATH << EOF
				> [hooks]
				> pretxnchangegroup = sh $TESTTMP/pretxnchangegroup.sh
				> EOF

				$ hg init repo
				$ hg clone -q repo child
				$ cd child

				Test pushing vars to repo with pushvars.server not set

				$ echo b > a
				$ hg commit -Aqm a
				$ hg push --pushvars "DEBUG=1" --pushvars "BYPASS_REVIEW=true"
				pushing to $TESTTMP/repo
				searching for changes
				adding changesets
				adding manifests
				adding file changes
				added 1 changesets with 1 changes to 1 files

				Setting pushvars.sever = true and then pushing.

				$ echo [push] >> $HGRCPATH
				$ echo "pushvars.server = true" >> $HGRCPATH
				$ echo b >> a
				$ hg commit -Aqm a
				$ hg push --pushvars "DEBUG=1" --pushvars "BYPASS_REVIEW=true"
				pushing to $TESTTMP/repo
				searching for changes
				adding changesets
				adding manifests
				adding file changes
				added 1 changesets with 1 changes to 1 files
				HG_USERVAR_BYPASS_REVIEW=true
				HG_USERVAR_DEBUG=1

				Test pushing var with empty right-hand side

				$ echo b >> a
				$ hg commit -Aqm a
				$ hg push --pushvars "DEBUG="
				pushing to $TESTTMP/repo
				searching for changes
				adding changesets
				adding manifests
				adding file changes
				added 1 changesets with 1 changes to 1 files
				HG_USERVAR_DEBUG=

				Test pushing bad vars

				$ echo b >> a
				$ hg commit -Aqm b
				$ hg push --pushvars "DEBUG"
				pushing to $TESTTMP/repo
				searching for changes
				abort: unable to parse variable 'DEBUG', should follow 'KEY=VALUE' or 'KEY=' format
				[255]