upstream/mercurial-mirror Files · tests/test-status-rev.t

share: wrap bmstore._writerepo for transaction sensitivity (issue4940)...

share: wrap bmstore._writerepo for transaction sensitivity (issue4940) made 'bmstore.write()' transaction sensitive, to restore original bookmarks correctly at failure of a transaction. For example, shelve and unshelve imply steps below: before 46dec89fe888: 1. move active bookmark forward at internal rebasing 2. 'bmstore.write()' writes updated ones into .hg/bookmarks 3. rollback transaction to remove internal commits 4. restore updated bookmarks manually after 46dec89fe888: 1. move active bookmark forward at internal rebasing 2. 'bmstore.write()' doesn't write updated ones into .hg/bookmarks (these are written into .hg/bookmarks.pending, if external hook is spawn) 3. rollback transaction to remove internal commits 4. .hg/bookmarks should be clean, because it isn't changed while transaction running: see (2) above But if shelve or unshelve is executed in the repository created with "shared bookmarks" ("hg share -B"), this doesn't work as expected, because: - share extension makes 'bmstore.write()' write updated bookmarks into .hg/bookmarks of shared source repository regardless of transaction activity, and - intentional transaction failure at the end of shelve/unshelve doesn't restore already updated .hg/bookmarks of shared source This patch makes share extension wrap 'bmstore._writerepo()' instead of 'bmstore.write()', because the former is used to actually write bookmark changes out.

Martin von Zweigbergk - - Load All Authors

File last commit:

r23731:ccbaa2ed default


                r26933:a7eecd02

stable

