##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

tests: unify test-diff-color
Matt Mackall -
r12415:1ff3fc4b default
parent child Browse files
Show More
Show file before | Show file after | Hide comments
@@ -1,64 +1,124 b''
1 #!/bin/sh
1 Setup
2
3 echo "[extensions]" >> $HGRCPATH
4 echo "color=" >> $HGRCPATH
5
2
6 hg init repo
3 $ echo "[extensions]" >> $HGRCPATH
7 cd repo
4 $ echo "color=" >> $HGRCPATH
8 cat > a <<EOF
5 $ hg init repo
9 c
6 $ cd repo
10 c
7 $ cat > a <<EOF
11 a
8 > c
12 a
9 > c
13 b
10 > a
14 a
11 > a
15 a
12 > b
16 c
13 > a
17 c
14 > a
18 EOF
15 > c
19 hg ci -Am adda
16 > c
20 cat > a <<EOF
17 > EOF
21 c
18 $ hg ci -Am adda
22 c
19 adding a
23 a
20 $ cat > a <<EOF
24 a
21 > c
25 dd
22 > c
26 a
23 > a
27 a
24 > a
28 c
25 > dd
29 c
26 > a
30 EOF
27 > a
28 > c
29 > c
30 > EOF
31
32 default context
33
34 $ hg diff --nodates --color=always
35 diff -r cf9f4ba66af2 a
36 --- a/a
37 +++ b/a
38 @@ -2,7 +2,7 @@
39 c
40 a
41 a
42 -b
43 +dd
44 a
45 a
46 c
47
48 --unified=2
49
50 $ hg diff --nodates -U 2 --color=always
51 diff -r cf9f4ba66af2 a
52 --- a/a
53 +++ b/a
54 @@ -3,5 +3,5 @@
55 a
56 a
57 -b
58 +dd
59 a
60 a
31
61
32 echo '% default context'
62 diffstat
33 hg diff --nodates --color=always
34
35 echo '% --unified=2'
36 hg diff --nodates -U 2 --color=always
37
63
38 echo '% diffstat'
64 $ hg diff --stat --color=always
39 hg diff --stat --color=always
65 a | 2 +-
66 1 files changed, 1 insertions(+), 1 deletions(-)
67 $ echo "record=" >> $HGRCPATH
68 $ echo "[ui]" >> $HGRCPATH
69 $ echo "interactive=true" >> $HGRCPATH
70 $ echo "[diff]" >> $HGRCPATH
71 $ echo "git=True" >> $HGRCPATH
40
72
41 echo "record=" >> $HGRCPATH
73 record
42 echo "[ui]" >> $HGRCPATH
43 echo "interactive=true" >> $HGRCPATH
44 echo "[diff]" >> $HGRCPATH
45 echo "git=True" >> $HGRCPATH
46
74
47 echo % record
75 $ chmod 0755 a
48 chmod 0755 a
76 $ hg record --color=always -m moda a <<EOF
49 hg record --color=always -m moda a <<EOF
77 > y
50 y
78 > y
51 y
79 > EOF
52 EOF
80 diff --git a/a b/a
53 echo
81 old mode 100644
82 new mode 100755
83 1 hunks, 1 lines changed
84 examine changes to 'a'? [Ynsfdaq?]
85 @@ -2,7 +2,7 @@
86 c
87 a
88 a
89 -b
90 +dd
91 a
92 a
93 c
94 record this change to 'a'? [Ynsfdaq?]
95 $ echo
96
97 $ echo "[extensions]" >> $HGRCPATH
98 $ echo "mq=" >> $HGRCPATH
99 $ hg rollback
100 rolling back to revision 0 (undo commit)
54
101
55 echo "[extensions]" >> $HGRCPATH
102 qrecord
56 echo "mq=" >> $HGRCPATH
57
103
58 hg rollback
104 $ hg qrecord --color=always -m moda patch <<EOF
59 echo % qrecord
105 > y
60 hg qrecord --color=always -m moda patch <<EOF
106 > y
61 y
107 > EOF
62 y
108 diff --git a/a b/a
63 EOF
109 old mode 100644
64 echo
110 new mode 100755
111 1 hunks, 1 lines changed
112 examine changes to 'a'? [Ynsfdaq?]
113 @@ -2,7 +2,7 @@
114 c
115 a
116 a
117 -b
118 +dd
119 a
120 a
121 c
122 record this change to 'a'? [Ynsfdaq?]
123 $ echo
124
Show file before | Show file after | Hide comments
1 NO CONTENT: file was removed
NO CONTENT: file was removed
General Comments 0
You need to be logged in to leave comments. Login now