upstream/mercurial-mirror Files · tests/test-merge-force.t

revset: make descendants() lazier...

revset: make descendants() lazier Previously descendants() would force the provided subset to become a set. In the case of revsets like '(%ld::) - (%ld)' (as used by histedit) this would force the '- (%ld)' set to be evaluated, which produced a set containing every commit in the repo (except %ld). This takes 0.6s on large repos. This changes descendants to trust the subset to implement __contains__ efficiently, which improves the above revset to 0.16s. Shaving 0.4 seconds off of histedit. revset : (20000::) - (20000) 0) obsolete feature not enabled but 54243 markers found! ! wall 0.023640 comb 0.020000 user 0.020000 sys 0.000000 (best of 100) 1) obsolete feature not enabled but 54243 markers found! ! wall 0.019589 comb 0.020000 user 0.020000 sys 0.000000 (best of 100) This commit removes the final revset related perf hotspot from histedit. Combined with the previous two patches, they shave a little over 3 seconds off histedit on large repos.

Siddharth Agarwal - - Load All Authors

File last commit:

r19802:94c39465 default


                r22449:da05fe01

default

Download file

             test-merge-force.t
        
                    45 lines
            
             | 670 B
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-merge-force.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

        $ hg init

        $ echo a > a

        $ hg ci -qAm 'add a'

        $ echo b > b

        $ hg ci -qAm 'add b'

        $ hg up -qC 0

        $ hg rm a

        $ hg ci -m 'rm a'

        created new head

        $ hg up -qC 1

        $ rm a

      Local deleted a file, remote removed

      Should fail, since there are deleted files:

        $ hg merge

        abort: uncommitted changes

        (use 'hg status' to list changes)

        [255]

      Should succeed with --force:

        $ hg -v merge --force

        resolving manifests

        removing a

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

        (branch merge, don't forget to commit)

      Should show 'a' as removed:

        $ hg status

        R a

        $ hg ci -m merge

      Should not show 'a':

        $ hg manifest

        b

	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

				$ hg init

				$ echo a > a
				$ hg ci -qAm 'add a'

				$ echo b > b
				$ hg ci -qAm 'add b'

				$ hg up -qC 0
				$ hg rm a
				$ hg ci -m 'rm a'
				created new head

				$ hg up -qC 1
				$ rm a

				Local deleted a file, remote removed

				Should fail, since there are deleted files:

				$ hg merge
				abort: uncommitted changes
				(use 'hg status' to list changes)
				[255]

				Should succeed with --force:

				$ hg -v merge --force
				resolving manifests
				removing a
				0 files updated, 0 files merged, 1 files removed, 0 files unresolved
				(branch merge, don't forget to commit)

				Should show 'a' as removed:

				$ hg status
				R a

				$ hg ci -m merge

				Should not show 'a':

				$ hg manifest
				b