Mercurial > hg

comparison tests/test-remove.out @ 12129:07ac2a560fce stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
remove: properly set return code when warnings are issued This removes the warn() function in favor of issuing warnings directly for each kind of file that Mercurial won't remove. This also uses three separate translatable strings instead of using string formatting to build the message. This should make it easier to localize.
author Brodie Rao <brodie@bitheap.org>
date Mon, 30 Aug 2010 20:27:25 -0400
parents 1f665246dab3
children
comparison
equal deleted inserted replaced
12128:090dc5eef746 12129:07ac2a560fce
1 % file not managed 1 % file not managed
2 not removing foo: file is untracked 2 not removing foo: file is untracked
3 exit code: 1
3 ? foo 4 ? foo
4 ./foo 5 ./foo
5 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 6 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
6 % 00 state added, options none 7 % 00 state added, options none
7 not removing bar: file has been marked for add (use -f to force removal) 8 not removing bar: file has been marked for add (use -f to force removal)
9 exit code: 1
8 A bar 10 A bar
9 ./bar 11 ./bar
10 ./foo 12 ./foo
11 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 13 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
12 % 01 state clean, options none 14 % 01 state clean, options none
15 exit code: 0
13 R foo 16 R foo
14 ? bar 17 ? bar
15 ./bar 18 ./bar
16 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 19 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
17 % 02 state modified, options none 20 % 02 state modified, options none
18 not removing foo: file is modified (use -f to force removal) 21 not removing foo: file is modified (use -f to force removal)
22 exit code: 1
19 M foo 23 M foo
20 ? bar 24 ? bar
21 ./bar 25 ./bar
22 ./foo 26 ./foo
23 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 27 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
24 % 03 state missing, options none 28 % 03 state missing, options none
29 exit code: 0
25 R foo 30 R foo
26 ? bar 31 ? bar
27 ./bar 32 ./bar
28 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 33 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
29 % 10 state added, options -f 34 % 10 state added, options -f
35 exit code: 0
30 ? bar 36 ? bar
31 ./bar 37 ./bar
32 ./foo 38 ./foo
33 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 39 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
34 % 11 state clean, options -f 40 % 11 state clean, options -f
41 exit code: 0
35 R foo 42 R foo
36 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 43 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
37 % 12 state modified, options -f 44 % 12 state modified, options -f
45 exit code: 0
38 R foo 46 R foo
39 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 47 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
40 % 13 state missing, options -f 48 % 13 state missing, options -f
49 exit code: 0
41 R foo 50 R foo
42 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 51 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
43 % 20 state added, options -A 52 % 20 state added, options -A
44 not removing bar: file still exists (use -f to force removal) 53 not removing bar: file still exists (use -f to force removal)
54 exit code: 1
45 A bar 55 A bar
46 ./bar 56 ./bar
47 ./foo 57 ./foo
48 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 58 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
49 % 21 state clean, options -A 59 % 21 state clean, options -A
50 not removing foo: file still exists (use -f to force removal) 60 not removing foo: file still exists (use -f to force removal)
61 exit code: 1
51 ? bar 62 ? bar
52 ./bar 63 ./bar
53 ./foo 64 ./foo
54 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 65 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
55 % 22 state modified, options -A 66 % 22 state modified, options -A
56 not removing foo: file still exists (use -f to force removal) 67 not removing foo: file still exists (use -f to force removal)
68 exit code: 1
57 M foo 69 M foo
58 ? bar 70 ? bar
59 ./bar 71 ./bar
60 ./foo 72 ./foo
61 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 73 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
62 % 23 state missing, options -A 74 % 23 state missing, options -A
75 exit code: 0
63 R foo 76 R foo
64 ? bar 77 ? bar
65 ./bar 78 ./bar
66 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 79 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
67 % 30 state added, options -Af 80 % 30 state added, options -Af
81 exit code: 0
68 ? bar 82 ? bar
69 ./bar 83 ./bar
70 ./foo 84 ./foo
71 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 85 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
72 % 31 state clean, options -Af 86 % 31 state clean, options -Af
87 exit code: 0
73 R foo 88 R foo
74 ./foo 89 ./foo
75 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 90 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
76 % 32 state modified, options -Af 91 % 32 state modified, options -Af
92 exit code: 0
77 R foo 93 R foo
78 ./foo 94 ./foo
79 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 95 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
80 % 33 state missing, options -Af 96 % 33 state missing, options -Af
97 exit code: 0
81 R foo 98 R foo
82 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 99 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
83 adding test/bar 100 adding test/bar
84 adding test/foo 101 adding test/foo
85 % dir, options none 102 % dir, options none
86 removing test/bar 103 removing test/bar
87 removing test/foo 104 removing test/foo
105 exit code: 0
88 R test/bar 106 R test/bar
89 R test/foo 107 R test/foo
90 ./foo 108 ./foo
91 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 109 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
92 % dir, options -f 110 % dir, options -f
93 removing test/bar 111 removing test/bar
94 removing test/foo 112 removing test/foo
113 exit code: 0
95 R test/bar 114 R test/bar
96 R test/foo 115 R test/foo
97 ./foo 116 ./foo
98 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 117 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
99 % dir, options -A 118 % dir, options -A
100 not removing test/foo: file still exists (use -f to force removal) 119 not removing test/foo: file still exists (use -f to force removal)
101 removing test/bar 120 removing test/bar
121 exit code: 1
102 R test/bar 122 R test/bar
103 ./foo 123 ./foo
104 ./test/foo 124 ./test/foo
105 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 125 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
106 % dir, options -Af 126 % dir, options -Af
107 removing test/bar 127 removing test/bar
108 removing test/foo 128 removing test/foo
129 exit code: 0
109 R test/bar 130 R test/bar
110 R test/foo 131 R test/foo
111 ./foo 132 ./foo
112 ./test/foo 133 ./test/foo
113 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 134 2 files updated, 0 files merged, 0 files removed, 0 files unresolved