upstream/mercurial-mirror Files · tests/test-sparse-clone.t

resolve: add option to warn/abort on -m with unresolved conflict markers...

resolve: add option to warn/abort on -m with unresolved conflict markers When a user is dropped out of Mercurial to a terminal to resolve files, we emit messages like: conflicts while merging file1! (edit, then use 'hg resolve --mark') conflicts while merging file2! (edit, then use 'hg resolve --mark') We don't mention a file name in the hint, so some users might do something like `$EDITOR file1; hg resolve --mark`, see that it says "(no more unresolved files)" and forget to deal with file2 before running the next command. Even if we did mention a file name in the hint, it's too easy to forget it (maybe the merge spans a couple days or something). This option lets us inform the user that they might have missed something. In the scenario above, the output would be something like: warning: the following files still have conflict markers: file2 (no more unresolved files) Differential Revision: https://phab.mercurial-scm.org/D4035

Gregory Szorc - - Load All Authors

File last commit:

r33289:abd7dedb default


                r38817:bb54db4a

@96 default

Download file

             test-sparse-clone.t
        
                    72 lines
            
             | 1.5 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-sparse-clone.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      test sparse

        $ cat >> $HGRCPATH << EOF

        > [ui]

        > ssh = $PYTHON "$RUNTESTDIR/dummyssh"

        > username = nobody <no.reply@fb.com>

        > [extensions]

        > sparse=

        > purge=

        > strip=

        > rebase=

        > EOF

        $ hg init myrepo

        $ cd myrepo

        $ echo a > index.html

        $ echo x > data.py

        $ echo z > readme.txt

        $ cat > webpage.sparse <<EOF

        > [include]

        > *.html

        > EOF

        $ cat > backend.sparse <<EOF

        > [include]

        > *.py

        > EOF

        $ hg ci -Aqm 'initial'

        $ cd ..

      Verify local clone with a sparse profile works

        $ hg clone --enable-profile webpage.sparse myrepo clone1

        updating to branch default

        warning: sparse profile 'webpage.sparse' not found in rev 000000000000 - ignoring it

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

        $ cd clone1

        $ ls

        index.html

        $ cd ..

      Verify local clone with include works

        $ hg clone --include *.sparse myrepo clone2

        updating to branch default

        2 files updated, 0 files merged, 0 files removed, 0 files unresolved

        $ cd clone2

        $ ls

        backend.sparse

        webpage.sparse

        $ cd ..

      Verify local clone with exclude works

        $ hg clone --exclude data.py myrepo clone3

        updating to branch default

        4 files updated, 0 files merged, 0 files removed, 0 files unresolved

        $ cd clone3

        $ ls

        backend.sparse

        index.html

        readme.txt

        webpage.sparse

        $ cd ..

      Verify sparse clone profile over ssh works

        $ hg clone -q --enable-profile webpage.sparse ssh://user@dummy/myrepo clone4

        warning: sparse profile 'webpage.sparse' not found in rev 000000000000 - ignoring it

        $ cd clone4

        $ ls

        index.html

        $ cd ..

	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 sparse

				$ cat >> $HGRCPATH << EOF
				> [ui]
				> ssh = $PYTHON "$RUNTESTDIR/dummyssh"
				> username = nobody <no.reply@fb.com>
				> [extensions]
				> sparse=
				> purge=
				> strip=
				> rebase=
				> EOF

				$ hg init myrepo
				$ cd myrepo
				$ echo a > index.html
				$ echo x > data.py
				$ echo z > readme.txt
				$ cat > webpage.sparse <<EOF
				> [include]
				> *.html
				> EOF
				$ cat > backend.sparse <<EOF
				> [include]
				> *.py
				> EOF
				$ hg ci -Aqm 'initial'
				$ cd ..

				Verify local clone with a sparse profile works

				$ hg clone --enable-profile webpage.sparse myrepo clone1
				updating to branch default
				warning: sparse profile 'webpage.sparse' not found in rev 000000000000 - ignoring it
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved
				$ cd clone1
				$ ls
				index.html
				$ cd ..

				Verify local clone with include works

				$ hg clone --include *.sparse myrepo clone2
				updating to branch default
				2 files updated, 0 files merged, 0 files removed, 0 files unresolved
				$ cd clone2
				$ ls
				backend.sparse
				webpage.sparse
				$ cd ..

				Verify local clone with exclude works

				$ hg clone --exclude data.py myrepo clone3
				updating to branch default
				4 files updated, 0 files merged, 0 files removed, 0 files unresolved
				$ cd clone3
				$ ls
				backend.sparse
				index.html
				readme.txt
				webpage.sparse
				$ cd ..

				Verify sparse clone profile over ssh works

				$ hg clone -q --enable-profile webpage.sparse ssh://user@dummy/myrepo clone4
				warning: sparse profile 'webpage.sparse' not found in rev 000000000000 - ignoring it
				$ cd clone4
				$ ls
				index.html
				$ cd ..