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

largefiles: restore standins from non branch-tip parent at rollback correctly...

largefiles: restore standins from non branch-tip parent at rollback correctly Before this patch, "hg rollback" can't restore standins correclty, if: - old parent of the working directory is rollback-ed, and - new parent of the working directory is not branch-tip "overriderollback" uses "merge.update" as a kind of "revert" utility to restore only standins with "node=None", and this makes "merge.update" choose "branch-tip" revision as the updating target unexpectedly. Then, "merge.update" restores standins from the branch-tip revision regardless of the parent of the working directory after rollback and this may cause unexpected behavior. This patch invokes "merge.update" with "node='.'" to restore standins from the parent revision of the working directory. In fact, this "merge.update" invocation will be replaced in the subsequent patch to fix another problem, but this change is usefull to inform reason why such complicated case should be tested.

Matt Mackall - - Load All Authors

File last commit:

r19942:2c886ded stable


                r22284:72b37865

default

Download file

             test-generaldelta.t
        
                    24 lines
            
             | 792 B
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-generaldelta.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      Check whether size of generaldelta revlog is not bigger than its

      regular equivalent. Test would fail if generaldelta was naive

      implementation of parentdelta: third manifest revision would be fully

      inserted due to big distance from its paren revision (zero).

        $ hg init repo

        $ cd repo

        $ echo foo > foo

        $ echo bar > bar

        $ hg commit -q -Am boo

        $ hg clone --pull . ../gdrepo -q --config format.generaldelta=yes

        $ for r in 1 2 3; do

        >   echo $r > foo

        >   hg commit -q -m $r

        >   hg up -q -r 0

        >   hg pull . -q -r $r -R ../gdrepo

        > done

        $ cd ..

        >>> import os

        >>> regsize = os.stat("repo/.hg/store/00manifest.i").st_size

        >>> gdsize = os.stat("gdrepo/.hg/store/00manifest.i").st_size

        >>> if regsize < gdsize:

        ...     print 'generaldata increased size of manifest'

	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

				Check whether size of generaldelta revlog is not bigger than its
				regular equivalent. Test would fail if generaldelta was naive
				implementation of parentdelta: third manifest revision would be fully
				inserted due to big distance from its paren revision (zero).

				$ hg init repo
				$ cd repo
				$ echo foo > foo
				$ echo bar > bar
				$ hg commit -q -Am boo
				$ hg clone --pull . ../gdrepo -q --config format.generaldelta=yes
				$ for r in 1 2 3; do
				> echo $r > foo
				> hg commit -q -m $r
				> hg up -q -r 0
				> hg pull . -q -r $r -R ../gdrepo
				> done

				$ cd ..
				>>> import os
				>>> regsize = os.stat("repo/.hg/store/00manifest.i").st_size
				>>> gdsize = os.stat("gdrepo/.hg/store/00manifest.i").st_size
				>>> if regsize < gdsize:
				... print 'generaldata increased size of manifest'