upstream/mercurial-mirror Files · tests/test-patch.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-patch.t
        
                    89 lines
            
             | 2.3 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-patch.t
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Nicolas Dumazet
    
tests: unify test-patch

              r11784
            
        $ cat > patchtool.py <<EOF

        > import sys

        > print 'Using custom patch'

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

        >     print '--binary found !'

        > EOF

        $ echo "[ui]" >> $HGRCPATH

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

              r32940
            
        $ echo "patch=$PYTHON ../patchtool.py" >> $HGRCPATH

        Nicolas Dumazet
    
tests: unify test-patch

              r11784
            
        $ 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 ..

        Christian Ebert
    
test-patch.t: typos

              r11815
            
      This test checks that:

       - custom patch commands with arguments actually work

        Nicolas Dumazet
    
tests: unify test-patch

              r11784
            
       - 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

        Greg Ward
    
import: simplify status reporting logic (and make it more I18N-friendly)...

              r15194
            
        applied to working directory

        Mads Kiilerich
    
import: don't strip '#' lines from patch descriptions (issue 2417)...

              r12645
            
      Issue2417: hg import with # comments in description

      Prepare source repo and patch:

        $ rm $HGRCPATH

        $ hg init c

        $ cd c

        Wagner Bruna
    
patch: fix parsing patch files containing CRs not followed by LFs...

              r14832
            
        $ printf "a\rc" > a

        Mads Kiilerich
    
import: don't strip '#' lines from patch descriptions (issue 2417)...

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

        Wagner Bruna
    
patch: fix parsing patch files containing CRs not followed by LFs...

              r14832
            
        $ printf "a\rb\rc" > a

        Mads Kiilerich
    
import: don't strip '#' lines from patch descriptions (issue 2417)...

              r12645
            
        $ cat << eof > log

        Mads Kiilerich
    
import: only the first hg patch marker should be processed (issue2417)...

              r12728
            
        > 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

        Mads Kiilerich
    
import: don't strip '#' lines from patch descriptions (issue 2417)...

              r12645
            
        > 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

        Wagner Bruna
    
patch: fix parsing patch files containing CRs not followed by LFs...

              r14832
            
        changeset:   1:cd0bde79c428

        Mads Kiilerich
    
import: don't strip '#' lines from patch descriptions (issue 2417)...

              r12645
            
        tag:         tip

        user:        test

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

        files:       a

        description:

        Mads Kiilerich
    
import: only the first hg patch marker should be processed (issue2417)...

              r12728
            
        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

        Mads Kiilerich
    
import: don't strip '#' lines from patch descriptions (issue 2417)...

              r12645
            
        $ 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-patch	r11784	$ cat > patchtool.py <<EOF
		> import sys
		> print 'Using custom patch'
		> if '--binary' in sys.argv:
		> print '--binary found !'
		> EOF

		$ echo "[ui]" >> $HGRCPATH
Augie Fackler cleanup: use $PYTHON to run python in many more tests...	r32940	$ echo "patch=$PYTHON ../patchtool.py" >> $HGRCPATH
Nicolas Dumazet tests: unify test-patch	r11784
		$ 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 ..

Christian Ebert test-patch.t: typos	r11815	This test checks that:
		- custom patch commands with arguments actually work
Nicolas Dumazet tests: unify test-patch	r11784	- 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
Greg Ward import: simplify status reporting logic (and make it more I18N-friendly)...	r15194	applied to working directory
Mads Kiilerich import: don't strip '#' lines from patch descriptions (issue 2417)...	r12645
		Issue2417: hg import with # comments in description

		Prepare source repo and patch:

		$ rm $HGRCPATH
		$ hg init c
		$ cd c
Wagner Bruna patch: fix parsing patch files containing CRs not followed by LFs...	r14832	$ printf "a\rc" > a
Mads Kiilerich import: don't strip '#' lines from patch descriptions (issue 2417)...	r12645	$ hg ci -A -m 0 a -d '0 0'
Wagner Bruna patch: fix parsing patch files containing CRs not followed by LFs...	r14832	$ printf "a\rb\rc" > a
Mads Kiilerich import: don't strip '#' lines from patch descriptions (issue 2417)...	r12645	$ cat << eof > log
Mads Kiilerich import: only the first hg patch marker should be processed (issue2417)...	r12728	> 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
Mads Kiilerich import: don't strip '#' lines from patch descriptions (issue 2417)...	r12645	> 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
Wagner Bruna patch: fix parsing patch files containing CRs not followed by LFs...	r14832	changeset: 1:cd0bde79c428
Mads Kiilerich import: don't strip '#' lines from patch descriptions (issue 2417)...	r12645	tag: tip
		user: test
		date: Thu Jan 01 00:00:00 1970 +0000
		files: a
		description:
Mads Kiilerich import: only the first hg patch marker should be processed (issue2417)...	r12728	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
Mads Kiilerich import: don't strip '#' lines from patch descriptions (issue 2417)...	r12645

		$ cd ..