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

localrepo: make journal.dirstate contain in-memory changes before transaction...

localrepo: make journal.dirstate contain in-memory changes before transaction Before this patch, in-memory dirstate changes aren't written out at opening transaction, even though 'journal.dirstate' is created directly from '.hg/dirstate'. Therefore, subsequent 'hg rollback' uses incomplete 'undo.dirstate' to restore dirstate, if dirstate is changed and isn't written out before opening transaction. In cases below, the condition "dirstate is changed and isn't written out before opening transaction" isn't satisfied and this problem doesn't appear: - "wlock scope" and "transaction scope" are almost equivalent e.g. 'commit --amend', 'import' and so on - dirstate changes are written out before opening transaction e.g. 'rebase' (via 'dirstateguard') and 'commit -A' (by separated wlock scopes) On the other hand, 'backout' may satisfy the condition above. To make 'journal.dirstate' contain in-memory changes before opening transaction, this patch explicitly invokes 'dirstate.write()' in 'localrepository.transaction()'. 'dirstate.write()' is placed before not "writing journal files out" but "invoking pretxnopen hooks" for visibility of dirstate changes to external hook processes. BTW, in the test script, 'touch -t 200001010000' and 'hg status' are invoked to make file 'c' surely clean in dirstate, because "clean but unsure" files indirectly cause 'dirstate.write()' at 'repo.status()' in 'repo.commit()' (see for detail) and prevents from certainly reproducing the issue.

Durham Goode - - Load All Authors

File last commit:

r22955:fab9dda0 default


                r25878:800e090e

stable

Download file

             test-obsolete-changeset-exchange.t
        
                    85 lines
            
             | 2.4 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-obsolete-changeset-exchange.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      Test changesets filtering during exchanges (some tests are still in

      test-obsolete.t)

        $ cat >> $HGRCPATH << EOF

        > [experimental]

        > evolution=createmarkers

        > EOF

      Push does not corrupt remote

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

      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

      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)

      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

				Test changesets filtering during exchanges (some tests are still in
				test-obsolete.t)

				$ cat >> $HGRCPATH << EOF
				> [experimental]
				> evolution=createmarkers
				> EOF

				Push does not corrupt remote
				----------------------------

				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

				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)

				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)