upstream/mercurial-mirror Files · tests/test-merge-local.t

pycompat: custom implementation of urllib.parse.quote()...

pycompat: custom implementation of urllib.parse.quote() urllib.parse.quote() accepts either str or bytes and returns str. There exists a urllib.parse.quote_from_bytes() which only accepts bytes. We should probably use that to retain strong typing and avoid surprises. In addition, since nearly all strings in Mercurial are bytes, we probably don't want quote() returning unicode. So, this patch implements a custom quote() that only accepts bytes and returns bytes. The quoted URL should only contain URL safe characters which is a strict subset of ASCII. So `.encode('ascii', 'strict')` should be safe.

Gábor Stefanik - - Load All Authors

File last commit:

r30229:69ffbbe7 stable


                r31400:fb1f7033

default

Download file

             test-merge-local.t
        
                    151 lines
            
             | 3.4 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-merge-local.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

        $ hg init

      Revision 0:

        $ echo "unchanged" > unchanged

        $ echo "remove me" > remove

        $ echo "copy me" > copy

        $ echo "move me" > move

        $ for i in 1 2 3 4 5 6 7 8 9; do

        >     echo "merge ok $i" >> zzz1_merge_ok

        > done

        $ echo "merge bad" > zzz2_merge_bad

        $ hg ci -Am "revision 0"

        adding copy

        adding move

        adding remove

        adding unchanged

        adding zzz1_merge_ok

        adding zzz2_merge_bad

      Revision 1:

        $ hg rm remove

        $ hg mv move moved

        $ hg cp copy copied

        $ echo "added" > added

        $ hg add added

        $ echo "new first line" > zzz1_merge_ok

        $ hg cat zzz1_merge_ok >> zzz1_merge_ok

        $ echo "new last line" >> zzz2_merge_bad

        $ hg ci -m "revision 1"

      Local changes to revision 0:

        $ hg co 0

        4 files updated, 0 files merged, 3 files removed, 0 files unresolved

        $ echo "new last line" >> zzz1_merge_ok

        $ echo "another last line" >> zzz2_merge_bad

        $ hg diff --nodates | grep "^[+-][^<>]"

        --- a/zzz1_merge_ok

        +++ b/zzz1_merge_ok

        +new last line

        --- a/zzz2_merge_bad

        +++ b/zzz2_merge_bad

        +another last line

        $ hg st

        M zzz1_merge_ok

        M zzz2_merge_bad

      Local merge with bad merge tool:

        $ HGMERGE=false hg co

        merging zzz1_merge_ok

        merging zzz2_merge_bad

        merging zzz2_merge_bad failed!

        3 files updated, 1 files merged, 2 files removed, 1 files unresolved

        use 'hg resolve' to retry unresolved file merges

        [1]

        $ hg resolve -m

        (no more unresolved files)

        $ hg co 0

        merging zzz1_merge_ok

        merging zzz2_merge_bad

        warning: conflicts while merging zzz2_merge_bad! (edit, then use 'hg resolve --mark')

        2 files updated, 1 files merged, 3 files removed, 1 files unresolved

        use 'hg resolve' to retry unresolved file merges

        [1]

        $ hg diff --nodates | grep "^[+-][^<>]"

        --- a/zzz1_merge_ok

        +++ b/zzz1_merge_ok

        +new last line

        --- a/zzz2_merge_bad

        +++ b/zzz2_merge_bad

        +another last line

        +=======

        $ hg st

        M zzz1_merge_ok

        M zzz2_merge_bad

        ? zzz2_merge_bad.orig

      Local merge with conflicts:

        $ hg resolve -m

        (no more unresolved files)

        $ hg co

        merging zzz1_merge_ok

        merging zzz2_merge_bad

        warning: conflicts while merging zzz2_merge_bad! (edit, then use 'hg resolve --mark')

        3 files updated, 1 files merged, 2 files removed, 1 files unresolved

        use 'hg resolve' to retry unresolved file merges

        [1]

        $ hg resolve -m

        (no more unresolved files)

        $ hg co 0 --config 'ui.origbackuppath=.hg/origbackups'

        merging zzz1_merge_ok

        merging zzz2_merge_bad

        warning: conflicts while merging zzz2_merge_bad! (edit, then use 'hg resolve --mark')

        2 files updated, 1 files merged, 3 files removed, 1 files unresolved

        use 'hg resolve' to retry unresolved file merges

        [1]

      Are orig files from the last commit where we want them?

        $ ls .hg/origbackups

        zzz2_merge_bad.orig

        $ hg diff --nodates | grep "^[+-][^<>]"

        --- a/zzz1_merge_ok

        +++ b/zzz1_merge_ok

        +new last line

        --- a/zzz2_merge_bad

        +++ b/zzz2_merge_bad

        +another last line

        +=======

        +=======

        +new last line

        +=======

        $ hg st

        M zzz1_merge_ok

        M zzz2_merge_bad

        ? zzz2_merge_bad.orig

      Local merge without conflicts:

        $ hg revert zzz2_merge_bad

        $ hg resolve -m

        (no more unresolved files)

        $ hg co

        merging zzz1_merge_ok

        4 files updated, 1 files merged, 2 files removed, 0 files unresolved

        $ hg diff --nodates | grep "^[+-][^<>]"

        --- a/zzz1_merge_ok

        +++ b/zzz1_merge_ok

        +new last line

        $ hg st

        M zzz1_merge_ok

        ? zzz2_merge_bad.orig

	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

				$ hg init

				Revision 0:

				$ echo "unchanged" > unchanged
				$ echo "remove me" > remove
				$ echo "copy me" > copy
				$ echo "move me" > move
				$ for i in 1 2 3 4 5 6 7 8 9; do
				> echo "merge ok $i" >> zzz1_merge_ok
				> done
				$ echo "merge bad" > zzz2_merge_bad
				$ hg ci -Am "revision 0"
				adding copy
				adding move
				adding remove
				adding unchanged
				adding zzz1_merge_ok
				adding zzz2_merge_bad

				Revision 1:

				$ hg rm remove
				$ hg mv move moved
				$ hg cp copy copied
				$ echo "added" > added
				$ hg add added
				$ echo "new first line" > zzz1_merge_ok
				$ hg cat zzz1_merge_ok >> zzz1_merge_ok
				$ echo "new last line" >> zzz2_merge_bad
				$ hg ci -m "revision 1"

				Local changes to revision 0:

				$ hg co 0
				4 files updated, 0 files merged, 3 files removed, 0 files unresolved
				$ echo "new last line" >> zzz1_merge_ok
				$ echo "another last line" >> zzz2_merge_bad

				$ hg diff --nodates \| grep "^[+-][^<>]"
				--- a/zzz1_merge_ok
				+++ b/zzz1_merge_ok
				+new last line
				--- a/zzz2_merge_bad
				+++ b/zzz2_merge_bad
				+another last line

				$ hg st
				M zzz1_merge_ok
				M zzz2_merge_bad

				Local merge with bad merge tool:

				$ HGMERGE=false hg co
				merging zzz1_merge_ok
				merging zzz2_merge_bad
				merging zzz2_merge_bad failed!
				3 files updated, 1 files merged, 2 files removed, 1 files unresolved
				use 'hg resolve' to retry unresolved file merges
				[1]

				$ hg resolve -m
				(no more unresolved files)

				$ hg co 0
				merging zzz1_merge_ok
				merging zzz2_merge_bad
				warning: conflicts while merging zzz2_merge_bad! (edit, then use 'hg resolve --mark')
				2 files updated, 1 files merged, 3 files removed, 1 files unresolved
				use 'hg resolve' to retry unresolved file merges
				[1]

				$ hg diff --nodates \| grep "^[+-][^<>]"
				--- a/zzz1_merge_ok
				+++ b/zzz1_merge_ok
				+new last line
				--- a/zzz2_merge_bad
				+++ b/zzz2_merge_bad
				+another last line
				+=======

				$ hg st
				M zzz1_merge_ok
				M zzz2_merge_bad
				? zzz2_merge_bad.orig

				Local merge with conflicts:

				$ hg resolve -m
				(no more unresolved files)

				$ hg co
				merging zzz1_merge_ok
				merging zzz2_merge_bad
				warning: conflicts while merging zzz2_merge_bad! (edit, then use 'hg resolve --mark')
				3 files updated, 1 files merged, 2 files removed, 1 files unresolved
				use 'hg resolve' to retry unresolved file merges
				[1]

				$ hg resolve -m
				(no more unresolved files)

				$ hg co 0 --config 'ui.origbackuppath=.hg/origbackups'
				merging zzz1_merge_ok
				merging zzz2_merge_bad
				warning: conflicts while merging zzz2_merge_bad! (edit, then use 'hg resolve --mark')
				2 files updated, 1 files merged, 3 files removed, 1 files unresolved
				use 'hg resolve' to retry unresolved file merges
				[1]

				Are orig files from the last commit where we want them?
				$ ls .hg/origbackups
				zzz2_merge_bad.orig

				$ hg diff --nodates \| grep "^[+-][^<>]"
				--- a/zzz1_merge_ok
				+++ b/zzz1_merge_ok
				+new last line
				--- a/zzz2_merge_bad
				+++ b/zzz2_merge_bad
				+another last line
				+=======
				+=======
				+new last line
				+=======

				$ hg st
				M zzz1_merge_ok
				M zzz2_merge_bad
				? zzz2_merge_bad.orig

				Local merge without conflicts:

				$ hg revert zzz2_merge_bad

				$ hg resolve -m
				(no more unresolved files)

				$ hg co
				merging zzz1_merge_ok
				4 files updated, 1 files merged, 2 files removed, 0 files unresolved

				$ hg diff --nodates \| grep "^[+-][^<>]"
				--- a/zzz1_merge_ok
				+++ b/zzz1_merge_ok
				+new last line

				$ hg st
				M zzz1_merge_ok
				? zzz2_merge_bad.orig