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

Pulkit Goyal - - Load All Authors

File last commit:

r37401:cb70be32 default


                r39595:07b58266

default

Download file

             test-journal-share.t
        
                    154 lines
            
             | 4.5 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-journal-share.t
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Martijn Pieters
    
journal: add share extension support...

              r29503
            
      Journal extension test: tests the share extension support

        $ cat >> testmocks.py << EOF

        Yuya Nishihara
    
procutil: bulk-replace function calls to point to new module

              r37138
            
        > # mock out procutil.getuser() and util.makedate() to supply testable values

        Martijn Pieters
    
journal: add share extension support...

              r29503
            
        > import os

        > from mercurial import util

        Yuya Nishihara
    
procutil: bulk-replace function calls to point to new module

              r37138
            
        > from mercurial.utils import procutil

        Martijn Pieters
    
journal: add share extension support...

              r29503
            
        > def mockgetuser():

        Pulkit Goyal
    
py3: convert user value to bytes by b'' prefix...

              r37401
            
        >     return b'foobar'

        Martijn Pieters
    
journal: add share extension support...

              r29503
            
        > 

        > def mockmakedate():

        >     filename = os.path.join(os.environ['TESTTMP'], 'testtime')

        >     try:

        >         with open(filename, 'rb') as timef:

        >             time = float(timef.read()) + 1

        >     except IOError:

        >         time = 0.0

        >     with open(filename, 'wb') as timef:

        >         timef.write(str(time))

        >     return (time, 0)

        > 

        Yuya Nishihara
    
procutil: bulk-replace function calls to point to new module

              r37138
            
        > procutil.getuser = mockgetuser

        Martijn Pieters
    
journal: add share extension support...

              r29503
            
        > util.makedate = mockmakedate

        > EOF

        $ cat >> $HGRCPATH << EOF

        > [extensions]

        > journal=

        > share=

        > testmocks=`pwd`/testmocks.py

        > [remotenames]

        > rename.default=remote

        > EOF

        $ hg init repo

        $ cd repo

        $ hg bookmark bm

        $ touch file0

        FUJIWARA Katsunori
    
tests: avoid quoting of commit messages for test portability...

              r30238
            
        $ hg commit -Am file0-added

        Martijn Pieters
    
journal: add share extension support...

              r29503
            
        adding file0

        $ hg journal --all

        previous locations of the working copy and bookmarks:

        FUJIWARA Katsunori
    
tests: avoid quoting of commit messages for test portability...

              r30238
            
        0fd3805711f9  .         commit -Am file0-added

        0fd3805711f9  bm        commit -Am file0-added

        Martijn Pieters
    
journal: add share extension support...

              r29503
            
      A shared working copy initially receives the same bookmarks and working copy

        $ cd ..

        $ hg share repo shared1

        updating working directory

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

        $ cd shared1

        $ hg journal --all

        previous locations of the working copy and bookmarks:

        FUJIWARA Katsunori
    
tests: avoid quoting of commit messages for test portability...

              r30238
            
        0fd3805711f9  .         share repo shared1

        Martijn Pieters
    
journal: add share extension support...

              r29503
            
      unless you explicitly share bookmarks

        $ cd ..

        $ hg share --bookmarks repo shared2

        updating working directory

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

        $ cd shared2

        $ hg journal --all

        previous locations of the working copy and bookmarks:

        FUJIWARA Katsunori
    
tests: avoid quoting of commit messages for test portability...

              r30238
            
        0fd3805711f9  .         share --bookmarks repo shared2

        0fd3805711f9  bm        commit -Am file0-added

        Martijn Pieters
    
journal: add share extension support...

              r29503
            
      Moving the bookmark in the original repository is only shown in the repository

      that shares bookmarks

        $ cd ../repo

        $ touch file1

        FUJIWARA Katsunori
    
tests: avoid quoting of commit messages for test portability...

              r30238
            
        $ hg commit -Am file1-added

        Martijn Pieters
    
