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

identify: add template support...

identify: add template support This is based on a patch proposed last year by Mathias De Maré[1], with a few changes. - Tags and bookmarks are now formatted lists, for more flexible queries. - The templater is populated whether or not [-nibtB] is specified. (Plain output is unchanged.) This seems more consistent with other templated commands. - The 'id' property is a string, instead of a list. - The parents of 'wdir()' have their own list of attributes. I left 'id' as a string because it seems very useful for generating version info. It's also a bit strange because the value and meaning changes depending on whether or not --debug is passed (short vs full hash), whether the revision is a merge or not (one hash or two, separated by a '+'), the working directory or not (node vs p1node), and local or not (remote defaults to tip, and never has '+'). The equivalent string built with {rev} seems much less useful, and I couldn't think of a reasonable name, so I left it out. The discussion seemed to be pointing towards having a list of nodes, with more than one entry for a merge. It seems simpler to give the nodes a name, and use {node} for the actual commit probed, especially now that there is a virtual node for 'wdir()'. Yuya mentioned using fm.nested() in that thread, so I did for the parent nodes. I'm not sure if the plan is to fill in all of the context attributes in these items, or if these nested items should simply be made {p1node} and {p1rev}. I used ':' as the tag separator for consistency with {tags} in the log templater. Likewise, bookmarks are separated by a space for consistency with the corresponding log template. [1] https://www.mercurial-scm.org/pipermail/mercurial-devel/2016-August/087039.html

Augie Fackler - - Load All Authors

File last commit:

r32940:75be1499 default


                r33051:15a79ac8

default

Download file

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

        Martin von Zweigbergk
    
status: add more complete tests for --rev...

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

      combined correctly with the dirstate status.

        $ hg init

        Martin von Zweigbergk
    
test-status-rev: use same names as from generate-working-copy-states...

              r23196
            
      First commit

        Martin von Zweigbergk
    
status: add more complete tests for --rev...

              r23037
            
        Augie Fackler
    
cleanup: use $PYTHON to run python in many more tests...

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

        Martin von Zweigbergk
    
test-status-rev: use common script for generating file history...

              r23197
            
        $ 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

        Martin von Zweigbergk
    
status: add more complete tests for --rev...

              r23037
            
        Martin von Zweigbergk
    
test-status-rev: use same names as from generate-working-copy-states...

              r23196
            
      Second commit

        Martin von Zweigbergk
    
status: add more complete tests for --rev...

              r23037
            
        Augie Fackler
    
cleanup: use $PYTHON to run python in many more tests...

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

        Martin von Zweigbergk
    
test-status-rev: use common script for generating file history...

              r23197
            
        $ 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

        Martin von Zweigbergk
    
status: add more complete tests for --rev...

              r23037
            
        Martin von Zweigbergk
    
test-status-rev: use same names as from generate-working-copy-states...

              r23196
            
      Working copy

        Martin von Zweigbergk
    
status: add more complete tests for --rev...

              r23037
            
        Augie Fackler
    
cleanup: use $PYTHON to run python in many more tests...

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

        Martin von Zweigbergk
    
test-status-rev: use common script for generating file history...

              r23197
            
        $ 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-*

        Martin von Zweigbergk
    
status: add more complete tests for --rev...

              r23037
            
        Martin von Zweigbergk
    
test-status-rev: add tests for plain dirstate and inter-revision status...

              r23230
            
      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

        Matt Harbison
    
tests: handle differences between missing file error strings on Windows and Unix

              r23353
            
      #if windows

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

        missing_missing_missing-untracked: The system cannot find the file specified

      #else

        Martin von Zweigbergk
    
test-status-rev: add tests for plain dirstate and inter-revision status...

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

        missing_missing_missing-untracked: No such file or directory

        Matt Harbison
    
tests: handle differences between missing file error strings on Windows and Unix

              r23353
            
      #endif

        Martin von Zweigbergk
    
test-status-rev: add tests for plain dirstate and inter-revision status...

              r23230
            
      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

        Martin von Zweigbergk
    
status: add more complete tests for --rev...

              r23037
            
        Martin von Zweigbergk
    
test-status-rev: remove unnecessary initial commit...

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

        Martin von Zweigbergk
    
test-status-rev: use same names as from generate-working-copy-states...

              r23196
            
        M content1_content1_content3-tracked

        Martin von Zweigbergk
    
