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

rebase: choose default destination the same way as 'hg merge' (BC)...

rebase: choose default destination the same way as 'hg merge' (BC) This changeset finally make 'hg rebase' choose its default destination using the same logic as 'hg merge'. The previous default was "tipmost changeset on the current branch", the new default is "the other head if there is only one". This change has multiple consequences: - Multiple tests which were not rebasing anything (rebasing from tipmost head) are now rebasing on the other "lower" branch. This is the expected new behavior. - A test is now explicitly aborting when there is too many heads on the branch. This is the expected behavior. - We gained a better detection of the "nothing to rebase" case while performing 'hg pull --rebase' so the message have been updated. Making clearer than an update was performed and why. This is beneficial side-effect. - Rebasing from an active bookmark will behave the same as 'hg merge' from a bookmark.

Pierre-Yves David - - Load All Authors

File last commit:

r26917:2329ca3e default


                r28189:fac3a24b

default

Download file

             test-manifestv2.t
        
                    101 lines
            
             | 2.3 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-manifestv2.t
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Drew Gottlieb
    
tests: test that we can convert to manifestv2 with clone...

              r24935
            
      Create repo with old manifest

        Pierre-Yves David
    
test: use generaldelta in test-manifestv2.t...

              r26917
            
        $ cat << EOF >> $HGRCPATH

        > [format]

        > usegeneraldelta=yes

        > EOF

        Drew Gottlieb
    
