Mercurial > hg
annotate tests/test-encoding-align.t @ 45074:797ef6f8295e
fix: prefetch file contents
This prevents the worker subprocesses from contacting the server individually,
which is either inefficient, or leads to problems if the connection is shared
among them.
Differential Revision: https://phab.mercurial-scm.org/D8723
author | Rodrigo Damazio Bovendorp <rdamazio@google.com> |
---|---|
date | Thu, 09 Jul 2020 20:46:52 -0700 |
parents | 24bef6a99958 |
children |
rev | line source |
---|---|
12418
09c6dd129f82
tests: unify test-encoding-align
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
1 Test alignment of multibyte characters |
11611
4f5a6df2af92
i18n: use encoding.colwidth() for correct column width
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
diff
changeset
|
2 |
12418
09c6dd129f82
tests: unify test-encoding-align
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
3 $ HGENCODING=utf-8 |
09c6dd129f82
tests: unify test-encoding-align
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
4 $ export HGENCODING |
09c6dd129f82
tests: unify test-encoding-align
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
5 $ hg init t |
09c6dd129f82
tests: unify test-encoding-align
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
6 $ cd t |
39707
5abc47d4ca6b
tests: quote PYTHON usage
Matt Harbison <matt_harbison@yahoo.com>
parents:
36052
diff
changeset
|
7 $ "$PYTHON" << EOF |
41345
24bef6a99958
py3: fix up test-encoding-align.t for python3
Augie Fackler <augie@google.com>
parents:
39707
diff
changeset
|
8 > from mercurial import pycompat |
12418
09c6dd129f82
tests: unify test-encoding-align
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
9 > # (byte, width) = (6, 4) |
36052
af9cb761b5f3
py3: replace file() with open() in test-encoding-align.t
Pulkit Goyal <7895pulkit@gmail.com>
parents:
33262
diff
changeset
|
10 > s = b"\xe7\x9f\xad\xe5\x90\x8d" |
12418
09c6dd129f82
tests: unify test-encoding-align
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
11 > # (byte, width) = (7, 7): odd width is good for alignment test |
36052
af9cb761b5f3
py3: replace file() with open() in test-encoding-align.t
Pulkit Goyal <7895pulkit@gmail.com>
parents:
33262
diff
changeset
|
12 > m = b"MIDDLE_" |
12418
09c6dd129f82
tests: unify test-encoding-align
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
13 > # (byte, width) = (18, 12) |
36052
af9cb761b5f3
py3: replace file() with open() in test-encoding-align.t
Pulkit Goyal <7895pulkit@gmail.com>
parents:
33262
diff
changeset
|
14 > l = b"\xe9\x95\xb7\xe3\x81\x84\xe9\x95\xb7\xe3\x81\x84\xe5\x90\x8d\xe5\x89\x8d" |
af9cb761b5f3
py3: replace file() with open() in test-encoding-align.t
Pulkit Goyal <7895pulkit@gmail.com>
parents:
33262
diff
changeset
|
15 > f = open('s', 'wb'); f.write(s); f.close() |
af9cb761b5f3
py3: replace file() with open() in test-encoding-align.t
Pulkit Goyal <7895pulkit@gmail.com>
parents:
33262
diff
changeset
|
16 > f = open('m', 'wb'); f.write(m); f.close() |
af9cb761b5f3
py3: replace file() with open() in test-encoding-align.t
Pulkit Goyal <7895pulkit@gmail.com>
parents:
33262
diff
changeset
|
17 > f = open('l', 'wb'); f.write(l); f.close() |
12418
09c6dd129f82
tests: unify test-encoding-align
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
18 > # instant extension to show list of options |
36052
af9cb761b5f3
py3: replace file() with open() in test-encoding-align.t
Pulkit Goyal <7895pulkit@gmail.com>
parents:
33262
diff
changeset
|
19 > f = open('showoptlist.py', 'wb'); f.write(b"""# encoding: utf-8 |
32337
46ba2cdda476
registrar: move cmdutil.command to registrar module (API)
Yuya Nishihara <yuya@tcha.org>
parents:
25295
diff
changeset
|
20 > from mercurial import registrar |
21254
51e5c793a9f4
tests: declare commands using decorator
Gregory Szorc <gregory.szorc@gmail.com>
parents:
17837
diff
changeset
|
21 > cmdtable = {} |
32337
46ba2cdda476
registrar: move cmdutil.command to registrar module (API)
Yuya Nishihara <yuya@tcha.org>
parents:
25295
diff
changeset
|
22 > command = registrar.command(cmdtable) |
21254
51e5c793a9f4
tests: declare commands using decorator
Gregory Szorc <gregory.szorc@gmail.com>
parents:
17837
diff
changeset
|
23 > |
33097
fce4ed2912bb
py3: make sure commands name are bytes in tests
Pulkit Goyal <7895pulkit@gmail.com>
parents:
32337
diff
changeset
|
24 > @command(b'showoptlist', |
41345
24bef6a99958
py3: fix up test-encoding-align.t for python3
Augie Fackler <augie@google.com>
parents:
39707
diff
changeset
|
25 > [(b's', b'opt1', b'', b'short width' + (b' ' +%(s)s) * 8, %(s)s), |
24bef6a99958
py3: fix up test-encoding-align.t for python3
Augie Fackler <augie@google.com>
parents:
39707
diff
changeset
|
26 > (b'm', b'opt2', b'', b'middle width' + (b' ' + %(m)s) * 8, %(m)s), |
24bef6a99958
py3: fix up test-encoding-align.t for python3
Augie Fackler <augie@google.com>
parents:
39707
diff
changeset
|
27 > (b'l', b'opt3', b'', b'long width' + (b' ' + %(l)s) * 8, %(l)s)], |
24bef6a99958
py3: fix up test-encoding-align.t for python3
Augie Fackler <augie@google.com>
parents:
39707
diff
changeset
|
28 > b'') |
12418
09c6dd129f82
tests: unify test-encoding-align
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
29 > def showoptlist(ui, repo, *pats, **opts): |
09c6dd129f82
tests: unify test-encoding-align
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
30 > '''dummy command to show option descriptions''' |
09c6dd129f82
tests: unify test-encoding-align
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
31 > return 0 |
41345
24bef6a99958
py3: fix up test-encoding-align.t for python3
Augie Fackler <augie@google.com>
parents:
39707
diff
changeset
|
32 > """ % {b's': pycompat.byterepr(s), |
24bef6a99958
py3: fix up test-encoding-align.t for python3
Augie Fackler <augie@google.com>
parents:
39707
diff
changeset
|
33 > b'm': pycompat.byterepr(m), |
24bef6a99958
py3: fix up test-encoding-align.t for python3
Augie Fackler <augie@google.com>
parents:
39707
diff
changeset
|
34 > b'l': pycompat.byterepr(l), |
24bef6a99958
py3: fix up test-encoding-align.t for python3
Augie Fackler <augie@google.com>
parents:
39707
diff
changeset
|
35 > }) |
12418
09c6dd129f82
tests: unify test-encoding-align
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
36 > f.close() |
09c6dd129f82
tests: unify test-encoding-align
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
37 > EOF |
09c6dd129f82
tests: unify test-encoding-align
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
38 $ S=`cat s` |
09c6dd129f82
tests: unify test-encoding-align
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
39 $ M=`cat m` |
09c6dd129f82
tests: unify test-encoding-align
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
40 $ L=`cat l` |
11611
4f5a6df2af92
i18n: use encoding.colwidth() for correct column width
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
diff
changeset
|
41 |
12418
09c6dd129f82
tests: unify test-encoding-align
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
42 alignment of option descriptions in help |
11611
4f5a6df2af92
i18n: use encoding.colwidth() for correct column width
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
diff
changeset
|
43 |
12418
09c6dd129f82
tests: unify test-encoding-align
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
44 $ cat <<EOF > .hg/hgrc |
09c6dd129f82
tests: unify test-encoding-align
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
45 > [extensions] |
09c6dd129f82
tests: unify test-encoding-align
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
46 > ja_ext = `pwd`/showoptlist.py |
09c6dd129f82
tests: unify test-encoding-align
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
47 > EOF |
09c6dd129f82
tests: unify test-encoding-align
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
48 |
09c6dd129f82
tests: unify test-encoding-align
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
49 check alignment of option descriptions in help |
11611
4f5a6df2af92
i18n: use encoding.colwidth() for correct column width
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
diff
changeset
|
50 |
12418
09c6dd129f82
tests: unify test-encoding-align
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
51 $ hg help showoptlist |
15203
c7ce651a6bc9
help: generate command help into a single RST string for formatting
Matt Mackall <mpm@selenic.com>
parents:
15202
diff
changeset
|
52 hg showoptlist |
12418
09c6dd129f82
tests: unify test-encoding-align
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
53 |
09c6dd129f82
tests: unify test-encoding-align
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
54 dummy command to show option descriptions |
09c6dd129f82
tests: unify test-encoding-align
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
55 |
09c6dd129f82
tests: unify test-encoding-align
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
56 options: |
09c6dd129f82
tests: unify test-encoding-align
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
57 |
15145
ff26712a0c50
help: use RST to format option lists
Matt Mackall <mpm@selenic.com>
parents:
15066
diff
changeset
|
58 -s --opt1 \xe7\x9f\xad\xe5\x90\x8d short width \xe7\x9f\xad\xe5\x90\x8d \xe7\x9f\xad\xe5\x90\x8d \xe7\x9f\xad\xe5\x90\x8d \xe7\x9f\xad\xe5\x90\x8d \xe7\x9f\xad\xe5\x90\x8d \xe7\x9f\xad\xe5\x90\x8d \xe7\x9f\xad\xe5\x90\x8d \xe7\x9f\xad\xe5\x90\x8d (esc) |
ff26712a0c50
help: use RST to format option lists
Matt Mackall <mpm@selenic.com>
parents:
15066
diff
changeset
|
59 -m --opt2 MIDDLE_ middle width MIDDLE_ MIDDLE_ MIDDLE_ MIDDLE_ MIDDLE_ |
ff26712a0c50
help: use RST to format option lists
Matt Mackall <mpm@selenic.com>
parents:
15066
diff
changeset
|
60 MIDDLE_ MIDDLE_ MIDDLE_ |
ff26712a0c50
help: use RST to format option lists
Matt Mackall <mpm@selenic.com>
parents:
15066
diff
changeset
|
61 -l --opt3 \xe9\x95\xb7\xe3\x81\x84\xe9\x95\xb7\xe3\x81\x84\xe5\x90\x8d\xe5\x89\x8d long width \xe9\x95\xb7\xe3\x81\x84\xe9\x95\xb7\xe3\x81\x84\xe5\x90\x8d\xe5\x89\x8d \xe9\x95\xb7\xe3\x81\x84\xe9\x95\xb7\xe3\x81\x84\xe5\x90\x8d\xe5\x89\x8d \xe9\x95\xb7\xe3\x81\x84\xe9\x95\xb7\xe3\x81\x84\xe5\x90\x8d\xe5\x89\x8d (esc) |
ff26712a0c50
help: use RST to format option lists
Matt Mackall <mpm@selenic.com>
parents:
15066
diff
changeset
|
62 \xe9\x95\xb7\xe3\x81\x84\xe9\x95\xb7\xe3\x81\x84\xe5\x90\x8d\xe5\x89\x8d \xe9\x95\xb7\xe3\x81\x84\xe9\x95\xb7\xe3\x81\x84\xe5\x90\x8d\xe5\x89\x8d \xe9\x95\xb7\xe3\x81\x84\xe9\x95\xb7\xe3\x81\x84\xe5\x90\x8d\xe5\x89\x8d \xe9\x95\xb7\xe3\x81\x84\xe9\x95\xb7\xe3\x81\x84\xe5\x90\x8d\xe5\x89\x8d (esc) |
ff26712a0c50
help: use RST to format option lists
Matt Mackall <mpm@selenic.com>
parents:
15066
diff
changeset
|
63 \xe9\x95\xb7\xe3\x81\x84\xe9\x95\xb7\xe3\x81\x84\xe5\x90\x8d\xe5\x89\x8d (esc) |
12418
09c6dd129f82
tests: unify test-encoding-align
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
64 |
22110
26f7c8033bed
help: tweak --verbose command help hint
Matt Mackall <mpm@selenic.com>
parents:
21585
diff
changeset
|
65 (some details hidden, use --verbose to show complete help) |
11611
4f5a6df2af92
i18n: use encoding.colwidth() for correct column width
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
diff
changeset
|
66 |
12418
09c6dd129f82
tests: unify test-encoding-align
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
67 |
09c6dd129f82
tests: unify test-encoding-align
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
68 $ rm -f s; touch s |
09c6dd129f82
tests: unify test-encoding-align
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
69 $ rm -f m; touch m |
09c6dd129f82
tests: unify test-encoding-align
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
70 $ rm -f l; touch l |
09c6dd129f82
tests: unify test-encoding-align
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
71 |
09c6dd129f82
tests: unify test-encoding-align
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
72 add files |
11611
4f5a6df2af92
i18n: use encoding.colwidth() for correct column width
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
diff
changeset
|
73 |
12418
09c6dd129f82
tests: unify test-encoding-align
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
74 $ cp s $S |
09c6dd129f82
tests: unify test-encoding-align
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
75 $ hg add $S |
09c6dd129f82
tests: unify test-encoding-align
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
76 $ cp m $M |
09c6dd129f82
tests: unify test-encoding-align
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
77 $ hg add $M |
09c6dd129f82
tests: unify test-encoding-align
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
78 $ cp l $L |
09c6dd129f82
tests: unify test-encoding-align
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
79 $ hg add $L |
11611
4f5a6df2af92
i18n: use encoding.colwidth() for correct column width
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
diff
changeset
|
80 |
12418
09c6dd129f82
tests: unify test-encoding-align
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
81 commit(1) |
09c6dd129f82
tests: unify test-encoding-align
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
82 |
09c6dd129f82
tests: unify test-encoding-align
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
83 $ echo 'first line(1)' >> s; cp s $S |
09c6dd129f82
tests: unify test-encoding-align
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
84 $ echo 'first line(2)' >> m; cp m $M |
09c6dd129f82
tests: unify test-encoding-align
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
85 $ echo 'first line(3)' >> l; cp l $L |
09c6dd129f82
tests: unify test-encoding-align
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
86 $ hg commit -m 'first commit' -u $S |
09c6dd129f82
tests: unify test-encoding-align
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
87 |
09c6dd129f82
tests: unify test-encoding-align
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
88 commit(2) |
11611
4f5a6df2af92
i18n: use encoding.colwidth() for correct column width
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
diff
changeset
|
89 |
12418
09c6dd129f82
tests: unify test-encoding-align
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
90 $ echo 'second line(1)' >> s; cp s $S |
09c6dd129f82
tests: unify test-encoding-align
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
91 $ echo 'second line(2)' >> m; cp m $M |
09c6dd129f82
tests: unify test-encoding-align
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
92 $ echo 'second line(3)' >> l; cp l $L |
09c6dd129f82
tests: unify test-encoding-align
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
93 $ hg commit -m 'second commit' -u $M |
11611
4f5a6df2af92
i18n: use encoding.colwidth() for correct column width
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
diff
changeset
|
94 |
12418
09c6dd129f82
tests: unify test-encoding-align
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
95 commit(3) |
11611
4f5a6df2af92
i18n: use encoding.colwidth() for correct column width
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
diff
changeset
|
96 |
12418
09c6dd129f82
tests: unify test-encoding-align
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
97 $ echo 'third line(1)' >> s; cp s $S |
09c6dd129f82
tests: unify test-encoding-align
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
98 $ echo 'third line(2)' >> m; cp m $M |
09c6dd129f82
tests: unify test-encoding-align
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
99 $ echo 'third line(3)' >> l; cp l $L |
09c6dd129f82
tests: unify test-encoding-align
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
100 $ hg commit -m 'third commit' -u $L |
11611
4f5a6df2af92
i18n: use encoding.colwidth() for correct column width
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
diff
changeset
|
101 |
12418
09c6dd129f82
tests: unify test-encoding-align
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
102 check alignment of user names in annotate |
11611
4f5a6df2af92
i18n: use encoding.colwidth() for correct column width
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
diff
changeset
|
103 |
12418
09c6dd129f82
tests: unify test-encoding-align
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
104 $ hg annotate -u $M |
12941
b911cb80c671
tests: use (esc) markup for string-escape
Mads Kiilerich <mads@kiilerich.com>
parents:
12722
diff
changeset
|
105 \xe7\x9f\xad\xe5\x90\x8d: first line(2) (esc) |
12418
09c6dd129f82
tests: unify test-encoding-align
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
106 MIDDLE_: second line(2) |
12941
b911cb80c671
tests: use (esc) markup for string-escape
Mads Kiilerich <mads@kiilerich.com>
parents:
12722
diff
changeset
|
107 \xe9\x95\xb7\xe3\x81\x84\xe9\x95\xb7\xe3\x81\x84\xe5\x90\x8d\xe5\x89\x8d: third line(2) (esc) |
11611
4f5a6df2af92
i18n: use encoding.colwidth() for correct column width
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
diff
changeset
|
108 |
12418
09c6dd129f82
tests: unify test-encoding-align
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
109 check alignment of filenames in diffstat |
11611
4f5a6df2af92
i18n: use encoding.colwidth() for correct column width
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
diff
changeset
|
110 |
12418
09c6dd129f82
tests: unify test-encoding-align
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
111 $ hg diff -c tip --stat |
09c6dd129f82
tests: unify test-encoding-align
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
112 MIDDLE_ | 1 + |
12941
b911cb80c671
tests: use (esc) markup for string-escape
Mads Kiilerich <mads@kiilerich.com>
parents:
12722
diff
changeset
|
113 \xe7\x9f\xad\xe5\x90\x8d | 1 + (esc) |
b911cb80c671
tests: use (esc) markup for string-escape
Mads Kiilerich <mads@kiilerich.com>
parents:
12722
diff
changeset
|
114 \xe9\x95\xb7\xe3\x81\x84\xe9\x95\xb7\xe3\x81\x84\xe5\x90\x8d\xe5\x89\x8d | 1 + (esc) |
12418
09c6dd129f82
tests: unify test-encoding-align
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
115 3 files changed, 3 insertions(+), 0 deletions(-) |
11611
4f5a6df2af92
i18n: use encoding.colwidth() for correct column width
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
diff
changeset
|
116 |
12418
09c6dd129f82
tests: unify test-encoding-align
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
117 add branches/tags |
11611
4f5a6df2af92
i18n: use encoding.colwidth() for correct column width
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
diff
changeset
|
118 |
12418
09c6dd129f82
tests: unify test-encoding-align
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
119 $ hg branch $S |
12941
b911cb80c671
tests: use (esc) markup for string-escape
Mads Kiilerich <mads@kiilerich.com>
parents:
12722
diff
changeset
|
120 marked working directory as branch \xe7\x9f\xad\xe5\x90\x8d (esc) |
15615 | 121 (branches are permanent and global, did you want a bookmark?) |
12418
09c6dd129f82
tests: unify test-encoding-align
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
122 $ hg tag $S |
21571
17da326fd041
bookmarks: properly align multi-byte characters
Matt Mackall <mpm@selenic.com>
parents:
21570
diff
changeset
|
123 $ hg book -f $S |
12418
09c6dd129f82
tests: unify test-encoding-align
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
124 $ hg branch $M |
09c6dd129f82
tests: unify test-encoding-align
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
125 marked working directory as branch MIDDLE_ |
09c6dd129f82
tests: unify test-encoding-align
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
126 $ hg tag $M |
21571
17da326fd041
bookmarks: properly align multi-byte characters
Matt Mackall <mpm@selenic.com>
parents:
21570
diff
changeset
|
127 $ hg book -f $M |
12418
09c6dd129f82
tests: unify test-encoding-align
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
128 $ hg branch $L |
12941
b911cb80c671
tests: use (esc) markup for string-escape
Mads Kiilerich <mads@kiilerich.com>
parents:
12722
diff
changeset
|
129 marked working directory as branch \xe9\x95\xb7\xe3\x81\x84\xe9\x95\xb7\xe3\x81\x84\xe5\x90\x8d\xe5\x89\x8d (esc) |
12418
09c6dd129f82
tests: unify test-encoding-align
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
130 $ hg tag $L |
21571
17da326fd041
bookmarks: properly align multi-byte characters
Matt Mackall <mpm@selenic.com>
parents:
21570
diff
changeset
|
131 $ hg book -f $L |
11611
4f5a6df2af92
i18n: use encoding.colwidth() for correct column width
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
diff
changeset
|
132 |
12418
09c6dd129f82
tests: unify test-encoding-align
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
133 check alignment of branches |
11611
4f5a6df2af92
i18n: use encoding.colwidth() for correct column width
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
diff
changeset
|
134 |
21570
d0ec3800101a
tests: fix cut and paste error on encoding alignment test
Matt Mackall <mpm@selenic.com>
parents:
17837
diff
changeset
|
135 $ hg branches |
d0ec3800101a
tests: fix cut and paste error on encoding alignment test
Matt Mackall <mpm@selenic.com>
parents:
17837
diff
changeset
|
136 \xe9\x95\xb7\xe3\x81\x84\xe9\x95\xb7\xe3\x81\x84\xe5\x90\x8d\xe5\x89\x8d 5:d745ff46155b (esc) |
d0ec3800101a
tests: fix cut and paste error on encoding alignment test
Matt Mackall <mpm@selenic.com>
parents:
17837
diff
changeset
|
137 MIDDLE_ 4:9259be597f19 (inactive) |
d0ec3800101a
tests: fix cut and paste error on encoding alignment test
Matt Mackall <mpm@selenic.com>
parents:
17837
diff
changeset
|
138 \xe7\x9f\xad\xe5\x90\x8d 3:b06c5b6def9e (inactive) (esc) |
d0ec3800101a
tests: fix cut and paste error on encoding alignment test
Matt Mackall <mpm@selenic.com>
parents:
17837
diff
changeset
|
139 default 2:64a70663cee8 (inactive) |
11611
4f5a6df2af92
i18n: use encoding.colwidth() for correct column width
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
diff
changeset
|
140 |
12418
09c6dd129f82
tests: unify test-encoding-align
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
141 check alignment of tags |
11611
4f5a6df2af92
i18n: use encoding.colwidth() for correct column width
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
diff
changeset
|
142 |
12418
09c6dd129f82
tests: unify test-encoding-align
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
143 $ hg tags |
09c6dd129f82
tests: unify test-encoding-align
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
144 tip 5:d745ff46155b |
12941
b911cb80c671
tests: use (esc) markup for string-escape
Mads Kiilerich <mads@kiilerich.com>
parents:
12722
diff
changeset
|
145 \xe9\x95\xb7\xe3\x81\x84\xe9\x95\xb7\xe3\x81\x84\xe5\x90\x8d\xe5\x89\x8d 4:9259be597f19 (esc) |
12418
09c6dd129f82
tests: unify test-encoding-align
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
146 MIDDLE_ 3:b06c5b6def9e |
12941
b911cb80c671
tests: use (esc) markup for string-escape
Mads Kiilerich <mads@kiilerich.com>
parents:
12722
diff
changeset
|
147 \xe7\x9f\xad\xe5\x90\x8d 2:64a70663cee8 (esc) |
16913
f2719b387380
tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents:
15615
diff
changeset
|
148 |
21571
17da326fd041
bookmarks: properly align multi-byte characters
Matt Mackall <mpm@selenic.com>
parents:
21570
diff
changeset
|
149 check alignment of bookmarks |
17da326fd041
bookmarks: properly align multi-byte characters
Matt Mackall <mpm@selenic.com>
parents:
21570
diff
changeset
|
150 |
17da326fd041
bookmarks: properly align multi-byte characters
Matt Mackall <mpm@selenic.com>
parents:
21570
diff
changeset
|
151 $ hg book |
17da326fd041
bookmarks: properly align multi-byte characters
Matt Mackall <mpm@selenic.com>
parents:
21570
diff
changeset
|
152 MIDDLE_ 5:d745ff46155b |
17da326fd041
bookmarks: properly align multi-byte characters
Matt Mackall <mpm@selenic.com>
parents:
21570
diff
changeset
|
153 \xe7\x9f\xad\xe5\x90\x8d 4:9259be597f19 (esc) |
17da326fd041
bookmarks: properly align multi-byte characters
Matt Mackall <mpm@selenic.com>
parents:
21570
diff
changeset
|
154 * \xe9\x95\xb7\xe3\x81\x84\xe9\x95\xb7\xe3\x81\x84\xe5\x90\x8d\xe5\x89\x8d 5:d745ff46155b (esc) |