upstream/mercurial-mirror Files · tests/test-narrow-rebase.t

wireprotov2: implement commands as a generator of objects...

wireprotov2: implement commands as a generator of objects Previously, wire protocol version 2 inherited version 1's model of having separate types to represent the results of different wire protocol commands. As I implemented more powerful commands in future commits, I found I was using a common pattern of returning a special type to hold a generator. This meant the command function required a closure to do most of the work. That made logic flow more difficult to follow. I also noticed that many commands were effectively a sequence of objects to be CBOR encoded. I think it makes sense to define version 2 commands as generators. This way, commands can simply emit the data structures they wish to send to the client. This eliminates the need for a closure in command functions and removes encoding from the bodies of commands. As part of this commit, the handling of response objects has been moved into the serverreactor class. This puts the reactor in the driver's seat with regards to CBOR encoding and error handling. Having error handling in the function that emits frames is particularly important because exceptions in that function can lead to things getting in a bad state: I'm fairly certain that uncaught exceptions in the frame generator were causing deadlocks. I also introduced a dedicated error type for explicit error reporting in command handlers. This will be used in subsequent commits. There's still a bit of work to be done here, especially around formalizing the error handling "protocol." I've added yet another TODO to track this so we don't forget. Test output changed because we're using generators and no longer know we are at the end of the data until we hit the end of the generator. This means we can't emit the end-of-stream flag until we've exhausted the generator. Hence the introduction of 0-sized end-of-stream frames. Differential Revision: https://phab.mercurial-scm.org/D4472

Augie Fackler - - Load All Authors

File last commit:

r36096:a2a6e724 default


                r39595:07b58266

default

