author | Levi Bard <levi@unity3d.com> |
Sat, 07 Jan 2012 19:11:31 +0100 | |
changeset 15795 | 8bed8551d535 |
parent 15623 | fc8c7a5ccc4a |
child 17467 | 448d0c452140 |
permissions | -rw-r--r-- |
15446
c5c9ca3719f9
tests: use 'hghave serve' to guard tests that requires serve daemon management
Mads Kiilerich <mads@kiilerich.com>
parents:
14647
diff
changeset
|
1 |
$ "$TESTDIR/hghave" serve || exit 80 |
9879
7bb004fc14ec
Extend test-branchmap to test c51494c53841
Thomas Arendsen Hein <thomas@intevation.de>
parents:
9789
diff
changeset
|
2 |
|
12447
f5f90d3808e2
tests: unify test-http-branchmap
Matt Mackall <mpm@selenic.com>
parents:
11617
diff
changeset
|
3 |
$ hgserve() { |
f5f90d3808e2
tests: unify test-http-branchmap
Matt Mackall <mpm@selenic.com>
parents:
11617
diff
changeset
|
4 |
> hg serve -a localhost -p $HGPORT1 -d --pid-file=hg.pid -E errors.log -v $@ |
f5f90d3808e2
tests: unify test-http-branchmap
Matt Mackall <mpm@selenic.com>
parents:
11617
diff
changeset
|
5 |
> cat hg.pid >> "$DAEMON_PIDS" |
f5f90d3808e2
tests: unify test-http-branchmap
Matt Mackall <mpm@selenic.com>
parents:
11617
diff
changeset
|
6 |
> } |
f5f90d3808e2
tests: unify test-http-branchmap
Matt Mackall <mpm@selenic.com>
parents:
11617
diff
changeset
|
7 |
$ hg init a |
f5f90d3808e2
tests: unify test-http-branchmap
Matt Mackall <mpm@selenic.com>
parents:
11617
diff
changeset
|
8 |
$ hg --encoding utf-8 -R a branch æ |
12942
05fffd665170
tests: use (esc) for all non-ASCII test output
Mads Kiilerich <mads@kiilerich.com>
parents:
12700
diff
changeset
|
9 |
marked working directory as branch \xc3\xa6 (esc) |
15615 | 10 |
(branches are permanent and global, did you want a bookmark?) |
12447
f5f90d3808e2
tests: unify test-http-branchmap
Matt Mackall <mpm@selenic.com>
parents:
11617
diff
changeset
|
11 |
$ echo foo > a/foo |
f5f90d3808e2
tests: unify test-http-branchmap
Matt Mackall <mpm@selenic.com>
parents:
11617
diff
changeset
|
12 |
$ hg -R a ci -Am foo |
f5f90d3808e2
tests: unify test-http-branchmap
Matt Mackall <mpm@selenic.com>
parents:
11617
diff
changeset
|
13 |
adding foo |
f5f90d3808e2
tests: unify test-http-branchmap
Matt Mackall <mpm@selenic.com>
parents:
11617
diff
changeset
|
14 |
$ hgserve -R a --config web.push_ssl=False --config web.allow_push=* --encoding latin1 |
12700
17aa0f1ed89d
tests: use a glob for all of the host, might not be localhost
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
12643
diff
changeset
|
15 |
listening at http://*:$HGPORT1/ (bound to 127.0.0.1:$HGPORT1) (glob) |
12447
f5f90d3808e2
tests: unify test-http-branchmap
Matt Mackall <mpm@selenic.com>
parents:
11617
diff
changeset
|
16 |
$ hg --encoding utf-8 clone http://localhost:$HGPORT1 b |
f5f90d3808e2
tests: unify test-http-branchmap
Matt Mackall <mpm@selenic.com>
parents:
11617
diff
changeset
|
17 |
requesting all changes |
f5f90d3808e2
tests: unify test-http-branchmap
Matt Mackall <mpm@selenic.com>
parents:
11617
diff
changeset
|
18 |
adding changesets |
f5f90d3808e2
tests: unify test-http-branchmap
Matt Mackall <mpm@selenic.com>
parents:
11617
diff
changeset
|
19 |
adding manifests |
f5f90d3808e2
tests: unify test-http-branchmap
Matt Mackall <mpm@selenic.com>
parents:
11617
diff
changeset
|
20 |
adding file changes |
f5f90d3808e2
tests: unify test-http-branchmap
Matt Mackall <mpm@selenic.com>
parents:
11617
diff
changeset
|
21 |
added 1 changesets with 1 changes to 1 files |
12942
05fffd665170
tests: use (esc) for all non-ASCII test output
Mads Kiilerich <mads@kiilerich.com>
parents:
12700
diff
changeset
|
22 |
updating to branch \xc3\xa6 (esc) |
12447
f5f90d3808e2
tests: unify test-http-branchmap
Matt Mackall <mpm@selenic.com>
parents:
11617
diff
changeset
|
23 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
f5f90d3808e2
tests: unify test-http-branchmap
Matt Mackall <mpm@selenic.com>
parents:
11617
diff
changeset
|
24 |
$ hg --encoding utf-8 -R b log |
f5f90d3808e2
tests: unify test-http-branchmap
Matt Mackall <mpm@selenic.com>
parents:
11617
diff
changeset
|
25 |
changeset: 0:867c11ce77b8 |
12942
05fffd665170
tests: use (esc) for all non-ASCII test output
Mads Kiilerich <mads@kiilerich.com>
parents:
12700
diff
changeset
|
26 |
branch: \xc3\xa6 (esc) |
12447
f5f90d3808e2
tests: unify test-http-branchmap
Matt Mackall <mpm@selenic.com>
parents:
11617
diff
changeset
|
27 |
tag: tip |
f5f90d3808e2
tests: unify test-http-branchmap
Matt Mackall <mpm@selenic.com>
parents:
11617
diff
changeset
|
28 |
user: test |
f5f90d3808e2
tests: unify test-http-branchmap
Matt Mackall <mpm@selenic.com>
parents:
11617
diff
changeset
|
29 |
date: Thu Jan 01 00:00:00 1970 +0000 |
f5f90d3808e2
tests: unify test-http-branchmap
Matt Mackall <mpm@selenic.com>
parents:
11617
diff
changeset
|
30 |
summary: foo |
f5f90d3808e2
tests: unify test-http-branchmap
Matt Mackall <mpm@selenic.com>
parents:
11617
diff
changeset
|
31 |
|
f5f90d3808e2
tests: unify test-http-branchmap
Matt Mackall <mpm@selenic.com>
parents:
11617
diff
changeset
|
32 |
$ echo bar >> b/foo |
f5f90d3808e2
tests: unify test-http-branchmap
Matt Mackall <mpm@selenic.com>
parents:
11617
diff
changeset
|
33 |
$ hg -R b ci -m bar |
f5f90d3808e2
tests: unify test-http-branchmap
Matt Mackall <mpm@selenic.com>
parents:
11617
diff
changeset
|
34 |
$ hg --encoding utf-8 -R b push |
13815
d066d8d652c8
url: add trailing slashes to URLs with hostnames that don't have one
Brodie Rao <brodie@bitheap.org>
parents:
12942
diff
changeset
|
35 |
pushing to http://localhost:$HGPORT1/ |
12447
f5f90d3808e2
tests: unify test-http-branchmap
Matt Mackall <mpm@selenic.com>
parents:
11617
diff
changeset
|
36 |
searching for changes |
f5f90d3808e2
tests: unify test-http-branchmap
Matt Mackall <mpm@selenic.com>
parents:
11617
diff
changeset
|
37 |
remote: adding changesets |
f5f90d3808e2
tests: unify test-http-branchmap
Matt Mackall <mpm@selenic.com>
parents:
11617
diff
changeset
|
38 |
remote: adding manifests |
f5f90d3808e2
tests: unify test-http-branchmap
Matt Mackall <mpm@selenic.com>
parents:
11617
diff
changeset
|
39 |
remote: adding file changes |
f5f90d3808e2
tests: unify test-http-branchmap
Matt Mackall <mpm@selenic.com>
parents:
11617
diff
changeset
|
40 |
remote: added 1 changesets with 1 changes to 1 files |
f5f90d3808e2
tests: unify test-http-branchmap
Matt Mackall <mpm@selenic.com>
parents:
11617
diff
changeset
|
41 |
$ hg -R a --encoding utf-8 log |
f5f90d3808e2
tests: unify test-http-branchmap
Matt Mackall <mpm@selenic.com>
parents:
11617
diff
changeset
|
42 |
changeset: 1:58e7c90d67cb |
12942
05fffd665170
tests: use (esc) for all non-ASCII test output
Mads Kiilerich <mads@kiilerich.com>
parents:
12700
diff
changeset
|
43 |
branch: \xc3\xa6 (esc) |
12447
f5f90d3808e2
tests: unify test-http-branchmap
Matt Mackall <mpm@selenic.com>
parents:
11617
diff
changeset
|
44 |
tag: tip |
f5f90d3808e2
tests: unify test-http-branchmap
Matt Mackall <mpm@selenic.com>
parents:
11617
diff
changeset
|
45 |
user: test |
f5f90d3808e2
tests: unify test-http-branchmap
Matt Mackall <mpm@selenic.com>
parents:
11617
diff
changeset
|
46 |
date: Thu Jan 01 00:00:00 1970 +0000 |
f5f90d3808e2
tests: unify test-http-branchmap
Matt Mackall <mpm@selenic.com>
parents:
11617
diff
changeset
|
47 |
summary: bar |
f5f90d3808e2
tests: unify test-http-branchmap
Matt Mackall <mpm@selenic.com>
parents:
11617
diff
changeset
|
48 |
|
f5f90d3808e2
tests: unify test-http-branchmap
Matt Mackall <mpm@selenic.com>
parents:
11617
diff
changeset
|
49 |
changeset: 0:867c11ce77b8 |
12942
05fffd665170
tests: use (esc) for all non-ASCII test output
Mads Kiilerich <mads@kiilerich.com>
parents:
12700
diff
changeset
|
50 |
branch: \xc3\xa6 (esc) |
12447
f5f90d3808e2
tests: unify test-http-branchmap
Matt Mackall <mpm@selenic.com>
parents:
11617
diff
changeset
|
51 |
user: test |
f5f90d3808e2
tests: unify test-http-branchmap
Matt Mackall <mpm@selenic.com>
parents:
11617
diff
changeset
|
52 |
date: Thu Jan 01 00:00:00 1970 +0000 |
f5f90d3808e2
tests: unify test-http-branchmap
Matt Mackall <mpm@selenic.com>
parents:
11617
diff
changeset
|
53 |
summary: foo |
f5f90d3808e2
tests: unify test-http-branchmap
Matt Mackall <mpm@selenic.com>
parents:
11617
diff
changeset
|
54 |
|
f5f90d3808e2
tests: unify test-http-branchmap
Matt Mackall <mpm@selenic.com>
parents:
11617
diff
changeset
|
55 |
$ kill `cat hg.pid` |
9879
7bb004fc14ec
Extend test-branchmap to test c51494c53841
Thomas Arendsen Hein <thomas@intevation.de>
parents:
9789
diff
changeset
|
56 |
|
12447
f5f90d3808e2
tests: unify test-http-branchmap
Matt Mackall <mpm@selenic.com>
parents:
11617
diff
changeset
|
57 |
verify 7e7d56fe4833 (encoding fallback in branchmap to maintain compatibility with 1.3.x) |
9879
7bb004fc14ec
Extend test-branchmap to test c51494c53841
Thomas Arendsen Hein <thomas@intevation.de>
parents:
9789
diff
changeset
|
58 |
|
12447
f5f90d3808e2
tests: unify test-http-branchmap
Matt Mackall <mpm@selenic.com>
parents:
11617
diff
changeset
|
59 |
$ cat <<EOF > oldhg |
f5f90d3808e2
tests: unify test-http-branchmap
Matt Mackall <mpm@selenic.com>
parents:
11617
diff
changeset
|
60 |
> import sys |
f5f90d3808e2
tests: unify test-http-branchmap
Matt Mackall <mpm@selenic.com>
parents:
11617
diff
changeset
|
61 |
> from mercurial import ui, hg, commands |
f5f90d3808e2
tests: unify test-http-branchmap
Matt Mackall <mpm@selenic.com>
parents:
11617
diff
changeset
|
62 |
> |
f5f90d3808e2
tests: unify test-http-branchmap
Matt Mackall <mpm@selenic.com>
parents:
11617
diff
changeset
|
63 |
> class StdoutWrapper(object): |
f5f90d3808e2
tests: unify test-http-branchmap
Matt Mackall <mpm@selenic.com>
parents:
11617
diff
changeset
|
64 |
> def __init__(self, stdout): |
f5f90d3808e2
tests: unify test-http-branchmap
Matt Mackall <mpm@selenic.com>
parents:
11617
diff
changeset
|
65 |
> self._file = stdout |
f5f90d3808e2
tests: unify test-http-branchmap
Matt Mackall <mpm@selenic.com>
parents:
11617
diff
changeset
|
66 |
> |
f5f90d3808e2
tests: unify test-http-branchmap
Matt Mackall <mpm@selenic.com>
parents:
11617
diff
changeset
|
67 |
> def write(self, data): |
f5f90d3808e2
tests: unify test-http-branchmap
Matt Mackall <mpm@selenic.com>
parents:
11617
diff
changeset
|
68 |
> if data == '47\n': |
f5f90d3808e2
tests: unify test-http-branchmap
Matt Mackall <mpm@selenic.com>
parents:
11617
diff
changeset
|
69 |
> # latin1 encoding is one %xx (3 bytes) shorter |
f5f90d3808e2
tests: unify test-http-branchmap
Matt Mackall <mpm@selenic.com>
parents:
11617
diff
changeset
|
70 |
> data = '44\n' |
f5f90d3808e2
tests: unify test-http-branchmap
Matt Mackall <mpm@selenic.com>
parents:
11617
diff
changeset
|
71 |
> elif data.startswith('%C3%A6 '): |
f5f90d3808e2
tests: unify test-http-branchmap
Matt Mackall <mpm@selenic.com>
parents:
11617
diff
changeset
|
72 |
> # translate to latin1 encoding |
f5f90d3808e2
tests: unify test-http-branchmap
Matt Mackall <mpm@selenic.com>
parents:
11617
diff
changeset
|
73 |
> data = '%%E6 %s' % data[7:] |
f5f90d3808e2
tests: unify test-http-branchmap
Matt Mackall <mpm@selenic.com>
parents:
11617
diff
changeset
|
74 |
> self._file.write(data) |
f5f90d3808e2
tests: unify test-http-branchmap
Matt Mackall <mpm@selenic.com>
parents:
11617
diff
changeset
|
75 |
> |
f5f90d3808e2
tests: unify test-http-branchmap
Matt Mackall <mpm@selenic.com>
parents:
11617
diff
changeset
|
76 |
> def __getattr__(self, name): |
f5f90d3808e2
tests: unify test-http-branchmap
Matt Mackall <mpm@selenic.com>
parents:
11617
diff
changeset
|
77 |
> return getattr(self._file, name) |
f5f90d3808e2
tests: unify test-http-branchmap
Matt Mackall <mpm@selenic.com>
parents:
11617
diff
changeset
|
78 |
> |
f5f90d3808e2
tests: unify test-http-branchmap
Matt Mackall <mpm@selenic.com>
parents:
11617
diff
changeset
|
79 |
> sys.stdout = StdoutWrapper(sys.stdout) |
f5f90d3808e2
tests: unify test-http-branchmap
Matt Mackall <mpm@selenic.com>
parents:
11617
diff
changeset
|
80 |
> sys.stderr = StdoutWrapper(sys.stderr) |
f5f90d3808e2
tests: unify test-http-branchmap
Matt Mackall <mpm@selenic.com>
parents:
11617
diff
changeset
|
81 |
> |
f5f90d3808e2
tests: unify test-http-branchmap
Matt Mackall <mpm@selenic.com>
parents:
11617
diff
changeset
|
82 |
> myui = ui.ui() |
f5f90d3808e2
tests: unify test-http-branchmap
Matt Mackall <mpm@selenic.com>
parents:
11617
diff
changeset
|
83 |
> repo = hg.repository(myui, 'a') |
14647
2e9f379de0ac
serve: add --cmdserver option to communicate with hg over a pipe
Idan Kamara <idankk86@gmail.com>
parents:
13815
diff
changeset
|
84 |
> commands.serve(myui, repo, stdio=True, cmdserver=False) |
12447
f5f90d3808e2
tests: unify test-http-branchmap
Matt Mackall <mpm@selenic.com>
parents:
11617
diff
changeset
|
85 |
> EOF |
f5f90d3808e2
tests: unify test-http-branchmap
Matt Mackall <mpm@selenic.com>
parents:
11617
diff
changeset
|
86 |
$ echo baz >> b/foo |
f5f90d3808e2
tests: unify test-http-branchmap
Matt Mackall <mpm@selenic.com>
parents:
11617
diff
changeset
|
87 |
$ hg -R b ci -m baz |
f5f90d3808e2
tests: unify test-http-branchmap
Matt Mackall <mpm@selenic.com>
parents:
11617
diff
changeset
|
88 |
$ hg push -R b -e 'python oldhg' ssh://dummy/ --encoding latin1 |
f5f90d3808e2
tests: unify test-http-branchmap
Matt Mackall <mpm@selenic.com>
parents:
11617
diff
changeset
|
89 |
pushing to ssh://dummy/ |
f5f90d3808e2
tests: unify test-http-branchmap
Matt Mackall <mpm@selenic.com>
parents:
11617
diff
changeset
|
90 |
searching for changes |
f5f90d3808e2
tests: unify test-http-branchmap
Matt Mackall <mpm@selenic.com>
parents:
11617
diff
changeset
|
91 |
remote: adding changesets |
f5f90d3808e2
tests: unify test-http-branchmap
Matt Mackall <mpm@selenic.com>
parents:
11617
diff
changeset
|
92 |
remote: adding manifests |
f5f90d3808e2
tests: unify test-http-branchmap
Matt Mackall <mpm@selenic.com>
parents:
11617
diff
changeset
|
93 |
remote: adding file changes |
f5f90d3808e2
tests: unify test-http-branchmap
Matt Mackall <mpm@selenic.com>
parents:
11617
diff
changeset
|
94 |
remote: added 1 changesets with 1 changes to 1 files |