journal: add share extension support...

              r29503
            
        adding file1

        $ cd ../shared1

        $ hg journal --all

        previous locations of the working copy and bookmarks:

        FUJIWARA Katsunori
    
tests: avoid quoting of commit messages for test portability...

              r30238
            
        0fd3805711f9  .         share repo shared1

        Martijn Pieters
    
journal: add share extension support...

              r29503
            
        $ cd ../shared2

        $ hg journal --all

        previous locations of the working copy and bookmarks:

        FUJIWARA Katsunori
    
tests: avoid quoting of commit messages for test portability...

              r30238
            
        4f354088b094  bm        commit -Am file1-added

        0fd3805711f9  .         share --bookmarks repo shared2

        0fd3805711f9  bm        commit -Am file0-added

        Martijn Pieters
    
journal: add share extension support...

              r29503
            
      But working copy changes are always 'local'

        $ cd ../repo

        $ hg up 0

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

        (leaving bookmark bm)

        $ hg journal --all

        previous locations of the working copy and bookmarks:

        FUJIWARA Katsunori
    
tests: avoid quoting of commit messages for test portability...

              r30238
            
        0fd3805711f9  .         up 0

        4f354088b094  .         commit -Am file1-added

        4f354088b094  bm        commit -Am file1-added

        0fd3805711f9  .         commit -Am file0-added

        0fd3805711f9  bm        commit -Am file0-added

        Martijn Pieters
    
journal: add share extension support...

              r29503
            
        $ cd ../shared2

        $ hg journal --all

        previous locations of the working copy and bookmarks:

        FUJIWARA Katsunori
    
tests: avoid quoting of commit messages for test portability...

              r30238
            
        4f354088b094  bm        commit -Am file1-added

        0fd3805711f9  .         share --bookmarks repo shared2

        0fd3805711f9  bm        commit -Am file0-added

        Martijn Pieters
    
journal: add share extension support...

              r29503
            
        $ hg up tip

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

        $ hg up 0

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

        $ hg journal

        previous locations of '.':

        FUJIWARA Katsunori
    
tests: avoid quoting of commit messages for test portability...

              r30238
            
        0fd3805711f9  up 0

        4f354088b094  up tip

        0fd3805711f9  share --bookmarks repo shared2

        Martijn Pieters
    
journal: add share extension support...

              r29503
            
      Unsharing works as expected; the journal remains consistent

        $ cd ../shared1

        $ hg unshare

        $ hg journal --all

        previous locations of the working copy and bookmarks:

        FUJIWARA Katsunori
    
tests: avoid quoting of commit messages for test portability...

              r30238
            
        0fd3805711f9  .         share repo shared1

        Martijn Pieters
    
journal: add share extension support...

              r29503
            
        $ cd ../shared2

        $ hg unshare

        $ hg journal --all

        previous locations of the working copy and bookmarks:

        FUJIWARA Katsunori
    
tests: avoid quoting of commit messages for test portability...

              r30238
            
        0fd3805711f9  .         up 0

        4f354088b094  .         up tip

        4f354088b094  bm        commit -Am file1-added

        0fd3805711f9  .         share --bookmarks repo shared2

        0fd3805711f9  bm        commit -Am file0-added

        Martijn Pieters
    
journal: add share extension support...

              r29503
            
      New journal entries in the source repo no longer show up in the other working copies

        $ cd ../repo

        $ hg bookmark newbm -r tip

        $ hg journal newbm

        previous locations of 'newbm':

        FUJIWARA Katsunori
    
tests: avoid quoting of commit messages for test portability...

              r30238
            
        4f354088b094  bookmark newbm -r tip

        Martijn Pieters
    
journal: add share extension support...

              r29503
            
        $ cd ../shared2

        $ hg journal newbm

        previous locations of 'newbm':

        no recorded locations

      This applies for both directions

        $ hg bookmark shared2bm -r tip

        $ hg journal shared2bm

        previous locations of 'shared2bm':

        FUJIWARA Katsunori
    