Download file

             test-narrow-rebase.t
        
                    93 lines
            
             | 2.6 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-narrow-rebase.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

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

      create full repo

        $ hg init master

        $ cd master

        $ mkdir inside

        $ echo inside1 > inside/f1

        $ echo inside2 > inside/f2

        $ mkdir outside

        $ echo outside1 > outside/f1

        $ echo outside2 > outside/f2

        $ hg ci -Aqm 'initial'

        $ echo modified > inside/f1

        $ hg ci -qm 'modify inside/f1'

        $ hg update -q 0

        $ echo modified2 > inside/f2

        $ hg ci -qm 'modify inside/f2'

        $ hg update -q 0

        $ echo modified > outside/f1

        $ hg ci -qm 'modify outside/f1'

        $ hg update -q 0

        $ echo modified2 > outside/f1

        $ hg ci -qm 'conflicting outside/f1'

        $ cd ..

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

        requesting all changes

        adding changesets

        adding manifests

        adding file changes

        added 5 changesets with 4 changes to 2 files (+3 heads)

        new changesets *:* (glob)

        updating to branch default

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

        $ cd narrow

        $ cat >> $HGRCPATH <<EOF

        > [extensions]

        > rebase=

        > EOF

        $ hg update -q 0

      Can rebase onto commit where no files outside narrow spec are involved

        $ hg update -q 0

        $ echo modified > inside/f2

        $ hg ci -qm 'modify inside/f2'

        $ hg rebase -d 'desc("modify inside/f1")'

        rebasing 5:c2f36d04e05d "modify inside/f2" (tip)

        saved backup bundle to $TESTTMP/narrow/.hg/strip-backup/*-rebase.hg (glob)

      Can rebase onto conflicting changes inside narrow spec

        $ hg update -q 0

        $ echo conflicting > inside/f1

        $ hg ci -qm 'conflicting inside/f1'

        $ hg rebase -d 'desc("modify inside/f1")' 2>&1 | egrep -v '(warning:|incomplete!)'

        rebasing 6:cdce97fbf653 "conflicting inside/f1" (tip)

        merging inside/f1

        unresolved conflicts (see hg resolve, then hg rebase --continue)

        $ echo modified3 > inside/f1

        $ hg resolve -m 2>&1 | grep -v continue:

        (no more unresolved files)

        $ hg rebase --continue

        rebasing 6:cdce97fbf653 "conflicting inside/f1" (tip)

        saved backup bundle to $TESTTMP/narrow/.hg/strip-backup/*-rebase.hg (glob)

      Can rebase onto non-conflicting changes outside narrow spec

        $ hg update -q 0

        $ echo modified > inside/f2

        $ hg ci -qm 'modify inside/f2'

        $ hg rebase -d 'desc("modify outside/f1")'

        rebasing 7:c2f36d04e05d "modify inside/f2" (tip)

        saved backup bundle to $TESTTMP/narrow/.hg/strip-backup/*-rebase.hg (glob)

      Rebase interrupts on conflicting changes outside narrow spec

        $ hg update -q 'desc("conflicting outside/f1")'

        $ hg phase -f -d .

        no phases changed

        $ hg rebase -d 'desc("modify outside/f1")'

        rebasing 4:707c035aadb6 "conflicting outside/f1"

        abort: conflict in file 'outside/f1' is outside narrow clone

        [255]

	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

				$ mkdir inside
				$ echo inside1 > inside/f1
				$ echo inside2 > inside/f2
				$ mkdir outside
				$ echo outside1 > outside/f1
				$ echo outside2 > outside/f2
				$ hg ci -Aqm 'initial'

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

				$ hg update -q 0
				$ echo modified2 > inside/f2
				$ hg ci -qm 'modify inside/f2'

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

				$ hg update -q 0
				$ echo modified2 > outside/f1
				$ hg ci -qm 'conflicting outside/f1'

				$ cd ..

				$ hg clone --narrow ssh://user@dummy/master narrow --include inside
				requesting all changes
				adding changesets
				adding manifests
				adding file changes
				added 5 changesets with 4 changes to 2 files (+3 heads)
				new changesets : (glob)
				updating to branch default
				2 files updated, 0 files merged, 0 files removed, 0 files unresolved
				$ cd narrow
				$ cat >> $HGRCPATH <<EOF
				> [extensions]
				> rebase=
				> EOF

				$ hg update -q 0

				Can rebase onto commit where no files outside narrow spec are involved

				$ hg update -q 0
				$ echo modified > inside/f2
				$ hg ci -qm 'modify inside/f2'
				$ hg rebase -d 'desc("modify inside/f1")'
				rebasing 5:c2f36d04e05d "modify inside/f2" (tip)
				saved backup bundle to $TESTTMP/narrow/.hg/strip-backup/*-rebase.hg (glob)

				Can rebase onto conflicting changes inside narrow spec

				$ hg update -q 0
				$ echo conflicting > inside/f1
				$ hg ci -qm 'conflicting inside/f1'
				$ hg rebase -d 'desc("modify inside/f1")' 2>&1 \| egrep -v '(warning:\|incomplete!)'
				rebasing 6:cdce97fbf653 "conflicting inside/f1" (tip)
				merging inside/f1
				unresolved conflicts (see hg resolve, then hg rebase --continue)
				$ echo modified3 > inside/f1
				$ hg resolve -m 2>&1 \| grep -v continue:
				(no more unresolved files)
				$ hg rebase --continue
				rebasing 6:cdce97fbf653 "conflicting inside/f1" (tip)
				saved backup bundle to $TESTTMP/narrow/.hg/strip-backup/*-rebase.hg (glob)

				Can rebase onto non-conflicting changes outside narrow spec

				$ hg update -q 0
				$ echo modified > inside/f2
				$ hg ci -qm 'modify inside/f2'
				$ hg rebase -d 'desc("modify outside/f1")'
				rebasing 7:c2f36d04e05d "modify inside/f2" (tip)
				saved backup bundle to $TESTTMP/narrow/.hg/strip-backup/*-rebase.hg (glob)

				Rebase interrupts on conflicting changes outside narrow spec

				$ hg update -q 'desc("conflicting outside/f1")'
				$ hg phase -f -d .
				no phases changed
				$ hg rebase -d 'desc("modify outside/f1")'
				rebasing 4:707c035aadb6 "conflicting outside/f1"
				abort: conflict in file 'outside/f1' is outside narrow clone
				[255]