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

Augie Fackler - - Load All Authors

File last commit:

r36096:a2a6e724 default


                r39673:c7a7c7e8

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]