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

Pierre-Yves David - - Load All Authors

File last commit:

r32267:c2380b44 default


                r37669:950294e2

default

Download file

             test-issue1175.t
        
                    97 lines
            
             | 2.1 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-issue1175.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      https://bz.mercurial-scm.org/1175

        $ hg init

        $ touch a

        $ hg ci -Am0

        adding a

        $ hg mv a a1

        $ hg ci -m1

        $ hg co 0

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

        $ hg mv a a2

        $ hg up

        note: possible conflict - a was renamed multiple times to:

         a2

         a1

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

        $ hg ci -m2

        $ touch a

        $ hg ci -Am3

        adding a

        $ hg mv a b

        $ hg ci -Am4 a

        $ hg ci --debug --traceback -Am5 b

        committing files:

        b

        warning: can't find ancestor for 'b' copied from 'a'!

        committing manifest

        committing changelog

        updating the branch cache

        committed changeset 5:83a687e8a97c80992ba385bbfd766be181bfb1d1

        $ hg verify

        checking changesets

        checking manifests

        crosschecking files in changesets and manifests

        checking files

        4 files, 6 changesets, 4 total revisions

        $ hg export --git tip

        # HG changeset patch

        # User test

        # Date 0 0

        #      Thu Jan 01 00:00:00 1970 +0000

        # Node ID 83a687e8a97c80992ba385bbfd766be181bfb1d1

        # Parent  1d1625283f71954f21d14c3d44d0ad3c019c597f

        5

        diff --git a/b b/b

        new file mode 100644

      https://bz.mercurial-scm.org/show_bug.cgi?id=4476

        $ hg init foo

        $ cd foo

        $ touch a && hg ci -Aqm a

        $ hg mv a b

        $ echo b1 >> b

        $ hg ci -Aqm b1

        $ hg up 0

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

        $ hg mv a b

        $ echo b2 >> b

        $ hg ci -Aqm b2

        $ hg graft 1

        grafting 1:5974126fad84 "b1"

        merging b

        warning: conflicts while merging b! (edit, then use 'hg resolve --mark')

        abort: unresolved conflicts, can't continue

        (use 'hg resolve' and 'hg graft --continue')

        [255]

        $ echo a > b

        $ echo b3 >> b

        $ hg resolve --mark b

        (no more unresolved files)

        continue: hg graft --continue

        $ hg graft --continue

        grafting 1:5974126fad84 "b1"

        warning: can't find ancestor for 'b' copied from 'a'!

        $ hg log -f b -T 'changeset:   {rev}:{node|short}\nsummary:     {desc}\n\n'

        changeset:   3:376d30ccffc0

        summary:     b1

        changeset:   2:416baaa2e5e4

        summary:     b2

        changeset:   0:3903775176ed

        summary:     a

	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

				https://bz.mercurial-scm.org/1175

				$ hg init
				$ touch a
				$ hg ci -Am0
				adding a

				$ hg mv a a1
				$ hg ci -m1

				$ hg co 0
				1 files updated, 0 files merged, 1 files removed, 0 files unresolved

				$ hg mv a a2
				$ hg up
				note: possible conflict - a was renamed multiple times to:
				a2
				a1
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved

				$ hg ci -m2

				$ touch a
				$ hg ci -Am3
				adding a

				$ hg mv a b
				$ hg ci -Am4 a

				$ hg ci --debug --traceback -Am5 b
				committing files:
				b
				warning: can't find ancestor for 'b' copied from 'a'!
				committing manifest
				committing changelog
				updating the branch cache
				committed changeset 5:83a687e8a97c80992ba385bbfd766be181bfb1d1

				$ hg verify
				checking changesets
				checking manifests
				crosschecking files in changesets and manifests
				checking files
				4 files, 6 changesets, 4 total revisions

				$ hg export --git tip
				# HG changeset patch
				# User test
				# Date 0 0
				# Thu Jan 01 00:00:00 1970 +0000
				# Node ID 83a687e8a97c80992ba385bbfd766be181bfb1d1
				# Parent 1d1625283f71954f21d14c3d44d0ad3c019c597f
				5

				diff --git a/b b/b
				new file mode 100644

				https://bz.mercurial-scm.org/show_bug.cgi?id=4476

				$ hg init foo
				$ cd foo
				$ touch a && hg ci -Aqm a
				$ hg mv a b
				$ echo b1 >> b
				$ hg ci -Aqm b1
				$ hg up 0
				1 files updated, 0 files merged, 1 files removed, 0 files unresolved
				$ hg mv a b
				$ echo b2 >> b
				$ hg ci -Aqm b2
				$ hg graft 1
				grafting 1:5974126fad84 "b1"
				merging b
				warning: conflicts while merging b! (edit, then use 'hg resolve --mark')
				abort: unresolved conflicts, can't continue
				(use 'hg resolve' and 'hg graft --continue')
				[255]
				$ echo a > b
				$ echo b3 >> b
				$ hg resolve --mark b
				(no more unresolved files)
				continue: hg graft --continue
				$ hg graft --continue
				grafting 1:5974126fad84 "b1"
				warning: can't find ancestor for 'b' copied from 'a'!
				$ hg log -f b -T 'changeset: {rev}:{node\|short}\nsummary: {desc}\n\n'
				changeset: 3:376d30ccffc0
				summary: b1

				changeset: 2:416baaa2e5e4
				summary: b2

				changeset: 0:3903775176ed
				summary: a