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

wireprotov2: define and implement "manifestdata" command...

wireprotov2: define and implement "manifestdata" command The added command can be used for obtaining manifest data. Given a manifest path and set of manifest nodes, data about manifests can be retrieved. Unlike changeset data, we wish to emit deltas to describe manifest revisions. So the command uses the relatively new API for building delta requests and emitting them. The code calls into deltaparent(), which I'm not very keen of. There's still work to be done in delta generation land so implementation details of storage (e.g. exactly one delta is stored/available) don't creep into higher levels. But we can worry about this later (there is already a TODO on imanifestorage tracking this). On the subject of parent deltas, the server assumes parent revisions exist on the receiving end. This is obviously wrong for shallow clone. I've added TODOs to add a mechanism to the command to allow clients to specify desired behavior. This shouldn't be too difficult to implement. Another big change is that the client must explicitly request manifest nodes to retrieve. This is a major departure from "getbundle," where the server derives relevant manifests as it iterates changesets and sends them automatically. As implemented, the client must transmit each requested node to the server. At 20 bytes per node, we're looking at 2 MB per 100,000 nodes. Plus wire encoding overhead. This isn't ideal for clients with limited upload bandwidth. I plan to address this in the future by allowing alternate mechanisms for defining the revisions to retrieve. One idea is to define a range of changeset revisions whose manifest revisions to retrieve (similar to how "changesetdata" works). We almost certainly want an API to look up an individual manifest by node. And that's where I've chosen to start with the implementation. Again, a theme of this early exchangev2 work is I want to start by building primitives for accessing raw repository data first and see how far we can get with those before we need more complexity. Differential Revision: https://phab.mercurial-scm.org/D4488

Yuya Nishihara - - Load All Authors

File last commit:

r38282:dbf31732 default


                r39673:c7a7c7e8

default

