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

internals: extract frame-based protocol docs to own document...

internals: extract frame-based protocol docs to own document wireprotocol.txt is quite long and difficult to digest. The frame-based protocol is effectively a standalone concept (and could even be used outside of Mercurial). So this commit extracts its docs to a standalone file. The first few paragraphs were rewritten as part of the extraction. Sections headers were adjusted accordingly. Existing referalls in wireprotocol.txt were updated to refer to the new doc / concept, which I've started referring to as `hgrpc`. I'm on the fence as to whether to move the HTTP and SSH transport details to the new doc as well. For now, I'm leaving them in wireprotocol.txt. Differential Revision: https://phab.mercurial-scm.org/D4443

Augie Fackler - - Load All Authors

File last commit:

r36096:a2a6e724 default


                r39594:b0e0db15

default

Download file

             test-narrow-rebase.t
        
                    93 lines
            
             | 2.6 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-narrow-rebase.t
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Augie Fackler
    
narrow: import experimental extension from narrowhg revision cb51d673e9c5...

              r36096
            
        $ . "$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

Augie Fackler narrow: import experimental extension from narrowhg revision cb51d673e9c5...	r36096
		$ . "$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]