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

repository: define manifest interfaces...

repository: define manifest interfaces The long march towards declaring interfaces for repository primitives continues. This commit essentially defines interfaces based on the following types: * manifest.manifestdict -> imanifestdict * manifest.manifestlog -> imanifestlog * manifest.memmanifestctx -> imanifestrevisionwritable * manifest.manifestctx -> imanifestrevisionstored * manifest.memtreemanifestctx -> imanifestrevisionwritable * manifest.treemanifestctx -> imanifestrevisionstored * util.dirs -> idirs The interfaces are thoroughly documented. Their documentation is now better than the documentation in manifest.py in many cases. With the exception of util.dirs, classes have been annotated with their interfaces. (I didn't feel like util.dirs needed the proper interface treatment.) Tests have been added demonstrating that all classes and instances conform to their interfaces. This work was much easier than filelogs. That's because Durham did an excellent job formalizing the manifest API a while back. There are still some minor kludges with the interfaces that should probably be addressed. But the primary goal with interface declarations is getting something established. Once we have an interface, we can modify it later easily enough. Differential Revision: https://phab.mercurial-scm.org/D3869

Gregory Szorc - - Load All Authors

File last commit:

r33293:c9cbf4de default


                r38549:c82ea938

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)