upstream/mercurial-mirror Files · tests/test-status-committed-and-ignored.t

rhg: add resolve_file_args to path_utils.rs...

rhg: add resolve_file_args to path_utils.rs Extracted logic for resolving `FILE ...` arguments from cat.rs into a new function in path_utils.rs. I plan to use this for rhg annotate. I tried to reuse hg::utils::files::canonical_path instead, but that didn't work. For example it reports a InsideDotHg error for any path containing "..".

Arseniy Alekseyev - - Load All Authors

File last commit:

r51224:edcc35a4 stable


                r53438:f33f37ac

default

Download file

             test-status-committed-and-ignored.t
        
                    33 lines
            
             | 621 B
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-status-committed-and-ignored.t
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Arseniy Alekseyev
    
tests: demonstrate a bug with committed&ignored dirs

              r51223
            
      #testcases dirstate-v1 dirstate-v2

      #if dirstate-v2

        $ cat >> $HGRCPATH << EOF

        > [format]

        > use-dirstate-v2=1

        > [storage]

        > dirstate-v2.slow-path=allow

        > EOF

      #endif

        $ rm -rf r

        $ hg init r

        $ cd r

        $ mkdir d1

        $ mkdir d2

        $ touch d1/f d2/f

        $ hg commit -Am '.'

        adding d1/f

        adding d2/f

        $ echo 'syntax:re' >> .hgignore

        $ echo '^d1$' >> .hgignore

        $ hg commit -Am "ignore d1"

        adding .hgignore

      Now d1 is a directory that's both committed and ignored.

      Untracked files in d2 are still shown, but ones in d1 are ignored:

        $ touch d1/g

        $ touch d2/g

        $ RAYON_NUM_THREADS=1 hg status

        Arseniy Alekseyev
    
dirstate: fix the bug in [status] dealing with committed&ignored directories...

              r51224
            
        ? d2/g

	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

Arseniy Alekseyev tests: demonstrate a bug with committed&ignored dirs	r51223	#testcases dirstate-v1 dirstate-v2

		#if dirstate-v2
		$ cat >> $HGRCPATH << EOF
		> [format]
		> use-dirstate-v2=1
		> [storage]
		> dirstate-v2.slow-path=allow
		> EOF
		#endif

		$ rm -rf r

		$ hg init r
		$ cd r
		$ mkdir d1
		$ mkdir d2
		$ touch d1/f d2/f
		$ hg commit -Am '.'
		adding d1/f
		adding d2/f
		$ echo 'syntax:re' >> .hgignore
		$ echo '^d1$' >> .hgignore
		$ hg commit -Am "ignore d1"
		adding .hgignore

		Now d1 is a directory that's both committed and ignored.
		Untracked files in d2 are still shown, but ones in d1 are ignored:

		$ touch d1/g
		$ touch d2/g
		$ RAYON_NUM_THREADS=1 hg status
Arseniy Alekseyev dirstate: fix the bug in [status] dealing with committed&ignored directories...	r51224	? d2/g