tests: avoid quoting of commit messages for test portability...

              r30238
            
        4f354088b094  bookmark shared2bm -r tip

        Martijn Pieters
    
journal: add share extension support...

              r29503
            
        $ cd ../repo

        $ hg journal shared2bm

        previous locations of 'shared2bm':

        no recorded locations

	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

Martijn Pieters journal: add share extension support...	r29503	Journal extension test: tests the share extension support

		$ cat >> testmocks.py << EOF
Yuya Nishihara procutil: bulk-replace function calls to point to new module	r37138	> # mock out procutil.getuser() and util.makedate() to supply testable values
Martijn Pieters journal: add share extension support...	r29503	> import os
		> from mercurial import util
Yuya Nishihara procutil: bulk-replace function calls to point to new module	r37138	> from mercurial.utils import procutil
Martijn Pieters journal: add share extension support...	r29503	> def mockgetuser():
Pulkit Goyal py3: convert user value to bytes by b'' prefix...	r37401	> return b'foobar'
Martijn Pieters journal: add share extension support...	r29503	>
		> def mockmakedate():
		> filename = os.path.join(os.environ['TESTTMP'], 'testtime')
		> try:
		> with open(filename, 'rb') as timef:
		> time = float(timef.read()) + 1
		> except IOError:
		> time = 0.0
		> with open(filename, 'wb') as timef:
		> timef.write(str(time))
		> return (time, 0)
		>
Yuya Nishihara procutil: bulk-replace function calls to point to new module	r37138	> procutil.getuser = mockgetuser
Martijn Pieters journal: add share extension support...	r29503	> util.makedate = mockmakedate
		> EOF

		$ cat >> $HGRCPATH << EOF
		> [extensions]
		> journal=
		> share=
		> testmocks=`pwd`/testmocks.py
		> [remotenames]
		> rename.default=remote
		> EOF

		$ hg init repo
		$ cd repo
		$ hg bookmark bm
		$ touch file0
FUJIWARA Katsunori tests: avoid quoting of commit messages for test portability...	r30238	$ hg commit -Am file0-added
Martijn Pieters journal: add share extension support...	r29503	adding file0
		$ hg journal --all
		previous locations of the working copy and bookmarks:
FUJIWARA Katsunori tests: avoid quoting of commit messages for test portability...	r30238	0fd3805711f9 . commit -Am file0-added
		0fd3805711f9 bm commit -Am file0-added
Martijn Pieters journal: add share extension support...	r29503
		A shared working copy initially receives the same bookmarks and working copy

		$ cd ..
		$ hg share repo shared1
		updating working directory
		1 files updated, 0 files merged, 0 files removed, 0 files unresolved
		$ cd shared1
		$ hg journal --all
		previous locations of the working copy and bookmarks:
FUJIWARA Katsunori tests: avoid quoting of commit messages for test portability...	r30238	0fd3805711f9 . share repo shared1
Martijn Pieters journal: add share extension support...	r29503
		unless you explicitly share bookmarks

		$ cd ..
		$ hg share --bookmarks repo shared2
		updating working directory
		1 files updated, 0 files merged, 0 files removed, 0 files unresolved
		$ cd shared2
		$ hg journal --all
		previous locations of the working copy and bookmarks:
FUJIWARA Katsunori tests: avoid quoting of commit messages for test portability...	r30238	0fd3805711f9 . share --bookmarks repo shared2
		0fd3805711f9 bm commit -Am file0-added
Martijn Pieters journal: add share extension support...	r29503
		Moving the bookmark in the original repository is only shown in the repository
		that shares bookmarks

		$ cd ../repo
		$ touch file1
FUJIWARA Katsunori tests: avoid quoting of commit messages for test portability...	r30238	$ hg commit -Am file1-added
Martijn Pieters journal: add share extension support...	r29503	adding file1
		$ cd ../shared1
		$ hg journal --all
		previous locations of the working copy and bookmarks:
