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

logcmdutil: rewrite jsonchangeset printer to be backed by jsonformatter...

logcmdutil: rewrite jsonchangeset printer to be backed by jsonformatter This is a bit slower than the original implementation, but I don't think that would actually matter. It's still faster than full templating. $ hg log -Tjson -r0:5000 --time > /dev/null (orig) time: real 1.550 secs (user 1.500+0.000 sys 0.040+0.000) (new) time: real 1.810 secs (user 1.740+0.000 sys 0.070+0.000) cf. $ hg log -Tdefault -r0:5000 --time > /dev/null time: real 4.980 secs (user 4.850+0.000 sys 0.130+0.000) $ hg log -r0:5000 --time > /dev/null time: real 2.340 secs (user 2.220+0.000 sys 0.100+0.000) $ hg log -r0:5000 -q --time > /dev/null time: real 0.750 secs (user 0.670+0.000 sys 0.070+0.000) The test output changes because keys are sorted alphabetically.

Gregory Szorc - - Load All Authors

File last commit:

r33293:c9cbf4de default


                r37790:814151cd

default

Download file

             test-sparse-merges.t
        
                    62 lines
            
             | 1.4 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-sparse-merges.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      test merging things outside of the sparse checkout

        $ hg init myrepo

        $ cd myrepo

        $ cat > .hg/hgrc <<EOF

        > [extensions]

        > sparse=

        > EOF

        $ echo foo > foo

        $ echo bar > bar

        $ hg add foo bar

        $ hg commit -m initial

        $ hg branch feature

        marked working directory as branch feature

        (branches are permanent and global, did you want a bookmark?)

        $ echo bar2 >> bar

        $ hg commit -m 'feature - bar2'

        $ hg update -q default

        $ hg debugsparse --exclude 'bar**'

        $ hg merge feature

        temporarily included 1 file(s) in the sparse checkout for merging

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

        (branch merge, don't forget to commit)

      Verify bar was merged temporarily

        $ ls

        bar

        foo

        $ hg status

        M bar

      Verify bar disappears automatically when the working copy becomes clean

        $ hg commit -m "merged"

        cleaned up 1 temporarily added file(s) from the sparse checkout

        $ hg status

        $ ls

        foo

        $ hg cat -r . bar

        bar

        bar2

      Test merging things outside of the sparse checkout that are not in the working

      copy

        $ hg strip -q -r . --config extensions.strip=

        $ hg up -q feature

        $ touch branchonly

        $ hg ci -Aqm 'add branchonly'

        $ hg up -q default

        $ hg debugsparse -X branchonly

        $ hg merge feature

        temporarily included 2 file(s) in the sparse checkout for merging

        2 files updated, 0 files merged, 0 files removed, 0 files unresolved

        (branch merge, don't forget to commit)

	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 merging things outside of the sparse checkout

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

				$ echo foo > foo
				$ echo bar > bar
				$ hg add foo bar
				$ hg commit -m initial

				$ hg branch feature
				marked working directory as branch feature
				(branches are permanent and global, did you want a bookmark?)
				$ echo bar2 >> bar
				$ hg commit -m 'feature - bar2'

				$ hg update -q default
				$ hg debugsparse --exclude 'bar**'

				$ hg merge feature
				temporarily included 1 file(s) in the sparse checkout for merging
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved
				(branch merge, don't forget to commit)

				Verify bar was merged temporarily

				$ ls
				bar
				foo
				$ hg status
				M bar

				Verify bar disappears automatically when the working copy becomes clean

				$ hg commit -m "merged"
				cleaned up 1 temporarily added file(s) from the sparse checkout
				$ hg status
				$ ls
				foo

				$ hg cat -r . bar
				bar
				bar2

				Test merging things outside of the sparse checkout that are not in the working
				copy

				$ hg strip -q -r . --config extensions.strip=
				$ hg up -q feature
				$ touch branchonly
				$ hg ci -Aqm 'add branchonly'

				$ hg up -q default
				$ hg debugsparse -X branchonly
				$ hg merge feature
				temporarily included 2 file(s) in the sparse checkout for merging
				2 files updated, 0 files merged, 0 files removed, 0 files unresolved
				(branch merge, don't forget to commit)