upstream/mercurial-mirror Files · tests/test-obsolete-changeset-exchange.t

largefiles: restore standins according to restored dirstate...

largefiles: restore standins according to restored dirstate Before this patch, standins are restored from the NEW parent of the working directory at "hg rollback", and this causes: - standins removed in the rollback-ed revision are restored, and become orphan, because they are already marked as "R" in the restored dirstate and expected to be unlinked - standins added in the rollback-ed revision are left as they were before rollback, because they are not included in the new parent (this may not be so serious) This patch replaces the "merge.update" invocation with a specific implementation to restore standins according to restored dirstate. This is also the preparation to centralize the logic of updating largefiles into the function wrapping "merge.update" in the subsequent patch. After that patch, "merge.update" will also update largefiles in the working directory and be redundant for restoring standins only.

Pierre-Yves David - - Load All Authors

File last commit:

r18499:d07834e5 stable


                r22285:85bded43

default

Download file

             test-obsolete-changeset-exchange.t
        
                    87 lines
            
             | 2.5 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-obsolete-changeset-exchange.t
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Patrick Mezard
    
discovery: add extinct changesets to outgoing.excluded...

              r17248
            
      Test changesets filtering during exchanges (some tests are still in

      test-obsolete.t)

        Pierre-Yves David
    
obsolete: introduce an `_enabled` switch to disable the feature by default...

              r17296
            
        $ cat > obs.py << EOF

        > import mercurial.obsolete

        > mercurial.obsolete._enabled = True

        > EOF

        $ echo '[extensions]' >> $HGRCPATH

        $ echo "obs=${TESTTMP}/obs.py" >> $HGRCPATH

        Pierre-Yves David
    
test: fix typo in test comment

              r17327
            
      Push does not corrupt remote

      ----------------------------

        Patrick Mezard
    
discovery: add extinct changesets to outgoing.excluded...

              r17248
            
      Create a DAG where a changeset reuses a revision from a file first used in an

      extinct changeset.

        $ hg init local

        $ cd local

        $ echo 'base' > base

        $ hg commit -Am base

        adding base

        $ echo 'A' > A

        $ hg commit -Am A

        adding A

        $ hg up 0

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

        $ hg revert -ar 1

        adding A

        $ hg commit -Am "A'"

        created new head

        $ hg log -G --template='{desc} {node}'

        @  A' f89bcc95eba5174b1ccc3e33a82e84c96e8338ee

        |

        | o  A 9d73aac1b2ed7d53835eaeec212ed41ea47da53a

        |/

        o  base d20a80d4def38df63a4b330b7fb688f3d4cae1e3

        $ hg debugobsolete 9d73aac1b2ed7d53835eaeec212ed41ea47da53a f89bcc95eba5174b1ccc3e33a82e84c96e8338ee

      Push it. The bundle should not refer to the extinct changeset.

        $ hg init ../other

        $ hg push ../other

        pushing to ../other

        searching for changes

        adding changesets

        adding manifests

        adding file changes

        added 2 changesets with 2 changes to 2 files

        $ hg -R ../other verify

        checking changesets

        checking manifests

        crosschecking files in changesets and manifests

        checking files

        2 files, 2 changesets, 2 total revisions

        Pierre-Yves David
    
pull: fix crash when pulling changeset that get hidden locally (issue3788)...

              r18498
            
      Adding a changeset going extinct locally

      ------------------------------------------

      Pull a changeset that will immediatly goes extinct (because you already have a

      marker to obsolete him)

      (test resolution of issue3788)

        $ hg phase --draft --force f89bcc95eba5

        $ hg phase -R ../other --draft --force f89bcc95eba5

        $ hg commit --amend -m "A''"

        $ hg --hidden --config extensions.mq= strip  --no-backup f89bcc95eba5

        $ hg pull ../other

        pulling from ../other

        searching for changes

        adding changesets

        adding manifests

        adding file changes

        added 1 changesets with 0 changes to 1 files (+1 heads)

        (run 'hg heads' to see heads, 'hg merge' to merge)

        Pierre-Yves David
    