Download file

             test-status-rev.t
        
                    162 lines
            
             | 6.4 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-status-rev.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      Tests of 'hg status --rev <rev>' to make sure status between <rev> and '.' get

      combined correctly with the dirstate status.

        $ hg init

      First commit

        $ python $TESTDIR/generate-working-copy-states.py state 2 1

        $ hg addremove --similarity 0

        adding content1_content1_content1-tracked

        adding content1_content1_content1-untracked

        adding content1_content1_content3-tracked

        adding content1_content1_content3-untracked

        adding content1_content1_missing-tracked

        adding content1_content1_missing-untracked

        adding content1_content2_content1-tracked

        adding content1_content2_content1-untracked

        adding content1_content2_content2-tracked

        adding content1_content2_content2-untracked

        adding content1_content2_content3-tracked

        adding content1_content2_content3-untracked

        adding content1_content2_missing-tracked

        adding content1_content2_missing-untracked

        adding content1_missing_content1-tracked

        adding content1_missing_content1-untracked

        adding content1_missing_content3-tracked

        adding content1_missing_content3-untracked

        adding content1_missing_missing-tracked

        adding content1_missing_missing-untracked

        $ hg commit -m first

      Second commit

        $ python $TESTDIR/generate-working-copy-states.py state 2 2

        $ hg addremove --similarity 0

        removing content1_missing_content1-tracked

        removing content1_missing_content1-untracked

        removing content1_missing_content3-tracked

        removing content1_missing_content3-untracked

        removing content1_missing_missing-tracked

        removing content1_missing_missing-untracked

        adding missing_content2_content2-tracked

        adding missing_content2_content2-untracked

        adding missing_content2_content3-tracked

        adding missing_content2_content3-untracked

        adding missing_content2_missing-tracked

        adding missing_content2_missing-untracked

        $ hg commit -m second

      Working copy

        $ python $TESTDIR/generate-working-copy-states.py state 2 wc

        $ hg addremove --similarity 0

        adding content1_missing_content1-tracked

        adding content1_missing_content1-untracked

        adding content1_missing_content3-tracked

        adding content1_missing_content3-untracked

        adding content1_missing_missing-tracked

        adding content1_missing_missing-untracked

        adding missing_missing_content3-tracked

        adding missing_missing_content3-untracked

        adding missing_missing_missing-tracked

        adding missing_missing_missing-untracked

        $ hg forget *_*_*-untracked

        $ rm *_*_missing-*

      Status compared to parent of the working copy, i.e. the dirstate status

        $ hg status -A --rev 1 'glob:missing_content2_content3-tracked'

        M missing_content2_content3-tracked

        $ hg status -A --rev 1 'glob:missing_content2_content2-tracked'

        C missing_content2_content2-tracked

        $ hg status -A --rev 1 'glob:missing_missing_content3-tracked'

        A missing_missing_content3-tracked

        $ hg status -A --rev 1 'glob:missing_missing_content3-untracked'

        ? missing_missing_content3-untracked

        $ hg status -A --rev 1 'glob:missing_content2_*-untracked'

        R missing_content2_content2-untracked

        R missing_content2_content3-untracked

        R missing_content2_missing-untracked

        $ hg status -A --rev 1 'glob:missing_*_missing-tracked'

        ! missing_content2_missing-tracked

        ! missing_missing_missing-tracked

      #if windows

        $ hg status -A --rev 1 'glob:missing_missing_missing-untracked'

        missing_missing_missing-untracked: The system cannot find the file specified

      #else

        $ hg status -A --rev 1 'glob:missing_missing_missing-untracked'

        missing_missing_missing-untracked: No such file or directory

      #endif

      Status between first and second commit. Should ignore dirstate status.

        $ hg status -A --rev 0:1 'glob:content1_content2_*'

        M content1_content2_content1-tracked

        M content1_content2_content1-untracked

        M content1_content2_content2-tracked

        M content1_content2_content2-untracked

        M content1_content2_content3-tracked

        M content1_content2_content3-untracked

        M content1_content2_missing-tracked

        M content1_content2_missing-untracked

        $ hg status -A --rev 0:1 'glob:content1_content1_*'

        C content1_content1_content1-tracked

        C content1_content1_content1-untracked

        C content1_content1_content3-tracked

        C content1_content1_content3-untracked

        C content1_content1_missing-tracked

        C content1_content1_missing-untracked

        $ hg status -A --rev 0:1 'glob:missing_content2_*'

        A missing_content2_content2-tracked

        A missing_content2_content2-untracked

        A missing_content2_content3-tracked

        A missing_content2_content3-untracked

        A missing_content2_missing-tracked

        A missing_content2_missing-untracked

        $ hg status -A --rev 0:1 'glob:content1_missing_*'

        R content1_missing_content1-tracked

        R content1_missing_content1-untracked

        R content1_missing_content3-tracked

        R content1_missing_content3-untracked

        R content1_missing_missing-tracked

        R content1_missing_missing-untracked

        $ hg status -A --rev 0:1 'glob:missing_missing_*'

      Status compared to one revision back, checking that the dirstate status

      is correctly combined with the inter-revision status

        $ hg status -A --rev 0 'glob:content1_*_content[23]-tracked'

        M content1_content1_content3-tracked

        M content1_content2_content2-tracked

        M content1_content2_content3-tracked

        M content1_missing_content3-tracked

        $ hg status -A --rev 0 'glob:content1_*_content1-tracked'

        C content1_content1_content1-tracked

        C content1_content2_content1-tracked

        C content1_missing_content1-tracked

        $ hg status -A --rev 0 'glob:missing_*_content?-tracked'

        A missing_content2_content2-tracked

        A missing_content2_content3-tracked

        A missing_missing_content3-tracked

      BROKEN: missing_content2_content[23]-untracked exist, so should be listed

        $ hg status -A --rev 0 'glob:missing_*_content?-untracked'

        ? missing_missing_content3-untracked

        $ hg status -A --rev 0 'glob:content1_*_*-untracked'

        R content1_content1_content1-untracked

        R content1_content1_content3-untracked

        R content1_content1_missing-untracked

        R content1_content2_content1-untracked

        R content1_content2_content2-untracked

        R content1_content2_content3-untracked

        R content1_content2_missing-untracked

        R content1_missing_content1-untracked

        R content1_missing_content3-untracked

        R content1_missing_missing-untracked

        $ hg status -A --rev 0 'glob:*_*_missing-tracked'

        ! content1_content1_missing-tracked

        ! content1_content2_missing-tracked

        ! content1_missing_missing-tracked

        ! missing_content2_missing-tracked

        ! missing_missing_missing-tracked

        $ hg status -A --rev 0 'glob:missing_*_missing-untracked'

	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

				Tests of 'hg status --rev <rev>' to make sure status between <rev> and '.' get
				combined correctly with the dirstate status.

				$ hg init

				First commit

				$ python $TESTDIR/generate-working-copy-states.py state 2 1
				$ hg addremove --similarity 0
				adding content1_content1_content1-tracked
				adding content1_content1_content1-untracked
				adding content1_content1_content3-tracked
				adding content1_content1_content3-untracked
				adding content1_content1_missing-tracked
				adding content1_content1_missing-untracked
				adding content1_content2_content1-tracked
				adding content1_content2_content1-untracked
				adding content1_content2_content2-tracked
				adding content1_content2_content2-untracked
				adding content1_content2_content3-tracked
				adding content1_content2_content3-untracked
				adding content1_content2_missing-tracked
				adding content1_content2_missing-untracked
				adding content1_missing_content1-tracked
				adding content1_missing_content1-untracked
				adding content1_missing_content3-tracked
				adding content1_missing_content3-untracked
				adding content1_missing_missing-tracked
				adding content1_missing_missing-untracked
				$ hg commit -m first

				Second commit

				$ python $TESTDIR/generate-working-copy-states.py state 2 2
				$ hg addremove --similarity 0
				removing content1_missing_content1-tracked
				removing content1_missing_content1-untracked
				removing content1_missing_content3-tracked
				removing content1_missing_content3-untracked
				removing content1_missing_missing-tracked
				removing content1_missing_missing-untracked
				adding missing_content2_content2-tracked
				adding missing_content2_content2-untracked
				adding missing_content2_content3-tracked
				adding missing_content2_content3-untracked
				adding missing_content2_missing-tracked
				adding missing_content2_missing-untracked
				$ hg commit -m second

				Working copy

				$ python $TESTDIR/generate-working-copy-states.py state 2 wc
				$ hg addremove --similarity 0
				adding content1_missing_content1-tracked
				adding content1_missing_content1-untracked
				adding content1_missing_content3-tracked
				adding content1_missing_content3-untracked
				adding content1_missing_missing-tracked
				adding content1_missing_missing-untracked
				adding missing_missing_content3-tracked
				adding missing_missing_content3-untracked
				adding missing_missing_missing-tracked
				adding missing_missing_missing-untracked
				$ hg forget __*-untracked
				$ rm __missing-*

				Status compared to parent of the working copy, i.e. the dirstate status

				$ hg status -A --rev 1 'glob:missing_content2_content3-tracked'
				M missing_content2_content3-tracked
				$ hg status -A --rev 1 'glob:missing_content2_content2-tracked'
				C missing_content2_content2-tracked
				$ hg status -A --rev 1 'glob:missing_missing_content3-tracked'
				A missing_missing_content3-tracked
				$ hg status -A --rev 1 'glob:missing_missing_content3-untracked'
				? missing_missing_content3-untracked
				$ hg status -A --rev 1 'glob:missing_content2_*-untracked'
				R missing_content2_content2-untracked
				R missing_content2_content3-untracked
				R missing_content2_missing-untracked
				$ hg status -A --rev 1 'glob:missing_*_missing-tracked'
				! missing_content2_missing-tracked
				! missing_missing_missing-tracked
				#if windows
				$ hg status -A --rev 1 'glob:missing_missing_missing-untracked'
				missing_missing_missing-untracked: The system cannot find the file specified
				#else
				$ hg status -A --rev 1 'glob:missing_missing_missing-untracked'
				missing_missing_missing-untracked: No such file or directory
				#endif

				Status between first and second commit. Should ignore dirstate status.

				$ hg status -A --rev 0:1 'glob:content1_content2_*'
				M content1_content2_content1-tracked
				M content1_content2_content1-untracked
				M content1_content2_content2-tracked
				M content1_content2_content2-untracked
				M content1_content2_content3-tracked
				M content1_content2_content3-untracked
				M content1_content2_missing-tracked
				M content1_content2_missing-untracked
				$ hg status -A --rev 0:1 'glob:content1_content1_*'
				C content1_content1_content1-tracked
				C content1_content1_content1-untracked
				C content1_content1_content3-tracked
				C content1_content1_content3-untracked
				C content1_content1_missing-tracked
				C content1_content1_missing-untracked
				$ hg status -A --rev 0:1 'glob:missing_content2_*'
				A missing_content2_content2-tracked
				A missing_content2_content2-untracked
				A missing_content2_content3-tracked
				A missing_content2_content3-untracked
				A missing_content2_missing-tracked
				A missing_content2_missing-untracked
				$ hg status -A --rev 0:1 'glob:content1_missing_*'
				R content1_missing_content1-tracked
				R content1_missing_content1-untracked
				R content1_missing_content3-tracked
				R content1_missing_content3-untracked
				R content1_missing_missing-tracked
				R content1_missing_missing-untracked
				$ hg status -A --rev 0:1 'glob:missing_missing_*'

				Status compared to one revision back, checking that the dirstate status
				is correctly combined with the inter-revision status

				$ hg status -A --rev 0 'glob:content1_*_content[23]-tracked'
				M content1_content1_content3-tracked
				M content1_content2_content2-tracked
				M content1_content2_content3-tracked
				M content1_missing_content3-tracked
				$ hg status -A --rev 0 'glob:content1_*_content1-tracked'
				C content1_content1_content1-tracked
				C content1_content2_content1-tracked
				C content1_missing_content1-tracked
				$ hg status -A --rev 0 'glob:missing_*_content?-tracked'
				A missing_content2_content2-tracked
				A missing_content2_content3-tracked
				A missing_missing_content3-tracked
				BROKEN: missing_content2_content[23]-untracked exist, so should be listed
				$ hg status -A --rev 0 'glob:missing_*_content?-untracked'
				? missing_missing_content3-untracked
				$ hg status -A --rev 0 'glob:content1__-untracked'
				R content1_content1_content1-untracked
				R content1_content1_content3-untracked
				R content1_content1_missing-untracked
				R content1_content2_content1-untracked
				R content1_content2_content2-untracked
				R content1_content2_content3-untracked
				R content1_content2_missing-untracked
				R content1_missing_content1-untracked
				R content1_missing_content3-untracked
				R content1_missing_missing-untracked
				$ hg status -A --rev 0 'glob:__missing-tracked'
				! content1_content1_missing-tracked
				! content1_content2_missing-tracked
				! content1_missing_missing-tracked
				! missing_content2_missing-tracked
				! missing_missing_missing-tracked
				$ hg status -A --rev 0 'glob:missing_*_missing-untracked'