test-status-rev: use one glob for each expected status...

              r23228
            
        M content1_content2_content2-tracked

        M content1_content2_content3-tracked

        M content1_missing_content3-tracked

        Martin von Zweigbergk
    
test-status-rev: remove unnecessary initial commit...

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

        Martin von Zweigbergk
    
test-status-rev: use one glob for each expected status...

              r23228
            
        C content1_content1_content1-tracked

        C content1_content2_content1-tracked

        C content1_missing_content1-tracked

        Martin von Zweigbergk
    
test-status-rev: remove unnecessary initial commit...

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

        Martin von Zweigbergk
    
test-status-rev: use one glob for each expected status...

              r23228
            
        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

        Martin von Zweigbergk
    
test-status-rev: remove unnecessary initial commit...

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

        Martin von Zweigbergk
    
test-status-rev: use one glob for each expected status...

              r23228
            
        ? missing_missing_content3-untracked

        Martin von Zweigbergk
    
test-status-rev: remove unnecessary initial commit...

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

        Martin von Zweigbergk
    
test-status-rev: use one glob for each expected status...

              r23228
            
        R content1_content1_content1-untracked

        R content1_content1_content3-untracked

        Martin von Zweigbergk
    
test-status-rev: use same names as from generate-working-copy-states...

              r23196
            
        R content1_content1_missing-untracked

        Martin von Zweigbergk
    
test-status-rev: use one glob for each expected status...

              r23228
            
        R content1_content2_content1-untracked

        Martin von Zweigbergk
    
test-status-rev: use same names as from generate-working-copy-states...

              r23196
            
        R content1_content2_content2-untracked

        Martin von Zweigbergk
    
test-status-rev: use one glob for each expected status...

              r23228
            
        R content1_content2_content3-untracked

        Martin von Zweigbergk
    
test-status-rev: use same names as from generate-working-copy-states...

              r23196
            
        R content1_content2_missing-untracked

        Martin von Zweigbergk
    
test-status-rev: use one glob for each expected status...

              r23228
            
        R content1_missing_content1-untracked

        R content1_missing_content3-untracked

        R content1_missing_missing-untracked

        Martin von Zweigbergk
    
test-status-rev: remove unnecessary initial commit...

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

        Martin von Zweigbergk
    
test-status-rev: use one glob for each expected status...

              r23228
            
        ! content1_content1_missing-tracked

        ! content1_content2_missing-tracked

        Martin von Zweigbergk
    
test-status-rev: use same names as from generate-working-copy-states...

              r23196
            
        ! content1_missing_missing-tracked

        ! missing_content2_missing-tracked

        Martin von Zweigbergk
    
test-status-rev: use one glob for each expected status...

              r23228
            
        ! missing_missing_missing-tracked

        Martin von Zweigbergk
    
test-status-rev: remove unnecessary initial commit...

              r23229
            
        $ 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

Martin von Zweigbergk status: add more complete tests for --rev...	r23037	Tests of 'hg status --rev <rev>' to make sure status between <rev> and '.' get
		combined correctly with the dirstate status.

		$ hg init

Martin von Zweigbergk test-status-rev: use same names as from generate-working-copy-states...	r23196	First commit
Martin von Zweigbergk status: add more complete tests for --rev...	r23037
Augie Fackler cleanup: use $PYTHON to run python in many more tests...	r32940	$ $PYTHON $TESTDIR/generate-working-copy-states.py state 2 1
Martin von Zweigbergk test-status-rev: use common script for generating file history...	r23197	$ 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
Martin von Zweigbergk status: add more complete tests for --rev...	r23037
Martin von Zweigbergk test-status-rev: use same names as from generate-working-copy-states...	r23196	Second commit
Martin von Zweigbergk status: add more complete tests for --rev...	r23037
Augie Fackler cleanup: use $PYTHON to run python in many more tests...	r32940	$ $PYTHON $TESTDIR/generate-working-copy-states.py state 2 2
Martin von Zweigbergk test-status-rev: use common script for generating file history...	r23197	$ 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
Martin von Zweigbergk status: add more complete tests for --rev...	r23037
Martin von Zweigbergk test-status-rev: use same names as from generate-working-copy-states...	r23196	Working copy
Martin von Zweigbergk status: add more complete tests for --rev...	r23037
Augie Fackler cleanup: use $PYTHON to run python in many more tests...	r32940	$ $PYTHON $TESTDIR/generate-working-copy-states.py state 2 wc
Martin von Zweigbergk test-status-rev: use common script for generating file history...	r23197	$ 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-*
Martin von Zweigbergk status: add more complete tests for --rev...	r23037
Martin von Zweigbergk test-status-rev: add tests for plain dirstate and inter-revision status...	r23230	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
Matt Harbison tests: handle differences between missing file error strings on Windows and Unix	r23353	#if windows
		$ hg status -A --rev 1 'glob:missing_missing_missing-untracked'
		missing_missing_missing-untracked: The system cannot find the file specified
		#else
