upstream/mercurial-mirror Files · tests/test-import-eol.t

identify: add template support...

identify: add template support This is based on a patch proposed last year by Mathias De Maré[1], with a few changes. - Tags and bookmarks are now formatted lists, for more flexible queries. - The templater is populated whether or not [-nibtB] is specified. (Plain output is unchanged.) This seems more consistent with other templated commands. - The 'id' property is a string, instead of a list. - The parents of 'wdir()' have their own list of attributes. I left 'id' as a string because it seems very useful for generating version info. It's also a bit strange because the value and meaning changes depending on whether or not --debug is passed (short vs full hash), whether the revision is a merge or not (one hash or two, separated by a '+'), the working directory or not (node vs p1node), and local or not (remote defaults to tip, and never has '+'). The equivalent string built with {rev} seems much less useful, and I couldn't think of a reasonable name, so I left it out. The discussion seemed to be pointing towards having a list of nodes, with more than one entry for a merge. It seems simpler to give the nodes a name, and use {node} for the actual commit probed, especially now that there is a virtual node for 'wdir()'. Yuya mentioned using fm.nested() in that thread, so I did for the parent nodes. I'm not sure if the plan is to fill in all of the context attributes in these items, or if these nested items should simply be made {p1node} and {p1rev}. I used ':' as the tag separator for consistency with {tags} in the log templater. Likewise, bookmarks are separated by a space for consistency with the corresponding log template. [1] https://www.mercurial-scm.org/pipermail/mercurial-devel/2016-August/087039.html

Augie Fackler - - Load All Authors

File last commit:

r32940:75be1499 default


                r33051:15a79ac8

default

Download file

             test-import-eol.t
        
                    146 lines
            
             | 2.7 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-import-eol.t
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Nicolas Dumazet
    
tests: unify test-qimport-eol

              r11808
            
        $ cat > makepatch.py <<EOF

        > f = file('eol.diff', 'wb')

        > w = f.write

        > w('test message\n')

        > w('diff --git a/a b/a\n')

        > w('--- a/a\n')

        > w('+++ b/a\n')

        > w('@@ -1,5 +1,5 @@\n')

        > w(' a\n')

        > w('-bbb\r\n')

        > w('+yyyy\r\n')

        > w(' cc\r\n')

        > w(' \n')

        > w(' d\n')

        > w('-e\n')

        > w('\ No newline at end of file\n')

        > w('+z\r\n')

        > w('\ No newline at end of file\r\n')

        > EOF

        $ hg init repo

        $ cd repo

        $ echo '\.diff' > .hgignore

      Test different --eol values

        Augie Fackler
    
tests: use $PYTHON instead of hardcoding python...

              r22947
            
        $ $PYTHON -c 'file("a", "wb").write("a\nbbb\ncc\n\nd\ne")'

        Nicolas Dumazet
    
tests: unify test-qimport-eol

              r11808
            
        $ hg ci -Am adda

        adding .hgignore

        adding a

        Augie Fackler
    
cleanup: use $PYTHON to run python in many more tests...

              r32940
            
        $ $PYTHON ../makepatch.py

        Nicolas Dumazet
    
tests: unify test-qimport-eol

              r11808
            
      invalid eol

        $ hg --config patch.eol='LFCR' import eol.diff

        applying eol.diff

        Martin Geisler
    
Merge with stable

              r12070
            
        abort: unsupported line endings type: LFCR

        Matt Mackall
    
tests: add exit codes to unified tests

              r12316
            
        [255]

        Nicolas Dumazet
    
tests: unify test-qimport-eol

              r11808
            
        $ hg revert -a

      force LF

        $ hg --traceback --config patch.eol='LF' import eol.diff

        applying eol.diff

        Mads Kiilerich
    
tests: use (esc) instead of other kinds of string escaping

              r12943
            
        $ cat a

        a

        yyyy

        cc

        d

        e (no-eol)

        Nicolas Dumazet
    
tests: unify test-qimport-eol

              r11808
            
        $ hg st

      force CRLF

        $ hg up -C 0

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

        $ hg --traceback --config patch.eol='CRLF' import eol.diff

        applying eol.diff

        Mads Kiilerich
    
tests: use (esc) instead of other kinds of string escaping

              r12943
            
        $ cat a

        a\r (esc)

        yyyy\r (esc)

        cc\r (esc)

        \r (esc)

        d\r (esc)

        e (no-eol)

        Nicolas Dumazet
    
tests: unify test-qimport-eol

              r11808
            
        $ hg st

      auto EOL on LF file

        $ hg up -C 0

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

        $ hg --traceback --config patch.eol='auto' import eol.diff

        applying eol.diff

        Mads Kiilerich
    
tests: use (esc) instead of other kinds of string escaping

              r12943
            
        $ cat a

        a

        yyyy

        cc

        d

        e (no-eol)

        Nicolas Dumazet
    
