upstream/mercurial-mirror Files · tests/test-narrow-update.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:

r37301:d4e62df1 default


                r37669:950294e2

default

Download file

             test-narrow-update.t
        
                    76 lines
            
             | 1.8 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-narrow-update.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

        $ . "$TESTDIR/narrow-library.sh"

      create full repo

        $ hg init master

        $ cd master

        $ echo init > init

        $ hg ci -Aqm 'initial'

        $ mkdir inside

        $ echo inside > inside/f1

        $ mkdir outside

        $ echo outside > outside/f1

        $ hg ci -Aqm 'add inside and outside'

        $ echo modified > inside/f1

        $ hg ci -qm 'modify inside'

        $ echo modified > outside/f1

        $ hg ci -qm 'modify outside'

        $ cd ..

        $ hg clone --narrow ssh://user@dummy/master narrow --include inside

        requesting all changes

        adding changesets

        adding manifests

        adding file changes

        added 4 changesets with 2 changes to 1 files

        new changesets *:* (glob)

        updating to branch default

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

        $ cd narrow

        $ hg debugindex -c

           rev linkrev nodeid       p1           p2

             0       0 9958b1af2add 000000000000 000000000000

             1       1 2db4ce2a3bfe 9958b1af2add 000000000000

             2       2 0980ee31a742 2db4ce2a3bfe 000000000000

             3       3 4410145019b7 0980ee31a742 000000000000

        $ hg update -q 0

      Can update to revision with changes inside

        $ hg update -q 'desc("add inside and outside")'

        $ hg update -q 'desc("modify inside")'

        $ find *

        inside

        inside/f1

        $ cat inside/f1

        modified

      Can update to revision with changes outside

        $ hg update -q 'desc("modify outside")'

        $ find *

        inside

        inside/f1

        $ cat inside/f1

        modified

      Can update with a deleted file inside

        $ hg rm inside/f1

        $ hg update -q 'desc("modify inside")'

        $ hg update -q 'desc("modify outside")'

        $ hg update -q 'desc("initial")'

        $ hg update -q 'desc("modify inside")'

      Can update with a moved file inside

        $ hg mv inside/f1 inside/f2

        $ hg update -q 'desc("modify outside")'

        $ hg update -q 'desc("initial")'

        $ hg update -q 'desc("modify inside")'

	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


				$ . "$TESTDIR/narrow-library.sh"

				create full repo

				$ hg init master
				$ cd master
				$ echo init > init
				$ hg ci -Aqm 'initial'

				$ mkdir inside
				$ echo inside > inside/f1
				$ mkdir outside
				$ echo outside > outside/f1
				$ hg ci -Aqm 'add inside and outside'

				$ echo modified > inside/f1
				$ hg ci -qm 'modify inside'

				$ echo modified > outside/f1
				$ hg ci -qm 'modify outside'

				$ cd ..

				$ hg clone --narrow ssh://user@dummy/master narrow --include inside
				requesting all changes
				adding changesets
				adding manifests
				adding file changes
				added 4 changesets with 2 changes to 1 files
				new changesets : (glob)
				updating to branch default
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved
				$ cd narrow
				$ hg debugindex -c
				rev linkrev nodeid p1 p2
				0 0 9958b1af2add 000000000000 000000000000
				1 1 2db4ce2a3bfe 9958b1af2add 000000000000
				2 2 0980ee31a742 2db4ce2a3bfe 000000000000
				3 3 4410145019b7 0980ee31a742 000000000000

				$ hg update -q 0

				Can update to revision with changes inside

				$ hg update -q 'desc("add inside and outside")'
				$ hg update -q 'desc("modify inside")'
				$ find *
				inside
				inside/f1
				$ cat inside/f1
				modified

				Can update to revision with changes outside

				$ hg update -q 'desc("modify outside")'
				$ find *
				inside
				inside/f1
				$ cat inside/f1
				modified

				Can update with a deleted file inside

				$ hg rm inside/f1
				$ hg update -q 'desc("modify inside")'
				$ hg update -q 'desc("modify outside")'
				$ hg update -q 'desc("initial")'
				$ hg update -q 'desc("modify inside")'

				Can update with a moved file inside

				$ hg mv inside/f1 inside/f2
				$ hg update -q 'desc("modify outside")'
				$ hg update -q 'desc("initial")'
				$ hg update -q 'desc("modify inside")'