upstream/mercurial-mirror Files · tests/test-convert-bzr-114.t

largefiles: factor out procedures to update lfdirstate for post-committing...

largefiles: factor out procedures to update lfdirstate for post-committing Before this patch, procedures to update lfdirstate for post-committing are scattered in "lfilesrepo.commit". In the case of "hg commit" with patterns for target files ("Case 2"), lfdirstate is updated BEFORE real committing. This patch factors out procedures to update lfdirstate for post-committing into "lfutil.markcommitted", and makes it callable via "markcommitted" of the context passed to "lfilesrepo.commitctx". "markcommitted" of the context is called, only when it is committed successfully. Passing original "markcommitted" of the context is meaningless in this patch, but required in subsequent one to prepare something before invocation of it.

Matt Mackall - - Load All Authors

File last commit:

r22046:7a9cbb31 default


                r23184:3100d1cb

default

Download file

             test-convert-bzr-114.t
        
                    39 lines
            
             | 912 B
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-convert-bzr-114.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      #require bzr114

        $ . "$TESTDIR/bzr-definitions"

      The file/directory replacement can only be reproduced on

      bzr >= 1.4. Merge it back in test-convert-bzr-directories once

      this version becomes mainstream.

      replace file with dir

        $ mkdir test-replace-file-with-dir

        $ cd test-replace-file-with-dir

        $ bzr init -q source

        $ cd source

        $ echo d > d

        $ bzr add -q d

        $ bzr commit -q -m 'add d file'

        $ rm d

        $ mkdir d

        $ bzr add -q d

        $ bzr commit -q -m 'replace with d dir'

        $ echo a > d/a

        $ bzr add -q d/a

        $ bzr commit -q -m 'add d/a'

        $ cd ..

        $ hg convert source source-hg

        initializing destination source-hg repository

        scanning source...

        sorting...

        converting...

        2 add d file

        1 replace with d dir

        0 add d/a

        $ manifest source-hg tip

        % manifest of tip

        644   d/a

        $ cd source-hg

        $ hg update

        1 files updated, 0 files merged, 0 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

				#require bzr114

				$ . "$TESTDIR/bzr-definitions"

				The file/directory replacement can only be reproduced on
				bzr >= 1.4. Merge it back in test-convert-bzr-directories once
				this version becomes mainstream.
				replace file with dir

				$ mkdir test-replace-file-with-dir
				$ cd test-replace-file-with-dir
				$ bzr init -q source
				$ cd source
				$ echo d > d
				$ bzr add -q d
				$ bzr commit -q -m 'add d file'
				$ rm d
				$ mkdir d
				$ bzr add -q d
				$ bzr commit -q -m 'replace with d dir'
				$ echo a > d/a
				$ bzr add -q d/a
				$ bzr commit -q -m 'add d/a'
				$ cd ..
				$ hg convert source source-hg
				initializing destination source-hg repository
				scanning source...
				sorting...
				converting...
				2 add d file
				1 replace with d dir
				0 add d/a
				$ manifest source-hg tip
				% manifest of tip
				644 d/a
				$ cd source-hg
				$ hg update
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved
				$ cd ../..