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

httppeer: implement command executor for version 2 peer...

httppeer: implement command executor for version 2 peer Now that we have a new API for issuing commands which is compatible with wire protocol version 2, we can start using it with wire protocol version 2. This commit replaces our hacky implementation of _call() with something a bit more robust based on the new command executor interface. We now have proper support for issuing multiple commands per HTTP request. Each HTTP request maintains its own client reactor. The implementation is similar to the one in the legacy wire protocol. We use a ThreadPoolExecutor for spinning up a thread to read the HTTP response in the background. This allows responses to resolve in any order. While not implemented on the server yet, a client could use concurrent.futures.as_completed() with a collection of futures and handle responses as they arrive from the server. The return value from issued commands is still a simple list of raw or decoded CBOR data. This is still super hacky. We will want a rich data type for representing command responses. But at least this commit gets us one step closer to a proper peer implementation. Differential Revision: https://phab.mercurial-scm.org/D3297

Gregory Szorc - - Load All Authors

File last commit:

r33293:c9cbf4de default


                r37669:950294e2

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)