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

ui: add new config option for help text width...

ui: add new config option for help text width Before this patch, when printing help text using `hg help`, or `hg log -h`, the output will wrap at 78 chars even if the user has a bigger terminal width and there is no config option to change it, making the experience different from the commonly used `man` tool. This patch introduces a new config option `ui.textwidth`, which replaces the hardcoded number. It's set to 78 by default to maintain compatibility. When set to 0, `hg help` will behave more like `man`.

Greg Ward - - Load All Authors

File last commit:

r15194:0705f2ac default


                r29070:29a7d591

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

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

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

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