upstream/mercurial-mirror Files · tests/test-share.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:

r22046:7a9cbb31 default


                r22287:f3ac9677

default

Download file

             test-share.t
        
                    134 lines
            
             | 2.6 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-share.t
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Matt Mackall
    
tests: replace exit 80 with #require

              r22046
            
      #require killdaemons

        Matt Mackall
    
tests: unify test-share

              r12487
            
        $ echo "[extensions]"      >> $HGRCPATH

        $ echo "share = "          >> $HGRCPATH

      prepare repo1

        $ hg init repo1

        $ cd repo1

        $ echo a > a

        $ hg commit -A -m'init'

        adding a

      share it

        $ cd ..

        $ hg share repo1 repo2

        updating working directory

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

      share shouldn't have a store dir

        $ cd repo2

        $ test -d .hg/store

        [1]

      Some sed versions appends newline, some don't, and some just fails

        $ cat .hg/sharedpath; echo

        Mads Kiilerich
    
tests: make (glob) on windows accept \ instead of /...

              r15447
            
        $TESTTMP/repo1/.hg (glob)

        Matt Mackall
    
tests: unify test-share

              r12487
            
        Greg Ward
    
share: allow trailing newline on .hg/sharedpath....

              r15101
            
      trailing newline on .hg/sharedpath is ok

        $ hg tip -q

        0:d3873e73d99e

        $ echo '' >> .hg/sharedpath

        $ cat .hg/sharedpath

        Mads Kiilerich
    
tests: make (glob) on windows accept \ instead of /...

              r15447
            
        $TESTTMP/repo1/.hg (glob)

        Greg Ward
    
share: allow trailing newline on .hg/sharedpath....

              r15101
            
        $ hg tip -q

        0:d3873e73d99e

        Matt Mackall
    
tests: unify test-share

              r12487
            
      commit in shared clone

        $ echo a >> a

        $ hg commit -m'change in shared clone'

      check original

        $ cd ../repo1

        $ hg log

        changeset:   1:8af4dc49db9e

        tag:         tip

        user:        test

        date:        Thu Jan 01 00:00:00 1970 +0000

        summary:     change in shared clone

        changeset:   0:d3873e73d99e

        user:        test

        date:        Thu Jan 01 00:00:00 1970 +0000

        summary:     init

        $ hg update

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

        $ cat a             # should be two lines of "a"

        a

        a

      commit in original

        $ echo b > b

        $ hg commit -A -m'another file'

        adding b

      check in shared clone

        $ cd ../repo2

        $ hg log

        changeset:   2:c2e0ac586386

        tag:         tip

        user:        test

        date:        Thu Jan 01 00:00:00 1970 +0000

        summary:     another file

        changeset:   1:8af4dc49db9e

        user:        test

        date:        Thu Jan 01 00:00:00 1970 +0000

        summary:     change in shared clone

        changeset:   0:d3873e73d99e

        user:        test

        date:        Thu Jan 01 00:00:00 1970 +0000

        summary:     init

        $ hg update

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

        $ cat b             # should exist with one "b"

        b

      hg serve shared clone

        $ hg serve -n test -p $HGPORT -d --pid-file=hg.pid

        $ cat hg.pid >> $DAEMON_PIDS

        Mads Kiilerich
    
tests: prepare get-with-headers.py for MSYS...

              r17017
            
        $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT 'raw-file/'

        Matt Mackall
    
tests: unify test-share

              r12487
            
        200 Script output follows

        -rw-r--r-- 4 a

        -rw-r--r-- 2 b

        Simon Heimberg
    
test: test unshare command

              r15080
            
      test unshare command

        $ hg unshare

        $ test -d .hg/store

        $ test -f .hg/sharedpath

        [1]

        $ hg unshare

        abort: this is not a shared repo

        [255]

      check that a change does not propagate

        $ echo b >> b

        $ hg commit -m'change in unshared'

        $ cd ../repo1

        $ hg id -r tip

        c2e0ac586386 tip

        Mads Kiilerich
    
tests: add missing trailing 'cd ..'...

              r16913
            
        $ cd ..

        Patrick Mezard
    
