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

Durham Goode - - Load All Authors

File last commit:

r32151:4d504e54 default


                r39673:c7a7c7e8

default

Download file

             test-issue672.t
        
                    99 lines
            
             | 2.9 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-issue672.t
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Matt Mackall
    
urls: bulk-change BTS urls to new location

              r26420
            
      https://bz.mercurial-scm.org/672

        Adrian Buehlmann
    
tests: unify test-issue*

              r12195
            
      # 0-2-4

      #  \ \ \

      #   1-3-5

      #

      # rename in #1, content change in #4.

        $ hg init

        $ touch 1

        $ touch 2

        $ hg commit -Am init  # 0

        adding 1

        adding 2

        $ hg rename 1 1a

        $ hg commit -m rename # 1

        $ hg co -C 0

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

        $ echo unrelated >> 2

        $ hg ci -m unrelated1 # 2

        created new head

        $ hg merge --debug 1

          searching for copies back to rev 1

          unmatched files in other:

           1a

        Thomas Arendsen Hein
    
merge: show renamed on one and deleted on the other side in debug output

              r16795
            
          all copies found (* = to merge, ! = divergent, % = renamed and deleted):

        Siddharth Agarwal
    
copies: make debug messages more sensible...

              r18135
            
           src: '1' -> dst: '1a' 

        Adrian Buehlmann
    
tests: unify test-issue*

              r12195
            
          checking for directory renames

        resolving manifests

        Siddharth Agarwal
    
manifestmerge: pass in branchmerge and force separately...

              r18605
            
         branchmerge: True, force: False, partial: False

        Martin Geisler
    
merge: make debug output easier to read...

              r15625
            
         ancestor: 81f4b099af3d, local: c64f439569a9+, remote: c12dcd37c90a

        Adrian Buehlmann
    
tests: unify test-issue*

              r12195
            
         1: other deleted -> r

        Bryan O'Sullivan
    
tests: update test output (will be folded into parent)

              r18631
            
        removing 1

        Mads Kiilerich
    
merge: change debug logging - test output changes but no real changes...

              r21391
            
         1a: remote created -> g

        Bryan O'Sullivan
    
tests: update test output (will be folded into parent)

              r18631
            
        getting 1a

        Adrian Buehlmann
    