tests: test that we can convert to manifestv2 with clone...

              r24935
            
        $ hg init existing

        $ cd existing

        $ echo footext > foo

        $ hg add foo

        $ hg commit -m initial

      We're using v1, so no manifestv2 entry is in requires yet.

        $ grep manifestv2 .hg/requires

        [1]

      Let's clone this with manifestv2 enabled to switch to the new format for

      future commits.

        $ cd ..

        $ hg clone --pull existing new --config experimental.manifestv2=1

        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

        $ cd new

      Check that entry was added to .hg/requires.

        $ grep manifestv2 .hg/requires

        manifestv2

      Make a new commit.

        $ echo newfootext > foo

        $ hg commit -m new

      Check that the manifest actually switched to v2.

        $ hg debugdata -m 0

        foo\x0021e958b1dca695a60ee2e9cf151753204ee0f9e9 (esc)

        $ hg debugdata -m 1

        \x00 (esc)

        \x00foo\x00 (esc)

        I\xab\x7f\xb8(\x83\xcas\x15\x9d\xc2\xd3\xd3:5\x08\xbad5_ (esc)

      Check that manifestv2 is used if the requirement is present, even if it's

      disabled in the config.

        $ echo newerfootext > foo

        $ hg --config experimental.manifestv2=False commit -m newer

        $ hg debugdata -m 2

        \x00 (esc)

        \x00foo\x00 (esc)

        \xa6\xb1\xfb\xef]\x91\xa1\x19`\xf3.#\x90S\xf8\x06 \xe2\x19\x00 (esc)

      Check that we can still read v1 manifests.

        $ hg files -r 0

        foo

        $ cd ..

      Check that entry is added to .hg/requires on repo creation

        Martin von Zweigbergk
    
manifestv2: set requires at repo creation time...

              r24571
            
        $ hg --config experimental.manifestv2=True init repo

        $ cd repo

        $ grep manifestv2 .hg/requires

        manifestv2

      Set up simple repo

        $ echo a > file1

        $ echo b > file2

        $ echo c > file3

        $ hg ci -Aqm 'initial'

        $ echo d > file2

        $ hg ci -m 'modify file2'

      Check that 'hg verify', which uses manifest.readdelta(), works

        $ hg verify

        checking changesets

        checking manifests

        crosschecking files in changesets and manifests

        checking files

        3 files, 2 changesets, 4 total revisions

        Martin von Zweigbergk
    
manifestv2: add support for writing new manifest format...

              r24573
            
      Check that manifest revlog is smaller than for v1

        Martin von Zweigbergk
    
manifestv2: set requires at repo creation time...

              r24571
            
        $ hg debugindex -m

        Pierre-Yves David
    
test: use generaldelta in test-manifestv2.t...

              r26917
            
           rev    offset  length  delta linkrev nodeid       p1           p2

             0         0      81     -1       0 57361477c778 000000000000 000000000000

        Martin von Zweigbergk
    
manifestv2: add support for writing new manifest format...

              r24573
            
             1        81      33      0       1 aeaab5a2ef74 57361477c778 000000000000

	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

Drew Gottlieb tests: test that we can convert to manifestv2 with clone...	r24935	Create repo with old manifest

Pierre-Yves David test: use generaldelta in test-manifestv2.t...	r26917	$ cat << EOF >> $HGRCPATH
		> [format]
		> usegeneraldelta=yes
		> EOF

Drew Gottlieb tests: test that we can convert to manifestv2 with clone...	r24935	$ hg init existing
		$ cd existing
		$ echo footext > foo
		$ hg add foo
		$ hg commit -m initial

		We're using v1, so no manifestv2 entry is in requires yet.

		$ grep manifestv2 .hg/requires
		[1]

		Let's clone this with manifestv2 enabled to switch to the new format for
		future commits.

		$ cd ..
		$ hg clone --pull existing new --config experimental.manifestv2=1
		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
		$ cd new

		Check that entry was added to .hg/requires.

		$ grep manifestv2 .hg/requires
		manifestv2

		Make a new commit.

		$ echo newfootext > foo
		$ hg commit -m new

		Check that the manifest actually switched to v2.

		$ hg debugdata -m 0
		foo\x0021e958b1dca695a60ee2e9cf151753204ee0f9e9 (esc)

		$ hg debugdata -m 1
		\x00 (esc)
		\x00foo\x00 (esc)
		I\xab\x7f\xb8(\x83\xcas\x15\x9d\xc2\xd3\xd3:5\x08\xbad5_ (esc)

		Check that manifestv2 is used if the requirement is present, even if it's
		disabled in the config.

		$ echo newerfootext > foo
		$ hg --config experimental.manifestv2=False commit -m newer

		$ hg debugdata -m 2
		\x00 (esc)
		\x00foo\x00 (esc)
		\xa6\xb1\xfb\xef]\x91\xa1\x19`\xf3.#\x90S\xf8\x06 \xe2\x19\x00 (esc)

		Check that we can still read v1 manifests.

		$ hg files -r 0
		foo

		$ cd ..

		Check that entry is added to .hg/requires on repo creation
Martin von Zweigbergk manifestv2: set requires at repo creation time...	r24571
		$ hg --config experimental.manifestv2=True init repo
		$ cd repo
		$ grep manifestv2 .hg/requires
		manifestv2

		Set up simple repo

		$ echo a > file1
		$ echo b > file2
		$ echo c > file3
		$ hg ci -Aqm 'initial'
		$ echo d > file2
		$ hg ci -m 'modify file2'

		Check that 'hg verify', which uses manifest.readdelta(), works

		$ hg verify
		checking changesets
		checking manifests
		crosschecking files in changesets and manifests
		checking files
		3 files, 2 changesets, 4 total revisions

Martin von Zweigbergk manifestv2: add support for writing new manifest format...	r24573	Check that manifest revlog is smaller than for v1
Martin von Zweigbergk manifestv2: set requires at repo creation time...	r24571
		$ hg debugindex -m
Pierre-Yves David test: use generaldelta in test-manifestv2.t...	r26917	rev offset length delta linkrev nodeid p1 p2
		0 0 81 -1 0 57361477c778 000000000000 000000000000
Martin von Zweigbergk manifestv2: add support for writing new manifest format...	r24573	1 81 33 0 1 aeaab5a2ef74 57361477c778 000000000000