Martin von Zweigbergk test-status-rev: add tests for plain dirstate and inter-revision status...	r23230	$ hg status -A --rev 1 'glob:missing_missing_missing-untracked'
		missing_missing_missing-untracked: No such file or directory
Matt Harbison tests: handle differences between missing file error strings on Windows and Unix	r23353	#endif
Martin von Zweigbergk test-status-rev: add tests for plain dirstate and inter-revision status...	r23230
		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
Martin von Zweigbergk status: add more complete tests for --rev...	r23037
Martin von Zweigbergk test-status-rev: remove unnecessary initial commit...	r23229	$ hg status -A --rev 0 'glob:content1_*_content[23]-tracked'
Martin von Zweigbergk test-status-rev: use same names as from generate-working-copy-states...	r23196	M content1_content1_content3-tracked
Martin von Zweigbergk test-status-rev: use one glob for each expected status...	r23228	M content1_content2_content2-tracked
		M content1_content2_content3-tracked
		M content1_missing_content3-tracked
Martin von Zweigbergk test-status-rev: remove unnecessary initial commit...	r23229	$ hg status -A --rev 0 'glob:content1_*_content1-tracked'
Martin von Zweigbergk test-status-rev: use one glob for each expected status...	r23228	C content1_content1_content1-tracked
		C content1_content2_content1-tracked
		C content1_missing_content1-tracked
Martin von Zweigbergk test-status-rev: remove unnecessary initial commit...	r23229	$ hg status -A --rev 0 'glob:missing_*_content?-tracked'
Martin von Zweigbergk test-status-rev: use one glob for each expected status...	r23228	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
Martin von Zweigbergk test-status-rev: remove unnecessary initial commit...	r23229	$ hg status -A --rev 0 'glob:missing_*_content?-untracked'
Martin von Zweigbergk test-status-rev: use one glob for each expected status...	r23228	? missing_missing_content3-untracked
Martin von Zweigbergk test-status-rev: remove unnecessary initial commit...	r23229	$ hg status -A --rev 0 'glob:content1__-untracked'
Martin von Zweigbergk test-status-rev: use one glob for each expected status...	r23228	R content1_content1_content1-untracked
		R content1_content1_content3-untracked
Martin von Zweigbergk test-status-rev: use same names as from generate-working-copy-states...	r23196	R content1_content1_missing-untracked
Martin von Zweigbergk test-status-rev: use one glob for each expected status...	r23228	R content1_content2_content1-untracked
Martin von Zweigbergk test-status-rev: use same names as from generate-working-copy-states...	r23196	R content1_content2_content2-untracked
Martin von Zweigbergk test-status-rev: use one glob for each expected status...	r23228	R content1_content2_content3-untracked
Martin von Zweigbergk test-status-rev: use same names as from generate-working-copy-states...	r23196	R content1_content2_missing-untracked
Martin von Zweigbergk test-status-rev: use one glob for each expected status...	r23228	R content1_missing_content1-untracked
		R content1_missing_content3-untracked
		R content1_missing_missing-untracked
Martin von Zweigbergk test-status-rev: remove unnecessary initial commit...	r23229	$ hg status -A --rev 0 'glob:__missing-tracked'
Martin von Zweigbergk test-status-rev: use one glob for each expected status...	r23228	! content1_content1_missing-tracked
		! content1_content2_missing-tracked
Martin von Zweigbergk test-status-rev: use same names as from generate-working-copy-states...	r23196	! content1_missing_missing-tracked
		! missing_content2_missing-tracked
Martin von Zweigbergk test-status-rev: use one glob for each expected status...	r23228	! missing_missing_missing-tracked
Martin von Zweigbergk test-status-rev: remove unnecessary initial commit...	r23229	$ hg status -A --rev 0 'glob:missing_*_missing-untracked'