author | Manuel Jacob <me@manueljacob.de> |
Fri, 10 Jul 2020 09:59:36 +0200 | |
changeset 45080 | 00cdac669614 |
parent 44782 | 3d5fb6cab832 |
child 45730 | fbde66b05da4 |
permissions | -rw-r--r-- |
38021
538e850ae737
tests: mark tests that fail when using chg as #require no-chg
Kyle Lippincott <spectral@google.com>
parents:
37592
diff
changeset
|
1 |
#require no-chg |
538e850ae737
tests: mark tests that fail when using chg as #require no-chg
Kyle Lippincott <spectral@google.com>
parents:
37592
diff
changeset
|
2 |
|
37498
aacfca6f9767
wireproto: support for pullbundles
Joerg Sonnenberger <joerg@bec.de>
parents:
diff
changeset
|
3 |
$ hg init repo |
aacfca6f9767
wireproto: support for pullbundles
Joerg Sonnenberger <joerg@bec.de>
parents:
diff
changeset
|
4 |
$ cd repo |
aacfca6f9767
wireproto: support for pullbundles
Joerg Sonnenberger <joerg@bec.de>
parents:
diff
changeset
|
5 |
$ echo foo > foo |
aacfca6f9767
wireproto: support for pullbundles
Joerg Sonnenberger <joerg@bec.de>
parents:
diff
changeset
|
6 |
$ hg ci -qAm 'add foo' |
aacfca6f9767
wireproto: support for pullbundles
Joerg Sonnenberger <joerg@bec.de>
parents:
diff
changeset
|
7 |
$ echo >> foo |
aacfca6f9767
wireproto: support for pullbundles
Joerg Sonnenberger <joerg@bec.de>
parents:
diff
changeset
|
8 |
$ hg ci -m 'change foo' |
aacfca6f9767
wireproto: support for pullbundles
Joerg Sonnenberger <joerg@bec.de>
parents:
diff
changeset
|
9 |
$ hg up -qC 0 |
aacfca6f9767
wireproto: support for pullbundles
Joerg Sonnenberger <joerg@bec.de>
parents:
diff
changeset
|
10 |
$ echo bar > bar |
aacfca6f9767
wireproto: support for pullbundles
Joerg Sonnenberger <joerg@bec.de>
parents:
diff
changeset
|
11 |
$ hg ci -qAm 'add bar' |
aacfca6f9767
wireproto: support for pullbundles
Joerg Sonnenberger <joerg@bec.de>
parents:
diff
changeset
|
12 |
|
aacfca6f9767
wireproto: support for pullbundles
Joerg Sonnenberger <joerg@bec.de>
parents:
diff
changeset
|
13 |
$ hg log |
aacfca6f9767
wireproto: support for pullbundles
Joerg Sonnenberger <joerg@bec.de>
parents:
diff
changeset
|
14 |
changeset: 2:effea6de0384 |
aacfca6f9767
wireproto: support for pullbundles
Joerg Sonnenberger <joerg@bec.de>
parents:
diff
changeset
|
15 |
tag: tip |
aacfca6f9767
wireproto: support for pullbundles
Joerg Sonnenberger <joerg@bec.de>
parents:
diff
changeset
|
16 |
parent: 0:bbd179dfa0a7 |
aacfca6f9767
wireproto: support for pullbundles
Joerg Sonnenberger <joerg@bec.de>
parents:
diff
changeset
|
17 |
user: test |
aacfca6f9767
wireproto: support for pullbundles
Joerg Sonnenberger <joerg@bec.de>
parents:
diff
changeset
|
18 |
date: Thu Jan 01 00:00:00 1970 +0000 |
aacfca6f9767
wireproto: support for pullbundles
Joerg Sonnenberger <joerg@bec.de>
parents:
diff
changeset
|
19 |
summary: add bar |
aacfca6f9767
wireproto: support for pullbundles
Joerg Sonnenberger <joerg@bec.de>
parents:
diff
changeset
|
20 |
|
aacfca6f9767
wireproto: support for pullbundles
Joerg Sonnenberger <joerg@bec.de>
parents:
diff
changeset
|
21 |
changeset: 1:ed1b79f46b9a |
aacfca6f9767
wireproto: support for pullbundles
Joerg Sonnenberger <joerg@bec.de>
parents:
diff
changeset
|
22 |
user: test |
aacfca6f9767
wireproto: support for pullbundles
Joerg Sonnenberger <joerg@bec.de>
parents:
diff
changeset
|
23 |
date: Thu Jan 01 00:00:00 1970 +0000 |
aacfca6f9767
wireproto: support for pullbundles
Joerg Sonnenberger <joerg@bec.de>
parents:
diff
changeset
|
24 |
summary: change foo |
aacfca6f9767
wireproto: support for pullbundles
Joerg Sonnenberger <joerg@bec.de>
parents:
diff
changeset
|
25 |
|
aacfca6f9767
wireproto: support for pullbundles
Joerg Sonnenberger <joerg@bec.de>
parents:
diff
changeset
|
26 |
changeset: 0:bbd179dfa0a7 |
aacfca6f9767
wireproto: support for pullbundles
Joerg Sonnenberger <joerg@bec.de>
parents:
diff
changeset
|
27 |
user: test |
aacfca6f9767
wireproto: support for pullbundles
Joerg Sonnenberger <joerg@bec.de>
parents:
diff
changeset
|
28 |
date: Thu Jan 01 00:00:00 1970 +0000 |
aacfca6f9767
wireproto: support for pullbundles
Joerg Sonnenberger <joerg@bec.de>
parents:
diff
changeset
|
29 |
summary: add foo |
aacfca6f9767
wireproto: support for pullbundles
Joerg Sonnenberger <joerg@bec.de>
parents:
diff
changeset
|
30 |
|
aacfca6f9767
wireproto: support for pullbundles
Joerg Sonnenberger <joerg@bec.de>
parents:
diff
changeset
|
31 |
$ cd .. |
aacfca6f9767
wireproto: support for pullbundles
Joerg Sonnenberger <joerg@bec.de>
parents:
diff
changeset
|
32 |
|
aacfca6f9767
wireproto: support for pullbundles
Joerg Sonnenberger <joerg@bec.de>
parents:
diff
changeset
|
33 |
Test pullbundle functionality |
aacfca6f9767
wireproto: support for pullbundles
Joerg Sonnenberger <joerg@bec.de>
parents:
diff
changeset
|
34 |
|
aacfca6f9767
wireproto: support for pullbundles
Joerg Sonnenberger <joerg@bec.de>
parents:
diff
changeset
|
35 |
$ cd repo |
aacfca6f9767
wireproto: support for pullbundles
Joerg Sonnenberger <joerg@bec.de>
parents:
diff
changeset
|
36 |
$ cat <<EOF > .hg/hgrc |
aacfca6f9767
wireproto: support for pullbundles
Joerg Sonnenberger <joerg@bec.de>
parents:
diff
changeset
|
37 |
> [server] |
aacfca6f9767
wireproto: support for pullbundles
Joerg Sonnenberger <joerg@bec.de>
parents:
diff
changeset
|
38 |
> pullbundle = True |
44782
3d5fb6cab832
pullbundles: use unfiltered repo for head/base matching
Joerg Sonnenberger <joerg@bec.de>
parents:
42897
diff
changeset
|
39 |
> [experimental] |
3d5fb6cab832
pullbundles: use unfiltered repo for head/base matching
Joerg Sonnenberger <joerg@bec.de>
parents:
42897
diff
changeset
|
40 |
> evolution = True |
37498
aacfca6f9767
wireproto: support for pullbundles
Joerg Sonnenberger <joerg@bec.de>
parents:
diff
changeset
|
41 |
> [extensions] |
aacfca6f9767
wireproto: support for pullbundles
Joerg Sonnenberger <joerg@bec.de>
parents:
diff
changeset
|
42 |
> blackbox = |
aacfca6f9767
wireproto: support for pullbundles
Joerg Sonnenberger <joerg@bec.de>
parents:
diff
changeset
|
43 |
> EOF |
aacfca6f9767
wireproto: support for pullbundles
Joerg Sonnenberger <joerg@bec.de>
parents:
diff
changeset
|
44 |
$ hg bundle --base null -r 0 .hg/0.hg |
aacfca6f9767
wireproto: support for pullbundles
Joerg Sonnenberger <joerg@bec.de>
parents:
diff
changeset
|
45 |
1 changesets found |
aacfca6f9767
wireproto: support for pullbundles
Joerg Sonnenberger <joerg@bec.de>
parents:
diff
changeset
|
46 |
$ hg bundle --base 0 -r 1 .hg/1.hg |
aacfca6f9767
wireproto: support for pullbundles
Joerg Sonnenberger <joerg@bec.de>
parents:
diff
changeset
|
47 |
1 changesets found |
aacfca6f9767
wireproto: support for pullbundles
Joerg Sonnenberger <joerg@bec.de>
parents:
diff
changeset
|
48 |
$ hg bundle --base 1 -r 2 .hg/2.hg |
aacfca6f9767
wireproto: support for pullbundles
Joerg Sonnenberger <joerg@bec.de>
parents:
diff
changeset
|
49 |
1 changesets found |
aacfca6f9767
wireproto: support for pullbundles
Joerg Sonnenberger <joerg@bec.de>
parents:
diff
changeset
|
50 |
$ cat <<EOF > .hg/pullbundles.manifest |
38678
7e4a856a4f05
pullbundle: fix handling of gzip bundlespecs
Joerg Sonnenberger <joerg@bec.de>
parents:
38021
diff
changeset
|
51 |
> 2.hg BUNDLESPEC=none-v2 heads=effea6de0384e684f44435651cb7bd70b8735bd4 bases=bbd179dfa0a71671c253b3ae0aa1513b60d199fa |
7e4a856a4f05
pullbundle: fix handling of gzip bundlespecs
Joerg Sonnenberger <joerg@bec.de>
parents:
38021
diff
changeset
|
52 |
> 1.hg BUNDLESPEC=bzip2-v2 heads=ed1b79f46b9a29f5a6efa59cf12fcfca43bead5a bases=bbd179dfa0a71671c253b3ae0aa1513b60d199fa |
7e4a856a4f05
pullbundle: fix handling of gzip bundlespecs
Joerg Sonnenberger <joerg@bec.de>
parents:
38021
diff
changeset
|
53 |
> 0.hg BUNDLESPEC=gzip-v2 heads=bbd179dfa0a71671c253b3ae0aa1513b60d199fa |
37498
aacfca6f9767
wireproto: support for pullbundles
Joerg Sonnenberger <joerg@bec.de>
parents:
diff
changeset
|
54 |
> EOF |
aacfca6f9767
wireproto: support for pullbundles
Joerg Sonnenberger <joerg@bec.de>
parents:
diff
changeset
|
55 |
$ hg --config blackbox.track=debug --debug serve -p $HGPORT2 -d --pid-file=../repo.pid |
37592
fb91757471b5
tests: glob away fqdn wherever we print it
Augie Fackler <augie@google.com>
parents:
37516
diff
changeset
|
56 |
listening at http://*:$HGPORT2/ (bound to $LOCALIP:$HGPORT2) (glob) (?) |
37498
aacfca6f9767
wireproto: support for pullbundles
Joerg Sonnenberger <joerg@bec.de>
parents:
diff
changeset
|
57 |
$ cat ../repo.pid >> $DAEMON_PIDS |
aacfca6f9767
wireproto: support for pullbundles
Joerg Sonnenberger <joerg@bec.de>
parents:
diff
changeset
|
58 |
$ cd .. |
aacfca6f9767
wireproto: support for pullbundles
Joerg Sonnenberger <joerg@bec.de>
parents:
diff
changeset
|
59 |
$ hg clone -r 0 http://localhost:$HGPORT2/ repo.pullbundle |
aacfca6f9767
wireproto: support for pullbundles
Joerg Sonnenberger <joerg@bec.de>
parents:
diff
changeset
|
60 |
adding changesets |
aacfca6f9767
wireproto: support for pullbundles
Joerg Sonnenberger <joerg@bec.de>
parents:
diff
changeset
|
61 |
adding manifests |
aacfca6f9767
wireproto: support for pullbundles
Joerg Sonnenberger <joerg@bec.de>
parents:
diff
changeset
|
62 |
adding file changes |
aacfca6f9767
wireproto: support for pullbundles
Joerg Sonnenberger <joerg@bec.de>
parents:
diff
changeset
|
63 |
added 1 changesets with 1 changes to 1 files |
39480
89630d0b3e23
phase: report number of non-public changeset alongside the new range
Boris Feld <boris.feld@octobus.net>
parents:
38678
diff
changeset
|
64 |
new changesets bbd179dfa0a7 (1 drafts) |
37498
aacfca6f9767
wireproto: support for pullbundles
Joerg Sonnenberger <joerg@bec.de>
parents:
diff
changeset
|
65 |
updating to branch default |
aacfca6f9767
wireproto: support for pullbundles
Joerg Sonnenberger <joerg@bec.de>
parents:
diff
changeset
|
66 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
aacfca6f9767
wireproto: support for pullbundles
Joerg Sonnenberger <joerg@bec.de>
parents:
diff
changeset
|
67 |
$ cd repo.pullbundle |
aacfca6f9767
wireproto: support for pullbundles
Joerg Sonnenberger <joerg@bec.de>
parents:
diff
changeset
|
68 |
$ hg pull -r 1 |
aacfca6f9767
wireproto: support for pullbundles
Joerg Sonnenberger <joerg@bec.de>
parents:
diff
changeset
|
69 |
pulling from http://localhost:$HGPORT2/ |
aacfca6f9767
wireproto: support for pullbundles
Joerg Sonnenberger <joerg@bec.de>
parents:
diff
changeset
|
70 |
searching for changes |
aacfca6f9767
wireproto: support for pullbundles
Joerg Sonnenberger <joerg@bec.de>
parents:
diff
changeset
|
71 |
adding changesets |
aacfca6f9767
wireproto: support for pullbundles
Joerg Sonnenberger <joerg@bec.de>
parents:
diff
changeset
|
72 |
adding manifests |
aacfca6f9767
wireproto: support for pullbundles
Joerg Sonnenberger <joerg@bec.de>
parents:
diff
changeset
|
73 |
adding file changes |
aacfca6f9767
wireproto: support for pullbundles
Joerg Sonnenberger <joerg@bec.de>
parents:
diff
changeset
|
74 |
added 1 changesets with 1 changes to 1 files |
39480
89630d0b3e23
phase: report number of non-public changeset alongside the new range
Boris Feld <boris.feld@octobus.net>
parents:
38678
diff
changeset
|
75 |
new changesets ed1b79f46b9a (1 drafts) |
37498
aacfca6f9767
wireproto: support for pullbundles
Joerg Sonnenberger <joerg@bec.de>
parents:
diff
changeset
|
76 |
(run 'hg update' to get a working copy) |
aacfca6f9767
wireproto: support for pullbundles
Joerg Sonnenberger <joerg@bec.de>
parents:
diff
changeset
|
77 |
$ hg pull -r 2 |
aacfca6f9767
wireproto: support for pullbundles
Joerg Sonnenberger <joerg@bec.de>
parents:
diff
changeset
|
78 |
pulling from http://localhost:$HGPORT2/ |
aacfca6f9767
wireproto: support for pullbundles
Joerg Sonnenberger <joerg@bec.de>
parents:
diff
changeset
|
79 |
searching for changes |
aacfca6f9767
wireproto: support for pullbundles
Joerg Sonnenberger <joerg@bec.de>
parents:
diff
changeset
|
80 |
adding changesets |
aacfca6f9767
wireproto: support for pullbundles
Joerg Sonnenberger <joerg@bec.de>
parents:
diff
changeset
|
81 |
adding manifests |
aacfca6f9767
wireproto: support for pullbundles
Joerg Sonnenberger <joerg@bec.de>
parents:
diff
changeset
|
82 |
adding file changes |
aacfca6f9767
wireproto: support for pullbundles
Joerg Sonnenberger <joerg@bec.de>
parents:
diff
changeset
|
83 |
added 1 changesets with 1 changes to 1 files (+1 heads) |
39480
89630d0b3e23
phase: report number of non-public changeset alongside the new range
Boris Feld <boris.feld@octobus.net>
parents:
38678
diff
changeset
|
84 |
new changesets effea6de0384 (1 drafts) |
37498
aacfca6f9767
wireproto: support for pullbundles
Joerg Sonnenberger <joerg@bec.de>
parents:
diff
changeset
|
85 |
(run 'hg heads' to see heads, 'hg merge' to merge) |
aacfca6f9767
wireproto: support for pullbundles
Joerg Sonnenberger <joerg@bec.de>
parents:
diff
changeset
|
86 |
$ cd .. |
aacfca6f9767
wireproto: support for pullbundles
Joerg Sonnenberger <joerg@bec.de>
parents:
diff
changeset
|
87 |
$ killdaemons.py |
aacfca6f9767
wireproto: support for pullbundles
Joerg Sonnenberger <joerg@bec.de>
parents:
diff
changeset
|
88 |
$ grep 'sending pullbundle ' repo/.hg/blackbox.log |
aacfca6f9767
wireproto: support for pullbundles
Joerg Sonnenberger <joerg@bec.de>
parents:
diff
changeset
|
89 |
* sending pullbundle "0.hg" (glob) |
aacfca6f9767
wireproto: support for pullbundles
Joerg Sonnenberger <joerg@bec.de>
parents:
diff
changeset
|
90 |
* sending pullbundle "1.hg" (glob) |
aacfca6f9767
wireproto: support for pullbundles
Joerg Sonnenberger <joerg@bec.de>
parents:
diff
changeset
|
91 |
* sending pullbundle "2.hg" (glob) |
aacfca6f9767
wireproto: support for pullbundles
Joerg Sonnenberger <joerg@bec.de>
parents:
diff
changeset
|
92 |
$ rm repo/.hg/blackbox.log |
aacfca6f9767
wireproto: support for pullbundles
Joerg Sonnenberger <joerg@bec.de>
parents:
diff
changeset
|
93 |
|
aacfca6f9767
wireproto: support for pullbundles
Joerg Sonnenberger <joerg@bec.de>
parents:
diff
changeset
|
94 |
Test pullbundle functionality for incremental pulls |
aacfca6f9767
wireproto: support for pullbundles
Joerg Sonnenberger <joerg@bec.de>
parents:
diff
changeset
|
95 |
|
aacfca6f9767
wireproto: support for pullbundles
Joerg Sonnenberger <joerg@bec.de>
parents:
diff
changeset
|
96 |
$ cd repo |
aacfca6f9767
wireproto: support for pullbundles
Joerg Sonnenberger <joerg@bec.de>
parents:
diff
changeset
|
97 |
$ hg --config blackbox.track=debug --debug serve -p $HGPORT2 -d --pid-file=../repo.pid |
37592
fb91757471b5
tests: glob away fqdn wherever we print it
Augie Fackler <augie@google.com>
parents:
37516
diff
changeset
|
98 |
listening at http://*:$HGPORT2/ (bound to $LOCALIP:$HGPORT2) (glob) (?) |
37498
aacfca6f9767
wireproto: support for pullbundles
Joerg Sonnenberger <joerg@bec.de>
parents:
diff
changeset
|
99 |
$ cat ../repo.pid >> $DAEMON_PIDS |
aacfca6f9767
wireproto: support for pullbundles
Joerg Sonnenberger <joerg@bec.de>
parents:
diff
changeset
|
100 |
$ cd .. |
aacfca6f9767
wireproto: support for pullbundles
Joerg Sonnenberger <joerg@bec.de>
parents:
diff
changeset
|
101 |
$ hg clone http://localhost:$HGPORT2/ repo.pullbundle2 |
aacfca6f9767
wireproto: support for pullbundles
Joerg Sonnenberger <joerg@bec.de>
parents:
diff
changeset
|
102 |
requesting all changes |
aacfca6f9767
wireproto: support for pullbundles
Joerg Sonnenberger <joerg@bec.de>
parents:
diff
changeset
|
103 |
adding changesets |
aacfca6f9767
wireproto: support for pullbundles
Joerg Sonnenberger <joerg@bec.de>
parents:
diff
changeset
|
104 |
adding manifests |
aacfca6f9767
wireproto: support for pullbundles
Joerg Sonnenberger <joerg@bec.de>
parents:
diff
changeset
|
105 |
adding file changes |
aacfca6f9767
wireproto: support for pullbundles
Joerg Sonnenberger <joerg@bec.de>
parents:
diff
changeset
|
106 |
adding changesets |
aacfca6f9767
wireproto: support for pullbundles
Joerg Sonnenberger <joerg@bec.de>
parents:
diff
changeset
|
107 |
adding manifests |
aacfca6f9767
wireproto: support for pullbundles
Joerg Sonnenberger <joerg@bec.de>
parents:
diff
changeset
|
108 |
adding file changes |
aacfca6f9767
wireproto: support for pullbundles
Joerg Sonnenberger <joerg@bec.de>
parents:
diff
changeset
|
109 |
adding changesets |
aacfca6f9767
wireproto: support for pullbundles
Joerg Sonnenberger <joerg@bec.de>
parents:
diff
changeset
|
110 |
adding manifests |
aacfca6f9767
wireproto: support for pullbundles
Joerg Sonnenberger <joerg@bec.de>
parents:
diff
changeset
|
111 |
adding file changes |
42897
d7304434390f
changegroup: move message about added changes to transaction summary
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
42143
diff
changeset
|
112 |
added 3 changesets with 3 changes to 3 files (+1 heads) |
39480
89630d0b3e23
phase: report number of non-public changeset alongside the new range
Boris Feld <boris.feld@octobus.net>
parents:
38678
diff
changeset
|
113 |
new changesets bbd179dfa0a7:ed1b79f46b9a (3 drafts) |
37498
aacfca6f9767
wireproto: support for pullbundles
Joerg Sonnenberger <joerg@bec.de>
parents:
diff
changeset
|
114 |
updating to branch default |
aacfca6f9767
wireproto: support for pullbundles
Joerg Sonnenberger <joerg@bec.de>
parents:
diff
changeset
|
115 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
aacfca6f9767
wireproto: support for pullbundles
Joerg Sonnenberger <joerg@bec.de>
parents:
diff
changeset
|
116 |
$ killdaemons.py |
aacfca6f9767
wireproto: support for pullbundles
Joerg Sonnenberger <joerg@bec.de>
parents:
diff
changeset
|
117 |
$ grep 'sending pullbundle ' repo/.hg/blackbox.log |
aacfca6f9767
wireproto: support for pullbundles
Joerg Sonnenberger <joerg@bec.de>
parents:
diff
changeset
|
118 |
* sending pullbundle "0.hg" (glob) |
aacfca6f9767
wireproto: support for pullbundles
Joerg Sonnenberger <joerg@bec.de>
parents:
diff
changeset
|
119 |
* sending pullbundle "2.hg" (glob) |
aacfca6f9767
wireproto: support for pullbundles
Joerg Sonnenberger <joerg@bec.de>
parents:
diff
changeset
|
120 |
* sending pullbundle "1.hg" (glob) |
aacfca6f9767
wireproto: support for pullbundles
Joerg Sonnenberger <joerg@bec.de>
parents:
diff
changeset
|
121 |
$ rm repo/.hg/blackbox.log |
aacfca6f9767
wireproto: support for pullbundles
Joerg Sonnenberger <joerg@bec.de>
parents:
diff
changeset
|
122 |
|
42143
29569f2db929
bundle2: handle compression in _forwardchunks
Joerg Sonnenberger <joerg@bec.de>
parents:
39480
diff
changeset
|
123 |
Test pullbundle functionality for incoming |
29569f2db929
bundle2: handle compression in _forwardchunks
Joerg Sonnenberger <joerg@bec.de>
parents:
39480
diff
changeset
|
124 |
|
29569f2db929
bundle2: handle compression in _forwardchunks
Joerg Sonnenberger <joerg@bec.de>
parents:
39480
diff
changeset
|
125 |
$ cd repo |
29569f2db929
bundle2: handle compression in _forwardchunks
Joerg Sonnenberger <joerg@bec.de>
parents:
39480
diff
changeset
|
126 |
$ hg --config blackbox.track=debug --debug serve -p $HGPORT2 -d --pid-file=../repo.pid |
29569f2db929
bundle2: handle compression in _forwardchunks
Joerg Sonnenberger <joerg@bec.de>
parents:
39480
diff
changeset
|
127 |
listening at http://*:$HGPORT2/ (bound to $LOCALIP:$HGPORT2) (glob) (?) |
29569f2db929
bundle2: handle compression in _forwardchunks
Joerg Sonnenberger <joerg@bec.de>
parents:
39480
diff
changeset
|
128 |
$ cat ../repo.pid >> $DAEMON_PIDS |
29569f2db929
bundle2: handle compression in _forwardchunks
Joerg Sonnenberger <joerg@bec.de>
parents:
39480
diff
changeset
|
129 |
$ cd .. |
29569f2db929
bundle2: handle compression in _forwardchunks
Joerg Sonnenberger <joerg@bec.de>
parents:
39480
diff
changeset
|
130 |
$ hg clone http://localhost:$HGPORT2/ repo.pullbundle2a -r 0 |
29569f2db929
bundle2: handle compression in _forwardchunks
Joerg Sonnenberger <joerg@bec.de>
parents:
39480
diff
changeset
|
131 |
adding changesets |
29569f2db929
bundle2: handle compression in _forwardchunks
Joerg Sonnenberger <joerg@bec.de>
parents:
39480
diff
changeset
|
132 |
adding manifests |
29569f2db929
bundle2: handle compression in _forwardchunks
Joerg Sonnenberger <joerg@bec.de>
parents:
39480
diff
changeset
|
133 |
adding file changes |
29569f2db929
bundle2: handle compression in _forwardchunks
Joerg Sonnenberger <joerg@bec.de>
parents:
39480
diff
changeset
|
134 |
added 1 changesets with 1 changes to 1 files |
29569f2db929
bundle2: handle compression in _forwardchunks
Joerg Sonnenberger <joerg@bec.de>
parents:
39480
diff
changeset
|
135 |
new changesets bbd179dfa0a7 (1 drafts) |
29569f2db929
bundle2: handle compression in _forwardchunks
Joerg Sonnenberger <joerg@bec.de>
parents:
39480
diff
changeset
|
136 |
updating to branch default |
29569f2db929
bundle2: handle compression in _forwardchunks
Joerg Sonnenberger <joerg@bec.de>
parents:
39480
diff
changeset
|
137 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
29569f2db929
bundle2: handle compression in _forwardchunks
Joerg Sonnenberger <joerg@bec.de>
parents:
39480
diff
changeset
|
138 |
$ cd repo.pullbundle2a |
29569f2db929
bundle2: handle compression in _forwardchunks
Joerg Sonnenberger <joerg@bec.de>
parents:
39480
diff
changeset
|
139 |
$ hg incoming -r ed1b79f46b9a |
29569f2db929
bundle2: handle compression in _forwardchunks
Joerg Sonnenberger <joerg@bec.de>
parents:
39480
diff
changeset
|
140 |
comparing with http://localhost:$HGPORT2/ |
29569f2db929
bundle2: handle compression in _forwardchunks
Joerg Sonnenberger <joerg@bec.de>
parents:
39480
diff
changeset
|
141 |
searching for changes |
29569f2db929
bundle2: handle compression in _forwardchunks
Joerg Sonnenberger <joerg@bec.de>
parents:
39480
diff
changeset
|
142 |
changeset: 1:ed1b79f46b9a |
29569f2db929
bundle2: handle compression in _forwardchunks
Joerg Sonnenberger <joerg@bec.de>
parents:
39480
diff
changeset
|
143 |
tag: tip |
29569f2db929
bundle2: handle compression in _forwardchunks
Joerg Sonnenberger <joerg@bec.de>
parents:
39480
diff
changeset
|
144 |
user: test |
29569f2db929
bundle2: handle compression in _forwardchunks
Joerg Sonnenberger <joerg@bec.de>
parents:
39480
diff
changeset
|
145 |
date: Thu Jan 01 00:00:00 1970 +0000 |
29569f2db929
bundle2: handle compression in _forwardchunks
Joerg Sonnenberger <joerg@bec.de>
parents:
39480
diff
changeset
|
146 |
summary: change foo |
29569f2db929
bundle2: handle compression in _forwardchunks
Joerg Sonnenberger <joerg@bec.de>
parents:
39480
diff
changeset
|
147 |
|
29569f2db929
bundle2: handle compression in _forwardchunks
Joerg Sonnenberger <joerg@bec.de>
parents:
39480
diff
changeset
|
148 |
$ cd .. |
29569f2db929
bundle2: handle compression in _forwardchunks
Joerg Sonnenberger <joerg@bec.de>
parents:
39480
diff
changeset
|
149 |
$ killdaemons.py |
29569f2db929
bundle2: handle compression in _forwardchunks
Joerg Sonnenberger <joerg@bec.de>
parents:
39480
diff
changeset
|
150 |
$ grep 'sending pullbundle ' repo/.hg/blackbox.log |
29569f2db929
bundle2: handle compression in _forwardchunks
Joerg Sonnenberger <joerg@bec.de>
parents:
39480
diff
changeset
|
151 |
* sending pullbundle "0.hg" (glob) |
29569f2db929
bundle2: handle compression in _forwardchunks
Joerg Sonnenberger <joerg@bec.de>
parents:
39480
diff
changeset
|
152 |
* sending pullbundle "1.hg" (glob) |
29569f2db929
bundle2: handle compression in _forwardchunks
Joerg Sonnenberger <joerg@bec.de>
parents:
39480
diff
changeset
|
153 |
$ rm repo/.hg/blackbox.log |
29569f2db929
bundle2: handle compression in _forwardchunks
Joerg Sonnenberger <joerg@bec.de>
parents:
39480
diff
changeset
|
154 |
|
37498
aacfca6f9767
wireproto: support for pullbundles
Joerg Sonnenberger <joerg@bec.de>
parents:
diff
changeset
|
155 |
Test recovery from misconfigured server sending no new data |
aacfca6f9767
wireproto: support for pullbundles
Joerg Sonnenberger <joerg@bec.de>
parents:
diff
changeset
|
156 |
|
aacfca6f9767
wireproto: support for pullbundles
Joerg Sonnenberger <joerg@bec.de>
parents:
diff
changeset
|
157 |
$ cd repo |
aacfca6f9767
wireproto: support for pullbundles
Joerg Sonnenberger <joerg@bec.de>
parents:
diff
changeset
|
158 |
$ cat <<EOF > .hg/pullbundles.manifest |
aacfca6f9767
wireproto: support for pullbundles
Joerg Sonnenberger <joerg@bec.de>
parents:
diff
changeset
|
159 |
> 0.hg heads=ed1b79f46b9a29f5a6efa59cf12fcfca43bead5a bases=bbd179dfa0a71671c253b3ae0aa1513b60d199fa |
aacfca6f9767
wireproto: support for pullbundles
Joerg Sonnenberger <joerg@bec.de>
parents:
diff
changeset
|
160 |
> 0.hg heads=bbd179dfa0a71671c253b3ae0aa1513b60d199fa |
aacfca6f9767
wireproto: support for pullbundles
Joerg Sonnenberger <joerg@bec.de>
parents:
diff
changeset
|
161 |
> EOF |
aacfca6f9767
wireproto: support for pullbundles
Joerg Sonnenberger <joerg@bec.de>
parents:
diff
changeset
|
162 |
$ hg --config blackbox.track=debug --debug serve -p $HGPORT2 -d --pid-file=../repo.pid |
37592
fb91757471b5
tests: glob away fqdn wherever we print it
Augie Fackler <augie@google.com>
parents:
37516
diff
changeset
|
163 |
listening at http://*:$HGPORT2/ (bound to $LOCALIP:$HGPORT2) (glob) (?) |
37498
aacfca6f9767
wireproto: support for pullbundles
Joerg Sonnenberger <joerg@bec.de>
parents:
diff
changeset
|
164 |
$ cat ../repo.pid >> $DAEMON_PIDS |
aacfca6f9767
wireproto: support for pullbundles
Joerg Sonnenberger <joerg@bec.de>
parents:
diff
changeset
|
165 |
$ cd .. |
aacfca6f9767
wireproto: support for pullbundles
Joerg Sonnenberger <joerg@bec.de>
parents:
diff
changeset
|
166 |
$ hg clone -r 0 http://localhost:$HGPORT2/ repo.pullbundle3 |
aacfca6f9767
wireproto: support for pullbundles
Joerg Sonnenberger <joerg@bec.de>
parents:
diff
changeset
|
167 |
adding changesets |
aacfca6f9767
wireproto: support for pullbundles
Joerg Sonnenberger <joerg@bec.de>
parents:
diff
changeset
|
168 |
adding manifests |
aacfca6f9767
wireproto: support for pullbundles
Joerg Sonnenberger <joerg@bec.de>
parents:
diff
changeset
|
169 |
adding file changes |
aacfca6f9767
wireproto: support for pullbundles
Joerg Sonnenberger <joerg@bec.de>
parents:
diff
changeset
|
170 |
added 1 changesets with 1 changes to 1 files |
39480
89630d0b3e23
phase: report number of non-public changeset alongside the new range
Boris Feld <boris.feld@octobus.net>
parents:
38678
diff
changeset
|
171 |
new changesets bbd179dfa0a7 (1 drafts) |
37498
aacfca6f9767
wireproto: support for pullbundles
Joerg Sonnenberger <joerg@bec.de>
parents:
diff
changeset
|
172 |
updating to branch default |
aacfca6f9767
wireproto: support for pullbundles
Joerg Sonnenberger <joerg@bec.de>
parents:
diff
changeset
|
173 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
aacfca6f9767
wireproto: support for pullbundles
Joerg Sonnenberger <joerg@bec.de>
parents:
diff
changeset
|
174 |
$ cd repo.pullbundle3 |
aacfca6f9767
wireproto: support for pullbundles
Joerg Sonnenberger <joerg@bec.de>
parents:
diff
changeset
|
175 |
$ hg pull -r 1 |
aacfca6f9767
wireproto: support for pullbundles
Joerg Sonnenberger <joerg@bec.de>
parents:
diff
changeset
|
176 |
pulling from http://localhost:$HGPORT2/ |
aacfca6f9767
wireproto: support for pullbundles
Joerg Sonnenberger <joerg@bec.de>
parents:
diff
changeset
|
177 |
searching for changes |
aacfca6f9767
wireproto: support for pullbundles
Joerg Sonnenberger <joerg@bec.de>
parents:
diff
changeset
|
178 |
adding changesets |
aacfca6f9767
wireproto: support for pullbundles
Joerg Sonnenberger <joerg@bec.de>
parents:
diff
changeset
|
179 |
adding manifests |
aacfca6f9767
wireproto: support for pullbundles
Joerg Sonnenberger <joerg@bec.de>
parents:
diff
changeset
|
180 |
adding file changes |
aacfca6f9767
wireproto: support for pullbundles
Joerg Sonnenberger <joerg@bec.de>
parents:
diff
changeset
|
181 |
added 0 changesets with 0 changes to 1 files |
aacfca6f9767
wireproto: support for pullbundles
Joerg Sonnenberger <joerg@bec.de>
parents:
diff
changeset
|
182 |
abort: 00changelog.i@ed1b79f46b9a: no node! |
aacfca6f9767
wireproto: support for pullbundles
Joerg Sonnenberger <joerg@bec.de>
parents:
diff
changeset
|
183 |
[255] |
aacfca6f9767
wireproto: support for pullbundles
Joerg Sonnenberger <joerg@bec.de>
parents:
diff
changeset
|
184 |
$ cd .. |
aacfca6f9767
wireproto: support for pullbundles
Joerg Sonnenberger <joerg@bec.de>
parents:
diff
changeset
|
185 |
$ killdaemons.py |
aacfca6f9767
wireproto: support for pullbundles
Joerg Sonnenberger <joerg@bec.de>
parents:
diff
changeset
|
186 |
$ grep 'sending pullbundle ' repo/.hg/blackbox.log |
aacfca6f9767
wireproto: support for pullbundles
Joerg Sonnenberger <joerg@bec.de>
parents:
diff
changeset
|
187 |
* sending pullbundle "0.hg" (glob) |
aacfca6f9767
wireproto: support for pullbundles
Joerg Sonnenberger <joerg@bec.de>
parents:
diff
changeset
|
188 |
* sending pullbundle "0.hg" (glob) |
aacfca6f9767
wireproto: support for pullbundles
Joerg Sonnenberger <joerg@bec.de>
parents:
diff
changeset
|
189 |
$ rm repo/.hg/blackbox.log |
44782
3d5fb6cab832
pullbundles: use unfiltered repo for head/base matching
Joerg Sonnenberger <joerg@bec.de>
parents:
42897
diff
changeset
|
190 |
|
3d5fb6cab832
pullbundles: use unfiltered repo for head/base matching
Joerg Sonnenberger <joerg@bec.de>
parents:
42897
diff
changeset
|
191 |
Test processing when nodes used in the pullbundle.manifest end up being hidden |
3d5fb6cab832
pullbundles: use unfiltered repo for head/base matching
Joerg Sonnenberger <joerg@bec.de>
parents:
42897
diff
changeset
|
192 |
|
3d5fb6cab832
pullbundles: use unfiltered repo for head/base matching
Joerg Sonnenberger <joerg@bec.de>
parents:
42897
diff
changeset
|
193 |
$ hg --repo repo debugobsolete ed1b79f46b9a29f5a6efa59cf12fcfca43bead5a |
3d5fb6cab832
pullbundles: use unfiltered repo for head/base matching
Joerg Sonnenberger <joerg@bec.de>
parents:
42897
diff
changeset
|
194 |
1 new obsolescence markers |
3d5fb6cab832
pullbundles: use unfiltered repo for head/base matching
Joerg Sonnenberger <joerg@bec.de>
parents:
42897
diff
changeset
|
195 |
obsoleted 1 changesets |
3d5fb6cab832
pullbundles: use unfiltered repo for head/base matching
Joerg Sonnenberger <joerg@bec.de>
parents:
42897
diff
changeset
|
196 |
$ hg serve --repo repo --config server.view=visible -p $HGPORT -d --pid-file=hg.pid -E errors.log |
3d5fb6cab832
pullbundles: use unfiltered repo for head/base matching
Joerg Sonnenberger <joerg@bec.de>
parents:
42897
diff
changeset
|
197 |
$ cat hg.pid >> $DAEMON_PIDS |
3d5fb6cab832
pullbundles: use unfiltered repo for head/base matching
Joerg Sonnenberger <joerg@bec.de>
parents:
42897
diff
changeset
|
198 |
$ hg clone http://localhost:$HGPORT repo-obs |
3d5fb6cab832
pullbundles: use unfiltered repo for head/base matching
Joerg Sonnenberger <joerg@bec.de>
parents:
42897
diff
changeset
|
199 |
requesting all changes |
3d5fb6cab832
pullbundles: use unfiltered repo for head/base matching
Joerg Sonnenberger <joerg@bec.de>
parents:
42897
diff
changeset
|
200 |
adding changesets |
3d5fb6cab832
pullbundles: use unfiltered repo for head/base matching
Joerg Sonnenberger <joerg@bec.de>
parents:
42897
diff
changeset
|
201 |
adding manifests |
3d5fb6cab832
pullbundles: use unfiltered repo for head/base matching
Joerg Sonnenberger <joerg@bec.de>
parents:
42897
diff
changeset
|
202 |
adding file changes |
3d5fb6cab832
pullbundles: use unfiltered repo for head/base matching
Joerg Sonnenberger <joerg@bec.de>
parents:
42897
diff
changeset
|
203 |
adding changesets |
3d5fb6cab832
pullbundles: use unfiltered repo for head/base matching
Joerg Sonnenberger <joerg@bec.de>
parents:
42897
diff
changeset
|
204 |
adding manifests |
3d5fb6cab832
pullbundles: use unfiltered repo for head/base matching
Joerg Sonnenberger <joerg@bec.de>
parents:
42897
diff
changeset
|
205 |
adding file changes |
3d5fb6cab832
pullbundles: use unfiltered repo for head/base matching
Joerg Sonnenberger <joerg@bec.de>
parents:
42897
diff
changeset
|
206 |
added 2 changesets with 2 changes to 2 files |
3d5fb6cab832
pullbundles: use unfiltered repo for head/base matching
Joerg Sonnenberger <joerg@bec.de>
parents:
42897
diff
changeset
|
207 |
new changesets bbd179dfa0a7:effea6de0384 |
3d5fb6cab832
pullbundles: use unfiltered repo for head/base matching
Joerg Sonnenberger <joerg@bec.de>
parents:
42897
diff
changeset
|
208 |
updating to branch default |
3d5fb6cab832
pullbundles: use unfiltered repo for head/base matching
Joerg Sonnenberger <joerg@bec.de>
parents:
42897
diff
changeset
|
209 |
2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
3d5fb6cab832
pullbundles: use unfiltered repo for head/base matching
Joerg Sonnenberger <joerg@bec.de>
parents:
42897
diff
changeset
|
210 |
$ killdaemons.py |