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

hgweb: profile HTTP requests...

hgweb: profile HTTP requests Currently, running `hg serve --profile` doesn't yield anything useful: when the process is terminated the profiling output displays results from the main thread, which typically spends most of its time in select.select(). Furthermore, it has no meaningful results from mercurial.* modules because the threads serving HTTP requests don't actually get profiled. This patch teaches the hgweb wsgi applications to profile individual requests. If profiling is enabled, the profiler kicks in after HTTP/WSGI environment processing but before Mercurial's main request processing. The profile results are printed to the configured profiling output. If running `hg serve` from a shell, they will be printed to stderr, just before the HTTP request line is logged. If profiling to a file, we only write a single profile to the file because the file is not opened in append mode. We could add support for appending to files in a future patch if someone wants it. Per request profiling doesn't work with the statprof profiler because internally that profiler collects samples from the thread that *initially* requested profiling be enabled. I have plans to address this by vendoring Facebook's customized statprof and then improving it.

Kostia Balytskyi - - Load All Authors

File last commit:

r29629:b33c0c38 stable


                r29787:80df0426

default

Download file

             test-update-names.t
        
                    74 lines
            
             | 1.9 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

	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