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

Gregory Szorc - - Load All Authors

File last commit:

r37301:d4e62df1 default


                r39595:07b58266

default

Download file

             test-rename-merge1.t
        
                    188 lines
            
             | 4.3 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-rename-merge1.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

        $ hg init

        $ echo "[merge]" >> .hg/hgrc

        $ echo "followcopies = 1" >> .hg/hgrc

        $ echo foo > a

        $ echo foo > a2

        $ hg add a a2

        $ hg ci -m "start"

        $ hg mv a b

        $ hg mv a2 b2

        $ hg ci -m "rename"

        $ hg co 0

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

        $ echo blahblah > a

        $ echo blahblah > a2

        $ hg mv a2 c2

        $ hg ci -m "modify"

        created new head

        $ hg merge -y --debug

          searching for copies back to rev 1

          unmatched files in local:

           c2

          unmatched files in other:

           b

           b2

          all copies found (* = to merge, ! = divergent, % = renamed and deleted):

           src: 'a' -> dst: 'b' *

           src: 'a2' -> dst: 'b2' !

           src: 'a2' -> dst: 'c2' !

          checking for directory renames

        resolving manifests

         branchmerge: True, force: False, partial: False

         ancestor: af1939970a1c, local: 044f8520aeeb+, remote: 85c198ef2f6c

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

         c2

         b2

         preserving a for resolve of b

        removing a

         b2: remote created -> g

        getting b2

         b: remote moved from a -> m (premerge)

        picked tool ':merge' for b (binary False symlink False changedelete False)

        merging a and b to b

        my b@044f8520aeeb+ other b@85c198ef2f6c ancestor a@af1939970a1c

         premerge successful

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

        (branch merge, don't forget to commit)

        $ hg status -AC

        M b

          a

        M b2

        R a

        C c2

        $ cat b

        blahblah

        $ hg ci -m "merge"

        $ hg debugindex b

           rev linkrev nodeid       p1           p2

             0       1 57eacc201a7f 000000000000 000000000000

             1       3 4727ba907962 000000000000 57eacc201a7f

        $ hg debugrename b

        b renamed from a:dd03b83622e78778b403775d0d074b9ac7387a66

      This used to trigger a "divergent renames" warning, despite no renames

        $ hg cp b b3

        $ hg cp b b4

        $ hg ci -A -m 'copy b twice'

        $ hg up eb92d88a9712

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

        $ hg up

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

        $ hg rm b3 b4

        $ hg ci -m 'clean up a bit of our mess'

      We'd rather not warn on divergent renames done in the same changeset (issue2113)

        $ hg cp b b3

        $ hg mv b b4

        $ hg ci -A -m 'divergent renames in same changeset'

        $ hg up c761c6948de0

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

        $ hg up

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

      Check for issue2642

        $ hg init t

        $ cd t

        $ echo c0 > f1

        $ hg ci -Aqm0

        $ hg up null -q

        $ echo c1 > f1 # backport

        $ hg ci -Aqm1

        $ hg mv f1 f2

        $ hg ci -qm2

        $ hg up 0 -q

        $ hg merge 1 -q --tool internal:local

        $ hg ci -qm3

        $ hg merge 2

        merging f1 and f2 to f2

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

        (branch merge, don't forget to commit)

        $ cat f2

        c0

        $ cd ..

      Check for issue2089

        $ hg init repo2089

        $ cd repo2089

        $ echo c0 > f1

        $ hg ci -Aqm0

        $ hg up null -q

        $ echo c1 > f1

        $ hg ci -Aqm1

        $ hg up 0 -q

        $ hg merge 1 -q --tool internal:local

        $ echo c2 > f1

        $ hg ci -qm2

        $ hg up 1 -q

        $ hg mv f1 f2

        $ hg ci -Aqm3

        $ hg up 2 -q

        $ hg merge 3

        merging f1 and f2 to f2

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

        (branch merge, don't forget to commit)

        $ cat f2

        c2

        $ cd ..

      Check for issue3074

        $ hg init repo3074

        $ cd repo3074

        $ echo foo > file

        $ hg add file

        $ hg commit -m "added file"

        $ hg mv file newfile

        $ hg commit -m "renamed file"

        $ hg update 0

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

        $ hg rm file

        $ hg commit -m "deleted file"

        created new head

        $ hg merge --debug

          searching for copies back to rev 1

          unmatched files in other:

           newfile

          all copies found (* = to merge, ! = divergent, % = renamed and deleted):

           src: 'file' -> dst: 'newfile' %

          checking for directory renames

        resolving manifests

         branchmerge: True, force: False, partial: False

         ancestor: 19d7f95df299, local: 0084274f6b67+, remote: 5d32493049f0

        note: possible conflict - file was deleted and renamed to:

         newfile

         newfile: remote created -> g

        getting newfile

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

        (branch merge, don't forget to commit)

        $ hg status

        M newfile

        $ cd ..

	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

				$ hg init

				$ echo "[merge]" >> .hg/hgrc
				$ echo "followcopies = 1" >> .hg/hgrc

				$ echo foo > a
				$ echo foo > a2
				$ hg add a a2
				$ hg ci -m "start"

				$ hg mv a b
				$ hg mv a2 b2
				$ hg ci -m "rename"

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

				$ echo blahblah > a
				$ echo blahblah > a2
				$ hg mv a2 c2
				$ hg ci -m "modify"
				created new head

				$ hg merge -y --debug
				searching for copies back to rev 1
				unmatched files in local:
				c2
				unmatched files in other:
				b
				b2
				all copies found (* = to merge, ! = divergent, % = renamed and deleted):
				src: 'a' -> dst: 'b' *
				src: 'a2' -> dst: 'b2' !
				src: 'a2' -> dst: 'c2' !
				checking for directory renames
				resolving manifests
				branchmerge: True, force: False, partial: False
				ancestor: af1939970a1c, local: 044f8520aeeb+, remote: 85c198ef2f6c
				note: possible conflict - a2 was renamed multiple times to:
				c2
				b2
				preserving a for resolve of b
				removing a
				b2: remote created -> g
				getting b2
				b: remote moved from a -> m (premerge)
				picked tool ':merge' for b (binary False symlink False changedelete False)
				merging a and b to b
				my b@044f8520aeeb+ other b@85c198ef2f6c ancestor a@af1939970a1c
				premerge successful
				1 files updated, 1 files merged, 0 files removed, 0 files unresolved
				(branch merge, don't forget to commit)

				$ hg status -AC
				M b
				a
				M b2
				R a
				C c2

				$ cat b
				blahblah

				$ hg ci -m "merge"

				$ hg debugindex b
				rev linkrev nodeid p1 p2
				0 1 57eacc201a7f 000000000000 000000000000
				1 3 4727ba907962 000000000000 57eacc201a7f

				$ hg debugrename b
				b renamed from a:dd03b83622e78778b403775d0d074b9ac7387a66

				This used to trigger a "divergent renames" warning, despite no renames

				$ hg cp b b3
				$ hg cp b b4
				$ hg ci -A -m 'copy b twice'
				$ hg up eb92d88a9712
				0 files updated, 0 files merged, 2 files removed, 0 files unresolved
				$ hg up
				2 files updated, 0 files merged, 0 files removed, 0 files unresolved
				$ hg rm b3 b4
				$ hg ci -m 'clean up a bit of our mess'

				We'd rather not warn on divergent renames done in the same changeset (issue2113)

				$ hg cp b b3
				$ hg mv b b4
				$ hg ci -A -m 'divergent renames in same changeset'
				$ hg up c761c6948de0
				1 files updated, 0 files merged, 2 files removed, 0 files unresolved
				$ hg up
				2 files updated, 0 files merged, 1 files removed, 0 files unresolved

				Check for issue2642

				$ hg init t
				$ cd t

				$ echo c0 > f1
				$ hg ci -Aqm0

				$ hg up null -q
				$ echo c1 > f1 # backport
				$ hg ci -Aqm1
				$ hg mv f1 f2
				$ hg ci -qm2

				$ hg up 0 -q
				$ hg merge 1 -q --tool internal:local
				$ hg ci -qm3

				$ hg merge 2
				merging f1 and f2 to f2
				0 files updated, 1 files merged, 0 files removed, 0 files unresolved
				(branch merge, don't forget to commit)

				$ cat f2
				c0

				$ cd ..

				Check for issue2089

				$ hg init repo2089
				$ cd repo2089

				$ echo c0 > f1
				$ hg ci -Aqm0

				$ hg up null -q
				$ echo c1 > f1
				$ hg ci -Aqm1

				$ hg up 0 -q
				$ hg merge 1 -q --tool internal:local
				$ echo c2 > f1
				$ hg ci -qm2

				$ hg up 1 -q
				$ hg mv f1 f2
				$ hg ci -Aqm3

				$ hg up 2 -q
				$ hg merge 3
				merging f1 and f2 to f2
				0 files updated, 1 files merged, 0 files removed, 0 files unresolved
				(branch merge, don't forget to commit)

				$ cat f2
				c2

				$ cd ..

				Check for issue3074

				$ hg init repo3074
				$ cd repo3074
				$ echo foo > file
				$ hg add file
				$ hg commit -m "added file"
				$ hg mv file newfile
				$ hg commit -m "renamed file"
				$ hg update 0
				1 files updated, 0 files merged, 1 files removed, 0 files unresolved
				$ hg rm file
				$ hg commit -m "deleted file"
				created new head
				$ hg merge --debug
				searching for copies back to rev 1
				unmatched files in other:
				newfile
				all copies found (* = to merge, ! = divergent, % = renamed and deleted):
				src: 'file' -> dst: 'newfile' %
				checking for directory renames
				resolving manifests
				branchmerge: True, force: False, partial: False
				ancestor: 19d7f95df299, local: 0084274f6b67+, remote: 5d32493049f0
				note: possible conflict - file was deleted and renamed to:
				newfile
				newfile: remote created -> g
				getting newfile
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved
				(branch merge, don't forget to commit)
				$ hg status
				M newfile
				$ cd ..