upstream/mercurial-mirror Files · tests/test-pull-permission.t

largefiles: move "updatestandin" invocation to "hg.updaterepo" wrapper...

largefiles: move "updatestandin" invocation to "hg.updaterepo" wrapper Code paths below expect "hg.updaterepo" (or "hg.update" using it) to execute linear merging: - "update" in commands - "postincoming" in commands, used for: - "hg pull --update" - "hg unbundle --update" - "hgsubrepo.get" in subrepo For linear merging with largefiles, standins should be updated according to (possibly dirty) largefiles before "merge.update" invocation to detect conflicts correctly. Before this patch, only the "update" command can execute linear merging correctly, because largefiles extension takes care of only it. This patch moves "updatestandin" invocation from "overrideupdate" ("hg update" wrapper) to "_hgupdaterepo" ("hg.updaterepo" wrapper) to execute linear merging in "hg.updaterepo" correctly. This is also a preparation to centralize the logic of updating largefiles in the working directory into the function wrapping "merge.update" in the subsequent patch.

Matt Mackall - - Load All Authors

File last commit:

r22047:8fb6844a default


                r22287:f3ac9677

default

Download file

             test-pull-permission.t
        
                    32 lines
            
             | 625 B
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-pull-permission.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      #require unix-permissions no-root

        $ hg init a

        $ cd a

        $ echo foo > b

        $ hg add b

        $ hg ci -m "b"

        $ chmod -w .hg/store

        $ cd ..

        $ hg clone a b

        requesting all changes

        adding changesets

        adding manifests

        adding file changes

        added 1 changesets with 1 changes to 1 files

        updating to branch default

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

        $ chmod +w a/.hg/store # let test clean up

        $ cd b

        $ hg verify

        checking changesets

        checking manifests

        crosschecking files in changesets and manifests

        checking files

        1 files, 1 changesets, 1 total revisions

        $ 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 unix-permissions no-root

				$ hg init a
				$ cd a
				$ echo foo > b
				$ hg add b
				$ hg ci -m "b"

				$ chmod -w .hg/store

				$ cd ..

				$ hg clone a b
				requesting all changes
				adding changesets
				adding manifests
				adding file changes
				added 1 changesets with 1 changes to 1 files
				updating to branch default
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved

				$ chmod +w a/.hg/store # let test clean up

				$ cd b
				$ hg verify
				checking changesets
				checking manifests
				crosschecking files in changesets and manifests
				checking files
				1 files, 1 changesets, 1 total revisions

				$ cd ..