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

show: use consistent (and possibly shorter) node lengths...

show: use consistent (and possibly shorter) node lengths `hg show` makes heavy use of shortest() to limit the length of the node hash. For the "stack" and "work" views, you are often looking at multiple lines of similar output for "lines" of work. It is visually appeasing for things to vertically align. A naive use of {shortest(node, N)} could result in variable length nodes and for the first character of the description to vary by a column or two. We implement a function to determine the longest shortest prefix for a set of revisions. The new function is used to determine the printed node length for all `hg show` views. .. feature:: show: use consistent node length in views Our previous shortest node length of 5 was arbitrarily chosen. shortest() already does the work of ensuring that a partial node isn't ambiguous with an integer revision, which is our primary risk of a collision for very short nodes. It should be safe to go with the shortest node possible. Existing code is also optimized to handle nodes as short as 4. So, we decrease the minimum hash length from 5 to 4. We also add a test demonstrating that prefix collisions increase the node length. .. feature:: show: decrease minimum displayed hash length from 5 to 4 Differential Revision: https://phab.mercurial-scm.org/D558

Augie Fackler - - Load All Authors

File last commit:

r33974:b1f75d8e default


                r34192:e6b5e732

default

Download file

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

        $ cat > patchtool.py <<EOF

        > from __future__ import absolute_import, print_function

        > 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

        applied to working directory

      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
				> from __future__ import absolute_import, print_function
				> 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
				applied to working directory

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