tests: unify test-issue*

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

        (branch merge, don't forget to commit)

        $ hg ci -m merge1 # 3

        $ hg co -C 2

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

        $ echo hello >> 1

        $ hg ci -m unrelated2 # 4

        created new head

        $ hg co -C 3

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

        $ hg merge -y --debug 4

          searching for copies back to rev 1

          unmatched files in local:

           1a

        Thomas Arendsen Hein
    
merge: show renamed on one and deleted on the other side in debug output

              r16795
            
          all copies found (* = to merge, ! = divergent, % = renamed and deleted):

        Siddharth Agarwal
    
copies: make debug messages more sensible...

              r18135
            
           src: '1' -> dst: '1a' *

        Adrian Buehlmann
    
tests: unify test-issue*

              r12195
            
          checking for directory renames

        resolving manifests

        Siddharth Agarwal
    
manifestmerge: pass in branchmerge and force separately...

              r18605
            
         branchmerge: True, force: False, partial: False

        Martin Geisler
    
merge: make debug output easier to read...

              r15625
            
         ancestor: c64f439569a9, local: e327dca35ac8+, remote: 746e9549ea96

        Mads Kiilerich
    
merge: change debug logging - test output changes but no real changes...

              r21391
            
         preserving 1a for resolve of 1a

        Matt Harbison
    
tests: flag Windows specific lines about background closing as optional

              r28318
            
        starting 4 threads for background file closing (?)

        Siddharth Agarwal
    
merge.mergestate: perform all premerges before any merges (BC)...

              r26618
            
         1a: local copied/moved from 1 -> m (premerge)

        Siddharth Agarwal
    
filemerge: add debug output for whether this is a change/delete conflict...

              r27161
            
        picked tool ':merge' for 1a (binary False symlink False changedelete False)

        Adrian Buehlmann
    
tests: unify test-issue*

              r12195
            
        merging 1a and 1 to 1a

        Durham Goode
    
merge: add file ancestor linknode to mergestate...

              r28011
            
        my 1a@e327dca35ac8+ other 1@746e9549ea96 ancestor 1@c64f439569a9

        Adrian Buehlmann
    
tests: unify test-issue*

              r12195
            
         premerge successful

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

        (branch merge, don't forget to commit)

        $ hg co -C 4

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

        $ hg merge -y --debug 3

          searching for copies back to rev 1

          unmatched files in other:

           1a

        Thomas Arendsen Hein
    
merge: show renamed on one and deleted on the other side in debug output

              r16795
            
          all copies found (* = to merge, ! = divergent, % = renamed and deleted):

        Siddharth Agarwal
    
copies: make debug messages more sensible...

              r18135
            
           src: '1' -> dst: '1a' *

        Adrian Buehlmann
    
tests: unify test-issue*

              r12195
            
          checking for directory renames

        resolving manifests

        Siddharth Agarwal
    
manifestmerge: pass in branchmerge and force separately...

              r18605
            
         branchmerge: True, force: False, partial: False

        Martin Geisler
    
merge: make debug output easier to read...

              r15625
            
         ancestor: c64f439569a9, local: 746e9549ea96+, remote: e327dca35ac8

        Mads Kiilerich
    
merge: change debug logging - test output changes but no real changes...

              r21391
            
         preserving 1 for resolve of 1a

        removing 1

        Matt Harbison
    
tests: flag Windows specific lines about background closing as optional

              r28318
            
        starting 4 threads for background file closing (?)

        Siddharth Agarwal
    
merge.mergestate: perform all premerges before any merges (BC)...

              r26618
            
         1a: remote moved from 1 -> m (premerge)

        Siddharth Agarwal
    
filemerge: add debug output for whether this is a change/delete conflict...

              r27161
            
        picked tool ':merge' for 1a (binary False symlink False changedelete False)

        Adrian Buehlmann
    
tests: unify test-issue*

              r12195
            
        merging 1 and 1a to 1a

        Durham Goode
    
merge: add file ancestor linknode to mergestate...

              r28011
            
        my 1a@746e9549ea96+ other 1a@e327dca35ac8 ancestor 1@c64f439569a9

        Adrian Buehlmann
    
tests: unify test-issue*

              r12195
            
         premerge successful

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

        (branch merge, don't forget to commit)

	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

Matt Mackall urls: bulk-change BTS urls to new location	r26420	https://bz.mercurial-scm.org/672
Adrian Buehlmann tests: unify test-issue*	r12195
		# 0-2-4
		# \ \ \
		# 1-3-5
		#
		# rename in #1, content change in #4.

		$ hg init

		$ touch 1
		$ touch 2
		$ hg commit -Am init # 0
		adding 1
		adding 2

		$ hg rename 1 1a
		$ hg commit -m rename # 1

		$ hg co -C 0
		1 files updated, 0 files merged, 1 files removed, 0 files unresolved

		$ echo unrelated >> 2
		$ hg ci -m unrelated1 # 2
		created new head

		$ hg merge --debug 1
		searching for copies back to rev 1
		unmatched files in other:
		1a
Thomas Arendsen Hein merge: show renamed on one and deleted on the other side in debug output	r16795	all copies found (* = to merge, ! = divergent, % = renamed and deleted):
Siddharth Agarwal copies: make debug messages more sensible...	r18135	src: '1' -> dst: '1a'
Adrian Buehlmann tests: unify test-issue*	r12195	checking for directory renames
		resolving manifests
Siddharth Agarwal manifestmerge: pass in branchmerge and force separately...	r18605	branchmerge: True, force: False, partial: False
Martin Geisler merge: make debug output easier to read...	r15625	ancestor: 81f4b099af3d, local: c64f439569a9+, remote: c12dcd37c90a
Adrian Buehlmann tests: unify test-issue*	r12195	1: other deleted -> r
Bryan O'Sullivan tests: update test output (will be folded into parent)	r18631	removing 1
Mads Kiilerich merge: change debug logging - test output changes but no real changes...	r21391	1a: remote created -> g
Bryan O'Sullivan tests: update test output (will be folded into parent)	r18631	getting 1a
Adrian Buehlmann tests: unify test-issue*	r12195	1 files updated, 0 files merged, 1 files removed, 0 files unresolved
		(branch merge, don't forget to commit)

		$ hg ci -m merge1 # 3

		$ hg co -C 2
		1 files updated, 0 files merged, 1 files removed, 0 files unresolved

		$ echo hello >> 1
		$ hg ci -m unrelated2 # 4
		created new head

		$ hg co -C 3
		1 files updated, 0 files merged, 1 files removed, 0 files unresolved

		$ hg merge -y --debug 4
		searching for copies back to rev 1
		unmatched files in local:
		1a
Thomas Arendsen Hein merge: show renamed on one and deleted on the other side in debug output	r16795	all copies found (* = to merge, ! = divergent, % = renamed and deleted):
Siddharth Agarwal copies: make debug messages more sensible...	r18135	src: '1' -> dst: '1a' *
Adrian Buehlmann tests: unify test-issue*	r12195	checking for directory renames
		resolving manifests
Siddharth Agarwal manifestmerge: pass in branchmerge and force separately...	r18605	branchmerge: True, force: False, partial: False
Martin Geisler merge: make debug output easier to read...	r15625	ancestor: c64f439569a9, local: e327dca35ac8+, remote: 746e9549ea96
Mads Kiilerich merge: change debug logging - test output changes but no real changes...	r21391	preserving 1a for resolve of 1a
Matt Harbison tests: flag Windows specific lines about background closing as optional	r28318	starting 4 threads for background file closing (?)
Siddharth Agarwal merge.mergestate: perform all premerges before any merges (BC)...	r26618	1a: local copied/moved from 1 -> m (premerge)
Siddharth Agarwal filemerge: add debug output for whether this is a change/delete conflict...	r27161	picked tool ':merge' for 1a (binary False symlink False changedelete False)
Adrian Buehlmann tests: unify test-issue*	r12195	merging 1a and 1 to 1a
Durham Goode merge: add file ancestor linknode to mergestate...	r28011	my 1a@e327dca35ac8+ other 1@746e9549ea96 ancestor 1@c64f439569a9
Adrian Buehlmann tests: unify test-issue*	r12195	premerge successful
		0 files updated, 1 files merged, 0 files removed, 0 files unresolved
		(branch merge, don't forget to commit)

		$ hg co -C 4
		1 files updated, 0 files merged, 1 files removed, 0 files unresolved

		$ hg merge -y --debug 3
		searching for copies back to rev 1
		unmatched files in other:
		1a
Thomas Arendsen Hein merge: show renamed on one and deleted on the other side in debug output	r16795	all copies found (* = to merge, ! = divergent, % = renamed and deleted):
Siddharth Agarwal copies: make debug messages more sensible...	r18135	src: '1' -> dst: '1a' *
Adrian Buehlmann tests: unify test-issue*	r12195	checking for directory renames
		resolving manifests
Siddharth Agarwal manifestmerge: pass in branchmerge and force separately...	r18605	branchmerge: True, force: False, partial: False
Martin Geisler merge: make debug output easier to read...	r15625	ancestor: c64f439569a9, local: 746e9549ea96+, remote: e327dca35ac8
Mads Kiilerich merge: change debug logging - test output changes but no real changes...	r21391	preserving 1 for resolve of 1a
		removing 1
Matt Harbison tests: flag Windows specific lines about background closing as optional	r28318	starting 4 threads for background file closing (?)
Siddharth Agarwal merge.mergestate: perform all premerges before any merges (BC)...	r26618	1a: remote moved from 1 -> m (premerge)
Siddharth Agarwal filemerge: add debug output for whether this is a change/delete conflict...	r27161	picked tool ':merge' for 1a (binary False symlink False changedelete False)
Adrian Buehlmann tests: unify test-issue*	r12195	merging 1 and 1a to 1a
Durham Goode merge: add file ancestor linknode to mergestate...	r28011	my 1a@746e9549ea96+ other 1a@e327dca35ac8 ancestor 1@c64f439569a9
Adrian Buehlmann tests: unify test-issue*	r12195	premerge successful
		0 files updated, 1 files merged, 0 files removed, 0 files unresolved
		(branch merge, don't forget to commit)