upstream/mercurial-mirror Files · tests/test-merge8.t

changegroup: move file matcher from narrow extension...

changegroup: move file matcher from narrow extension Sparse changegroup generation requires the use of a matcher to filter which files are relevant. This commit moves the file matcher from the narrow extension to core and updates the narrow extension to use it. I'm not sure why the narrow extension was storing the matcher as a callable that resolved to a matcher. So I changed it to be a simple matcher instance. In addition, code from narrow to intersect the matcher with the local narrow spec is now performed automatically when the changegroup packer is created. If a matcher is not passed into getbundler() an alwaysmatcher() is assumed. This ensures that a matcher is always defined for all operations. Differential Revision: https://phab.mercurial-scm.org/D4011

Denis Laxalde - - Load All Authors

File last commit:

r34662:eb586ed5 default


                r38818:9c057acb

default

Download file

             test-merge8.t
        
                    30 lines
            
             | 727 B
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-merge8.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      Test for changeset ba7c74081861

      (update dirstate correctly for non-branchmerge updates)

        $ hg init a

        $ cd a

        $ echo a > a

        $ hg add a

        $ hg commit -m a

        $ cd ..

        $ hg clone a b

        updating to branch default

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

        $ cd a

        $ hg mv a b

        $ hg commit -m move

        $ echo b >> b

        $ hg commit -m b

        $ cd ../b

        $ hg pull ../a

        pulling from ../a

        searching for changes

        adding changesets

        adding manifests

        adding file changes

        added 2 changesets with 2 changes to 1 files

        new changesets e3c9b40284e1:772b37f1ca37

        (run 'hg update' to get a working copy)

        $ hg update

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

        $ cd ..

	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 for changeset ba7c74081861
				(update dirstate correctly for non-branchmerge updates)
				$ hg init a
				$ cd a
				$ echo a > a
				$ hg add a
				$ hg commit -m a
				$ cd ..
				$ hg clone a b
				updating to branch default
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved
				$ cd a
				$ hg mv a b
				$ hg commit -m move
				$ echo b >> b
				$ hg commit -m b
				$ cd ../b
				$ hg pull ../a
				pulling from ../a
				searching for changes
				adding changesets
				adding manifests
				adding file changes
				added 2 changesets with 2 changes to 1 files
				new changesets e3c9b40284e1:772b37f1ca37
				(run 'hg update' to get a working copy)
				$ hg update
				1 files updated, 0 files merged, 1 files removed, 0 files unresolved

				$ cd ..