test-obsolete: validate that bundle is not affected by issue3788...

              r18499
            
      check that bundle is not affected

        $ hg bundle --hidden --rev f89bcc95eba5 --base "f89bcc95eba5^" ../f89bcc95eba5.hg

        1 changesets found

        $ hg --hidden --config extensions.mq= strip --no-backup f89bcc95eba5

        $ hg unbundle ../f89bcc95eba5.hg

        adding changesets

        adding manifests

        adding file changes

        added 1 changesets with 0 changes to 1 files (+1 heads)

        (run 'hg heads' to see heads)

	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

Patrick Mezard discovery: add extinct changesets to outgoing.excluded...	r17248	Test changesets filtering during exchanges (some tests are still in
		test-obsolete.t)

Pierre-Yves David obsolete: introduce an `_enabled` switch to disable the feature by default...	r17296	$ cat > obs.py << EOF
		> import mercurial.obsolete
		> mercurial.obsolete._enabled = True
		> EOF
		$ echo '[extensions]' >> $HGRCPATH
		$ echo "obs=${TESTTMP}/obs.py" >> $HGRCPATH

Pierre-Yves David test: fix typo in test comment	r17327	Push does not corrupt remote
		----------------------------
Patrick Mezard discovery: add extinct changesets to outgoing.excluded...	r17248
		Create a DAG where a changeset reuses a revision from a file first used in an
		extinct changeset.

		$ hg init local
		$ cd local
		$ echo 'base' > base
		$ hg commit -Am base
		adding base
		$ echo 'A' > A
		$ hg commit -Am A
		adding A
		$ hg up 0
		0 files updated, 0 files merged, 1 files removed, 0 files unresolved
		$ hg revert -ar 1
		adding A
		$ hg commit -Am "A'"
		created new head
		$ hg log -G --template='{desc} {node}'
		@ A' f89bcc95eba5174b1ccc3e33a82e84c96e8338ee
		\|
		\| o A 9d73aac1b2ed7d53835eaeec212ed41ea47da53a
		\|/
		o base d20a80d4def38df63a4b330b7fb688f3d4cae1e3

		$ hg debugobsolete 9d73aac1b2ed7d53835eaeec212ed41ea47da53a f89bcc95eba5174b1ccc3e33a82e84c96e8338ee

		Push it. The bundle should not refer to the extinct changeset.

		$ hg init ../other
		$ hg push ../other
		pushing to ../other
		searching for changes
		adding changesets
		adding manifests
		adding file changes
		added 2 changesets with 2 changes to 2 files
		$ hg -R ../other verify
		checking changesets
		checking manifests
		crosschecking files in changesets and manifests
		checking files
		2 files, 2 changesets, 2 total revisions
Pierre-Yves David pull: fix crash when pulling changeset that get hidden locally (issue3788)...	r18498
		Adding a changeset going extinct locally
		------------------------------------------

		Pull a changeset that will immediatly goes extinct (because you already have a
		marker to obsolete him)
		(test resolution of issue3788)

		$ hg phase --draft --force f89bcc95eba5
		$ hg phase -R ../other --draft --force f89bcc95eba5
		$ hg commit --amend -m "A''"
		$ hg --hidden --config extensions.mq= strip --no-backup f89bcc95eba5
		$ hg pull ../other
		pulling from ../other
		searching for changes
		adding changesets
		adding manifests
		adding file changes
		added 1 changesets with 0 changes to 1 files (+1 heads)
		(run 'hg heads' to see heads, 'hg merge' to merge)
Pierre-Yves David test-obsolete: validate that bundle is not affected by issue3788...	r18499
		check that bundle is not affected

		$ hg bundle --hidden --rev f89bcc95eba5 --base "f89bcc95eba5^" ../f89bcc95eba5.hg
		1 changesets found
		$ hg --hidden --config extensions.mq= strip --no-backup f89bcc95eba5
		$ hg unbundle ../f89bcc95eba5.hg
		adding changesets
		adding manifests
		adding file changes
		added 1 changesets with 0 changes to 1 files (+1 heads)
		(run 'hg heads' to see heads)