tests: unify test-qimport-eol

              r11808
            
        $ hg st

      auto EOL on CRLF file

        Augie Fackler
    
tests: use $PYTHON instead of hardcoding python...

              r22947
            
        $ $PYTHON -c 'file("a", "wb").write("a\r\nbbb\r\ncc\r\n\r\nd\r\ne")'

        Nicolas Dumazet
    
tests: unify test-qimport-eol

              r11808
            
        $ hg commit -m 'switch EOLs in a'

        $ hg --traceback --config patch.eol='auto' import eol.diff

        applying eol.diff

        Mads Kiilerich
    
tests: use (esc) instead of other kinds of string escaping

              r12943
            
        $ cat a

        a\r (esc)

        yyyy\r (esc)

        cc\r (esc)

        \r (esc)

        d\r (esc)

        e (no-eol)

        Nicolas Dumazet
    
tests: unify test-qimport-eol

              r11808
            
        $ hg st

      auto EOL on new file or source without any EOL

        Augie Fackler
    
tests: use $PYTHON instead of hardcoding python...

              r22947
            
        $ $PYTHON -c 'file("noeol", "wb").write("noeol")'

        Nicolas Dumazet
    
tests: unify test-qimport-eol

              r11808
            
        $ hg add noeol

        $ hg commit -m 'add noeol'

        Augie Fackler
    
tests: use $PYTHON instead of hardcoding python...

              r22947
            
        $ $PYTHON -c 'file("noeol", "wb").write("noeol\r\nnoeol\n")'

        $ $PYTHON -c 'file("neweol", "wb").write("neweol\nneweol\r\n")'

        Nicolas Dumazet
    
tests: unify test-qimport-eol

              r11808
            
        $ hg add neweol

        $ hg diff --git > noeol.diff

        $ hg revert --no-backup noeol neweol

        $ rm neweol

        $ hg --traceback --config patch.eol='auto' import -m noeol noeol.diff

        applying noeol.diff

        Mads Kiilerich
    
tests: use (esc) instead of other kinds of string escaping

              r12943
            
        $ cat noeol

        noeol\r (esc)

        noeol

        $ cat neweol

        neweol

        neweol\r (esc)

        Nicolas Dumazet
    
tests: unify test-qimport-eol

              r11808
            
        $ hg st

      Test --eol and binary patches

        Augie Fackler
    
tests: use $PYTHON instead of hardcoding python...

              r22947
            
        $ $PYTHON -c 'file("b", "wb").write("a\x00\nb\r\nd")'

        Nicolas Dumazet
    
tests: unify test-qimport-eol

              r11808
            
        $ hg ci -Am addb

        adding b

        Augie Fackler
    
tests: use $PYTHON instead of hardcoding python...

              r22947
            
        $ $PYTHON -c 'file("b", "wb").write("a\x00\nc\r\nd")'

        Nicolas Dumazet
    
tests: unify test-qimport-eol

              r11808
            
        $ hg diff --git > bin.diff

        $ hg revert --no-backup b

      binary patch with --eol

        $ hg import --config patch.eol='CRLF' -m changeb bin.diff

        applying bin.diff

        Mads Kiilerich
    
tests: use (esc) instead of other kinds of string escaping

              r12943
            
        $ cat b

        a\x00 (esc)

        c\r (esc)

        d (no-eol)

        Nicolas Dumazet
    
tests: unify test-qimport-eol

              r11808
            
        $ hg st

        $ 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

Nicolas Dumazet tests: unify test-qimport-eol	r11808	$ cat > makepatch.py <<EOF
		> f = file('eol.diff', 'wb')
		> w = f.write
		> w('test message\n')
		> w('diff --git a/a b/a\n')
		> w('--- a/a\n')
		> w('+++ b/a\n')
		> w('@@ -1,5 +1,5 @@\n')
		> w(' a\n')
		> w('-bbb\r\n')
		> w('+yyyy\r\n')
		> w(' cc\r\n')
		> w(' \n')
		> w(' d\n')
		> w('-e\n')
		> w('\ No newline at end of file\n')
		> w('+z\r\n')
		> w('\ No newline at end of file\r\n')
		> EOF

		$ hg init repo
		$ cd repo
		$ echo '\.diff' > .hgignore


		Test different --eol values

Augie Fackler tests: use $PYTHON instead of hardcoding python...	r22947	$ $PYTHON -c 'file("a", "wb").write("a\nbbb\ncc\n\nd\ne")'
Nicolas Dumazet tests: unify test-qimport-eol	r11808	$ hg ci -Am adda
		adding .hgignore
		adding a
Augie Fackler cleanup: use $PYTHON to run python in many more tests...	r32940	$ $PYTHON ../makepatch.py
Nicolas Dumazet tests: unify test-qimport-eol	r11808

		invalid eol

		$ hg --config patch.eol='LFCR' import eol.diff
		applying eol.diff
