Show More
@@ -24,7 +24,7 b' list bookmarks with color' | |||
|
24 | 24 | |
|
25 | 25 | $ hg --config extensions.color= --config color.mode=ansi \ |
|
26 | 26 | > bookmark --color=always |
|
27 |
|
|
|
27 | \x1b[0;32m * X -1:000000000000\x1b[0m (esc) | |
|
28 | 28 | |
|
29 | 29 | update to bookmark X |
|
30 | 30 |
@@ -21,7 +21,7 b' list bookmarks with color' | |||
|
21 | 21 | |
|
22 | 22 | $ hg --config extensions.color= --config color.mode=ansi \ |
|
23 | 23 | > bookmarks --color=always |
|
24 |
|
|
|
24 | \x1b[0;32m * X -1:000000000000\x1b[0m (esc) | |
|
25 | 25 | |
|
26 | 26 | $ echo a > a |
|
27 | 27 | $ hg add a |
@@ -34,13 +34,13 b' test branch selection options' | |||
|
34 | 34 | $ hg up 0 |
|
35 | 35 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
36 | 36 | $ hg --encoding utf-8 branch Γ¦ |
|
37 |
marked working directory as branch |
|
|
37 | marked working directory as branch \xc3\xa6 (esc) | |
|
38 | 38 | $ echo ae1 > foo |
|
39 | 39 | $ hg ci -d '0 0' -mae1 |
|
40 | 40 | $ hg up 0 |
|
41 | 41 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
42 | 42 | $ hg --encoding utf-8 branch -f Γ¦ |
|
43 |
marked working directory as branch |
|
|
43 | marked working directory as branch \xc3\xa6 (esc) | |
|
44 | 44 | $ echo ae2 > foo |
|
45 | 45 | $ hg ci -d '0 0' -mae2 |
|
46 | 46 | created new head |
@@ -357,19 +357,19 b' default branch colors:' | |||
|
357 | 357 | $ hg up -C b |
|
358 | 358 | 2 files updated, 0 files merged, 3 files removed, 0 files unresolved |
|
359 | 359 | $ hg branches --color=always |
|
360 |
|
|
|
361 |
|
|
|
362 |
|
|
|
363 |
|
|
|
360 | \x1b[0;32mb\x1b[0m \x1b[0;33m 13:6ac12926b8c3\x1b[0m (esc) | |
|
361 | \x1b[0;0ma branch name much longer than the default justification used by branches\x1b[0m \x1b[0;33m7:10ff5895aa57\x1b[0m (esc) | |
|
362 | \x1b[0;0ma\x1b[0m \x1b[0;33m 5:d8cbc61dbaa6\x1b[0m (inactive) (esc) | |
|
363 | \x1b[0;0mdefault\x1b[0m \x1b[0;33m 0:19709c5a4e75\x1b[0m (inactive) (esc) | |
|
364 | 364 | |
|
365 | 365 | default closed branch color: |
|
366 | 366 | |
|
367 | 367 | $ hg branches --color=always --closed |
|
368 |
|
|
|
369 |
|
|
|
370 |
|
|
|
371 |
|
|
|
372 |
|
|
|
368 | \x1b[0;32mb\x1b[0m \x1b[0;33m 13:6ac12926b8c3\x1b[0m (esc) | |
|
369 | \x1b[0;0ma branch name much longer than the default justification used by branches\x1b[0m \x1b[0;33m7:10ff5895aa57\x1b[0m (esc) | |
|
370 | \x1b[0;30;1mc\x1b[0m \x1b[0;33m 14:717d2e6fabe1\x1b[0m (closed) (esc) | |
|
371 | \x1b[0;0ma\x1b[0m \x1b[0;33m 5:d8cbc61dbaa6\x1b[0m (inactive) (esc) | |
|
372 | \x1b[0;0mdefault\x1b[0m \x1b[0;33m 0:19709c5a4e75\x1b[0m (inactive) (esc) | |
|
373 | 373 | |
|
374 | 374 | $ echo "[extensions]" >> $HGRCPATH |
|
375 | 375 | $ echo "color =" >> $HGRCPATH |
@@ -383,16 +383,16 b' default closed branch color:' | |||
|
383 | 383 | custom branch colors: |
|
384 | 384 | |
|
385 | 385 | $ hg branches --color=always |
|
386 |
|
|
|
387 |
|
|
|
388 |
|
|
|
389 |
|
|
|
386 | \x1b[0;31mb\x1b[0m \x1b[0;36m 13:6ac12926b8c3\x1b[0m (esc) | |
|
387 | \x1b[0;32ma branch name much longer than the default justification used by branches\x1b[0m \x1b[0;36m7:10ff5895aa57\x1b[0m (esc) | |
|
388 | \x1b[0;35ma\x1b[0m \x1b[0;36m 5:d8cbc61dbaa6\x1b[0m (inactive) (esc) | |
|
389 | \x1b[0;35mdefault\x1b[0m \x1b[0;36m 0:19709c5a4e75\x1b[0m (inactive) (esc) | |
|
390 | 390 | |
|
391 | 391 | custom closed branch color: |
|
392 | 392 | |
|
393 | 393 | $ hg branches --color=always --closed |
|
394 |
|
|
|
395 |
|
|
|
396 |
|
|
|
397 |
|
|
|
398 |
|
|
|
394 | \x1b[0;31mb\x1b[0m \x1b[0;36m 13:6ac12926b8c3\x1b[0m (esc) | |
|
395 | \x1b[0;32ma branch name much longer than the default justification used by branches\x1b[0m \x1b[0;36m7:10ff5895aa57\x1b[0m (esc) | |
|
396 | \x1b[0;34mc\x1b[0m \x1b[0;36m 14:717d2e6fabe1\x1b[0m (closed) (esc) | |
|
397 | \x1b[0;35ma\x1b[0m \x1b[0;36m 5:d8cbc61dbaa6\x1b[0m (inactive) (esc) | |
|
398 | \x1b[0;35mdefault\x1b[0m \x1b[0;36m 0:19709c5a4e75\x1b[0m (inactive) (esc) |
@@ -102,9 +102,9 b' churn --diffstat with color' | |||
|
102 | 102 | |
|
103 | 103 | $ hg --config extensions.color= churn --config color.mode=ansi \ |
|
104 | 104 | > --diffstat --color=always |
|
105 |
user1 +3/-1 |
|
|
106 |
user3 +3/-0 |
|
|
107 |
user2 +2/-0 |
|
|
105 | user1 +3/-1 \x1b[0;32m+++++++++++++++++++++++++++++++++++++++++\x1b[0m\x1b[0;31m--------------\x1b[0m (esc) | |
|
106 | user3 +3/-0 \x1b[0;32m+++++++++++++++++++++++++++++++++++++++++\x1b[0m (esc) | |
|
107 | user2 +2/-0 \x1b[0;32m+++++++++++++++++++++++++++\x1b[0m (esc) | |
|
108 | 108 | |
|
109 | 109 | |
|
110 | 110 | changeset number churn |
@@ -82,7 +82,7 b' test utf-8 commit message and author' | |||
|
82 | 82 | darcs is encoding agnostic, so it takes whatever bytes it's given |
|
83 | 83 | |
|
84 | 84 | $ darcs record -a -l -m 'p4: desc Γ±' -A 'author Γ±' |
|
85 |
Finished recording patch 'p4: desc |
|
|
85 | Finished recording patch 'p4: desc \xc3\xb1' (esc) | |
|
86 | 86 | |
|
87 | 87 | Test latin-1 commit message |
|
88 | 88 | |
@@ -90,7 +90,7 b' Test latin-1 commit message' | |||
|
90 | 90 | $ printf "p5: desc " > ../p5 |
|
91 | 91 | $ python -c 'print "".join([chr(i) for i in range(128, 256)])' >> ../p5 |
|
92 | 92 | $ darcs record -a -l --logfile ../p5 |
|
93 | Finished recording patch 'p5: desc οΏ½οΏ½οΏ½οΏ½οΏ½οΏ½οΏ½οΏ½οΏ½οΏ½οΏ½οΏ½οΏ½οΏ½οΏ½οΏ½οΏ½οΏ½οΏ½οΏ½οΏ½οΏ½οΏ½οΏ½οΏ½οΏ½οΏ½οΏ½οΏ½οΏ½οΏ½οΏ½οΏ½οΏ½οΏ½οΏ½οΏ½οΏ½οΏ½οΏ½οΏ½οΏ½οΏ½οΏ½οΏ½οΏ½οΏ½οΏ½οΏ½οΏ½οΏ½οΏ½οΏ½οΏ½οΏ½οΏ½οΏ½οΏ½οΏ½οΏ½οΏ½οΏ½οΏ½οΏ½οΏ½οΏ½οΏ½οΏ½οΏ½οΏ½οΏ½οΏ½οΏ½οΏ½οΏ½οΏ½οΏ½οΏ½οΏ½οΏ½οΏ½οΏ½οΏ½οΏ½οΏ½οΏ½οΏ½οΏ½οΏ½οΏ½οΏ½οΏ½οΏ½οΏ½οΏ½οΏ½οΏ½οΏ½οΏ½οΏ½οΏ½οΏ½οΏ½οΏ½οΏ½οΏ½οΏ½οΏ½οΏ½οΏ½οΏ½οΏ½οΏ½οΏ½οΏ½οΏ½οΏ½οΏ½οΏ½οΏ½οΏ½οΏ½οΏ½οΏ½οΏ½οΏ½οΏ½οΏ½' | |
|
93 | Finished recording patch 'p5: desc \x80\x81\x82\x83\x84\x85\x86\x87\x88\x89\x8a\x8b\x8c\x8d\x8e\x8f\x90\x91\x92\x93\x94\x95\x96\x97\x98\x99\x9a\x9b\x9c\x9d\x9e\x9f\xa0\xa1\xa2\xa3\xa4\xa5\xa6\xa7\xa8\xa9\xaa\xab\xac\xad\xae\xaf\xb0\xb1\xb2\xb3\xb4\xb5\xb6\xb7\xb8\xb9\xba\xbb\xbc\xbd\xbe\xbf\xc0\xc1\xc2\xc3\xc4\xc5\xc6\xc7\xc8\xc9\xca\xcb\xcc\xcd\xce\xcf\xd0\xd1\xd2\xd3\xd4\xd5\xd6\xd7\xd8\xd9\xda\xdb\xdc\xdd\xde\xdf\xe0\xe1\xe2\xe3\xe4\xe5\xe6\xe7\xe8\xe9\xea\xeb\xec\xed\xee\xef\xf0\xf1\xf2\xf3\xf4\xf5\xf6\xf7\xf8\xf9\xfa\xfb\xfc\xfd\xfe\xff' (esc) | |
|
94 | 94 | |
|
95 | 95 | $ glog() |
|
96 | 96 | > { |
@@ -20,8 +20,8 b' Convert while testing all possible outpu' | |||
|
20 | 20 | found trunk at 'trunk' |
|
21 | 21 | found tags at 'tags' |
|
22 | 22 | found branches at 'branches' |
|
23 |
found branch branch |
|
|
24 |
found branch branch |
|
|
23 | found branch branch\xc3\xa9 at 5 (esc) | |
|
24 | found branch branch\xc3\xa9e at 6 (esc) | |
|
25 | 25 | scanning: 1 revisions |
|
26 | 26 | reparent to file://*/svn-repo/trunk (glob) |
|
27 | 27 | fetching revision log for "/trunk" from 4 to 0 |
@@ -34,18 +34,18 b' Convert while testing all possible outpu' | |||
|
34 | 34 | '/tags' is not under '/trunk', ignoring |
|
35 | 35 | scanning: 2 revisions |
|
36 | 36 | reparent to file://*/svn-repo/branches/branch%C3%A9 (glob) |
|
37 |
fetching revision log for "/branches/branch |
|
|
37 | fetching revision log for "/branches/branch\xc3\xa9" from 5 to 0 (esc) | |
|
38 | 38 | parsing revision 5 (1 changes) |
|
39 | 39 | reparent to file://*/svn-repo (glob) |
|
40 | 40 | reparent to file://*/svn-repo/branches/branch%C3%A9 (glob) |
|
41 |
found parent of branch /branches/branch |
|
|
41 | found parent of branch /branches/branch\xc3\xa9 at 4: /trunk (esc) | |
|
42 | 42 | scanning: 3 revisions |
|
43 | 43 | reparent to file://*/svn-repo/branches/branch%C3%A9e (glob) |
|
44 |
fetching revision log for "/branches/branch |
|
|
44 | fetching revision log for "/branches/branch\xc3\xa9e" from 6 to 0 (esc) | |
|
45 | 45 | parsing revision 6 (1 changes) |
|
46 | 46 | reparent to file://*/svn-repo (glob) |
|
47 | 47 | reparent to file://*/svn-repo/branches/branch%C3%A9e (glob) |
|
48 |
found parent of branch /branches/branch |
|
|
48 | found parent of branch /branches/branch\xc3\xa9e at 5: /branches/branch\xc3\xa9 (esc) | |
|
49 | 49 | scanning: 4 revisions |
|
50 | 50 | scanning: 5 revisions |
|
51 | 51 | scanning: 6 revisions |
@@ -58,63 +58,63 b' Convert while testing all possible outpu' | |||
|
58 | 58 | source: svn:afeb9c47-92ff-4c0c-9f72-e1f6eb8ac9af/trunk@2 |
|
59 | 59 | converting: 1/6 revisions (16.67%) |
|
60 | 60 | reparent to file://*/svn-repo/trunk (glob) |
|
61 |
scanning paths: /trunk/ |
|
|
62 |
scanning paths: /trunk/ |
|
|
63 |
scanning paths: /trunk/ |
|
|
64 | Γ /eΜ | |
|
65 |
getting files: |
|
|
66 | Γ© | |
|
67 |
getting files: |
|
|
61 | scanning paths: /trunk/\xc3\xa0 0/3 (0.00%) (esc) | |
|
62 | scanning paths: /trunk/\xc3\xa0/e\xcc\x81 1/3 (33.33%) (esc) | |
|
63 | scanning paths: /trunk/\xc3\xa9 2/3 (66.67%) (esc) | |
|
64 | \xc3\xa0/e\xcc\x81 (esc) | |
|
65 | getting files: \xc3\xa0/e\xcc\x81 1/2 (50.00%) (esc) | |
|
66 | \xc3\xa9 (esc) | |
|
67 | getting files: \xc3\xa9 2/2 (100.00%) (esc) | |
|
68 | 68 | 3 copy files |
|
69 | 69 | source: svn:afeb9c47-92ff-4c0c-9f72-e1f6eb8ac9af/trunk@3 |
|
70 | 70 | converting: 2/6 revisions (33.33%) |
|
71 |
scanning paths: /trunk/ |
|
|
71 | scanning paths: /trunk/\xc3\xa0 0/4 (0.00%) (esc) | |
|
72 | 72 | gone from -1 |
|
73 | 73 | reparent to file://*/svn-repo (glob) |
|
74 | 74 | reparent to file://*/svn-repo/trunk (glob) |
|
75 |
scanning paths: /trunk/ |
|
|
76 |
copied to |
|
|
77 |
scanning paths: /trunk/ |
|
|
75 | scanning paths: /trunk/\xc3\xa8 1/4 (25.00%) (esc) | |
|
76 | copied to \xc3\xa8 from \xc3\xa9@2 (esc) | |
|
77 | scanning paths: /trunk/\xc3\xa9 2/4 (50.00%) (esc) | |
|
78 | 78 | gone from -1 |
|
79 | 79 | reparent to file://*/svn-repo (glob) |
|
80 | 80 | reparent to file://*/svn-repo/trunk (glob) |
|
81 |
scanning paths: /trunk/ |
|
|
82 |
mark /trunk/ |
|
|
83 | Γ /eΜ | |
|
84 |
getting files: |
|
|
85 | Γ¨ | |
|
86 |
getting files: |
|
|
87 |
|
|
|
88 | Γ© | |
|
89 |
getting files: |
|
|
90 | ΓΉ/eΜ | |
|
91 |
getting files: |
|
|
92 |
|
|
|
81 | scanning paths: /trunk/\xc3\xb9 3/4 (75.00%) (esc) | |
|
82 | mark /trunk/\xc3\xb9 came from \xc3\xa0:2 (esc) | |
|
83 | \xc3\xa0/e\xcc\x81 (esc) | |
|
84 | getting files: \xc3\xa0/e\xcc\x81 1/4 (25.00%) (esc) | |
|
85 | \xc3\xa8 (esc) | |
|
86 | getting files: \xc3\xa8 2/4 (50.00%) (esc) | |
|
87 | \xc3\xa8: copy \xc3\xa9:6b67ccefd5ce6de77e7ead4f5292843a0255329f (esc) | |
|
88 | \xc3\xa9 (esc) | |
|
89 | getting files: \xc3\xa9 3/4 (75.00%) (esc) | |
|
90 | \xc3\xb9/e\xcc\x81 (esc) | |
|
91 | getting files: \xc3\xb9/e\xcc\x81 4/4 (100.00%) (esc) | |
|
92 | \xc3\xb9/e\xcc\x81: copy \xc3\xa0/e\xcc\x81:a9092a3d84a37b9993b5c73576f6de29b7ea50f6 (esc) | |
|
93 | 93 | 2 remove files |
|
94 | 94 | source: svn:afeb9c47-92ff-4c0c-9f72-e1f6eb8ac9af/trunk@4 |
|
95 | 95 | converting: 3/6 revisions (50.00%) |
|
96 |
scanning paths: /trunk/ |
|
|
96 | scanning paths: /trunk/\xc3\xa8 0/2 (0.00%) (esc) | |
|
97 | 97 | gone from -1 |
|
98 | 98 | reparent to file://*/svn-repo (glob) |
|
99 | 99 | reparent to file://*/svn-repo/trunk (glob) |
|
100 |
scanning paths: /trunk/ |
|
|
100 | scanning paths: /trunk/\xc3\xb9 1/2 (50.00%) (esc) | |
|
101 | 101 | gone from -1 |
|
102 | 102 | reparent to file://*/svn-repo (glob) |
|
103 | 103 | reparent to file://*/svn-repo/trunk (glob) |
|
104 | Γ¨ | |
|
105 |
getting files: |
|
|
106 | ΓΉ/eΜ | |
|
107 |
getting files: |
|
|
104 | \xc3\xa8 (esc) | |
|
105 | getting files: \xc3\xa8 1/2 (50.00%) (esc) | |
|
106 | \xc3\xb9/e\xcc\x81 (esc) | |
|
107 | getting files: \xc3\xb9/e\xcc\x81 2/2 (100.00%) (esc) | |
|
108 | 108 | 1 branch to branch? |
|
109 | 109 | source: svn:afeb9c47-92ff-4c0c-9f72-e1f6eb8ac9af/branches/branch?@5 |
|
110 | 110 | converting: 4/6 revisions (66.67%) |
|
111 | 111 | reparent to file://*/svn-repo/branches/branch%C3%A9 (glob) |
|
112 |
scanning paths: /branches/branch |
|
|
112 | scanning paths: /branches/branch\xc3\xa9 0/1 (0.00%) (esc) | |
|
113 | 113 | 0 branch to branch?e |
|
114 | 114 | source: svn:afeb9c47-92ff-4c0c-9f72-e1f6eb8ac9af/branches/branch?e@6 |
|
115 | 115 | converting: 5/6 revisions (83.33%) |
|
116 | 116 | reparent to file://*/svn-repo/branches/branch%C3%A9e (glob) |
|
117 |
scanning paths: /branches/branch |
|
|
117 | scanning paths: /branches/branch\xc3\xa9e 0/1 (0.00%) (esc) | |
|
118 | 118 | reparent to file://*/svn-repo (glob) |
|
119 | 119 | reparent to file://*/svn-repo/branches/branch%C3%A9e (glob) |
|
120 | 120 | reparent to file://*/svn-repo (glob) |
@@ -32,15 +32,15 b' Setup' | |||
|
32 | 32 | default context |
|
33 | 33 | |
|
34 | 34 | $ hg diff --nodates --color=always |
|
35 |
|
|
|
36 |
|
|
|
37 |
|
|
|
38 |
|
|
|
35 | \x1b[0;1mdiff -r cf9f4ba66af2 a\x1b[0m (esc) | |
|
36 | \x1b[0;31;1m--- a/a\x1b[0m (esc) | |
|
37 | \x1b[0;32;1m+++ b/a\x1b[0m (esc) | |
|
38 | \x1b[0;35m@@ -2,7 +2,7 @@\x1b[0m (esc) | |
|
39 | 39 | c |
|
40 | 40 | a |
|
41 | 41 | a |
|
42 |
|
|
|
43 |
|
|
|
42 | \x1b[0;31m-b\x1b[0m (esc) | |
|
43 | \x1b[0;32m+dd\x1b[0m (esc) | |
|
44 | 44 | a |
|
45 | 45 | a |
|
46 | 46 | c |
@@ -48,21 +48,21 b' default context' | |||
|
48 | 48 | --unified=2 |
|
49 | 49 | |
|
50 | 50 | $ hg diff --nodates -U 2 --color=always |
|
51 |
|
|
|
52 |
|
|
|
53 |
|
|
|
54 |
|
|
|
51 | \x1b[0;1mdiff -r cf9f4ba66af2 a\x1b[0m (esc) | |
|
52 | \x1b[0;31;1m--- a/a\x1b[0m (esc) | |
|
53 | \x1b[0;32;1m+++ b/a\x1b[0m (esc) | |
|
54 | \x1b[0;35m@@ -3,5 +3,5 @@\x1b[0m (esc) | |
|
55 | 55 | a |
|
56 | 56 | a |
|
57 |
|
|
|
58 |
|
|
|
57 | \x1b[0;31m-b\x1b[0m (esc) | |
|
58 | \x1b[0;32m+dd\x1b[0m (esc) | |
|
59 | 59 | a |
|
60 | 60 | a |
|
61 | 61 | |
|
62 | 62 | diffstat |
|
63 | 63 | |
|
64 | 64 | $ hg diff --stat --color=always |
|
65 |
a | 2 |
|
|
65 | a | 2 \x1b[0;32m+\x1b[0m\x1b[0;31m-\x1b[0m (esc) | |
|
66 | 66 | 1 files changed, 1 insertions(+), 1 deletions(-) |
|
67 | 67 | $ echo "record=" >> $HGRCPATH |
|
68 | 68 | $ echo "[ui]" >> $HGRCPATH |
@@ -77,17 +77,17 b' record' | |||
|
77 | 77 | > y |
|
78 | 78 | > y |
|
79 | 79 | > EOF |
|
80 |
|
|
|
81 |
|
|
|
82 |
|
|
|
80 | \x1b[0;1mdiff --git a/a b/a\x1b[0m (esc) | |
|
81 | \x1b[0;36;1mold mode 100644\x1b[0m (esc) | |
|
82 | \x1b[0;36;1mnew mode 100755\x1b[0m (esc) | |
|
83 | 83 | 1 hunks, 1 lines changed |
|
84 | 84 | examine changes to 'a'? [Ynsfdaq?] |
|
85 |
|
|
|
85 | \x1b[0;35m@@ -2,7 +2,7 @@\x1b[0m (esc) | |
|
86 | 86 | c |
|
87 | 87 | a |
|
88 | 88 | a |
|
89 |
|
|
|
90 |
|
|
|
89 | \x1b[0;31m-b\x1b[0m (esc) | |
|
90 | \x1b[0;32m+dd\x1b[0m (esc) | |
|
91 | 91 | a |
|
92 | 92 | a |
|
93 | 93 | c |
@@ -105,17 +105,17 b' qrecord' | |||
|
105 | 105 | > y |
|
106 | 106 | > y |
|
107 | 107 | > EOF |
|
108 |
|
|
|
109 |
|
|
|
110 |
|
|
|
108 | \x1b[0;1mdiff --git a/a b/a\x1b[0m (esc) | |
|
109 | \x1b[0;36;1mold mode 100644\x1b[0m (esc) | |
|
110 | \x1b[0;36;1mnew mode 100755\x1b[0m (esc) | |
|
111 | 111 | 1 hunks, 1 lines changed |
|
112 | 112 | examine changes to 'a'? [Ynsfdaq?] |
|
113 |
|
|
|
113 | \x1b[0;35m@@ -2,7 +2,7 @@\x1b[0m (esc) | |
|
114 | 114 | c |
|
115 | 115 | a |
|
116 | 116 | a |
|
117 |
|
|
|
118 |
|
|
|
117 | \x1b[0;31m-b\x1b[0m (esc) | |
|
118 | \x1b[0;32m+dd\x1b[0m (esc) | |
|
119 | 119 | a |
|
120 | 120 | a |
|
121 | 121 | c |
@@ -402,10 +402,9 b' Test \\r (carriage return) as used in "DO' | |||
|
402 | 402 | @@ -1,2 +1,3 @@ |
|
403 | 403 | -hello world |
|
404 | 404 | -goodbye world |
|
405 | +hello world | |
|
406 | + | |
|
407 | +goodbye | |
|
408 | world | |
|
405 | +hello world\r (esc) | |
|
406 | +\r (esc) | |
|
407 | +goodbye\rworld (esc) | |
|
409 | 408 | world |
|
410 | 409 | |
|
411 | 410 | No completely blank lines to ignore: |
@@ -416,10 +415,9 b' No completely blank lines to ignore:' | |||
|
416 | 415 | +++ b/foo |
|
417 | 416 | @@ -1,2 +1,3 @@ |
|
418 | 417 |
- |
|
419 | -goodbye world | |
|
420 | +hello world | |
|
421 | + | |
|
422 | +goodbye | |
|
418 | +hello world\r (esc) | |
|
419 | +\r (esc) | |
|
420 | +goodbye\rworld (esc) | |
|
423 | 421 | world |
|
424 | 422 | world |
|
425 | 423 | |
@@ -429,7 +427,7 b' Only new line noticed:' | |||
|
429 | 427 | diff -r 540c40a65b78 foo |
|
430 | 428 | --- a/foo |
|
431 | 429 | +++ b/foo |
|
432 | @@ -1,2 +1,3 @@ | |
|
430 | +\r (esc) | |
|
433 | 431 |
|
|
434 | 432 | + |
|
435 | 433 | goodbye world |
@@ -438,7 +436,7 b' Only new line noticed:' | |||
|
438 | 436 | diff -r 540c40a65b78 foo |
|
439 | 437 | --- a/foo |
|
440 | 438 | +++ b/foo |
|
441 | @@ -1,2 +1,3 @@ | |
|
439 | +\r (esc) | |
|
442 | 440 |
|
|
443 | 441 | + |
|
444 | 442 | goodbye world |
@@ -13,6 +13,6 b'' | |||
|
13 | 13 | +++ b/a Thu Jan 01 00:00:02 1970 +0000 |
|
14 | 14 | @@ -1,2 +1,3 @@ |
|
15 | 15 | confuse str.splitlines |
|
16 | embedded | |
|
16 | embedded\rnewline (esc) | |
|
17 | 17 | newline |
|
18 | 18 | +clean diff |
@@ -30,7 +30,7 b' should fail with encoding error' | |||
|
30 | 30 | $ HGENCODING=ascii hg ci -l latin-1 |
|
31 | 31 | transaction abort! |
|
32 | 32 | rollback completed |
|
33 |
abort: decoding near ' encoded: |
|
|
33 | abort: decoding near ' encoded: \xe9': 'ascii' codec can't decode byte 0xe9 in position 20: ordinal not in range(128)! (esc) | |
|
34 | 34 | [255] |
|
35 | 35 | |
|
36 | 36 | these should work |
@@ -41,7 +41,7 b' these should work' | |||
|
41 | 41 | $ HGENCODING=utf-8 hg ci -l utf-8 |
|
42 | 42 | $ HGENCODING=latin-1 hg tag `cat latin-1-tag` |
|
43 | 43 | $ HGENCODING=latin-1 hg branch `cat latin-1-tag` |
|
44 |
marked working directory as branch |
|
|
44 | marked working directory as branch \xe9 (esc) | |
|
45 | 45 | $ HGENCODING=latin-1 hg ci -m 'latin1 branch' |
|
46 | 46 | $ rm .hg/branch |
|
47 | 47 | |
@@ -86,7 +86,7 b' hg log (latin-1)' | |||
|
86 | 86 | |
|
87 | 87 | $ hg --encoding latin-1 log |
|
88 | 88 | changeset: 5:093c6077d1c8 |
|
89 |
branch: |
|
|
89 | branch: \xe9 (esc) | |
|
90 | 90 |
|
|
91 | 91 | user: test |
|
92 | 92 | date: Thu Jan 01 00:00:00 1970 +0000 |
@@ -95,35 +95,35 b' hg log (latin-1)' | |||
|
95 | 95 | changeset: 4:94db611b4196 |
|
96 | 96 | user: test |
|
97 | 97 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
98 |
summary: Added tag |
|
|
98 | summary: Added tag \xe9 for changeset ca661e7520de (esc) | |
|
99 | 99 | |
|
100 | 100 | changeset: 3:ca661e7520de |
|
101 |
tag: |
|
|
101 | tag: \xe9 (esc) | |
|
102 | 102 |
|
|
103 | 103 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
104 |
summary: utf-8 e' encoded: |
|
|
104 | summary: utf-8 e' encoded: \xe9 (esc) | |
|
105 | 105 | |
|
106 | 106 | changeset: 2:650c6f3d55dd |
|
107 | 107 | user: test |
|
108 | 108 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
109 |
summary: latin-1 e' encoded: |
|
|
109 | summary: latin-1 e' encoded: \xe9 (esc) | |
|
110 | 110 | |
|
111 | 111 |
|
|
112 | 112 | user: test |
|
113 | 113 | date: Mon Jan 12 13:46:40 1970 +0000 |
|
114 |
summary: koi8-r: |
|
|
114 | summary: koi8-r: \xd2\xd4\xd5\xd4\xd8 = u'\\u0440\\u0442\\u0443\\u0442\\u044c' (esc) | |
|
115 | 115 | |
|
116 | 116 | changeset: 0:1e78a93102a3 |
|
117 | 117 | user: test |
|
118 | 118 | date: Mon Jan 12 13:46:40 1970 +0000 |
|
119 |
summary: latin-1 e': |
|
|
119 | summary: latin-1 e': \xe9 = u'\\xe9' (esc) | |
|
120 | 120 | |
|
121 | 121 | |
|
122 | 122 | hg log (utf-8) |
|
123 | 123 | |
|
124 | 124 | $ hg --encoding utf-8 log |
|
125 | 125 | changeset: 5:093c6077d1c8 |
|
126 |
branch: |
|
|
126 | branch: \xc3\xa9 (esc) | |
|
127 | 127 | tag: tip |
|
128 | 128 | user: test |
|
129 | 129 | date: Thu Jan 01 00:00:00 1970 +0000 |
@@ -132,28 +132,28 b' hg log (utf-8)' | |||
|
132 | 132 | changeset: 4:94db611b4196 |
|
133 | 133 | user: test |
|
134 | 134 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
135 |
summary: Added tag |
|
|
135 | summary: Added tag \xc3\xa9 for changeset ca661e7520de (esc) | |
|
136 | 136 | |
|
137 | 137 | changeset: 3:ca661e7520de |
|
138 |
tag: |
|
|
138 | tag: \xc3\xa9 (esc) | |
|
139 | 139 | user: test |
|
140 | 140 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
141 |
summary: utf-8 e' encoded: |
|
|
141 | summary: utf-8 e' encoded: \xc3\xa9 (esc) | |
|
142 | 142 | |
|
143 | 143 |
|
|
144 | 144 | user: test |
|
145 | 145 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
146 |
summary: latin-1 e' encoded: |
|
|
146 | summary: latin-1 e' encoded: \xc3\xa9 (esc) | |
|
147 | 147 | |
|
148 | 148 | changeset: 1:0e5b7e3f9c4a |
|
149 | 149 | user: test |
|
150 | 150 | date: Mon Jan 12 13:46:40 1970 +0000 |
|
151 |
summary: koi8-r: |
|
|
151 | summary: koi8-r: \xc3\x92\xc3\x94\xc3\x95\xc3\x94\xc3\x98 = u'\\u0440\\u0442\\u0443\\u0442\\u044c' (esc) | |
|
152 | 152 | |
|
153 | 153 | changeset: 0:1e78a93102a3 |
|
154 | 154 | user: test |
|
155 | 155 | date: Mon Jan 12 13:46:40 1970 +0000 |
|
156 |
summary: latin-1 e': |
|
|
156 | summary: latin-1 e': \xc3\xa9 = u'\\xe9' (esc) | |
|
157 | 157 | |
|
158 | 158 | |
|
159 | 159 | hg tags (ascii) |
@@ -166,13 +166,13 b' hg tags (latin-1)' | |||
|
166 | 166 | |
|
167 | 167 | $ HGENCODING=latin-1 hg tags |
|
168 | 168 | tip 5:093c6077d1c8 |
|
169 |
|
|
|
169 | \xe9 3:ca661e7520de (esc) | |
|
170 | 170 | |
|
171 | 171 | hg tags (utf-8) |
|
172 | 172 | |
|
173 | 173 | $ HGENCODING=utf-8 hg tags |
|
174 | 174 | tip 5:093c6077d1c8 |
|
175 |
|
|
|
175 | \xc3\xa9 3:ca661e7520de (esc) | |
|
176 | 176 | |
|
177 | 177 | hg branches (ascii) |
|
178 | 178 | |
@@ -183,13 +183,13 b' hg branches (ascii)' | |||
|
183 | 183 | hg branches (latin-1) |
|
184 | 184 | |
|
185 | 185 | $ HGENCODING=latin-1 hg branches |
|
186 |
|
|
|
186 | \xe9 5:093c6077d1c8 (esc) | |
|
187 | 187 | default 4:94db611b4196 (inactive) |
|
188 | 188 | |
|
189 | 189 | hg branches (utf-8) |
|
190 | 190 | |
|
191 | 191 | $ HGENCODING=utf-8 hg branches |
|
192 |
|
|
|
192 | \xc3\xa9 5:093c6077d1c8 (esc) | |
|
193 | 193 | default 4:94db611b4196 (inactive) |
|
194 | 194 | $ echo '[ui]' >> .hg/hgrc |
|
195 | 195 | $ echo 'fallbackencoding = koi8-r' >> .hg/hgrc |
@@ -198,7 +198,7 b' hg log (utf-8)' | |||
|
198 | 198 | |
|
199 | 199 | $ HGENCODING=utf-8 hg log |
|
200 | 200 | changeset: 5:093c6077d1c8 |
|
201 |
branch: |
|
|
201 | branch: \xc3\xa9 (esc) | |
|
202 | 202 |
|
|
203 | 203 | user: test |
|
204 | 204 | date: Thu Jan 01 00:00:00 1970 +0000 |
@@ -207,28 +207,28 b' hg log (utf-8)' | |||
|
207 | 207 | changeset: 4:94db611b4196 |
|
208 | 208 | user: test |
|
209 | 209 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
210 |
summary: Added tag |
|
|
210 | summary: Added tag \xc3\xa9 for changeset ca661e7520de (esc) | |
|
211 | 211 | |
|
212 | 212 | changeset: 3:ca661e7520de |
|
213 |
tag: |
|
|
213 | tag: \xc3\xa9 (esc) | |
|
214 | 214 |
|
|
215 | 215 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
216 |
summary: utf-8 e' encoded: |
|
|
216 | summary: utf-8 e' encoded: \xc3\xa9 (esc) | |
|
217 | 217 | |
|
218 | 218 | changeset: 2:650c6f3d55dd |
|
219 | 219 | user: test |
|
220 | 220 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
221 |
summary: latin-1 e' encoded: |
|
|
221 | summary: latin-1 e' encoded: \xc3\xa9 (esc) | |
|
222 | 222 | |
|
223 | 223 |
|
|
224 | 224 | user: test |
|
225 | 225 | date: Mon Jan 12 13:46:40 1970 +0000 |
|
226 |
summary: koi8-r: |
|
|
226 | summary: koi8-r: \xd1\x80\xd1\x82\xd1\x83\xd1\x82\xd1\x8c = u'\\u0440\\u0442\\u0443\\u0442\\u044c' (esc) | |
|
227 | 227 | |
|
228 | 228 | changeset: 0:1e78a93102a3 |
|
229 | 229 | user: test |
|
230 | 230 | date: Mon Jan 12 13:46:40 1970 +0000 |
|
231 |
summary: latin-1 e': |
|
|
231 | summary: latin-1 e': \xd0\x98 = u'\\xe9' (esc) | |
|
232 | 232 | |
|
233 | 233 | |
|
234 | 234 | hg log (dolphin) |
@@ -237,7 +237,7 b' hg log (dolphin)' | |||
|
237 | 237 | abort: unknown encoding: dolphin, please check your locale settings |
|
238 | 238 | [255] |
|
239 | 239 | $ HGENCODING=ascii hg branch `cat latin-1-tag` |
|
240 |
abort: decoding near ' |
|
|
240 | abort: decoding near '\xe9': 'ascii' codec can't decode byte 0xe9 in position 0: ordinal not in range(128)! (esc) | |
|
241 | 241 | [255] |
|
242 | 242 | $ cp latin-1-tag .hg/branch |
|
243 | 243 | $ HGENCODING=latin-1 hg ci -m 'should fail' |
@@ -9,11 +9,11 b' test issue352' | |||
|
9 | 9 | $ A=`printf 'he\rllo'` |
|
10 | 10 | $ echo foo > "$A" |
|
11 | 11 | $ hg add |
|
12 | adding he | |
|
12 | adding he\rllo (esc) | |
|
13 | 13 | llo |
|
14 | 14 | abort: '\n' and '\r' disallowed in filenames: 'he\rllo' |
|
15 | 15 | [255] |
|
16 | $ hg ci -A -m m | |
|
16 | adding he\rllo (esc) | |
|
17 | 17 | adding he |
|
18 | 18 | llo |
|
19 | 19 | abort: '\n' and '\r' disallowed in filenames: 'he\rllo' |
@@ -31,7 +31,7 b' test issue352' | |||
|
31 | 31 | o |
|
32 | 32 | abort: '\n' and '\r' disallowed in filenames: 'hell\no' |
|
33 | 33 | [255] |
|
34 | $ echo foo > "$A" | |
|
34 | f he\rllo he\rllo (esc) | |
|
35 | 35 | $ hg debugwalk |
|
36 | 36 |
|
|
37 | 37 | llo he |
@@ -51,7 +51,7 b' test issue2039' | |||
|
51 | 51 | $ echo "[extensions]" >> $HGRCPATH |
|
52 | 52 | $ echo "color=" >> $HGRCPATH |
|
53 | 53 | $ A=`printf 'foo\nbar'` |
|
54 | $ B=`printf 'foo\nbar.baz'` | |
|
55 | $ touch "$A" | |
|
56 | $ touch "$B" | |
|
57 | $ hg status --color=always | |
|
54 | \x1b[0;35;1;4m? foo\x1b[0m (esc) | |
|
55 | \x1b[0;35;1;4mbar\x1b[0m (esc) | |
|
56 | \x1b[0;35;1;4m? foo\x1b[0m (esc) | |
|
57 | \x1b[0;35;1;4mbar.baz\x1b[0m (esc) |
@@ -33,9 +33,9 b' simple with color' | |||
|
33 | 33 | |
|
34 | 34 | $ hg --config extensions.color= grep --config color.mode=ansi \ |
|
35 | 35 | > --color=always port port |
|
36 |
port:4:ex |
|
|
37 |
port:4:va |
|
|
38 |
port:4:im |
|
|
36 | port:4:ex\x1b[0;31;1mport\x1b[0m (esc) | |
|
37 | port:4:va\x1b[0;31;1mport\x1b[0might (esc) | |
|
38 | port:4:im\x1b[0;31;1mport\x1b[0m/export (esc) | |
|
39 | 39 | |
|
40 | 40 | all |
|
41 | 41 |
@@ -5,7 +5,7 b'' | |||
|
5 | 5 | > } |
|
6 | 6 | $ hg init a |
|
7 | 7 | $ hg --encoding utf-8 -R a branch Γ¦ |
|
8 |
marked working directory as branch |
|
|
8 | marked working directory as branch \xc3\xa6 (esc) | |
|
9 | 9 | $ echo foo > a/foo |
|
10 | 10 | $ hg -R a ci -Am foo |
|
11 | 11 | adding foo |
@@ -17,11 +17,11 b'' | |||
|
17 | 17 | adding manifests |
|
18 | 18 | adding file changes |
|
19 | 19 | added 1 changesets with 1 changes to 1 files |
|
20 |
updating to branch |
|
|
20 | updating to branch \xc3\xa6 (esc) | |
|
21 | 21 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
22 | 22 | $ hg --encoding utf-8 -R b log |
|
23 | 23 | changeset: 0:867c11ce77b8 |
|
24 |
branch: |
|
|
24 | branch: \xc3\xa6 (esc) | |
|
25 | 25 |
|
|
26 | 26 | user: test |
|
27 | 27 | date: Thu Jan 01 00:00:00 1970 +0000 |
@@ -38,14 +38,14 b'' | |||
|
38 | 38 | remote: added 1 changesets with 1 changes to 1 files |
|
39 | 39 | $ hg -R a --encoding utf-8 log |
|
40 | 40 | changeset: 1:58e7c90d67cb |
|
41 |
branch: |
|
|
41 | branch: \xc3\xa6 (esc) | |
|
42 | 42 |
|
|
43 | 43 | user: test |
|
44 | 44 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
45 | 45 | summary: bar |
|
46 | 46 | |
|
47 | 47 | changeset: 0:867c11ce77b8 |
|
48 |
branch: |
|
|
48 | branch: \xc3\xa6 (esc) | |
|
49 | 49 |
|
|
50 | 50 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
51 | 51 | summary: foo |
@@ -523,31 +523,31 b' log -p -l2 --color=always' | |||
|
523 | 523 | |
|
524 | 524 | $ hg --config extensions.color= --config color.mode=ansi \ |
|
525 | 525 | > log -p -l2 --color=always |
|
526 |
|
|
|
526 | \x1b[0;33mchangeset: 6:2404bbcab562\x1b[0m (esc) | |
|
527 | 527 | tag: tip |
|
528 | 528 | user: test |
|
529 | 529 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
530 | 530 | summary: b1.1 |
|
531 | 531 | |
|
532 |
|
|
|
533 |
|
|
|
534 |
|
|
|
535 |
|
|
|
532 | \x1b[0;1mdiff -r 302e9dd6890d -r 2404bbcab562 b1\x1b[0m (esc) | |
|
533 | \x1b[0;31;1m--- a/b1 Thu Jan 01 00:00:01 1970 +0000\x1b[0m (esc) | |
|
534 | \x1b[0;32;1m+++ b/b1 Thu Jan 01 00:00:01 1970 +0000\x1b[0m (esc) | |
|
535 | \x1b[0;35m@@ -1,1 +1,2 @@\x1b[0m (esc) | |
|
536 | 536 | b1 |
|
537 |
|
|
|
537 | \x1b[0;32m+postm\x1b[0m (esc) | |
|
538 | 538 | |
|
539 |
|
|
|
539 | \x1b[0;33mchangeset: 5:302e9dd6890d\x1b[0m (esc) | |
|
540 | 540 | parent: 3:e62f78d544b4 |
|
541 | 541 | parent: 4:ddb82e70d1a1 |
|
542 | 542 | user: test |
|
543 | 543 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
544 | 544 | summary: m12 |
|
545 | 545 | |
|
546 |
|
|
|
547 |
|
|
|
548 |
|
|
|
549 |
|
|
|
550 |
|
|
|
546 | \x1b[0;1mdiff -r e62f78d544b4 -r 302e9dd6890d b2\x1b[0m (esc) | |
|
547 | \x1b[0;31;1m--- /dev/null Thu Jan 01 00:00:00 1970 +0000\x1b[0m (esc) | |
|
548 | \x1b[0;32;1m+++ b/b2 Thu Jan 01 00:00:01 1970 +0000\x1b[0m (esc) | |
|
549 | \x1b[0;35m@@ -0,0 +1,1 @@\x1b[0m (esc) | |
|
550 | \x1b[0;32m+b2\x1b[0m (esc) | |
|
551 | 551 | |
|
552 | 552 | |
|
553 | 553 |
@@ -218,9 +218,9 b' list patches and guards with color' | |||
|
218 | 218 | |
|
219 | 219 | $ hg --config extensions.color= qguard --config color.mode=ansi \ |
|
220 | 220 | > -l --color=always |
|
221 |
|
|
|
222 |
|
|
|
223 |
|
|
|
221 | \x1b[0;30;1ma.patch\x1b[0m: \x1b[0;33m+1\x1b[0m \x1b[0;33m+2\x1b[0m \x1b[0;31m-3\x1b[0m (esc) | |
|
222 | \x1b[0;34;1;4mb.patch\x1b[0m: \x1b[0;33m+2\x1b[0m (esc) | |
|
223 | \x1b[0;30;1mc.patch\x1b[0m: \x1b[0;32munguarded\x1b[0m (esc) | |
|
224 | 224 | |
|
225 | 225 | should pop b.patch |
|
226 | 226 | |
@@ -310,10 +310,10 b' and d.patch as Unapplied' | |||
|
310 | 310 | qseries again, but with color |
|
311 | 311 | |
|
312 | 312 | $ hg --config extensions.color= qseries -v --color=always |
|
313 |
0 G |
|
|
314 |
1 G |
|
|
315 |
2 A |
|
|
316 |
3 U |
|
|
313 | 0 G \x1b[0;30;1mnew.patch\x1b[0m (esc) | |
|
314 | 1 G \x1b[0;30;1mb.patch\x1b[0m (esc) | |
|
315 | 2 A \x1b[0;34;1;4mc.patch\x1b[0m (esc) | |
|
316 | 3 U \x1b[0;30;1md.patch\x1b[0m (esc) | |
|
317 | 317 | |
|
318 | 318 | $ hg qguard d.patch +2 |
|
319 | 319 | |
@@ -433,4 +433,4 b' the guards file was not ignored in the p' | |||
|
433 | 433 | hg qseries -m with color |
|
434 | 434 | |
|
435 | 435 | $ hg --config extensions.color= qseries -m --color=always |
|
436 |
|
|
|
436 | \x1b[0;31;1mb.patch\x1b[0m (esc) |
@@ -41,7 +41,7 b' test qpush on empty series' | |||
|
41 | 41 | transaction abort! |
|
42 | 42 | rollback completed |
|
43 | 43 | cleaning up working directory...done |
|
44 |
abort: decoding near ' |
|
|
44 | abort: decoding near '\xe9': 'ascii' codec can't decode byte 0xe9 in position 0: ordinal not in range(128)! (esc) | |
|
45 | 45 | [255] |
|
46 | 46 | $ hg parents |
|
47 | 47 | changeset: 0:bbd179dfa0a7 |
@@ -178,11 +178,11 b' add an untracked file' | |||
|
178 | 178 | status --mq with color (issue2096) |
|
179 | 179 | |
|
180 | 180 | $ hg status --mq --config extensions.color= --color=always |
|
181 |
|
|
|
182 |
|
|
|
183 |
|
|
|
184 |
|
|
|
185 |
|
|
|
181 | \x1b[0;32;1mA .hgignore\x1b[0m (esc) | |
|
182 | \x1b[0;32;1mA A\x1b[0m (esc) | |
|
183 | \x1b[0;32;1mA B\x1b[0m (esc) | |
|
184 | \x1b[0;32;1mA series\x1b[0m (esc) | |
|
185 | \x1b[0;35;1;4m? flaf\x1b[0m (esc) | |
|
186 | 186 | |
|
187 | 187 | try the --mq option on a command provided by an extension |
|
188 | 188 |
@@ -1925,7 +1925,7 b' test outgoing:' | |||
|
1925 | 1925 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
1926 | 1926 | +++ b/utf Thu Jan 01 00:00:04 1970 +0000 |
|
1927 | 1927 | @@ -0,0 +1,1 @@ |
|
1928 | +hΓΆmma! | |
|
1928 | +h\xc3\xb6mma! (esc) | |
|
1929 | 1929 | |
|
1930 | 1930 | Displaying [PATCH 3 of 8] charset=utf-8; content-transfer-encoding: quoted-printable ... |
|
1931 | 1931 | Content-Type: text/plain; charset="us-ascii" |
@@ -1996,7 +1996,7 b' test outgoing:' | |||
|
1996 | 1996 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
1997 | 1997 | +++ b/isolatin Thu Jan 01 00:00:05 1970 +0000 |
|
1998 | 1998 | @@ -0,0 +1,1 @@ |
|
1999 | +hοΏ½mma! | |
|
1999 | +h\xf6mma! (esc) | |
|
2000 | 2000 | |
|
2001 | 2001 | Displaying [PATCH 5 of 8] Added tag zero, zero.foo for changeset 8580ff50825a ... |
|
2002 | 2002 |
Content-Type: text/plain; |
@@ -51,7 +51,7 b' test with delay=0, refresh=0' | |||
|
51 | 51 | loop [ ] 0/3 |
|
52 | 52 | loop [=====================> ] 1/3 |
|
53 | 53 | loop [============================================> ] 2/3 |
|
54 | ||
|
54 | \r (esc) | |
|
55 | 55 | |
|
56 | 56 | test refresh is taken in account |
|
57 | 57 | |
@@ -64,7 +64,7 b' test format options 1' | |||
|
64 | 64 | |
|
65 | 65 | 0/2 loop lo |
|
66 | 66 | 1/2 loop lo |
|
67 | ||
|
67 | \r (esc) | |
|
68 | 68 | |
|
69 | 69 | test format options 2 |
|
70 | 70 | |
@@ -72,7 +72,7 b' test format options 2' | |||
|
72 | 72 | |
|
73 | 73 | 0/2 p.0 [ ] |
|
74 | 74 | 1/2 p.1 [=================================> ] |
|
75 | ||
|
75 | \r (esc) | |
|
76 | 76 | |
|
77 | 77 | test format options and indeterminate progress |
|
78 | 78 | |
@@ -80,7 +80,7 b' test format options and indeterminate pr' | |||
|
80 | 80 | |
|
81 | 81 | 0 loop.0 [ <=> ] |
|
82 | 82 | 1 loop.1 [ <=> ] |
|
83 | ||
|
83 | \r (esc) | |
|
84 | 84 | |
|
85 | 85 | make sure things don't fall over if count > total |
|
86 | 86 | |
@@ -92,7 +92,7 b" make sure things don't fall over if coun" | |||
|
92 | 92 | loop [==================================================> ] 3/4 |
|
93 | 93 | loop [===================================================================>] 4/4 |
|
94 | 94 | loop [ <=> ] 5/4 |
|
95 | ||
|
95 | \r (esc) | |
|
96 | 96 | |
|
97 | 97 | test immediate progress completion |
|
98 | 98 |
@@ -66,7 +66,7 b'' | |||
|
66 | 66 | $ hg co 4 |
|
67 | 67 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
68 | 68 | $ hg branch Γ© |
|
69 |
marked working directory as branch |
|
|
69 | marked working directory as branch \xc3\xa9 (esc) | |
|
70 | 70 | $ hg ci -Aqm9 |
|
71 | 71 | |
|
72 | 72 | $ hg tag -r6 1.0 |
@@ -11,100 +11,100 b'' | |||
|
11 | 11 | hg status in repo root: |
|
12 | 12 | |
|
13 | 13 | $ hg status --color=always |
|
14 |
|
|
|
15 |
|
|
|
16 |
|
|
|
17 |
|
|
|
18 |
|
|
|
19 |
|
|
|
14 | \x1b[0;35;1;4m? a/1/in_a_1\x1b[0m (esc) | |
|
15 | \x1b[0;35;1;4m? a/in_a\x1b[0m (esc) | |
|
16 | \x1b[0;35;1;4m? b/1/in_b_1\x1b[0m (esc) | |
|
17 | \x1b[0;35;1;4m? b/2/in_b_2\x1b[0m (esc) | |
|
18 | \x1b[0;35;1;4m? b/in_b\x1b[0m (esc) | |
|
19 | \x1b[0;35;1;4m? in_root\x1b[0m (esc) | |
|
20 | 20 | |
|
21 | 21 | hg status . in repo root: |
|
22 | 22 | |
|
23 | 23 | $ hg status --color=always . |
|
24 |
|
|
|
25 |
|
|
|
26 |
|
|
|
27 |
|
|
|
28 |
|
|
|
29 |
|
|
|
24 | \x1b[0;35;1;4m? a/1/in_a_1\x1b[0m (esc) | |
|
25 | \x1b[0;35;1;4m? a/in_a\x1b[0m (esc) | |
|
26 | \x1b[0;35;1;4m? b/1/in_b_1\x1b[0m (esc) | |
|
27 | \x1b[0;35;1;4m? b/2/in_b_2\x1b[0m (esc) | |
|
28 | \x1b[0;35;1;4m? b/in_b\x1b[0m (esc) | |
|
29 | \x1b[0;35;1;4m? in_root\x1b[0m (esc) | |
|
30 | 30 | |
|
31 | 31 | $ hg status --color=always --cwd a |
|
32 |
|
|
|
33 |
|
|
|
34 |
|
|
|
35 |
|
|
|
36 |
|
|
|
37 |
|
|
|
32 | \x1b[0;35;1;4m? a/1/in_a_1\x1b[0m (esc) | |
|
33 | \x1b[0;35;1;4m? a/in_a\x1b[0m (esc) | |
|
34 | \x1b[0;35;1;4m? b/1/in_b_1\x1b[0m (esc) | |
|
35 | \x1b[0;35;1;4m? b/2/in_b_2\x1b[0m (esc) | |
|
36 | \x1b[0;35;1;4m? b/in_b\x1b[0m (esc) | |
|
37 | \x1b[0;35;1;4m? in_root\x1b[0m (esc) | |
|
38 | 38 | $ hg status --color=always --cwd a . |
|
39 |
|
|
|
40 |
|
|
|
39 | \x1b[0;35;1;4m? 1/in_a_1\x1b[0m (esc) | |
|
40 | \x1b[0;35;1;4m? in_a\x1b[0m (esc) | |
|
41 | 41 | $ hg status --color=always --cwd a .. |
|
42 |
|
|
|
43 |
|
|
|
44 |
|
|
|
45 |
|
|
|
46 |
|
|
|
47 |
|
|
|
42 | \x1b[0;35;1;4m? 1/in_a_1\x1b[0m (esc) | |
|
43 | \x1b[0;35;1;4m? in_a\x1b[0m (esc) | |
|
44 | \x1b[0;35;1;4m? ../b/1/in_b_1\x1b[0m (esc) | |
|
45 | \x1b[0;35;1;4m? ../b/2/in_b_2\x1b[0m (esc) | |
|
46 | \x1b[0;35;1;4m? ../b/in_b\x1b[0m (esc) | |
|
47 | \x1b[0;35;1;4m? ../in_root\x1b[0m (esc) | |
|
48 | 48 | |
|
49 | 49 | $ hg status --color=always --cwd b |
|
50 |
|
|
|
51 |
|
|
|
52 |
|
|
|
53 |
|
|
|
54 |
|
|
|
55 |
|
|
|
50 | \x1b[0;35;1;4m? a/1/in_a_1\x1b[0m (esc) | |
|
51 | \x1b[0;35;1;4m? a/in_a\x1b[0m (esc) | |
|
52 | \x1b[0;35;1;4m? b/1/in_b_1\x1b[0m (esc) | |
|
53 | \x1b[0;35;1;4m? b/2/in_b_2\x1b[0m (esc) | |
|
54 | \x1b[0;35;1;4m? b/in_b\x1b[0m (esc) | |
|
55 | \x1b[0;35;1;4m? in_root\x1b[0m (esc) | |
|
56 | 56 | $ hg status --color=always --cwd b . |
|
57 |
|
|
|
58 |
|
|
|
59 |
|
|
|
57 | \x1b[0;35;1;4m? 1/in_b_1\x1b[0m (esc) | |
|
58 | \x1b[0;35;1;4m? 2/in_b_2\x1b[0m (esc) | |
|
59 | \x1b[0;35;1;4m? in_b\x1b[0m (esc) | |
|
60 | 60 | $ hg status --color=always --cwd b .. |
|
61 |
|
|
|
62 |
|
|
|
63 |
|
|
|
64 |
|
|
|
65 |
|
|
|
66 |
|
|
|
61 | \x1b[0;35;1;4m? ../a/1/in_a_1\x1b[0m (esc) | |
|
62 | \x1b[0;35;1;4m? ../a/in_a\x1b[0m (esc) | |
|
63 | \x1b[0;35;1;4m? 1/in_b_1\x1b[0m (esc) | |
|
64 | \x1b[0;35;1;4m? 2/in_b_2\x1b[0m (esc) | |
|
65 | \x1b[0;35;1;4m? in_b\x1b[0m (esc) | |
|
66 | \x1b[0;35;1;4m? ../in_root\x1b[0m (esc) | |
|
67 | 67 | |
|
68 | 68 | $ hg status --color=always --cwd a/1 |
|
69 |
|
|
|
70 |
|
|
|
71 |
|
|
|
72 |
|
|
|
73 |
|
|
|
74 |
|
|
|
69 | \x1b[0;35;1;4m? a/1/in_a_1\x1b[0m (esc) | |
|
70 | \x1b[0;35;1;4m? a/in_a\x1b[0m (esc) | |
|
71 | \x1b[0;35;1;4m? b/1/in_b_1\x1b[0m (esc) | |
|
72 | \x1b[0;35;1;4m? b/2/in_b_2\x1b[0m (esc) | |
|
73 | \x1b[0;35;1;4m? b/in_b\x1b[0m (esc) | |
|
74 | \x1b[0;35;1;4m? in_root\x1b[0m (esc) | |
|
75 | 75 | $ hg status --color=always --cwd a/1 . |
|
76 |
|
|
|
76 | \x1b[0;35;1;4m? in_a_1\x1b[0m (esc) | |
|
77 | 77 | $ hg status --color=always --cwd a/1 .. |
|
78 |
|
|
|
79 |
|
|
|
78 | \x1b[0;35;1;4m? in_a_1\x1b[0m (esc) | |
|
79 | \x1b[0;35;1;4m? ../in_a\x1b[0m (esc) | |
|
80 | 80 | |
|
81 | 81 | $ hg status --color=always --cwd b/1 |
|
82 |
|
|
|
83 |
|
|
|
84 |
|
|
|
85 |
|
|
|
86 |
|
|
|
87 |
|
|
|
82 | \x1b[0;35;1;4m? a/1/in_a_1\x1b[0m (esc) | |
|
83 | \x1b[0;35;1;4m? a/in_a\x1b[0m (esc) | |
|
84 | \x1b[0;35;1;4m? b/1/in_b_1\x1b[0m (esc) | |
|
85 | \x1b[0;35;1;4m? b/2/in_b_2\x1b[0m (esc) | |
|
86 | \x1b[0;35;1;4m? b/in_b\x1b[0m (esc) | |
|
87 | \x1b[0;35;1;4m? in_root\x1b[0m (esc) | |
|
88 | 88 | $ hg status --color=always --cwd b/1 . |
|
89 |
|
|
|
89 | \x1b[0;35;1;4m? in_b_1\x1b[0m (esc) | |
|
90 | 90 | $ hg status --color=always --cwd b/1 .. |
|
91 |
|
|
|
92 |
|
|
|
93 |
|
|
|
91 | \x1b[0;35;1;4m? in_b_1\x1b[0m (esc) | |
|
92 | \x1b[0;35;1;4m? ../2/in_b_2\x1b[0m (esc) | |
|
93 | \x1b[0;35;1;4m? ../in_b\x1b[0m (esc) | |
|
94 | 94 | |
|
95 | 95 | $ hg status --color=always --cwd b/2 |
|
96 |
|
|
|
97 |
|
|
|
98 |
|
|
|
99 |
|
|
|
100 |
|
|
|
101 |
|
|
|
96 | \x1b[0;35;1;4m? a/1/in_a_1\x1b[0m (esc) | |
|
97 | \x1b[0;35;1;4m? a/in_a\x1b[0m (esc) | |
|
98 | \x1b[0;35;1;4m? b/1/in_b_1\x1b[0m (esc) | |
|
99 | \x1b[0;35;1;4m? b/2/in_b_2\x1b[0m (esc) | |
|
100 | \x1b[0;35;1;4m? b/in_b\x1b[0m (esc) | |
|
101 | \x1b[0;35;1;4m? in_root\x1b[0m (esc) | |
|
102 | 102 | $ hg status --color=always --cwd b/2 . |
|
103 |
|
|
|
103 | \x1b[0;35;1;4m? in_b_2\x1b[0m (esc) | |
|
104 | 104 | $ hg status --color=always --cwd b/2 .. |
|
105 |
|
|
|
106 |
|
|
|
107 |
|
|
|
105 | \x1b[0;35;1;4m? ../1/in_b_1\x1b[0m (esc) | |
|
106 | \x1b[0;35;1;4m? in_b_2\x1b[0m (esc) | |
|
107 | \x1b[0;35;1;4m? ../in_b\x1b[0m (esc) | |
|
108 | 108 | $ cd .. |
|
109 | 109 | |
|
110 | 110 | $ hg init repo2 |
@@ -124,44 +124,44 b' hg status . in repo root:' | |||
|
124 | 124 | hg status: |
|
125 | 125 | |
|
126 | 126 | $ hg status --color=always |
|
127 |
|
|
|
128 |
|
|
|
129 |
|
|
|
130 |
|
|
|
127 | \x1b[0;32;1mA added\x1b[0m (esc) | |
|
128 | \x1b[0;31;1mR removed\x1b[0m (esc) | |
|
129 | \x1b[0;36;1;4m! deleted\x1b[0m (esc) | |
|
130 | \x1b[0;35;1;4m? unknown\x1b[0m (esc) | |
|
131 | 131 | |
|
132 | 132 | hg status modified added removed deleted unknown never-existed ignored: |
|
133 | 133 | |
|
134 | 134 | $ hg status --color=always modified added removed deleted unknown never-existed ignored |
|
135 | 135 | never-existed: No such file or directory |
|
136 |
|
|
|
137 |
|
|
|
138 |
|
|
|
139 |
|
|
|
136 | \x1b[0;32;1mA added\x1b[0m (esc) | |
|
137 | \x1b[0;31;1mR removed\x1b[0m (esc) | |
|
138 | \x1b[0;36;1;4m! deleted\x1b[0m (esc) | |
|
139 | \x1b[0;35;1;4m? unknown\x1b[0m (esc) | |
|
140 | 140 | |
|
141 | 141 | $ hg copy modified copied |
|
142 | 142 | |
|
143 | 143 | hg status -C: |
|
144 | 144 | |
|
145 | 145 | $ hg status --color=always -C |
|
146 |
|
|
|
147 |
|
|
|
148 |
|
|
|
149 |
|
|
|
150 |
|
|
|
151 |
|
|
|
146 | \x1b[0;32;1mA added\x1b[0m (esc) | |
|
147 | \x1b[0;32;1mA copied\x1b[0m (esc) | |
|
148 | \x1b[0;0m modified\x1b[0m (esc) | |
|
149 | \x1b[0;31;1mR removed\x1b[0m (esc) | |
|
150 | \x1b[0;36;1;4m! deleted\x1b[0m (esc) | |
|
151 | \x1b[0;35;1;4m? unknown\x1b[0m (esc) | |
|
152 | 152 | |
|
153 | 153 | hg status -A: |
|
154 | 154 | |
|
155 | 155 | $ hg status --color=always -A |
|
156 |
|
|
|
157 |
|
|
|
158 |
|
|
|
159 |
|
|
|
160 |
|
|
|
161 |
|
|
|
162 |
|
|
|
163 |
|
|
|
164 |
|
|
|
156 | \x1b[0;32;1mA added\x1b[0m (esc) | |
|
157 | \x1b[0;32;1mA copied\x1b[0m (esc) | |
|
158 | \x1b[0;0m modified\x1b[0m (esc) | |
|
159 | \x1b[0;31;1mR removed\x1b[0m (esc) | |
|
160 | \x1b[0;36;1;4m! deleted\x1b[0m (esc) | |
|
161 | \x1b[0;35;1;4m? unknown\x1b[0m (esc) | |
|
162 | \x1b[0;30;1mI ignored\x1b[0m (esc) | |
|
163 | \x1b[0;0mC .hgignore\x1b[0m (esc) | |
|
164 | \x1b[0;0mC modified\x1b[0m (esc) | |
|
165 | 165 | |
|
166 | 166 | |
|
167 | 167 | $ echo "^ignoreddir$" > .hgignore |
@@ -175,7 +175,7 b' hg status ignoreddir/file:' | |||
|
175 | 175 | hg status -i ignoreddir/file: |
|
176 | 176 | |
|
177 | 177 | $ hg status --color=always -i ignoreddir/file |
|
178 |
|
|
|
178 | \x1b[0;30;1mI ignoreddir/file\x1b[0m (esc) | |
|
179 | 179 | $ cd .. |
|
180 | 180 | |
|
181 | 181 | check 'status -q' and some combinations |
@@ -201,11 +201,11 b' test unknown color' | |||
|
201 | 201 | $ hg --config color.status.modified=periwinkle status --color=always |
|
202 | 202 | ignoring unknown color/effect 'periwinkle' (configured in color.status.modified) |
|
203 | 203 | M modified |
|
204 |
|
|
|
205 |
|
|
|
206 |
|
|
|
207 |
|
|
|
208 |
|
|
|
204 | \x1b[0;32;1mA added\x1b[0m (esc) | |
|
205 | \x1b[0;32;1mA copied\x1b[0m (esc) | |
|
206 | \x1b[0;31;1mR removed\x1b[0m (esc) | |
|
207 | \x1b[0;36;1;4m! deleted\x1b[0m (esc) | |
|
208 | \x1b[0;35;1;4m? unknown\x1b[0m (esc) | |
|
209 | 209 | |
|
210 | 210 | Run status with 2 different flags. |
|
211 | 211 | Check if result is the same or different. |
@@ -275,5 +275,5 b" test 'resolve -l'" | |||
|
275 | 275 | hg resolve with one unresolved, one resolved: |
|
276 | 276 | |
|
277 | 277 | $ hg resolve --color=always -l |
|
278 |
|
|
|
279 |
|
|
|
278 | \x1b[0;31;1mU a\x1b[0m (esc) | |
|
279 | \x1b[0;32;1mR b\x1b[0m (esc) |
General Comments 0
You need to be logged in to leave comments.
Login now