Download file

             test-narrow-commit.t
        
                    107 lines
            
             | 2.8 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-narrow-commit.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      #testcases flat tree

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

      #if tree

        $ cat << EOF >> $HGRCPATH

        > [experimental]

        > treemanifest = 1

        > EOF

      #endif

      create full repo

        $ hg init master

        $ cd master

        $ mkdir inside

        $ echo inside > inside/f1

        $ mkdir outside

        $ echo outside > outside/f1

        $ hg ci -Aqm 'initial'

        $ echo modified > inside/f1

        $ hg ci -qm 'modify inside'

        $ echo modified > outside/f1

        $ hg ci -qm 'modify outside'

        $ cd ..

      (The lfs extension does nothing here, but this test ensures that its hook that

      determines whether to add the lfs requirement, respects the narrow boundaries.)

        $ hg --config extensions.lfs= clone --narrow ssh://user@dummy/master narrow \

        >    --include inside

        requesting all changes

        adding changesets

        adding manifests

        adding file changes

        added 3 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 update -q 0

      Can not modify dirstate outside

        $ mkdir outside

        $ touch outside/f1

        $ hg debugwalk -v -I 'relglob:f1'

        * matcher:

        <includematcher includes='(?:(?:|.*/)f1(?:/|$))'>

        f  inside/f1  inside/f1

        $ hg add outside/f1

        abort: cannot track 'outside/f1' - it is outside the narrow clone

        [255]

        $ touch outside/f3

        $ hg add outside/f3

        abort: cannot track 'outside/f3' - it is outside the narrow clone

        [255]

      But adding a truly excluded file shouldn't count

        $ hg add outside/f3 -X outside/f3

        $ rm -r outside

      Can modify dirstate inside

        $ echo modified > inside/f1

        $ touch inside/f3

        $ hg add inside/f3

        $ hg status

        M inside/f1

        A inside/f3

        $ hg revert -qC .

        $ rm inside/f3

      Can commit changes inside. Leaves outside unchanged.

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

        $ echo modified2 > inside/f1

        $ hg manifest --debug

        4d6a634d5ba06331a60c29ee0db8412490a54fcd 644   inside/f1

        7fb3bb6356d28d4dc352c5ba52d7350a81b6bd46 644   outside/f1 (flat !)

        d0f2f706468ab0e8bec7af87446835fb1b13511b 755 d outside/ (tree !)

        $ hg commit -m 'modify inside/f1'

        created new head

        $ hg files -r .

        inside/f1

        outside/f1 (flat !)

        outside/ (tree !)

        $ hg manifest --debug

        3f4197b4a11b9016e77ebc47fe566944885fd11b 644   inside/f1

        7fb3bb6356d28d4dc352c5ba52d7350a81b6bd46 644   outside/f1 (flat !)

        d0f2f706468ab0e8bec7af87446835fb1b13511b 755 d outside/ (tree !)

      Some filesystems (notably FAT/exFAT only store timestamps with 2

      seconds of precision, so by sleeping for 3 seconds, we can ensure that

      the timestamps of files stored by dirstate will appear older than the

      dirstate file, and therefore we'll be able to get stable output from

      debugdirstate. If we don't do this, the test can be slightly flaky.

        $ sleep 3

        $ hg status

        $ hg debugdirstate --nodates

        n 644         10 set                 inside/f1

	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

				#testcases flat tree

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

				#if tree
				$ cat << EOF >> $HGRCPATH
				> [experimental]
				> treemanifest = 1
				> EOF
				#endif

				create full repo

				$ hg init master
				$ cd master

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

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

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

				$ cd ..

				(The lfs extension does nothing here, but this test ensures that its hook that
				determines whether to add the lfs requirement, respects the narrow boundaries.)

				$ hg --config extensions.lfs= clone --narrow ssh://user@dummy/master narrow \
				> --include inside
				requesting all changes
				adding changesets
				adding manifests
				adding file changes
				added 3 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 update -q 0

				Can not modify dirstate outside

				$ mkdir outside
				$ touch outside/f1
				$ hg debugwalk -v -I 'relglob:f1'
				* matcher:
				<includematcher includes='(?:(?:\|.*/)f1(?:/\|$))'>
				f inside/f1 inside/f1
				$ hg add outside/f1
				abort: cannot track 'outside/f1' - it is outside the narrow clone
				[255]
				$ touch outside/f3
				$ hg add outside/f3
				abort: cannot track 'outside/f3' - it is outside the narrow clone
				[255]

				But adding a truly excluded file shouldn't count

				$ hg add outside/f3 -X outside/f3

				$ rm -r outside

				Can modify dirstate inside

				$ echo modified > inside/f1
				$ touch inside/f3
				$ hg add inside/f3
				$ hg status
				M inside/f1
				A inside/f3
				$ hg revert -qC .
				$ rm inside/f3

				Can commit changes inside. Leaves outside unchanged.

				$ hg update -q 'desc("initial")'
				$ echo modified2 > inside/f1
				$ hg manifest --debug
				4d6a634d5ba06331a60c29ee0db8412490a54fcd 644 inside/f1
				7fb3bb6356d28d4dc352c5ba52d7350a81b6bd46 644 outside/f1 (flat !)
				d0f2f706468ab0e8bec7af87446835fb1b13511b 755 d outside/ (tree !)
				$ hg commit -m 'modify inside/f1'
				created new head
				$ hg files -r .
				inside/f1
				outside/f1 (flat !)
				outside/ (tree !)
				$ hg manifest --debug
				3f4197b4a11b9016e77ebc47fe566944885fd11b 644 inside/f1
				7fb3bb6356d28d4dc352c5ba52d7350a81b6bd46 644 outside/f1 (flat !)
				d0f2f706468ab0e8bec7af87446835fb1b13511b 755 d outside/ (tree !)
				Some filesystems (notably FAT/exFAT only store timestamps with 2
				seconds of precision, so by sleeping for 3 seconds, we can ensure that
				the timestamps of files stored by dirstate will appear older than the
				dirstate file, and therefore we'll be able to get stable output from
				debugdirstate. If we don't do this, the test can be slightly flaky.
				$ sleep 3
				$ hg status
				$ hg debugdirstate --nodates
				n 644 10 set inside/f1