Show More
@@ -1,153 +1,142 b'' | |||||
1 | $ hg init repo |
|
1 | $ hg init repo | |
2 | $ cd repo |
|
2 | $ cd repo | |
3 | $ cat > a <<EOF |
|
3 | $ cat > a <<EOF | |
4 | > c |
|
4 | > c | |
5 | > c |
|
5 | > c | |
6 | > a |
|
6 | > a | |
7 | > a |
|
7 | > a | |
8 | > b |
|
8 | > b | |
9 | > a |
|
9 | > a | |
10 | > a |
|
10 | > a | |
11 | > c |
|
11 | > c | |
12 | > c |
|
12 | > c | |
13 | > EOF |
|
13 | > EOF | |
14 | $ hg ci -Am adda |
|
14 | $ hg ci -Am adda | |
15 | adding a |
|
15 | adding a | |
16 |
|
16 | |||
17 | $ cat > a <<EOF |
|
17 | $ cat > a <<EOF | |
18 | > c |
|
18 | > c | |
19 | > c |
|
19 | > c | |
20 | > a |
|
20 | > a | |
21 | > a |
|
21 | > a | |
22 | > dd |
|
22 | > dd | |
23 | > a |
|
23 | > a | |
24 | > a |
|
24 | > a | |
25 | > c |
|
25 | > c | |
26 | > c |
|
26 | > c | |
27 | > EOF |
|
27 | > EOF | |
28 |
|
28 | |||
29 | default context |
|
29 | default context | |
30 |
|
30 | |||
31 | $ hg diff --nodates |
|
31 | $ hg diff --nodates | |
32 | diff -r cf9f4ba66af2 a |
|
32 | diff -r cf9f4ba66af2 a | |
33 | --- a/a |
|
33 | --- a/a | |
34 | +++ b/a |
|
34 | +++ b/a | |
35 | @@ -2,7 +2,7 @@ |
|
35 | @@ -2,7 +2,7 @@ | |
36 | c |
|
36 | c | |
37 | a |
|
37 | a | |
38 | a |
|
38 | a | |
39 | -b |
|
39 | -b | |
40 | +dd |
|
40 | +dd | |
41 | a |
|
41 | a | |
42 | a |
|
42 | a | |
43 | c |
|
43 | c | |
44 |
|
44 | |||
45 | invalid --unified |
|
45 | invalid --unified | |
46 |
|
46 | |||
47 | $ hg diff --nodates -U foo |
|
47 | $ hg diff --nodates -U foo | |
48 | abort: diff context lines count must be an integer, not 'foo' |
|
48 | abort: diff context lines count must be an integer, not 'foo' | |
49 | [255] |
|
49 | [255] | |
50 |
|
50 | |||
51 |
|
51 | |||
52 | $ hg diff --nodates -U 2 |
|
52 | $ hg diff --nodates -U 2 | |
53 | diff -r cf9f4ba66af2 a |
|
53 | diff -r cf9f4ba66af2 a | |
54 | --- a/a |
|
54 | --- a/a | |
55 | +++ b/a |
|
55 | +++ b/a | |
56 | @@ -3,5 +3,5 @@ |
|
56 | @@ -3,5 +3,5 @@ | |
57 | a |
|
57 | a | |
58 | a |
|
58 | a | |
59 | -b |
|
59 | -b | |
60 | +dd |
|
60 | +dd | |
61 | a |
|
61 | a | |
62 | a |
|
62 | a | |
63 |
|
63 | |||
64 | $ hg --config diff.unified=2 diff --nodates |
|
64 | $ hg --config diff.unified=2 diff --nodates | |
65 | diff -r cf9f4ba66af2 a |
|
65 | diff -r cf9f4ba66af2 a | |
66 | --- a/a |
|
66 | --- a/a | |
67 | +++ b/a |
|
67 | +++ b/a | |
68 | @@ -3,5 +3,5 @@ |
|
68 | @@ -3,5 +3,5 @@ | |
69 | a |
|
69 | a | |
70 | a |
|
70 | a | |
71 | -b |
|
71 | -b | |
72 | +dd |
|
72 | +dd | |
73 | a |
|
73 | a | |
74 | a |
|
74 | a | |
75 |
|
75 | |||
76 | $ hg diff --nodates -U 1 |
|
76 | $ hg diff --nodates -U 1 | |
77 | diff -r cf9f4ba66af2 a |
|
77 | diff -r cf9f4ba66af2 a | |
78 | --- a/a |
|
78 | --- a/a | |
79 | +++ b/a |
|
79 | +++ b/a | |
80 | @@ -4,3 +4,3 @@ |
|
80 | @@ -4,3 +4,3 @@ | |
81 | a |
|
81 | a | |
82 | -b |
|
82 | -b | |
83 | +dd |
|
83 | +dd | |
84 | a |
|
84 | a | |
85 |
|
85 | |||
86 | invalid diff.unified |
|
86 | invalid diff.unified | |
87 |
|
87 | |||
88 | $ hg --config diff.unified=foo diff --nodates |
|
88 | $ hg --config diff.unified=foo diff --nodates | |
89 | abort: diff context lines count must be an integer, not 'foo' |
|
89 | abort: diff context lines count must be an integer, not 'foo' | |
90 | [255] |
|
90 | [255] | |
91 |
|
91 | |||
92 | 0 lines of context hunk header matches gnu diff hunk header |
|
92 | 0 lines of context hunk header matches gnu diff hunk header | |
93 |
|
93 | |||
94 | $ hg init diffzero |
|
94 | $ hg init diffzero | |
95 | $ cd diffzero |
|
95 | $ cd diffzero | |
96 | $ cat > f1 << EOF |
|
96 | $ cat > f1 << EOF | |
97 | > c2 |
|
97 | > c2 | |
98 | > c4 |
|
98 | > c4 | |
99 | > c5 |
|
99 | > c5 | |
100 | > EOF |
|
100 | > EOF | |
101 | $ hg commit -Am0 |
|
101 | $ hg commit -Am0 | |
102 | adding f1 |
|
102 | adding f1 | |
103 |
|
103 | |||
104 | $ cat > f2 << EOF |
|
104 | $ cat > f2 << EOF | |
105 | > c1 |
|
105 | > c1 | |
106 | > c2 |
|
106 | > c2 | |
107 | > c3 |
|
107 | > c3 | |
108 | > c4 |
|
108 | > c4 | |
109 | > EOF |
|
109 | > EOF | |
110 | $ diff -U0 f1 f2 |
|
|||
111 | --- f1 * (glob) |
|
|||
112 | +++ f2 * (glob) |
|
|||
113 | @@ -0,0 +1 @@ |
|
|||
114 | +c1 |
|
|||
115 | @@ -1,0 +3 @@ |
|
|||
116 | +c3 |
|
|||
117 | @@ -3 +4,0 @@ |
|
|||
118 | -c5 |
|
|||
119 | [1] |
|
|||
120 |
|
||||
121 | $ mv f2 f1 |
|
110 | $ mv f2 f1 | |
122 | $ hg diff -U0 --nodates |
|
111 | $ hg diff -U0 --nodates | |
123 | diff -r 55d8ff78db23 f1 |
|
112 | diff -r 55d8ff78db23 f1 | |
124 | --- a/f1 |
|
113 | --- a/f1 | |
125 | +++ b/f1 |
|
114 | +++ b/f1 | |
126 | @@ -0,0 +1,1 @@ |
|
115 | @@ -0,0 +1,1 @@ | |
127 | +c1 |
|
116 | +c1 | |
128 | @@ -1,0 +3,1 @@ |
|
117 | @@ -1,0 +3,1 @@ | |
129 | +c3 |
|
118 | +c3 | |
130 | @@ -3,1 +4,0 @@ |
|
119 | @@ -3,1 +4,0 @@ | |
131 | -c5 |
|
120 | -c5 | |
132 |
|
121 | |||
133 | $ hg diff -U0 --nodates --git |
|
122 | $ hg diff -U0 --nodates --git | |
134 | diff --git a/f1 b/f1 |
|
123 | diff --git a/f1 b/f1 | |
135 | --- a/f1 |
|
124 | --- a/f1 | |
136 | +++ b/f1 |
|
125 | +++ b/f1 | |
137 | @@ -0,0 +1,1 @@ |
|
126 | @@ -0,0 +1,1 @@ | |
138 | +c1 |
|
127 | +c1 | |
139 | @@ -1,0 +3,1 @@ |
|
128 | @@ -1,0 +3,1 @@ | |
140 | +c3 |
|
129 | +c3 | |
141 | @@ -3,1 +4,0 @@ |
|
130 | @@ -3,1 +4,0 @@ | |
142 | -c5 |
|
131 | -c5 | |
143 |
|
132 | |||
144 | $ hg diff -U0 --nodates -p |
|
133 | $ hg diff -U0 --nodates -p | |
145 | diff -r 55d8ff78db23 f1 |
|
134 | diff -r 55d8ff78db23 f1 | |
146 | --- a/f1 |
|
135 | --- a/f1 | |
147 | +++ b/f1 |
|
136 | +++ b/f1 | |
148 | @@ -0,0 +1,1 @@ |
|
137 | @@ -0,0 +1,1 @@ | |
149 | +c1 |
|
138 | +c1 | |
150 | @@ -1,0 +3,1 @@ c2 |
|
139 | @@ -1,0 +3,1 @@ c2 | |
151 | +c3 |
|
140 | +c3 | |
152 | @@ -3,1 +4,0 @@ c4 |
|
141 | @@ -3,1 +4,0 @@ c4 | |
153 | -c5 |
|
142 | -c5 |
General Comments 0
You need to be logged in to leave comments.
Login now