FUJIWARA Katsunori tests: avoid quoting of commit messages for test portability...	r30238	0fd3805711f9 . share repo shared1
Martijn Pieters journal: add share extension support...	r29503	$ cd ../shared2
		$ hg journal --all
		previous locations of the working copy and bookmarks:
FUJIWARA Katsunori tests: avoid quoting of commit messages for test portability...	r30238	4f354088b094 bm commit -Am file1-added
		0fd3805711f9 . share --bookmarks repo shared2
		0fd3805711f9 bm commit -Am file0-added
Martijn Pieters journal: add share extension support...	r29503
		But working copy changes are always 'local'

		$ cd ../repo
		$ hg up 0
		0 files updated, 0 files merged, 1 files removed, 0 files unresolved
		(leaving bookmark bm)
		$ hg journal --all
		previous locations of the working copy and bookmarks:
FUJIWARA Katsunori tests: avoid quoting of commit messages for test portability...	r30238	0fd3805711f9 . up 0
		4f354088b094 . commit -Am file1-added
		4f354088b094 bm commit -Am file1-added
		0fd3805711f9 . commit -Am file0-added
		0fd3805711f9 bm commit -Am file0-added
Martijn Pieters journal: add share extension support...	r29503	$ cd ../shared2
		$ hg journal --all
		previous locations of the working copy and bookmarks:
FUJIWARA Katsunori tests: avoid quoting of commit messages for test portability...	r30238	4f354088b094 bm commit -Am file1-added
		0fd3805711f9 . share --bookmarks repo shared2
		0fd3805711f9 bm commit -Am file0-added
Martijn Pieters journal: add share extension support...	r29503	$ hg up tip
		1 files updated, 0 files merged, 0 files removed, 0 files unresolved
		$ hg up 0
		0 files updated, 0 files merged, 1 files removed, 0 files unresolved
		$ hg journal
		previous locations of '.':
FUJIWARA Katsunori tests: avoid quoting of commit messages for test portability...	r30238	0fd3805711f9 up 0
		4f354088b094 up tip
		0fd3805711f9 share --bookmarks repo shared2
Martijn Pieters journal: add share extension support...	r29503
		Unsharing works as expected; the journal remains consistent

		$ cd ../shared1
		$ hg unshare
		$ hg journal --all
		previous locations of the working copy and bookmarks:
FUJIWARA Katsunori tests: avoid quoting of commit messages for test portability...	r30238	0fd3805711f9 . share repo shared1
Martijn Pieters journal: add share extension support...	r29503	$ cd ../shared2
		$ hg unshare
		$ hg journal --all
		previous locations of the working copy and bookmarks:
FUJIWARA Katsunori tests: avoid quoting of commit messages for test portability...	r30238	0fd3805711f9 . up 0
		4f354088b094 . up tip
		4f354088b094 bm commit -Am file1-added
		0fd3805711f9 . share --bookmarks repo shared2
		0fd3805711f9 bm commit -Am file0-added
Martijn Pieters journal: add share extension support...	r29503
		New journal entries in the source repo no longer show up in the other working copies

		$ cd ../repo
		$ hg bookmark newbm -r tip
		$ hg journal newbm
		previous locations of 'newbm':
FUJIWARA Katsunori tests: avoid quoting of commit messages for test portability...	r30238	4f354088b094 bookmark newbm -r tip
Martijn Pieters journal: add share extension support...	r29503	$ cd ../shared2
		$ hg journal newbm
		previous locations of 'newbm':
		no recorded locations

		This applies for both directions

		$ hg bookmark shared2bm -r tip
		$ hg journal shared2bm
		previous locations of 'shared2bm':
FUJIWARA Katsunori tests: avoid quoting of commit messages for test portability...	r30238	4f354088b094 bookmark shared2bm -r tip
Martijn Pieters journal: add share extension support...	r29503	$ cd ../repo
		$ hg journal shared2bm
		previous locations of 'shared2bm':
		no recorded locations