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

i18n: use UTF-8 string to lower filename for case collision check...

i18n: use UTF-8 string to lower filename for case collision check Some character sets, cp932 (known as Shift-JIS for Japanese) for example, use 0x41('A') - 0x5A('Z') and 0x61('a') - 0x7A('z') as second or later character. In such character set, case collision checking recognizes different files as CASEFOLDED same file, if filenames are treated as byte sequence. win32mbcs extension is not appropriate to handle this problem, because this problem can occur on other than Windows platform only if problematic character set is used. Callers of util.checkcase() use known ASCII filenames as last component of path, and string.lower() is not applied to directory part of path. So, util.checkcase() is kept intact, even though it applies string.lower() to filenames.

Wagner Bruna - - Load All Authors

File last commit:

r14832:d60e4f22 stable


                r14980:28e98a8b

stable

Download file

             test-patch.t
        
                    89 lines
            
             | 2.2 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-patch.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

        $ cat > patchtool.py <<EOF

        > import sys

        > print 'Using custom patch'

        > if '--binary' in sys.argv:

        >     print '--binary found !'

        > EOF

        $ echo "[ui]" >> $HGRCPATH

        $ echo "patch=python ../patchtool.py" >> $HGRCPATH

        $ hg init a

        $ cd a

        $ echo a > a

        $ hg commit -Ama -d '1 0'

        adding a

        $ echo b >> a

        $ hg commit -Amb -d '2 0'

        $ cd ..

      This test checks that:

       - custom patch commands with arguments actually work

       - patch code does not try to add weird arguments like

       --binary when custom patch commands are used. For instance

       --binary is added by default under win32.

      check custom patch options are honored

        $ hg --cwd a export -o ../a.diff tip

        $ hg clone -r 0 a b

        adding changesets

        adding manifests

        adding file changes

        added 1 changesets with 1 changes to 1 files

        updating to branch default

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

        $ hg --cwd b import -v ../a.diff

        applying ../a.diff

        Using custom patch

      Issue2417: hg import with # comments in description

      Prepare source repo and patch:

        $ rm $HGRCPATH

        $ hg init c

        $ cd c

        $ printf "a\rc" > a

        $ hg ci -A -m 0 a -d '0 0'

        $ printf "a\rb\rc" > a

        $ cat << eof > log

        > first line which can't start with '# '

        > # second line is a comment but that shouldn't be a problem.

        > A patch marker like this was more problematic even after d7452292f9d3:

        > # HG changeset patch

        > # User lines looks like this - but it _is_ just a comment

        > eof

        $ hg ci -l log -d '0 0'

        $ hg export -o p 1

        $ cd ..

      Clone and apply patch:

        $ hg clone -r 0 c d

        adding changesets

        adding manifests

        adding file changes

        added 1 changesets with 1 changes to 1 files

        updating to branch default

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

        $ cd d

        $ hg import ../c/p

        applying ../c/p

        $ hg log -v -r 1

        changeset:   1:cd0bde79c428

        tag:         tip

        user:        test

        date:        Thu Jan 01 00:00:00 1970 +0000

        files:       a

        description:

        first line which can't start with '# '

        # second line is a comment but that shouldn't be a problem.

        A patch marker like this was more problematic even after d7452292f9d3:

        # HG changeset patch

        # User lines looks like this - but it _is_ just a comment

        $ 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

				$ cat > patchtool.py <<EOF
				> import sys
				> print 'Using custom patch'
				> if '--binary' in sys.argv:
				> print '--binary found !'
				> EOF

				$ echo "[ui]" >> $HGRCPATH
				$ echo "patch=python ../patchtool.py" >> $HGRCPATH

				$ hg init a
				$ cd a
				$ echo a > a
				$ hg commit -Ama -d '1 0'
				adding a
				$ echo b >> a
				$ hg commit -Amb -d '2 0'
				$ cd ..

				This test checks that:
				- custom patch commands with arguments actually work
				- patch code does not try to add weird arguments like
				--binary when custom patch commands are used. For instance
				--binary is added by default under win32.

				check custom patch options are honored

				$ hg --cwd a export -o ../a.diff tip
				$ hg clone -r 0 a b
				adding changesets
				adding manifests
				adding file changes
				added 1 changesets with 1 changes to 1 files
				updating to branch default
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved

				$ hg --cwd b import -v ../a.diff
				applying ../a.diff
				Using custom patch


				Issue2417: hg import with # comments in description

				Prepare source repo and patch:

				$ rm $HGRCPATH
				$ hg init c
				$ cd c
				$ printf "a\rc" > a
				$ hg ci -A -m 0 a -d '0 0'
				$ printf "a\rb\rc" > a
				$ cat << eof > log
				> first line which can't start with '# '
				> # second line is a comment but that shouldn't be a problem.
				> A patch marker like this was more problematic even after d7452292f9d3:
				> # HG changeset patch
				> # User lines looks like this - but it _is_ just a comment
				> eof
				$ hg ci -l log -d '0 0'
				$ hg export -o p 1
				$ cd ..

				Clone and apply patch:

				$ hg clone -r 0 c d
				adding changesets
				adding manifests
				adding file changes
				added 1 changesets with 1 changes to 1 files
				updating to branch default
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved
				$ cd d
				$ hg import ../c/p
				applying ../c/p
				$ hg log -v -r 1
				changeset: 1:cd0bde79c428
				tag: tip
				user: test
				date: Thu Jan 01 00:00:00 1970 +0000
				files: a
				description:
				first line which can't start with '# '
				# second line is a comment but that shouldn't be a problem.
				A patch marker like this was more problematic even after d7452292f9d3:
				# HG changeset patch
				# User lines looks like this - but it _is_ just a comment


				$ cd ..