tests: enable more server tests on Windows

              r17539
            
      Explicitly kill daemons to let the test exit on Windows

        $ "$TESTDIR/killdaemons.py" $DAEMON_PIDS

	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

Matt Mackall tests: replace exit 80 with #require	r22046	#require killdaemons
Matt Mackall tests: unify test-share	r12487
		$ echo "[extensions]" >> $HGRCPATH
		$ echo "share = " >> $HGRCPATH

		prepare repo1

		$ hg init repo1
		$ cd repo1
		$ echo a > a
		$ hg commit -A -m'init'
		adding a

		share it

		$ cd ..
		$ hg share repo1 repo2
		updating working directory
		1 files updated, 0 files merged, 0 files removed, 0 files unresolved

		share shouldn't have a store dir

		$ cd repo2
		$ test -d .hg/store
		[1]

		Some sed versions appends newline, some don't, and some just fails

		$ cat .hg/sharedpath; echo
Mads Kiilerich tests: make (glob) on windows accept \ instead of /...	r15447	$TESTTMP/repo1/.hg (glob)
Matt Mackall tests: unify test-share	r12487
Greg Ward share: allow trailing newline on .hg/sharedpath....	r15101	trailing newline on .hg/sharedpath is ok
		$ hg tip -q
		0:d3873e73d99e
		$ echo '' >> .hg/sharedpath
		$ cat .hg/sharedpath
Mads Kiilerich tests: make (glob) on windows accept \ instead of /...	r15447	$TESTTMP/repo1/.hg (glob)
Greg Ward share: allow trailing newline on .hg/sharedpath....	r15101	$ hg tip -q
		0:d3873e73d99e

Matt Mackall tests: unify test-share	r12487	commit in shared clone

		$ echo a >> a
		$ hg commit -m'change in shared clone'

		check original

		$ cd ../repo1
		$ hg log
		changeset: 1:8af4dc49db9e
		tag: tip
		user: test
		date: Thu Jan 01 00:00:00 1970 +0000
		summary: change in shared clone

		changeset: 0:d3873e73d99e
		user: test
		date: Thu Jan 01 00:00:00 1970 +0000
		summary: init

		$ hg update
		1 files updated, 0 files merged, 0 files removed, 0 files unresolved
		$ cat a # should be two lines of "a"
		a
		a

		commit in original

		$ echo b > b
		$ hg commit -A -m'another file'
		adding b

		check in shared clone

		$ cd ../repo2
		$ hg log
		changeset: 2:c2e0ac586386
		tag: tip
		user: test
		date: Thu Jan 01 00:00:00 1970 +0000
		summary: another file

		changeset: 1:8af4dc49db9e
		user: test
		date: Thu Jan 01 00:00:00 1970 +0000
		summary: change in shared clone

		changeset: 0:d3873e73d99e
		user: test
		date: Thu Jan 01 00:00:00 1970 +0000
		summary: init

		$ hg update
		1 files updated, 0 files merged, 0 files removed, 0 files unresolved
		$ cat b # should exist with one "b"
		b

		hg serve shared clone

		$ hg serve -n test -p $HGPORT -d --pid-file=hg.pid
		$ cat hg.pid >> $DAEMON_PIDS
Mads Kiilerich tests: prepare get-with-headers.py for MSYS...	r17017	$ "$TESTDIR/get-with-headers.py" localhost:$HGPORT 'raw-file/'
Matt Mackall tests: unify test-share	r12487	200 Script output follows


		-rw-r--r-- 4 a
		-rw-r--r-- 2 b


Simon Heimberg test: test unshare command	r15080
		test unshare command

		$ hg unshare
		$ test -d .hg/store
		$ test -f .hg/sharedpath
		[1]
		$ hg unshare
		abort: this is not a shared repo
		[255]

		check that a change does not propagate

		$ echo b >> b
		$ hg commit -m'change in unshared'
		$ cd ../repo1
		$ hg id -r tip
		c2e0ac586386 tip
Mads Kiilerich tests: add missing trailing 'cd ..'...	r16913
		$ cd ..
Patrick Mezard tests: enable more server tests on Windows	r17539
		Explicitly kill daemons to let the test exit on Windows

		$ "$TESTDIR/killdaemons.py" $DAEMON_PIDS