upstream/mercurial-mirror Files · tests/test-sparse-merges.t

lfs: add the 'lfs' requirement in the changegroup transaction introducing lfs...

lfs: add the 'lfs' requirement in the changegroup transaction introducing lfs A hook like this is how largefiles manages to do the same. Largefiles uses a changegroup hook, but this uses pretxnchangegroup because that actually causes the transaction to rollback in the unlikely event that writing the requirements out fails. Sadly, the requires file itself isn't rolled back if a subsequent hook fails, but that seems trivial. Now that commit, changegroup and convert are covered, I don't think there's any way to get an lfs repo without the requirement. The grep exit code is blotted out of some test-lfs-serve.t tests now showing the requirement, because run-tests.py doesn't support conditionalizing the exit code.

Gregory Szorc - - Load All Authors

File last commit:

r33293:c9cbf4de default


                r35520:6bb940de

default

Download file

             test-sparse-merges.t
        
                    62 lines
            
             | 1.4 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-sparse-merges.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      test merging things outside of the sparse checkout

        $ hg init myrepo

        $ cd myrepo

        $ cat > .hg/hgrc <<EOF

        > [extensions]

        > sparse=

        > EOF

        $ echo foo > foo

        $ echo bar > bar

        $ hg add foo bar

        $ hg commit -m initial

        $ hg branch feature

        marked working directory as branch feature

        (branches are permanent and global, did you want a bookmark?)

        $ echo bar2 >> bar

        $ hg commit -m 'feature - bar2'

        $ hg update -q default

        $ hg debugsparse --exclude 'bar**'

        $ hg merge feature

        temporarily included 1 file(s) in the sparse checkout for merging

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

        (branch merge, don't forget to commit)

      Verify bar was merged temporarily

        $ ls

        bar

        foo

        $ hg status

        M bar

      Verify bar disappears automatically when the working copy becomes clean

        $ hg commit -m "merged"

        cleaned up 1 temporarily added file(s) from the sparse checkout

        $ hg status

        $ ls

        foo

        $ hg cat -r . bar

        bar

        bar2

      Test merging things outside of the sparse checkout that are not in the working

      copy

        $ hg strip -q -r . --config extensions.strip=

        $ hg up -q feature

        $ touch branchonly

        $ hg ci -Aqm 'add branchonly'

        $ hg up -q default

        $ hg debugsparse -X branchonly

        $ hg merge feature

        temporarily included 2 file(s) in the sparse checkout for merging

        2 files updated, 0 files merged, 0 files removed, 0 files unresolved

        (branch merge, don't forget to commit)

	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 merging things outside of the sparse checkout

				$ hg init myrepo
				$ cd myrepo
				$ cat > .hg/hgrc <<EOF
				> [extensions]
				> sparse=
				> EOF

				$ echo foo > foo
				$ echo bar > bar
				$ hg add foo bar
				$ hg commit -m initial

				$ hg branch feature
				marked working directory as branch feature
				(branches are permanent and global, did you want a bookmark?)
				$ echo bar2 >> bar
				$ hg commit -m 'feature - bar2'

				$ hg update -q default
				$ hg debugsparse --exclude 'bar**'

				$ hg merge feature
				temporarily included 1 file(s) in the sparse checkout for merging
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved
				(branch merge, don't forget to commit)

				Verify bar was merged temporarily

				$ ls
				bar
				foo
				$ hg status
				M bar

				Verify bar disappears automatically when the working copy becomes clean

				$ hg commit -m "merged"
				cleaned up 1 temporarily added file(s) from the sparse checkout
				$ hg status
				$ ls
				foo

				$ hg cat -r . bar
				bar
				bar2

				Test merging things outside of the sparse checkout that are not in the working
				copy

				$ hg strip -q -r . --config extensions.strip=
				$ hg up -q feature
				$ touch branchonly
				$ hg ci -Aqm 'add branchonly'

				$ hg up -q default
				$ hg debugsparse -X branchonly
				$ hg merge feature
				temporarily included 2 file(s) in the sparse checkout for merging
				2 files updated, 0 files merged, 0 files removed, 0 files unresolved
				(branch merge, don't forget to commit)