upstream/mercurial-mirror Files · tests/test-update-names.t

changegroup: increase write buffer size to 128k...

changegroup: increase write buffer size to 128k By default, Python defers to the operating system for choosing the default buffer size on opened files. On my Linux machine, the default is 4k, which is really small for 2016. This patch bumps the write buffer size when writing changegroups/bundles to 128k. This matches the 128k read buffer we already use on revlogs. It's worth noting that this only impacts when writing to an explicit file (such as during `hg bundle`). Buffers when writing to bundle files via the repo vfs or to a temporary file are not impacted. When producing a none-v2 bundle file of the mozilla-unified repository, this change caused the number of write() system calls to drop from 952,449 to 29,788. After this change, the most frequent system calls are fstat(), read(), lseek(), and open(). There were 2,523,672 system calls after this patch (so a net decrease of ~950k is statistically significant). This change shows no performance change on my system. But I have a high-end system with a fast SSD. It is quite possible this change will have a significant impact on network file systems, where extra network round trips due to excessive I/O system calls could introduce significant latency.

Stanislau Hlebik - - Load All Authors

File last commit:

r30172:90a6c18a default


                r30212:260af198

default

Download file

             test-update-names.t
        
                    86 lines
            
             | 2.2 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-update-names.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      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

        abort: *: '$TESTTMP/r1/r2/name' (glob)

        [255]

        $ cd ..

      #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

      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)

	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

				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
				abort: *: '$TESTTMP/r1/r2/name' (glob)
				[255]
				$ cd ..

				#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

				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)