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

Meirambek Omyrzak - - Load All Authors

File last commit:

r39525:f1186c29 default


                r39673:c7a7c7e8

default

Download file

             test-subrepo-missing.t
        
                    141 lines
            
             | 3.9 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-subrepo-missing.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

        $ hg init repo

        $ cd repo

        $ hg init subrepo

        $ echo a > subrepo/a

        $ hg -R subrepo ci -Am adda

        adding a

        $ echo 'subrepo = subrepo' > .hgsub

        $ hg ci -Am addsubrepo

        adding .hgsub

        $ echo b > subrepo/b

        $ hg -R subrepo ci -Am addb

        adding b

        $ hg ci -m updatedsub

      ignore blanklines in .hgsubstate

        >>> open('.hgsubstate', 'wb').write(b'\n\n   \t \n   \n') and None

        $ hg st --subrepos

        M .hgsubstate

        $ hg revert -qC .hgsubstate

      abort more gracefully on .hgsubstate parsing error

        $ cp .hgsubstate .hgsubstate.old

        >>> open('.hgsubstate', 'wb').write(b'\ninvalid') and None

        $ hg st --subrepos --cwd $TESTTMP -R $TESTTMP/repo

        abort: invalid subrepository revision specifier in 'repo/.hgsubstate' line 2

        [255]

        $ mv .hgsubstate.old .hgsubstate

      delete .hgsub and revert it

        $ rm .hgsub

        $ hg revert .hgsub

        warning: subrepo spec file '.hgsub' not found

        warning: subrepo spec file '.hgsub' not found

      delete .hgsubstate and revert it

        $ rm .hgsubstate

        $ hg revert .hgsubstate

      delete .hgsub and update

        $ rm .hgsub

        $ hg up 0 --cwd $TESTTMP -R $TESTTMP/repo

        warning: subrepo spec file 'repo/.hgsub' not found

        warning: subrepo spec file 'repo/.hgsub' not found

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

        $ hg st

        warning: subrepo spec file '.hgsub' not found

        ! .hgsub

        $ ls subrepo

        a

      delete .hgsubstate and update

        $ hg up -C

        warning: subrepo spec file '.hgsub' not found

        warning: subrepo spec file '.hgsub' not found

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

        $ rm .hgsubstate

        $ hg up 0

        other [destination] changed .hgsubstate which local [working copy] deleted

        use (c)hanged version or leave (d)eleted? c

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

        $ hg st

        $ ls subrepo

        a

      Enable obsolete

        $ cat >> $HGRCPATH << EOF

        > [ui]

        > logtemplate= {rev}:{node|short} {desc|firstline}

        > [phases]

        > publish=False

        > [experimental]

        > evolution.createmarkers=True

        > EOF

      check that we can update parent repo with missing (amended) subrepo revision

        $ hg up --repository subrepo -r tip

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

        $ hg ci -m "updated subrepo to tip"

        created new head

        $ cd subrepo

        $ hg update -r tip

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

        $ echo foo > a

        $ hg commit --amend -m "addb (amended)"

        $ cd ..

        $ hg update --clean .

        revision 102a90ea7b4a in subrepository "subrepo" is hidden

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

      check that --hidden is propagated to the subrepo

        $ hg -R subrepo up tip

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

        $ hg ci -m 'commit with amended subrepo'

        $ echo bar > subrepo/a

        $ hg -R subrepo ci --amend -m "amend a (again)"

        $ hg --hidden cat subrepo/a

        foo

      verify will warn if locked-in subrepo revisions are hidden or missing

        $ hg ci -m "amended subrepo (again)"

        $ hg --config extensions.strip= --hidden strip -R subrepo -qr 'tip' --config devel.strip-obsmarkers=no

        $ hg verify

        checking changesets

        checking manifests

        crosschecking files in changesets and manifests

        checking files

        checked 5 changesets with 5 changes to 2 files

        checking subrepo links

        subrepo 'subrepo' is hidden in revision a66de08943b6

        subrepo 'subrepo' is hidden in revision 674d05939c1e

        subrepo 'subrepo' not found in revision a7d05d9055a4

      verifying shouldn't init a new subrepo if the reference doesn't exist

        $ mv subrepo b

        $ hg verify

        checking changesets

        checking manifests

        crosschecking files in changesets and manifests

        checking files

        checked 5 changesets with 5 changes to 2 files

        checking subrepo links

        0: repository $TESTTMP/repo/subrepo not found

        1: repository $TESTTMP/repo/subrepo not found

        3: repository $TESTTMP/repo/subrepo not found

        4: repository $TESTTMP/repo/subrepo not found

        $ ls

        b

        $ mv b subrepo

        $ 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 repo
				$ cd repo
				$ hg init subrepo
				$ echo a > subrepo/a
				$ hg -R subrepo ci -Am adda
				adding a
				$ echo 'subrepo = subrepo' > .hgsub
				$ hg ci -Am addsubrepo
				adding .hgsub
				$ echo b > subrepo/b
				$ hg -R subrepo ci -Am addb
				adding b
				$ hg ci -m updatedsub

				ignore blanklines in .hgsubstate

				>>> open('.hgsubstate', 'wb').write(b'\n\n \t \n \n') and None
				$ hg st --subrepos
				M .hgsubstate
				$ hg revert -qC .hgsubstate

				abort more gracefully on .hgsubstate parsing error

				$ cp .hgsubstate .hgsubstate.old
				>>> open('.hgsubstate', 'wb').write(b'\ninvalid') and None
				$ hg st --subrepos --cwd $TESTTMP -R $TESTTMP/repo
				abort: invalid subrepository revision specifier in 'repo/.hgsubstate' line 2
				[255]
				$ mv .hgsubstate.old .hgsubstate

				delete .hgsub and revert it

				$ rm .hgsub
				$ hg revert .hgsub
				warning: subrepo spec file '.hgsub' not found
				warning: subrepo spec file '.hgsub' not found

				delete .hgsubstate and revert it

				$ rm .hgsubstate
				$ hg revert .hgsubstate

				delete .hgsub and update

				$ rm .hgsub
				$ hg up 0 --cwd $TESTTMP -R $TESTTMP/repo
				warning: subrepo spec file 'repo/.hgsub' not found
				warning: subrepo spec file 'repo/.hgsub' not found
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved
				$ hg st
				warning: subrepo spec file '.hgsub' not found
				! .hgsub
				$ ls subrepo
				a

				delete .hgsubstate and update

				$ hg up -C
				warning: subrepo spec file '.hgsub' not found
				warning: subrepo spec file '.hgsub' not found
				2 files updated, 0 files merged, 0 files removed, 0 files unresolved
				$ rm .hgsubstate
				$ hg up 0
				other [destination] changed .hgsubstate which local [working copy] deleted
				use (c)hanged version or leave (d)eleted? c
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved
				$ hg st
				$ ls subrepo
				a

				Enable obsolete

				$ cat >> $HGRCPATH << EOF
				> [ui]
				> logtemplate= {rev}:{node\|short} {desc\|firstline}
				> [phases]
				> publish=False
				> [experimental]
				> evolution.createmarkers=True
				> EOF

				check that we can update parent repo with missing (amended) subrepo revision

				$ hg up --repository subrepo -r tip
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved
				$ hg ci -m "updated subrepo to tip"
				created new head
				$ cd subrepo
				$ hg update -r tip
				0 files updated, 0 files merged, 0 files removed, 0 files unresolved
				$ echo foo > a
				$ hg commit --amend -m "addb (amended)"
				$ cd ..
				$ hg update --clean .
				revision 102a90ea7b4a in subrepository "subrepo" is hidden
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved

				check that --hidden is propagated to the subrepo

				$ hg -R subrepo up tip
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved
				$ hg ci -m 'commit with amended subrepo'
				$ echo bar > subrepo/a
				$ hg -R subrepo ci --amend -m "amend a (again)"
				$ hg --hidden cat subrepo/a
				foo

				verify will warn if locked-in subrepo revisions are hidden or missing

				$ hg ci -m "amended subrepo (again)"
				$ hg --config extensions.strip= --hidden strip -R subrepo -qr 'tip' --config devel.strip-obsmarkers=no
				$ hg verify
				checking changesets
				checking manifests
				crosschecking files in changesets and manifests
				checking files
				checked 5 changesets with 5 changes to 2 files
				checking subrepo links
				subrepo 'subrepo' is hidden in revision a66de08943b6
				subrepo 'subrepo' is hidden in revision 674d05939c1e
				subrepo 'subrepo' not found in revision a7d05d9055a4

				verifying shouldn't init a new subrepo if the reference doesn't exist

				$ mv subrepo b
				$ hg verify
				checking changesets
				checking manifests
				crosschecking files in changesets and manifests
				checking files
				checked 5 changesets with 5 changes to 2 files
				checking subrepo links
				0: repository $TESTTMP/repo/subrepo not found
				1: repository $TESTTMP/repo/subrepo not found
				3: repository $TESTTMP/repo/subrepo not found
				4: repository $TESTTMP/repo/subrepo not found
				$ ls
				b
				$ mv b subrepo

				$ cd ..