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

Matt Harbison - - Load All Authors

File last commit:

r39629:c8514f85 default


                r39673:c7a7c7e8

default

Download file

             test-update-names.t
        
                    93 lines
            
             | 2.4 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-update-names.t
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Kostia Balytskyi
    
update: teach hg to override untracked dir with a tracked file on update...

              r29480
            
      Test update logic when there are renames or weird same-name cases between dirs

      and files

      Update with local changes across a file rename

        $ hg init r1 && cd r1

        $ echo a > a

        $ hg add a

        $ hg ci -m a

        $ hg mv a b

        $ hg ci -m rename

        $ echo b > b

        $ hg ci -m change

        $ hg up -q 0

        $ echo c > a

        $ hg up

        merging a and b to b

        warning: conflicts while merging b! (edit, then use 'hg resolve --mark')

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

        use 'hg resolve' to retry unresolved file merges

        [1]

      Test update when local untracked directory exists with the same name as a

      tracked file in a commit we are updating to

        $ hg init r2 && cd r2

        $ echo root > root && hg ci -Am root  # rev 0

        adding root

        $ echo text > name && hg ci -Am "name is a file"  # rev 1

        adding name

        $ hg up 0

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

        $ mkdir name

        $ hg up 1

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

      Test update when local untracked directory exists with some files in it and has

      the same name a tracked file in a commit we are updating to. In future this

      should be updated to give an friendlier error message, but now we should just

      make sure that this does not erase untracked data

        $ hg up 0

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

        $ mkdir name

        $ echo text > name/file

        $ hg st

        ? name/file

        $ hg up 1

        Matt Harbison
    
tests: stabilize change for handling not quoting non-empty-directory...

              r39629
            
        abort: Unlinking directory not permitted: *$TESTTMP/r1/r2/name* (glob) (windows !)

        Augie Fackler
    
tests: handle Python 3 not quoting non-empty-directory error...

              r39613
            
        abort: Directory not empty: '?\$TESTTMP/r1/r2/name'? (re) (no-windows !)

        Yuya Nishihara
    
merge: do not delete untracked files silently (issue5962)...

              r39232
            
        [255]

        $ cat name/file

        text

        Kostia Balytskyi
    
update: teach hg to override untracked dir with a tracked file on update...

              r29480
            
        $ cd ..

        Kostia Balytskyi
    
update: fix bug when update tries to modify folder symlink...

              r29629
            
      #if symlink

      Test update when two commits have symlinks that point to different folders

        $ hg init r3 && cd r3

        $ echo root > root && hg ci -Am root

        adding root

        $ mkdir folder1 && mkdir folder2

        $ ln -s folder1 folder

        $ hg ci -Am "symlink to folder1"

        adding folder

        $ rm folder

        $ ln -s folder2 folder

        $ hg ci -Am "symlink to folder2"

        $ hg up 1

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

        $ cd ..

      #endif

        Stanislau Hlebik
    
update: warn if cwd was deleted...

              r30172
            
        Yuya Nishihara
    
tests: run "cwd was removed" test only if cwd can actually be removed...

              r30230
            
      #if rmcwd

        Stanislau Hlebik
    
update: warn if cwd was deleted...

              r30172
            
      Test that warning is printed if cwd is deleted during update

        $ hg init r4 && cd r4

        $ mkdir dir

        $ cd dir

        $ echo a > a

        $ echo b > b

        $ hg add a b

        $ hg ci -m "file and dir"

        $ hg up -q null

        current directory was removed

        (consider changing to repo root: $TESTTMP/r1/r4)

        Yuya Nishihara
    
tests: run "cwd was removed" test only if cwd can actually be removed...

              r30230
            
      #endif

	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

Kostia Balytskyi update: teach hg to override untracked dir with a tracked file on update...	r29480	Test update logic when there are renames or weird same-name cases between dirs
		and files

		Update with local changes across a file rename

		$ hg init r1 && cd r1

		$ echo a > a
		$ hg add a
		$ hg ci -m a

		$ hg mv a b
		$ hg ci -m rename

		$ echo b > b
		$ hg ci -m change

		$ hg up -q 0

		$ echo c > a

		$ hg up
		merging a and b to b
		warning: conflicts while merging b! (edit, then use 'hg resolve --mark')
		0 files updated, 0 files merged, 0 files removed, 1 files unresolved
		use 'hg resolve' to retry unresolved file merges
		[1]

		Test update when local untracked directory exists with the same name as a
		tracked file in a commit we are updating to
		$ hg init r2 && cd r2
		$ echo root > root && hg ci -Am root # rev 0
		adding root
		$ echo text > name && hg ci -Am "name is a file" # rev 1
		adding name
		$ hg up 0
		0 files updated, 0 files merged, 1 files removed, 0 files unresolved
		$ mkdir name
		$ hg up 1
		1 files updated, 0 files merged, 0 files removed, 0 files unresolved

		Test update when local untracked directory exists with some files in it and has
		the same name a tracked file in a commit we are updating to. In future this
		should be updated to give an friendlier error message, but now we should just
		make sure that this does not erase untracked data
		$ hg up 0
		0 files updated, 0 files merged, 1 files removed, 0 files unresolved
		$ mkdir name
		$ echo text > name/file
		$ hg st
		? name/file
		$ hg up 1
Matt Harbison tests: stabilize change for handling not quoting non-empty-directory...	r39629	abort: Unlinking directory not permitted: $TESTTMP/r1/r2/name (glob) (windows !)
Augie Fackler tests: handle Python 3 not quoting non-empty-directory error...	r39613	abort: Directory not empty: '?\$TESTTMP/r1/r2/name'? (re) (no-windows !)
Yuya Nishihara merge: do not delete untracked files silently (issue5962)...	r39232	[255]
		$ cat name/file
		text
Kostia Balytskyi update: teach hg to override untracked dir with a tracked file on update...	r29480	$ cd ..
Kostia Balytskyi update: fix bug when update tries to modify folder symlink...	r29629
		#if symlink

		Test update when two commits have symlinks that point to different folders
		$ hg init r3 && cd r3
		$ echo root > root && hg ci -Am root
		adding root
		$ mkdir folder1 && mkdir folder2
		$ ln -s folder1 folder
		$ hg ci -Am "symlink to folder1"
		adding folder
		$ rm folder
		$ ln -s folder2 folder
		$ hg ci -Am "symlink to folder2"
		$ hg up 1
		1 files updated, 0 files merged, 0 files removed, 0 files unresolved
		$ cd ..

		#endif
Stanislau Hlebik update: warn if cwd was deleted...	r30172
Yuya Nishihara tests: run "cwd was removed" test only if cwd can actually be removed...	r30230	#if rmcwd

Stanislau Hlebik update: warn if cwd was deleted...	r30172	Test that warning is printed if cwd is deleted during update
		$ hg init r4 && cd r4
		$ mkdir dir
		$ cd dir
		$ echo a > a
		$ echo b > b
		$ hg add a b
		$ hg ci -m "file and dir"
		$ hg up -q null
		current directory was removed
		(consider changing to repo root: $TESTTMP/r1/r4)
Yuya Nishihara tests: run "cwd was removed" test only if cwd can actually be removed...	r30230
		#endif