upstream/mercurial-mirror Files · tests/test-hgignore.t

largefiles: move "updatestandin" invocation to "hg.updaterepo" wrapper...

largefiles: move "updatestandin" invocation to "hg.updaterepo" wrapper Code paths below expect "hg.updaterepo" (or "hg.update" using it) to execute linear merging: - "update" in commands - "postincoming" in commands, used for: - "hg pull --update" - "hg unbundle --update" - "hgsubrepo.get" in subrepo For linear merging with largefiles, standins should be updated according to (possibly dirty) largefiles before "merge.update" invocation to detect conflicts correctly. Before this patch, only the "update" command can execute linear merging correctly, because largefiles extension takes care of only it. This patch moves "updatestandin" invocation from "overrideupdate" ("hg update" wrapper) to "_hgupdaterepo" ("hg.updaterepo" wrapper) to execute linear merging in "hg.updaterepo" correctly. This is also a preparation to centralize the logic of updating largefiles in the working directory into the function wrapping "merge.update" in the subsequent patch.

Siddharth Agarwal - - Load All Authors

File last commit:

r21815:a4b67bf1 stable


                r22287:f3ac9677

default

Download file

             test-hgignore.t
        
                    150 lines
            
             | 2.2 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-hgignore.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

        $ hg init

      Issue562: .hgignore requires newline at end:

        $ touch foo

        $ touch bar

        $ touch baz

        $ cat > makeignore.py <<EOF

        > f = open(".hgignore", "w")

        > f.write("ignore\n")

        > f.write("foo\n")

        > # No EOL here

        > f.write("bar")

        > f.close()

        > EOF

        $ python makeignore.py

      Should display baz only:

        $ hg status

        ? baz

        $ rm foo bar baz .hgignore makeignore.py

        $ touch a.o

        $ touch a.c

        $ touch syntax

        $ mkdir dir

        $ touch dir/a.o

        $ touch dir/b.o

        $ touch dir/c.o

        $ hg add dir/a.o

        $ hg commit -m 0

        $ hg add dir/b.o

        $ hg status

        A dir/b.o

        ? a.c

        ? a.o

        ? dir/c.o

        ? syntax

        $ echo "*.o" > .hgignore

        $ hg status

        abort: $TESTTMP/.hgignore: invalid pattern (relre): *.o (glob)

        [255]

        $ echo ".*\.o" > .hgignore

        $ hg status

        A dir/b.o

        ? .hgignore

        ? a.c

        ? syntax

      Check it does not ignore the current directory '.':

        $ echo "^\." > .hgignore

        $ hg status

        A dir/b.o

        ? a.c

        ? a.o

        ? dir/c.o

        ? syntax

        $ echo "glob:**.o" > .hgignore

        $ hg status

        A dir/b.o

        ? .hgignore

        ? a.c

        ? syntax

        $ echo "glob:*.o" > .hgignore

        $ hg status

        A dir/b.o

        ? .hgignore

        ? a.c

        ? syntax

        $ echo "syntax: glob" > .hgignore

        $ echo "re:.*\.o" >> .hgignore

        $ hg status

        A dir/b.o

        ? .hgignore

        ? a.c

        ? syntax

        $ echo "syntax: invalid" > .hgignore

        $ hg status

        $TESTTMP/.hgignore: ignoring invalid syntax 'invalid' (glob)

        A dir/b.o

        ? .hgignore

        ? a.c

        ? a.o

        ? dir/c.o

        ? syntax

        $ echo "syntax: glob" > .hgignore

        $ echo "*.o" >> .hgignore

        $ hg status

        A dir/b.o

        ? .hgignore

        ? a.c

        ? syntax

        $ echo "relglob:syntax*" > .hgignore

        $ hg status

        A dir/b.o

        ? .hgignore

        ? a.c

        ? a.o

        ? dir/c.o

        $ echo "relglob:*" > .hgignore

        $ hg status

        A dir/b.o

        $ cd dir

        $ hg status .

        A b.o

        $ hg debugignore

        (?:(?:|.*/)[^/]*(?:/|$))

        $ cd ..

      Check patterns that match only the directory

        $ echo "^dir\$" > .hgignore

        $ hg status

        A dir/b.o

        ? .hgignore

        ? a.c

        ? a.o

        ? syntax

      Check recursive glob pattern matches no directories (dir/**/c.o matches dir/c.o)

        $ echo "syntax: glob" > .hgignore

        $ echo "dir/**/c.o" >> .hgignore

        $ touch dir/c.o

        $ mkdir dir/subdir

        $ touch dir/subdir/c.o

        $ hg status

        A dir/b.o

        ? .hgignore

        ? a.c

        ? a.o

        ? syntax

	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

				$ hg init

				Issue562: .hgignore requires newline at end:

				$ touch foo
				$ touch bar
				$ touch baz
				$ cat > makeignore.py <<EOF
				> f = open(".hgignore", "w")
				> f.write("ignore\n")
				> f.write("foo\n")
				> # No EOL here
				> f.write("bar")
				> f.close()
				> EOF

				$ python makeignore.py

				Should display baz only:

				$ hg status
				? baz

				$ rm foo bar baz .hgignore makeignore.py

				$ touch a.o
				$ touch a.c
				$ touch syntax
				$ mkdir dir
				$ touch dir/a.o
				$ touch dir/b.o
				$ touch dir/c.o

				$ hg add dir/a.o
				$ hg commit -m 0
				$ hg add dir/b.o

				$ hg status
				A dir/b.o
				? a.c
				? a.o
				? dir/c.o
				? syntax

				$ echo "*.o" > .hgignore
				$ hg status
				abort: $TESTTMP/.hgignore: invalid pattern (relre): *.o (glob)
				[255]

				$ echo ".*\.o" > .hgignore
				$ hg status
				A dir/b.o
				? .hgignore
				? a.c
				? syntax

				Check it does not ignore the current directory '.':

				$ echo "^\." > .hgignore
				$ hg status
				A dir/b.o
				? a.c
				? a.o
				? dir/c.o
				? syntax

				$ echo "glob:**.o" > .hgignore
				$ hg status
				A dir/b.o
				? .hgignore
				? a.c
				? syntax

				$ echo "glob:*.o" > .hgignore
				$ hg status
				A dir/b.o
				? .hgignore
				? a.c
				? syntax

				$ echo "syntax: glob" > .hgignore
				$ echo "re:.*\.o" >> .hgignore
				$ hg status
				A dir/b.o
				? .hgignore
				? a.c
				? syntax

				$ echo "syntax: invalid" > .hgignore
				$ hg status
				$TESTTMP/.hgignore: ignoring invalid syntax 'invalid' (glob)
				A dir/b.o
				? .hgignore
				? a.c
				? a.o
				? dir/c.o
				? syntax

				$ echo "syntax: glob" > .hgignore
				$ echo "*.o" >> .hgignore
				$ hg status
				A dir/b.o
				? .hgignore
				? a.c
				? syntax

				$ echo "relglob:syntax*" > .hgignore
				$ hg status
				A dir/b.o
				? .hgignore
				? a.c
				? a.o
				? dir/c.o

				$ echo "relglob:*" > .hgignore
				$ hg status
				A dir/b.o

				$ cd dir
				$ hg status .
				A b.o

				$ hg debugignore
				(?:(?:\|./)[^/](?:/\|$))

				$ cd ..

				Check patterns that match only the directory

				$ echo "^dir\$" > .hgignore
				$ hg status
				A dir/b.o
				? .hgignore
				? a.c
				? a.o
				? syntax

				Check recursive glob pattern matches no directories (dir/**/c.o matches dir/c.o)

				$ echo "syntax: glob" > .hgignore
				$ echo "dir/**/c.o" >> .hgignore
				$ touch dir/c.o
				$ mkdir dir/subdir
				$ touch dir/subdir/c.o
				$ hg status
				A dir/b.o
				? .hgignore
				? a.c
				? a.o
				? syntax