Martin Geisler Merge with stable	r12070	abort: unsupported line endings type: LFCR
Matt Mackall tests: add exit codes to unified tests	r12316	[255]
Nicolas Dumazet tests: unify test-qimport-eol	r11808	$ hg revert -a


		force LF

		$ hg --traceback --config patch.eol='LF' import eol.diff
		applying eol.diff
Mads Kiilerich tests: use (esc) instead of other kinds of string escaping	r12943	$ cat a
		a
		yyyy
		cc

		d
		e (no-eol)
Nicolas Dumazet tests: unify test-qimport-eol	r11808	$ hg st


		force CRLF

		$ hg up -C 0
		1 files updated, 0 files merged, 0 files removed, 0 files unresolved
		$ hg --traceback --config patch.eol='CRLF' import eol.diff
		applying eol.diff
Mads Kiilerich tests: use (esc) instead of other kinds of string escaping	r12943	$ cat a
		a\r (esc)
		yyyy\r (esc)
		cc\r (esc)
		\r (esc)
		d\r (esc)
		e (no-eol)
Nicolas Dumazet tests: unify test-qimport-eol	r11808	$ hg st


		auto EOL on LF file

		$ hg up -C 0
		1 files updated, 0 files merged, 0 files removed, 0 files unresolved
		$ hg --traceback --config patch.eol='auto' import eol.diff
		applying eol.diff
Mads Kiilerich tests: use (esc) instead of other kinds of string escaping	r12943	$ cat a
		a
		yyyy
		cc

		d
		e (no-eol)
Nicolas Dumazet tests: unify test-qimport-eol	r11808	$ hg st


		auto EOL on CRLF file

Augie Fackler tests: use $PYTHON instead of hardcoding python...	r22947	$ $PYTHON -c 'file("a", "wb").write("a\r\nbbb\r\ncc\r\n\r\nd\r\ne")'
Nicolas Dumazet tests: unify test-qimport-eol	r11808	$ hg commit -m 'switch EOLs in a'
		$ hg --traceback --config patch.eol='auto' import eol.diff
		applying eol.diff
Mads Kiilerich tests: use (esc) instead of other kinds of string escaping	r12943	$ cat a
		a\r (esc)
		yyyy\r (esc)
		cc\r (esc)
		\r (esc)
		d\r (esc)
		e (no-eol)
Nicolas Dumazet tests: unify test-qimport-eol	r11808	$ hg st


		auto EOL on new file or source without any EOL

Augie Fackler tests: use $PYTHON instead of hardcoding python...	r22947	$ $PYTHON -c 'file("noeol", "wb").write("noeol")'
Nicolas Dumazet tests: unify test-qimport-eol	r11808	$ hg add noeol
		$ hg commit -m 'add noeol'
Augie Fackler tests: use $PYTHON instead of hardcoding python...	r22947	$ $PYTHON -c 'file("noeol", "wb").write("noeol\r\nnoeol\n")'
		$ $PYTHON -c 'file("neweol", "wb").write("neweol\nneweol\r\n")'
Nicolas Dumazet tests: unify test-qimport-eol	r11808	$ hg add neweol
		$ hg diff --git > noeol.diff
		$ hg revert --no-backup noeol neweol
		$ rm neweol
		$ hg --traceback --config patch.eol='auto' import -m noeol noeol.diff
		applying noeol.diff
Mads Kiilerich tests: use (esc) instead of other kinds of string escaping	r12943	$ cat noeol
		noeol\r (esc)
		noeol
		$ cat neweol
		neweol
		neweol\r (esc)
Nicolas Dumazet tests: unify test-qimport-eol	r11808	$ hg st


		Test --eol and binary patches

Augie Fackler tests: use $PYTHON instead of hardcoding python...	r22947	$ $PYTHON -c 'file("b", "wb").write("a\x00\nb\r\nd")'
Nicolas Dumazet tests: unify test-qimport-eol	r11808	$ hg ci -Am addb
		adding b
Augie Fackler tests: use $PYTHON instead of hardcoding python...	r22947	$ $PYTHON -c 'file("b", "wb").write("a\x00\nc\r\nd")'
Nicolas Dumazet tests: unify test-qimport-eol	r11808	$ hg diff --git > bin.diff
		$ hg revert --no-backup b

		binary patch with --eol

		$ hg import --config patch.eol='CRLF' -m changeb bin.diff
		applying bin.diff
Mads Kiilerich tests: use (esc) instead of other kinds of string escaping	r12943	$ cat b
		a\x00 (esc)
		c\r (esc)
		d (no-eol)
Nicolas Dumazet tests: unify test-qimport-eol	r11808	$ hg st
		$ cd ..