upstream/mercurial-mirror Files · tests/test-sparse-verbose-json.t

patch: don't separate \r and \n when colorizing diff output...

patch: don't separate \r and \n when colorizing diff output When displaying diffs, \r at the end of a line is treated as trailing whitespace. This causes an ANSI escape code to be inserted between \r and \n. Some programs, such as less since version 530 (maybe earlier, but at least not version 487) displays ^M when it encounters a lone \r. This causes a lot of noise in diff output on Windows, where \r\n is used to terminate lines. We avoid that by treating both \n and \r\n as end of line when considering trailing whitespace.

Gregory Szorc - - Load All Authors

File last commit:

r33355:9087f999 default


                r38649:e1987261

default

Download file

             test-sparse-verbose-json.t
        
                    82 lines
            
             | 1.7 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-sparse-verbose-json.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      test sparse with --verbose and -T json

        $ hg init myrepo

        $ cd myrepo

        $ cat > .hg/hgrc <<EOF

        > [extensions]

        > sparse=

        > strip=

        > EOF

        $ echo a > show

        $ echo x > hide

        $ hg ci -Aqm 'initial'

        $ echo b > show

        $ echo y > hide

        $ echo aa > show2

        $ echo xx > hide2

        $ hg ci -Aqm 'two'

      Verify basic --include and --reset

        $ hg up -q 0

        $ hg debugsparse --include 'hide' -Tjson

        [

         {

          "exclude_rules_added": 0,

          "files_added": 0,

          "files_conflicting": 0,

          "files_dropped": 1,

          "include_rules_added": 1,

          "profiles_added": 0

         }

        ]

        $ hg debugsparse --clear-rules

        $ hg debugsparse --include 'hide' --verbose

        removing show

        Profiles changed: 0

        Include rules changed: 1

        Exclude rules changed: 0

        $ hg debugsparse --reset -Tjson

        [

         {

          "exclude_rules_added": 0,

          "files_added": 1,

          "files_conflicting": 0,

          "files_dropped": 0,

          "include_rules_added": -1,

          "profiles_added": 0

         }

        ]

        $ hg debugsparse --include 'hide'

        $ hg debugsparse --reset --verbose

        getting show

        Profiles changed: 0

        Include rules changed: -1

        Exclude rules changed: 0

      Verifying that problematic files still allow us to see the deltas when forcing:

        $ hg debugsparse --include 'show*'

        $ touch hide

        $ hg debugsparse --delete 'show*' --force -Tjson

        pending changes to 'hide'

        [

         {

          "exclude_rules_added": 0,

          "files_added": 0,

          "files_conflicting": 1,

          "files_dropped": 0,

          "include_rules_added": -1,

          "profiles_added": 0

         }

        ]

        $ hg debugsparse --include 'show*' --force

        pending changes to 'hide'

        $ hg debugsparse --delete 'show*' --force --verbose

        pending changes to 'hide'

        Profiles changed: 0

        Include rules changed: -1

        Exclude rules changed: 0

	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

				test sparse with --verbose and -T json

				$ hg init myrepo
				$ cd myrepo
				$ cat > .hg/hgrc <<EOF
				> [extensions]
				> sparse=
				> strip=
				> EOF

				$ echo a > show
				$ echo x > hide
				$ hg ci -Aqm 'initial'

				$ echo b > show
				$ echo y > hide
				$ echo aa > show2
				$ echo xx > hide2
				$ hg ci -Aqm 'two'

				Verify basic --include and --reset

				$ hg up -q 0
				$ hg debugsparse --include 'hide' -Tjson
				[
				{
				"exclude_rules_added": 0,
				"files_added": 0,
				"files_conflicting": 0,
				"files_dropped": 1,
				"include_rules_added": 1,
				"profiles_added": 0
				}
				]
				$ hg debugsparse --clear-rules
				$ hg debugsparse --include 'hide' --verbose
				removing show
				Profiles changed: 0
				Include rules changed: 1
				Exclude rules changed: 0

				$ hg debugsparse --reset -Tjson
				[
				{
				"exclude_rules_added": 0,
				"files_added": 1,
				"files_conflicting": 0,
				"files_dropped": 0,
				"include_rules_added": -1,
				"profiles_added": 0
				}
				]
				$ hg debugsparse --include 'hide'
				$ hg debugsparse --reset --verbose
				getting show
				Profiles changed: 0
				Include rules changed: -1
				Exclude rules changed: 0

				Verifying that problematic files still allow us to see the deltas when forcing:

				$ hg debugsparse --include 'show*'
				$ touch hide
				$ hg debugsparse --delete 'show*' --force -Tjson
				pending changes to 'hide'
				[
				{
				"exclude_rules_added": 0,
				"files_added": 0,
				"files_conflicting": 1,
				"files_dropped": 0,
				"include_rules_added": -1,
				"profiles_added": 0
				}
				]
				$ hg debugsparse --include 'show*' --force
				pending changes to 'hide'
				$ hg debugsparse --delete 'show*' --force --verbose
				pending changes to 'hide'
				Profiles changed: 0
				Include rules changed: -1
				Exclude rules changed: 0