Mercurial > hg
annotate tests/test-issue322.t @ 12748:d10369fefd01
alias: fail gracefully when invalid global options are given (issue2442)
This patch modifies the check for shell aliases to prevent crashing when an invalid
global option is given.
When an invalid global option is given the check will simply return and let the
normal error handling for this case happen.
author | Steve Losh <steve@stevelosh.com> |
---|---|
date | Sun, 17 Oct 2010 13:24:37 -0400 |
parents | b63f6422d2a7 |
children |
rev | line source |
---|---|
12328
b63f6422d2a7
tests: fix a bunch of pointless #s in unified tests
Matt Mackall <mpm@selenic.com>
parents:
12327
diff
changeset
|
1 http://mercurial.selenic.com/bts/issue322 |
2946 | 2 |
12195
ee41be2bbf5a
tests: unify test-issue*
Adrian Buehlmann <adrian@cadifra.com>
parents:
8936
diff
changeset
|
3 File replaced with directory: |
2949
7356fa3cff2c
add other dir/file case to test for issue322.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2946
diff
changeset
|
4 |
12195
ee41be2bbf5a
tests: unify test-issue*
Adrian Buehlmann <adrian@cadifra.com>
parents:
8936
diff
changeset
|
5 $ hg init a |
ee41be2bbf5a
tests: unify test-issue*
Adrian Buehlmann <adrian@cadifra.com>
parents:
8936
diff
changeset
|
6 $ cd a |
ee41be2bbf5a
tests: unify test-issue*
Adrian Buehlmann <adrian@cadifra.com>
parents:
8936
diff
changeset
|
7 $ echo a > a |
ee41be2bbf5a
tests: unify test-issue*
Adrian Buehlmann <adrian@cadifra.com>
parents:
8936
diff
changeset
|
8 $ hg commit -Ama |
ee41be2bbf5a
tests: unify test-issue*
Adrian Buehlmann <adrian@cadifra.com>
parents:
8936
diff
changeset
|
9 adding a |
ee41be2bbf5a
tests: unify test-issue*
Adrian Buehlmann <adrian@cadifra.com>
parents:
8936
diff
changeset
|
10 $ rm a |
ee41be2bbf5a
tests: unify test-issue*
Adrian Buehlmann <adrian@cadifra.com>
parents:
8936
diff
changeset
|
11 $ mkdir a |
ee41be2bbf5a
tests: unify test-issue*
Adrian Buehlmann <adrian@cadifra.com>
parents:
8936
diff
changeset
|
12 $ echo a > a/a |
ee41be2bbf5a
tests: unify test-issue*
Adrian Buehlmann <adrian@cadifra.com>
parents:
8936
diff
changeset
|
13 |
ee41be2bbf5a
tests: unify test-issue*
Adrian Buehlmann <adrian@cadifra.com>
parents:
8936
diff
changeset
|
14 Should fail - would corrupt dirstate: |
2946 | 15 |
12195
ee41be2bbf5a
tests: unify test-issue*
Adrian Buehlmann <adrian@cadifra.com>
parents:
8936
diff
changeset
|
16 $ hg add a/a |
ee41be2bbf5a
tests: unify test-issue*
Adrian Buehlmann <adrian@cadifra.com>
parents:
8936
diff
changeset
|
17 abort: file 'a' in dirstate clashes with 'a/a' |
12316
4134686b83e1
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
12195
diff
changeset
|
18 [255] |
2949
7356fa3cff2c
add other dir/file case to test for issue322.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2946
diff
changeset
|
19 |
12195
ee41be2bbf5a
tests: unify test-issue*
Adrian Buehlmann <adrian@cadifra.com>
parents:
8936
diff
changeset
|
20 $ cd .. |
ee41be2bbf5a
tests: unify test-issue*
Adrian Buehlmann <adrian@cadifra.com>
parents:
8936
diff
changeset
|
21 |
ee41be2bbf5a
tests: unify test-issue*
Adrian Buehlmann <adrian@cadifra.com>
parents:
8936
diff
changeset
|
22 Directory replaced with file: |
2946 | 23 |
12195
ee41be2bbf5a
tests: unify test-issue*
Adrian Buehlmann <adrian@cadifra.com>
parents:
8936
diff
changeset
|
24 $ hg init c |
ee41be2bbf5a
tests: unify test-issue*
Adrian Buehlmann <adrian@cadifra.com>
parents:
8936
diff
changeset
|
25 $ cd c |
ee41be2bbf5a
tests: unify test-issue*
Adrian Buehlmann <adrian@cadifra.com>
parents:
8936
diff
changeset
|
26 $ mkdir a |
ee41be2bbf5a
tests: unify test-issue*
Adrian Buehlmann <adrian@cadifra.com>
parents:
8936
diff
changeset
|
27 $ echo a > a/a |
ee41be2bbf5a
tests: unify test-issue*
Adrian Buehlmann <adrian@cadifra.com>
parents:
8936
diff
changeset
|
28 $ hg commit -Ama |
ee41be2bbf5a
tests: unify test-issue*
Adrian Buehlmann <adrian@cadifra.com>
parents:
8936
diff
changeset
|
29 adding a/a |
2949
7356fa3cff2c
add other dir/file case to test for issue322.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2946
diff
changeset
|
30 |
12195
ee41be2bbf5a
tests: unify test-issue*
Adrian Buehlmann <adrian@cadifra.com>
parents:
8936
diff
changeset
|
31 $ rm -r a |
ee41be2bbf5a
tests: unify test-issue*
Adrian Buehlmann <adrian@cadifra.com>
parents:
8936
diff
changeset
|
32 $ echo a > a |
ee41be2bbf5a
tests: unify test-issue*
Adrian Buehlmann <adrian@cadifra.com>
parents:
8936
diff
changeset
|
33 |
ee41be2bbf5a
tests: unify test-issue*
Adrian Buehlmann <adrian@cadifra.com>
parents:
8936
diff
changeset
|
34 Should fail - would corrupt dirstate: |
2949
7356fa3cff2c
add other dir/file case to test for issue322.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2946
diff
changeset
|
35 |
12195
ee41be2bbf5a
tests: unify test-issue*
Adrian Buehlmann <adrian@cadifra.com>
parents:
8936
diff
changeset
|
36 $ hg add a |
ee41be2bbf5a
tests: unify test-issue*
Adrian Buehlmann <adrian@cadifra.com>
parents:
8936
diff
changeset
|
37 abort: directory 'a' already in dirstate |
12316
4134686b83e1
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
12195
diff
changeset
|
38 [255] |
2949
7356fa3cff2c
add other dir/file case to test for issue322.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2946
diff
changeset
|
39 |
12195
ee41be2bbf5a
tests: unify test-issue*
Adrian Buehlmann <adrian@cadifra.com>
parents:
8936
diff
changeset
|
40 $ cd .. |
2953 | 41 |
12195
ee41be2bbf5a
tests: unify test-issue*
Adrian Buehlmann <adrian@cadifra.com>
parents:
8936
diff
changeset
|
42 Directory replaced with file: |
2949
7356fa3cff2c
add other dir/file case to test for issue322.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2946
diff
changeset
|
43 |
12195
ee41be2bbf5a
tests: unify test-issue*
Adrian Buehlmann <adrian@cadifra.com>
parents:
8936
diff
changeset
|
44 $ hg init d |
ee41be2bbf5a
tests: unify test-issue*
Adrian Buehlmann <adrian@cadifra.com>
parents:
8936
diff
changeset
|
45 $ cd d |
ee41be2bbf5a
tests: unify test-issue*
Adrian Buehlmann <adrian@cadifra.com>
parents:
8936
diff
changeset
|
46 $ mkdir b |
ee41be2bbf5a
tests: unify test-issue*
Adrian Buehlmann <adrian@cadifra.com>
parents:
8936
diff
changeset
|
47 $ mkdir b/c |
ee41be2bbf5a
tests: unify test-issue*
Adrian Buehlmann <adrian@cadifra.com>
parents:
8936
diff
changeset
|
48 $ echo a > b/c/d |
ee41be2bbf5a
tests: unify test-issue*
Adrian Buehlmann <adrian@cadifra.com>
parents:
8936
diff
changeset
|
49 $ hg commit -Ama |
ee41be2bbf5a
tests: unify test-issue*
Adrian Buehlmann <adrian@cadifra.com>
parents:
8936
diff
changeset
|
50 adding b/c/d |
ee41be2bbf5a
tests: unify test-issue*
Adrian Buehlmann <adrian@cadifra.com>
parents:
8936
diff
changeset
|
51 $ rm -r b |
ee41be2bbf5a
tests: unify test-issue*
Adrian Buehlmann <adrian@cadifra.com>
parents:
8936
diff
changeset
|
52 $ echo a > b |
2953 | 53 |
12195
ee41be2bbf5a
tests: unify test-issue*
Adrian Buehlmann <adrian@cadifra.com>
parents:
8936
diff
changeset
|
54 Should fail - would corrupt dirstate: |
2953 | 55 |
12195
ee41be2bbf5a
tests: unify test-issue*
Adrian Buehlmann <adrian@cadifra.com>
parents:
8936
diff
changeset
|
56 $ hg add b |
ee41be2bbf5a
tests: unify test-issue*
Adrian Buehlmann <adrian@cadifra.com>
parents:
8936
diff
changeset
|
57 abort: directory 'b' already in dirstate |
12316
4134686b83e1
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
12195
diff
changeset
|
58 [255] |
12195
ee41be2bbf5a
tests: unify test-issue*
Adrian Buehlmann <adrian@cadifra.com>
parents:
8936
diff
changeset
|
59 |