Show More
@@ -14,7 +14,7 b' import patch, help, url, encoding, templ' | |||||
14 | import archival, changegroup, cmdutil, sshserver, hbisect, hgweb, hgweb.server |
|
14 | import archival, changegroup, cmdutil, sshserver, hbisect, hgweb, hgweb.server | |
15 | import merge as mergemod |
|
15 | import merge as mergemod | |
16 | import minirst, revset, templatefilters |
|
16 | import minirst, revset, templatefilters | |
17 | import dagparser |
|
17 | import dagparser, context, simplemerge | |
18 |
|
18 | |||
19 | # Commands start here, listed alphabetically |
|
19 | # Commands start here, listed alphabetically | |
20 |
|
20 | |||
@@ -962,7 +962,6 b' def debugancestor(ui, repo, *args):' | |||||
962 |
|
962 | |||
963 | def debugbuilddag(ui, repo, text, |
|
963 | def debugbuilddag(ui, repo, text, | |
964 | mergeable_file=False, |
|
964 | mergeable_file=False, | |
965 | appended_file=False, |
|
|||
966 | overwritten_file=False, |
|
965 | overwritten_file=False, | |
967 | new_file=False): |
|
966 | new_file=False): | |
968 | """builds a repo with a given dag from scratch in the current empty repo |
|
967 | """builds a repo with a given dag from scratch in the current empty repo | |
@@ -979,8 +978,6 b' def debugbuilddag(ui, repo, text,' | |||||
979 | - "/p2" is a merge of the preceding node and p2 |
|
978 | - "/p2" is a merge of the preceding node and p2 | |
980 | - ":tag" defines a local tag for the preceding node |
|
979 | - ":tag" defines a local tag for the preceding node | |
981 | - "@branch" sets the named branch for subsequent nodes |
|
980 | - "@branch" sets the named branch for subsequent nodes | |
982 | - "!command" runs the command using your shell |
|
|||
983 | - "!!my command\\n" is like "!", but to the end of the line |
|
|||
984 | - "#...\\n" is a comment up to the end of the line |
|
981 | - "#...\\n" is a comment up to the end of the line | |
985 |
|
982 | |||
986 | Whitespace between the above elements is ignored. |
|
983 | Whitespace between the above elements is ignored. | |
@@ -994,28 +991,12 b' def debugbuilddag(ui, repo, text,' | |||||
994 |
|
991 | |||
995 | All string valued-elements are either strictly alphanumeric, or must |
|
992 | All string valued-elements are either strictly alphanumeric, or must | |
996 | be enclosed in double quotes ("..."), with "\\" as escape character. |
|
993 | be enclosed in double quotes ("..."), with "\\" as escape character. | |
997 |
|
||||
998 | Note that the --overwritten-file and --appended-file options imply the |
|
|||
999 | use of "HGMERGE=internal:local" during DAG buildup. |
|
|||
1000 | """ |
|
994 | """ | |
1001 |
|
995 | |||
1002 | if not (mergeable_file or appended_file or overwritten_file or new_file): |
|
996 | cl = repo.changelog | |
1003 | raise util.Abort(_('need at least one of -m, -a, -o, -n')) |
|
997 | if len(cl) > 0: | |
1004 |
|
||||
1005 | if len(repo.changelog) > 0: |
|
|||
1006 | raise util.Abort(_('repository is not empty')) |
|
998 | raise util.Abort(_('repository is not empty')) | |
1007 |
|
999 | |||
1008 | if overwritten_file or appended_file: |
|
|||
1009 | # we don't want to fail in merges during buildup |
|
|||
1010 | os.environ['HGMERGE'] = 'internal:local' |
|
|||
1011 |
|
||||
1012 | def writefile(fname, text, fmode="wb"): |
|
|||
1013 | f = open(fname, fmode) |
|
|||
1014 | try: |
|
|||
1015 | f.write(text) |
|
|||
1016 | finally: |
|
|||
1017 | f.close() |
|
|||
1018 |
|
||||
1019 | if mergeable_file: |
|
1000 | if mergeable_file: | |
1020 | linesperrev = 2 |
|
1001 | linesperrev = 2 | |
1021 | # determine number of revs in DAG |
|
1002 | # determine number of revs in DAG | |
@@ -1024,58 +1005,95 b' def debugbuilddag(ui, repo, text,' | |||||
1024 | if type == 'n': |
|
1005 | if type == 'n': | |
1025 | n += 1 |
|
1006 | n += 1 | |
1026 | # make a file with k lines per rev |
|
1007 | # make a file with k lines per rev | |
1027 |
|
|
1008 | initialmergedlines = [str(i) for i in xrange(0, n * linesperrev)] | |
1028 | + "\n") |
|
1009 | initialmergedlines.append("") | |
1029 |
|
1010 | |||
1030 |
|
|
1011 | tags = [] | |
1031 | atbranch = 'default' |
|
1012 | ||
1032 | for type, data in dagparser.parsedag(text): |
|
1013 | tr = repo.transaction("builddag") | |
1033 | if type == 'n': |
|
1014 | try: | |
1034 | ui.status('node %s\n' % str(data)) |
|
1015 | ||
1035 | id, ps = data |
|
1016 | at = -1 | |
1036 | p1 = ps[0] |
|
1017 | atbranch = 'default' | |
1037 | if p1 != at: |
|
1018 | nodeids = [] | |
1038 | update(ui, repo, node=str(p1), clean=True) |
|
1019 | for type, data in dagparser.parsedag(text): | |
1039 |
|
|
1020 | if type == 'n': | |
1040 | if repo.dirstate.branch() != atbranch: |
|
1021 | ui.note('node %s\n' % str(data)) | |
1041 | branch(ui, repo, atbranch, force=True) |
|
1022 | id, ps = data | |
1042 | if len(ps) > 1: |
|
1023 | ||
1043 |
|
|
1024 | files = [] | |
1044 | merge(ui, repo, node=p2) |
|
1025 | fctxs = {} | |
1045 |
|
1026 | |||
1046 | if mergeable_file: |
|
1027 | p2 = None | |
1047 | f = open("mf", "rb+") |
|
1028 | if mergeable_file: | |
1048 |
|
|
1029 | fn = "mf" | |
1049 |
|
|
1030 | p1 = repo[ps[0]] | |
1050 | lines[id * linesperrev] += " r%i" % id |
|
1031 | if len(ps) > 1: | |
1051 |
|
|
1032 | p2 = repo[ps[1]] | |
1052 | f.write("\n".join(lines)) |
|
1033 | pa = p1.ancestor(p2) | |
1053 | finally: |
|
1034 | base, local, other = [x[fn].data() for x in pa, p1, p2] | |
1054 | f.close() |
|
1035 | m3 = simplemerge.Merge3Text(base, local, other) | |
1055 |
|
1036 | ml = [l.strip() for l in m3.merge_lines()] | ||
1056 | if appended_file: |
|
1037 | ml.append("") | |
1057 | writefile("af", "r%i\n" % id, "ab") |
|
1038 | elif at > 0: | |
1058 |
|
1039 | ml = p1[fn].data().split("\n") | ||
1059 |
|
|
1040 | else: | |
1060 | writefile("of", "r%i\n" % id) |
|
1041 | ml = initialmergedlines | |
1061 |
|
1042 | ml[id * linesperrev] += " r%i" % id | ||
1062 | if new_file: |
|
1043 | mergedtext = "\n".join(ml) | |
1063 | writefile("nf%i" % id, "r%i\n" % id) |
|
1044 | files.append(fn) | |
1064 |
|
1045 | fctxs[fn] = context.memfilectx(fn, mergedtext) | ||
1065 | commit(ui, repo, addremove=True, message="r%i" % id, date=(id, 0)) |
|
1046 | ||
1066 | at = id |
|
1047 | if overwritten_file: | |
1067 | elif type == 'l': |
|
1048 | fn = "of" | |
1068 | id, name = data |
|
1049 | files.append(fn) | |
1069 | ui.status('tag %s\n' % name) |
|
1050 | fctxs[fn] = context.memfilectx(fn, "r%i\n" % id) | |
1070 | tag(ui, repo, name, local=True) |
|
1051 | ||
1071 | elif type == 'a': |
|
1052 | if new_file: | |
1072 | ui.status('branch %s\n' % data) |
|
1053 | fn = "nf%i" % id | |
1073 | atbranch = data |
|
1054 | files.append(fn) | |
1074 | elif type in 'cC': |
|
1055 | fctxs[fn] = context.memfilectx(fn, "r%i\n" % id) | |
1075 | r = util.system(data, cwd=repo.root) |
|
1056 | if len(ps) > 1: | |
1076 |
if |
|
1057 | if not p2: | |
1077 | desc, r = util.explain_exit(r) |
|
1058 | p2 = repo[ps[1]] | |
1078 | raise util.Abort(_('%s command %s') % (data, desc)) |
|
1059 | for fn in p2: | |
|
1060 | if fn.startswith("nf"): | |||
|
1061 | files.append(fn) | |||
|
1062 | fctxs[fn] = p2[fn] | |||
|
1063 | ||||
|
1064 | def fctxfn(repo, cx, path): | |||
|
1065 | return fctxs.get(path) | |||
|
1066 | ||||
|
1067 | if len(ps) == 0 or ps[0] < 0: | |||
|
1068 | pars = [None, None] | |||
|
1069 | elif len(ps) == 1: | |||
|
1070 | pars = [nodeids[ps[0]], None] | |||
|
1071 | else: | |||
|
1072 | pars = [nodeids[p] for p in ps] | |||
|
1073 | cx = context.memctx(repo, pars, "r%i" % id, files, fctxfn, | |||
|
1074 | date=(id, 0), | |||
|
1075 | user="debugbuilddag", | |||
|
1076 | extra={'branch': atbranch}) | |||
|
1077 | nodeid = repo.commitctx(cx) | |||
|
1078 | nodeids.append(nodeid) | |||
|
1079 | at = id | |||
|
1080 | elif type == 'l': | |||
|
1081 | id, name = data | |||
|
1082 | ui.note('tag %s\n' % name) | |||
|
1083 | tags.append("%s %s\n" % (hex(repo.changelog.node(id)), name)) | |||
|
1084 | elif type == 'a': | |||
|
1085 | ui.note('branch %s\n' % data) | |||
|
1086 | atbranch = data | |||
|
1087 | tr.close() | |||
|
1088 | finally: | |||
|
1089 | tr.release() | |||
|
1090 | ||||
|
1091 | if tags: | |||
|
1092 | tagsf = repo.opener("localtags", "w") | |||
|
1093 | try: | |||
|
1094 | tagsf.write("".join(tags)) | |||
|
1095 | finally: | |||
|
1096 | tagsf.close() | |||
1079 |
|
1097 | |||
1080 | def debugcommands(ui, cmd='', *args): |
|
1098 | def debugcommands(ui, cmd='', *args): | |
1081 | """list all available commands and options""" |
|
1099 | """list all available commands and options""" | |
@@ -4467,7 +4485,6 b' table = {' | |||||
4467 | "debugbuilddag": |
|
4485 | "debugbuilddag": | |
4468 | (debugbuilddag, |
|
4486 | (debugbuilddag, | |
4469 | [('m', 'mergeable-file', None, _('add single file mergeable changes')), |
|
4487 | [('m', 'mergeable-file', None, _('add single file mergeable changes')), | |
4470 | ('a', 'appended-file', None, _('add single file all revs append to')), |
|
|||
4471 | ('o', 'overwritten-file', None, _('add single file all revs overwrite')), |
|
4488 | ('o', 'overwritten-file', None, _('add single file all revs overwrite')), | |
4472 | ('n', 'new-file', None, _('add new file at each rev')), |
|
4489 | ('n', 'new-file', None, _('add new file at each rev')), | |
4473 | ], |
|
4490 | ], |
@@ -1,12 +1,16 b'' | |||||
1 | $ echo "[extensions]" >> $HGRCPATH |
|
1 | $ echo "[extensions]" >> $HGRCPATH | |
2 | $ echo "graphlog=" >> $HGRCPATH |
|
2 | $ echo "graphlog=" >> $HGRCPATH | |
3 |
|
3 | |||
4 | overwritten and appended files |
|
4 | plain | |
5 |
|
5 | |||
6 | $ rm -rf repo |
|
6 | $ rm -rf repo | |
7 | $ hg init repo |
|
7 | $ hg init repo | |
8 | $ cd repo |
|
8 | $ cd repo | |
9 |
$ hg debugbuilddag '+2:f +3:p2 @temp <f+4 @default /p2 +2' |
|
9 | $ hg debugbuilddag '+2:f +3:p2 @temp <f+4 @default /p2 +2' | |
|
10 | tags | |||
|
11 | $ cat .hg/localtags | |||
|
12 | 66f7d451a68b85ed82ff5fcc254daf50c74144bd f | |||
|
13 | bebd167eb94d257ace0e814aeb98e6972ed2970d p2 | |||
10 | dag |
|
14 | dag | |
11 | $ hg debugdag -t -b |
|
15 | $ hg debugdag -t -b | |
12 | +2:f |
|
16 | +2:f | |
@@ -15,10 +19,56 b' dag' | |||||
15 | @default*/p2+2:tip |
|
19 | @default*/p2+2:tip | |
16 | tip |
|
20 | tip | |
17 | $ hg id |
|
21 | $ hg id | |
18 | f96e381c614c tip |
|
22 | 000000000000 | |
19 | glog |
|
23 | glog | |
20 | $ hg glog --template '{rev}: {desc} [{branches}] @ {date}\n' |
|
24 | $ hg glog --template '{rev}: {desc} [{branches}] @ {date}\n' | |
21 |
|
|
25 | o 11: r11 [] @ 11.00 | |
|
26 | | | |||
|
27 | o 10: r10 [] @ 10.00 | |||
|
28 | | | |||
|
29 | o 9: r9 [] @ 9.00 | |||
|
30 | |\ | |||
|
31 | | o 8: r8 [temp] @ 8.00 | |||
|
32 | | | | |||
|
33 | | o 7: r7 [temp] @ 7.00 | |||
|
34 | | | | |||
|
35 | | o 6: r6 [temp] @ 6.00 | |||
|
36 | | | | |||
|
37 | | o 5: r5 [temp] @ 5.00 | |||
|
38 | | | | |||
|
39 | o | 4: r4 [] @ 4.00 | |||
|
40 | | | | |||
|
41 | o | 3: r3 [] @ 3.00 | |||
|
42 | | | | |||
|
43 | o | 2: r2 [] @ 2.00 | |||
|
44 | |/ | |||
|
45 | o 1: r1 [] @ 1.00 | |||
|
46 | | | |||
|
47 | o 0: r0 [] @ 0.00 | |||
|
48 | ||||
|
49 | ||||
|
50 | overwritten files | |||
|
51 | ||||
|
52 | $ rm -rf repo | |||
|
53 | $ hg init repo | |||
|
54 | $ cd repo | |||
|
55 | $ hg debugbuilddag '+2:f +3:p2 @temp <f+4 @default /p2 +2' -q -o | |||
|
56 | tags | |||
|
57 | $ cat .hg/localtags | |||
|
58 | 2a8ed67d317e370eac733dccc501b12d7b9c441a f | |||
|
59 | 4226a30965b7af58f94d0cda7e6c2c9c63e6bf90 p2 | |||
|
60 | dag | |||
|
61 | $ hg debugdag -t -b | |||
|
62 | +2:f | |||
|
63 | +3:p2 | |||
|
64 | @temp*f+3 | |||
|
65 | @default*/p2+2:tip | |||
|
66 | tip | |||
|
67 | $ hg id | |||
|
68 | 000000000000 | |||
|
69 | glog | |||
|
70 | $ hg glog --template '{rev}: {desc} [{branches}] @ {date}\n' | |||
|
71 | o 11: r11 [] @ 11.00 | |||
22 | | |
|
72 | | | |
23 | o 10: r10 [] @ 10.00 |
|
73 | o 10: r10 [] @ 10.00 | |
24 | | |
|
74 | | | |
@@ -44,33 +94,7 b' glog' | |||||
44 |
|
94 | |||
45 | glog of |
|
95 | glog of | |
46 | $ hg glog --template '{rev}: {desc} [{branches}]\n' of |
|
96 | $ hg glog --template '{rev}: {desc} [{branches}]\n' of | |
47 |
|
|
97 | o 11: r11 [] | |
48 | | |
|
|||
49 | o 10: r10 [] |
|
|||
50 | | |
|
|||
51 | o 9: r9 [] |
|
|||
52 | |\ |
|
|||
53 | | o 8: r8 [temp] |
|
|||
54 | | | |
|
|||
55 | | o 7: r7 [temp] |
|
|||
56 | | | |
|
|||
57 | | o 6: r6 [temp] |
|
|||
58 | | | |
|
|||
59 | | o 5: r5 [temp] |
|
|||
60 | | | |
|
|||
61 | o | 4: r4 [] |
|
|||
62 | | | |
|
|||
63 | o | 3: r3 [] |
|
|||
64 | | | |
|
|||
65 | o | 2: r2 [] |
|
|||
66 | |/ |
|
|||
67 | o 1: r1 [] |
|
|||
68 | | |
|
|||
69 | o 0: r0 [] |
|
|||
70 |
|
||||
71 | glog af |
|
|||
72 | $ hg glog --template '{rev}: {desc} [{branches}]\n' af |
|
|||
73 | @ 11: r11 [] |
|
|||
74 | | |
|
98 | | | |
75 | o 10: r10 [] |
|
99 | o 10: r10 [] | |
76 | | |
|
100 | | | |
@@ -96,25 +120,15 b' glog af' | |||||
96 |
|
120 | |||
97 | tags |
|
121 | tags | |
98 | $ hg tags -v |
|
122 | $ hg tags -v | |
99 |
tip 11: |
|
123 | tip 11:58a51e5eb988 | |
100 |
p2 4: |
|
124 | p2 4:4226a30965b7 local | |
101 |
f 1: |
|
125 | f 1:2a8ed67d317e local | |
102 | cat of |
|
126 | cat of | |
103 | $ hg cat of |
|
127 | $ hg cat of --rev tip | |
104 | r11 |
|
|||
105 | cat af |
|
|||
106 | $ hg cat af |
|
|||
107 | r0 |
|
|||
108 | r1 |
|
|||
109 | r5 |
|
|||
110 | r6 |
|
|||
111 | r7 |
|
|||
112 | r8 |
|
|||
113 | r9 |
|
|||
114 | r10 |
|
|||
115 | r11 |
|
128 | r11 | |
116 | $ cd .. |
|
129 | $ cd .. | |
117 |
|
130 | |||
|
131 | ||||
118 | new and mergeable files |
|
132 | new and mergeable files | |
119 |
|
133 | |||
120 | $ rm -rf repo |
|
134 | $ rm -rf repo | |
@@ -129,10 +143,10 b' dag' | |||||
129 | @default*/p2+2:tip |
|
143 | @default*/p2+2:tip | |
130 | tip |
|
144 | tip | |
131 | $ hg id |
|
145 | $ hg id | |
132 | 9c5ce9b70771 tip |
|
146 | 000000000000 | |
133 | glog |
|
147 | glog | |
134 | $ hg glog --template '{rev}: {desc} [{branches}] @ {date}\n' |
|
148 | $ hg glog --template '{rev}: {desc} [{branches}] @ {date}\n' | |
135 |
|
|
149 | o 11: r11 [] @ 11.00 | |
136 | | |
|
150 | | | |
137 | o 10: r10 [] @ 10.00 |
|
151 | o 10: r10 [] @ 10.00 | |
138 | | |
|
152 | | | |
@@ -158,7 +172,7 b' glog' | |||||
158 |
|
172 | |||
159 | glog mf |
|
173 | glog mf | |
160 | $ hg glog --template '{rev}: {desc} [{branches}]\n' mf |
|
174 | $ hg glog --template '{rev}: {desc} [{branches}]\n' mf | |
161 |
|
|
175 | o 11: r11 [] | |
162 | | |
|
176 | | | |
163 | o 10: r10 [] |
|
177 | o 10: r10 [] | |
164 | | |
|
178 | | | |
@@ -253,7 +267,7 b' cat r8 mf' | |||||
253 | 22 |
|
267 | 22 | |
254 | 23 |
|
268 | 23 | |
255 | man |
|
269 | man | |
256 | $ hg manifest |
|
270 | $ hg manifest --rev tip | |
257 | mf |
|
271 | mf | |
258 | nf0 |
|
272 | nf0 | |
259 | nf1 |
|
273 | nf1 | |
@@ -268,7 +282,7 b' man' | |||||
268 | nf8 |
|
282 | nf8 | |
269 | nf9 |
|
283 | nf9 | |
270 | cat mf |
|
284 | cat mf | |
271 | $ hg cat mf |
|
285 | $ hg cat mf --rev tip | |
272 | 0 r0 |
|
286 | 0 r0 | |
273 | 1 |
|
287 | 1 | |
274 | 2 r1 |
|
288 | 2 r1 | |
@@ -295,27 +309,5 b' cat mf' | |||||
295 | 23 |
|
309 | 23 | |
296 | $ cd .. |
|
310 | $ cd .. | |
297 |
|
311 | |||
298 | command |
|
|||
299 |
|
312 | |||
300 | $ rm -rf repo |
|
313 | ||
301 | $ hg init repo |
|
|||
302 | $ cd repo |
|
|||
303 | $ hg debugbuilddag '+2 !"touch X" +2' -q -o |
|
|||
304 | dag |
|
|||
305 | $ hg debugdag -t -b |
|
|||
306 | +4:tip |
|
|||
307 | glog |
|
|||
308 | $ hg glog --template '{rev}: {desc} [{branches}]\n' |
|
|||
309 | @ 3: r3 [] |
|
|||
310 | | |
|
|||
311 | o 2: r2 [] |
|
|||
312 | | |
|
|||
313 | o 1: r1 [] |
|
|||
314 | | |
|
|||
315 | o 0: r0 [] |
|
|||
316 |
|
||||
317 | glog X |
|
|||
318 | $ hg glog --template '{rev}: {desc} [{branches}]\n' X |
|
|||
319 | o 2: r2 [] |
|
|||
320 | | |
|
|||
321 | $ cd .. |
|
@@ -211,7 +211,7 b' Show all commands + options' | |||||
211 | cat: output, rev, decode, include, exclude |
|
211 | cat: output, rev, decode, include, exclude | |
212 | copy: after, force, include, exclude, dry-run |
|
212 | copy: after, force, include, exclude, dry-run | |
213 | debugancestor: |
|
213 | debugancestor: | |
214 |
debugbuilddag: mergeable |
|
214 | debugbuilddag: mergeable-file, overwritten-file, new-file | |
215 | debugbundle: all |
|
215 | debugbundle: all | |
216 | debugcheckstate: |
|
216 | debugcheckstate: | |
217 | debugcommands: |
|
217 | debugcommands: |
@@ -12,41 +12,41 b' Create a test repository:' | |||||
12 | $ cd repo |
|
12 | $ cd repo | |
13 | $ hg debugbuilddag -n -m '+2 :fork +5 :p1 *fork +6 :p2 /p1 :m1 +3' > /dev/null |
|
13 | $ hg debugbuilddag -n -m '+2 :fork +5 :p1 *fork +6 :p2 /p1 :m1 +3' > /dev/null | |
14 | $ hg glog --template '{node}\n' |
|
14 | $ hg glog --template '{node}\n' | |
15 | @ 2bba2f40f321484159b395a43f20101d4bb7ead0 |
|
15 | o 10c14a2cc935e1d8c31f9e98587dcf27fb08a6da | |
16 | | |
|
16 | | | |
17 | o d9e5488323c782fe684573f3043369d199038b6f |
|
17 | o 4801a72e5d88cb515b0c7e40fae34180f3f837f2 | |
18 | | |
|
18 | | | |
19 | o 6e9a5adf5437e49c746288cf95c5ac34fa8f2f72 |
|
19 | o 0b2f73f04880d9cb6a5cd8a757f0db0ad01e32c3 | |
20 | | |
|
20 | | | |
21 | o 733bf0910832b26b768a09172f325f995b5476e1 |
|
21 | o 8365676dbab05860ce0d9110f2af51368b961bbd | |
22 | |\ |
|
22 | |\ | |
23 | | o b5af5d6ea56d73ce24c40bc3cd19a862f74888ac |
|
23 | | o 5686dbbd9fc46cb806599c878d02fe1cb56b83d3 | |
24 | | | |
|
24 | | | | |
25 | | o 6b57ee934bb2996050540f84cdfc8dcad1e7267d |
|
25 | | o 13c0170174366b441dc68e8e33757232fa744458 | |
26 | | | |
|
26 | | | | |
27 | | o 2c0ec49482e8abe888b7bd090b5827acfc22b3d7 |
|
27 | | o 63476832d8ec6558cf9bbe3cbe0c757e5cf18043 | |
28 | | | |
|
28 | | | | |
29 | | o c1818a9f5977dd4139a48f93f5425c67d44a9368 |
|
29 | | o 700b7e19db54103633c4bf4a6a6b6d55f4d50c03 | |
30 | | | |
|
30 | | | | |
31 | | o 6c725a58ad10aea441540bfd06c507f63e8b9cdd |
|
31 | | o 928b5f94cdb278bb536eba552de348a4e92ef24d | |
32 | | | |
|
32 | | | | |
33 | | o 18063366a155bd56b5618229ae2ac3e91849aa5e |
|
33 | | o f34414c64173e0ecb61b25dc55e116dbbcc89bee | |
34 | | | |
|
34 | | | | |
35 | | o a21d913c992197a2eb60b298521ec0f045a04799 |
|
35 | | o 8931463777131cd73923e560b760061f2aa8a4bc | |
36 | | | |
|
36 | | | | |
37 | o | b6b2b682253df2ffedc10e9415e4114202b303c5 |
|
37 | o | 6621d79f61b23ec74cf4b69464343d9e0980ec8b | |
38 | | | |
|
38 | | | | |
39 | o | 2114148793524fd045998f71a45b0aaf139f752b |
|
39 | o | bac16991d12ff45f9dc43c52da1946dfadb83e80 | |
40 | | | |
|
40 | | | | |
41 | o | 74a573f2ae100f1cedfad9aa7b96f8eaab1dabfc |
|
41 | o | ff42371d57168345fdf1a3aac66a51f6a45d41d2 | |
42 | | | |
|
42 | | | | |
43 | o | ea919464b16e003894c48b6cb68df3cd9411b544 |
|
43 | o | d5f6e1ea452285324836a49d7d3c2a63cfed1d31 | |
44 | | | |
|
44 | | | | |
45 | o | 0f82d97ec2778746743fbc996740d409558fda22 |
|
45 | o | 713346a995c363120712aed1aee7e04afd867638 | |
46 | |/ |
|
46 | |/ | |
47 | o 6e23b016bc0f0e79c7bd9dd372ccee07055d7fd4 |
|
47 | o 29a4d1f17bd3f0779ca0525bebb1cfb51067c738 | |
48 | | |
|
48 | | | |
49 | o 10e64d654571f11577745b4d8372e859d9e4df63 |
|
49 | o 7704483d56b2a7b5db54dcee7c62378ac629b348 | |
50 |
|
50 | |||
51 | $ cd .. |
|
51 | $ cd .. | |
52 |
|
52 | |||
@@ -57,62 +57,62 b' Get everything:' | |||||
57 |
|
57 | |||
58 | $ hg debuggetbundle repo bundle |
|
58 | $ hg debuggetbundle repo bundle | |
59 | $ hg debugbundle bundle |
|
59 | $ hg debugbundle bundle | |
60 | 10e64d654571f11577745b4d8372e859d9e4df63 |
|
60 | 7704483d56b2a7b5db54dcee7c62378ac629b348 | |
61 | 6e23b016bc0f0e79c7bd9dd372ccee07055d7fd4 |
|
61 | 29a4d1f17bd3f0779ca0525bebb1cfb51067c738 | |
62 | 0f82d97ec2778746743fbc996740d409558fda22 |
|
62 | 713346a995c363120712aed1aee7e04afd867638 | |
63 | ea919464b16e003894c48b6cb68df3cd9411b544 |
|
63 | d5f6e1ea452285324836a49d7d3c2a63cfed1d31 | |
64 | 74a573f2ae100f1cedfad9aa7b96f8eaab1dabfc |
|
64 | ff42371d57168345fdf1a3aac66a51f6a45d41d2 | |
65 | 2114148793524fd045998f71a45b0aaf139f752b |
|
65 | bac16991d12ff45f9dc43c52da1946dfadb83e80 | |
66 | b6b2b682253df2ffedc10e9415e4114202b303c5 |
|
66 | 6621d79f61b23ec74cf4b69464343d9e0980ec8b | |
67 | a21d913c992197a2eb60b298521ec0f045a04799 |
|
67 | 8931463777131cd73923e560b760061f2aa8a4bc | |
68 | 18063366a155bd56b5618229ae2ac3e91849aa5e |
|
68 | f34414c64173e0ecb61b25dc55e116dbbcc89bee | |
69 | 6c725a58ad10aea441540bfd06c507f63e8b9cdd |
|
69 | 928b5f94cdb278bb536eba552de348a4e92ef24d | |
70 | c1818a9f5977dd4139a48f93f5425c67d44a9368 |
|
70 | 700b7e19db54103633c4bf4a6a6b6d55f4d50c03 | |
71 | 2c0ec49482e8abe888b7bd090b5827acfc22b3d7 |
|
71 | 63476832d8ec6558cf9bbe3cbe0c757e5cf18043 | |
72 | 6b57ee934bb2996050540f84cdfc8dcad1e7267d |
|
72 | 13c0170174366b441dc68e8e33757232fa744458 | |
73 | b5af5d6ea56d73ce24c40bc3cd19a862f74888ac |
|
73 | 5686dbbd9fc46cb806599c878d02fe1cb56b83d3 | |
74 | 733bf0910832b26b768a09172f325f995b5476e1 |
|
74 | 8365676dbab05860ce0d9110f2af51368b961bbd | |
75 | 6e9a5adf5437e49c746288cf95c5ac34fa8f2f72 |
|
75 | 0b2f73f04880d9cb6a5cd8a757f0db0ad01e32c3 | |
76 | d9e5488323c782fe684573f3043369d199038b6f |
|
76 | 4801a72e5d88cb515b0c7e40fae34180f3f837f2 | |
77 | 2bba2f40f321484159b395a43f20101d4bb7ead0 |
|
77 | 10c14a2cc935e1d8c31f9e98587dcf27fb08a6da | |
78 |
|
78 | |||
79 | Get part of linear run: |
|
79 | Get part of linear run: | |
80 |
|
80 | |||
81 | $ hg debuggetbundle repo bundle -H d9e5488323c782fe684573f3043369d199038b6f -C 733bf0910832b26b768a09172f325f995b5476e1 |
|
81 | $ hg debuggetbundle repo bundle -H 4801a72e5d88cb515b0c7e40fae34180f3f837f2 -C 8365676dbab05860ce0d9110f2af51368b961bbd | |
82 | $ hg debugbundle bundle |
|
82 | $ hg debugbundle bundle | |
83 | 6e9a5adf5437e49c746288cf95c5ac34fa8f2f72 |
|
83 | 0b2f73f04880d9cb6a5cd8a757f0db0ad01e32c3 | |
84 | d9e5488323c782fe684573f3043369d199038b6f |
|
84 | 4801a72e5d88cb515b0c7e40fae34180f3f837f2 | |
85 |
|
85 | |||
86 | Get missing branch and merge: |
|
86 | Get missing branch and merge: | |
87 |
|
87 | |||
88 | $ hg debuggetbundle repo bundle -H d9e5488323c782fe684573f3043369d199038b6f -C 6b57ee934bb2996050540f84cdfc8dcad1e7267d |
|
88 | $ hg debuggetbundle repo bundle -H 4801a72e5d88cb515b0c7e40fae34180f3f837f2 -C 13c0170174366b441dc68e8e33757232fa744458 | |
89 | $ hg debugbundle bundle |
|
89 | $ hg debugbundle bundle | |
90 | 0f82d97ec2778746743fbc996740d409558fda22 |
|
90 | 713346a995c363120712aed1aee7e04afd867638 | |
91 | ea919464b16e003894c48b6cb68df3cd9411b544 |
|
91 | d5f6e1ea452285324836a49d7d3c2a63cfed1d31 | |
92 | 74a573f2ae100f1cedfad9aa7b96f8eaab1dabfc |
|
92 | ff42371d57168345fdf1a3aac66a51f6a45d41d2 | |
93 | 2114148793524fd045998f71a45b0aaf139f752b |
|
93 | bac16991d12ff45f9dc43c52da1946dfadb83e80 | |
94 | b6b2b682253df2ffedc10e9415e4114202b303c5 |
|
94 | 6621d79f61b23ec74cf4b69464343d9e0980ec8b | |
95 | b5af5d6ea56d73ce24c40bc3cd19a862f74888ac |
|
95 | 5686dbbd9fc46cb806599c878d02fe1cb56b83d3 | |
96 | 733bf0910832b26b768a09172f325f995b5476e1 |
|
96 | 8365676dbab05860ce0d9110f2af51368b961bbd | |
97 | 6e9a5adf5437e49c746288cf95c5ac34fa8f2f72 |
|
97 | 0b2f73f04880d9cb6a5cd8a757f0db0ad01e32c3 | |
98 | d9e5488323c782fe684573f3043369d199038b6f |
|
98 | 4801a72e5d88cb515b0c7e40fae34180f3f837f2 | |
99 |
|
99 | |||
100 | Get from only one head: |
|
100 | Get from only one head: | |
101 |
|
101 | |||
102 | $ hg debuggetbundle repo bundle -H 6c725a58ad10aea441540bfd06c507f63e8b9cdd -C 6e23b016bc0f0e79c7bd9dd372ccee07055d7fd4 |
|
102 | $ hg debuggetbundle repo bundle -H 928b5f94cdb278bb536eba552de348a4e92ef24d -C 29a4d1f17bd3f0779ca0525bebb1cfb51067c738 | |
103 | $ hg debugbundle bundle |
|
103 | $ hg debugbundle bundle | |
104 | a21d913c992197a2eb60b298521ec0f045a04799 |
|
104 | 8931463777131cd73923e560b760061f2aa8a4bc | |
105 | 18063366a155bd56b5618229ae2ac3e91849aa5e |
|
105 | f34414c64173e0ecb61b25dc55e116dbbcc89bee | |
106 | 6c725a58ad10aea441540bfd06c507f63e8b9cdd |
|
106 | 928b5f94cdb278bb536eba552de348a4e92ef24d | |
107 |
|
107 | |||
108 | Get parts of two branches: |
|
108 | Get parts of two branches: | |
109 |
|
109 | |||
110 | $ hg debuggetbundle repo bundle -H 6b57ee934bb2996050540f84cdfc8dcad1e7267d -C c1818a9f5977dd4139a48f93f5425c67d44a9368 -H 2114148793524fd045998f71a45b0aaf139f752b -C ea919464b16e003894c48b6cb68df3cd9411b544 |
|
110 | $ hg debuggetbundle repo bundle -H 13c0170174366b441dc68e8e33757232fa744458 -C 700b7e19db54103633c4bf4a6a6b6d55f4d50c03 -H bac16991d12ff45f9dc43c52da1946dfadb83e80 -C d5f6e1ea452285324836a49d7d3c2a63cfed1d31 | |
111 | $ hg debugbundle bundle |
|
111 | $ hg debugbundle bundle | |
112 | 74a573f2ae100f1cedfad9aa7b96f8eaab1dabfc |
|
112 | ff42371d57168345fdf1a3aac66a51f6a45d41d2 | |
113 | 2114148793524fd045998f71a45b0aaf139f752b |
|
113 | bac16991d12ff45f9dc43c52da1946dfadb83e80 | |
114 | 2c0ec49482e8abe888b7bd090b5827acfc22b3d7 |
|
114 | 63476832d8ec6558cf9bbe3cbe0c757e5cf18043 | |
115 | 6b57ee934bb2996050540f84cdfc8dcad1e7267d |
|
115 | 13c0170174366b441dc68e8e33757232fa744458 | |
116 |
|
116 | |||
117 | Check that we get all needed file changes: |
|
117 | Check that we get all needed file changes: | |
118 |
|
118 | |||
@@ -120,54 +120,54 b' Check that we get all needed file change' | |||||
120 | format: id, p1, p2, cset, delta base, len(delta) |
|
120 | format: id, p1, p2, cset, delta base, len(delta) | |
121 |
|
121 | |||
122 | changelog |
|
122 | changelog | |
123 | 74a573f2ae100f1cedfad9aa7b96f8eaab1dabfc ea919464b16e003894c48b6cb68df3cd9411b544 0000000000000000000000000000000000000000 74a573f2ae100f1cedfad9aa7b96f8eaab1dabfc ea919464b16e003894c48b6cb68df3cd9411b544 99 |
|
123 | ff42371d57168345fdf1a3aac66a51f6a45d41d2 d5f6e1ea452285324836a49d7d3c2a63cfed1d31 0000000000000000000000000000000000000000 ff42371d57168345fdf1a3aac66a51f6a45d41d2 d5f6e1ea452285324836a49d7d3c2a63cfed1d31 99 | |
124 | 2114148793524fd045998f71a45b0aaf139f752b 74a573f2ae100f1cedfad9aa7b96f8eaab1dabfc 0000000000000000000000000000000000000000 2114148793524fd045998f71a45b0aaf139f752b 74a573f2ae100f1cedfad9aa7b96f8eaab1dabfc 99 |
|
124 | bac16991d12ff45f9dc43c52da1946dfadb83e80 ff42371d57168345fdf1a3aac66a51f6a45d41d2 0000000000000000000000000000000000000000 bac16991d12ff45f9dc43c52da1946dfadb83e80 ff42371d57168345fdf1a3aac66a51f6a45d41d2 99 | |
125 | 2c0ec49482e8abe888b7bd090b5827acfc22b3d7 c1818a9f5977dd4139a48f93f5425c67d44a9368 0000000000000000000000000000000000000000 2c0ec49482e8abe888b7bd090b5827acfc22b3d7 2114148793524fd045998f71a45b0aaf139f752b 102 |
|
125 | 63476832d8ec6558cf9bbe3cbe0c757e5cf18043 700b7e19db54103633c4bf4a6a6b6d55f4d50c03 0000000000000000000000000000000000000000 63476832d8ec6558cf9bbe3cbe0c757e5cf18043 bac16991d12ff45f9dc43c52da1946dfadb83e80 102 | |
126 | 6b57ee934bb2996050540f84cdfc8dcad1e7267d 2c0ec49482e8abe888b7bd090b5827acfc22b3d7 0000000000000000000000000000000000000000 6b57ee934bb2996050540f84cdfc8dcad1e7267d 2c0ec49482e8abe888b7bd090b5827acfc22b3d7 102 |
|
126 | 13c0170174366b441dc68e8e33757232fa744458 63476832d8ec6558cf9bbe3cbe0c757e5cf18043 0000000000000000000000000000000000000000 13c0170174366b441dc68e8e33757232fa744458 63476832d8ec6558cf9bbe3cbe0c757e5cf18043 102 | |
127 |
|
127 | |||
128 | manifest |
|
128 | manifest | |
129 | dac7984588fc4eea7acbf39693a9c1b06f5b175d 591f732a3faf1fb903815273f3c199a514a61ccb 0000000000000000000000000000000000000000 74a573f2ae100f1cedfad9aa7b96f8eaab1dabfc 591f732a3faf1fb903815273f3c199a514a61ccb 113 |
|
129 | dac7984588fc4eea7acbf39693a9c1b06f5b175d 591f732a3faf1fb903815273f3c199a514a61ccb 0000000000000000000000000000000000000000 ff42371d57168345fdf1a3aac66a51f6a45d41d2 591f732a3faf1fb903815273f3c199a514a61ccb 113 | |
130 | 0772616e6b48a76afb6c1458e193cbb3dae2e4ff dac7984588fc4eea7acbf39693a9c1b06f5b175d 0000000000000000000000000000000000000000 2114148793524fd045998f71a45b0aaf139f752b dac7984588fc4eea7acbf39693a9c1b06f5b175d 113 |
|
130 | 0772616e6b48a76afb6c1458e193cbb3dae2e4ff dac7984588fc4eea7acbf39693a9c1b06f5b175d 0000000000000000000000000000000000000000 bac16991d12ff45f9dc43c52da1946dfadb83e80 dac7984588fc4eea7acbf39693a9c1b06f5b175d 113 | |
131 | eb498cd9af6c44108e43041e951ce829e29f6c80 bff2f4817ced57b386caf7c4e3e36a4bc9af7e93 0000000000000000000000000000000000000000 2c0ec49482e8abe888b7bd090b5827acfc22b3d7 0772616e6b48a76afb6c1458e193cbb3dae2e4ff 295 |
|
131 | eb498cd9af6c44108e43041e951ce829e29f6c80 bff2f4817ced57b386caf7c4e3e36a4bc9af7e93 0000000000000000000000000000000000000000 63476832d8ec6558cf9bbe3cbe0c757e5cf18043 0772616e6b48a76afb6c1458e193cbb3dae2e4ff 295 | |
132 | b15709c071ddd2d93188508ba156196ab4f19620 eb498cd9af6c44108e43041e951ce829e29f6c80 0000000000000000000000000000000000000000 6b57ee934bb2996050540f84cdfc8dcad1e7267d eb498cd9af6c44108e43041e951ce829e29f6c80 114 |
|
132 | b15709c071ddd2d93188508ba156196ab4f19620 eb498cd9af6c44108e43041e951ce829e29f6c80 0000000000000000000000000000000000000000 13c0170174366b441dc68e8e33757232fa744458 eb498cd9af6c44108e43041e951ce829e29f6c80 114 | |
133 |
|
133 | |||
134 | mf |
|
134 | mf | |
135 | 4f73f97080266ab8e0c0561ca8d0da3eaf65b695 301ca08d026bb72cb4258a9d211bdf7ca0bcd810 0000000000000000000000000000000000000000 74a573f2ae100f1cedfad9aa7b96f8eaab1dabfc 301ca08d026bb72cb4258a9d211bdf7ca0bcd810 17 |
|
135 | 4f73f97080266ab8e0c0561ca8d0da3eaf65b695 301ca08d026bb72cb4258a9d211bdf7ca0bcd810 0000000000000000000000000000000000000000 ff42371d57168345fdf1a3aac66a51f6a45d41d2 301ca08d026bb72cb4258a9d211bdf7ca0bcd810 17 | |
136 | c7b583de053293870e145f45bd2d61643563fd06 4f73f97080266ab8e0c0561ca8d0da3eaf65b695 0000000000000000000000000000000000000000 2114148793524fd045998f71a45b0aaf139f752b 4f73f97080266ab8e0c0561ca8d0da3eaf65b695 18 |
|
136 | c7b583de053293870e145f45bd2d61643563fd06 4f73f97080266ab8e0c0561ca8d0da3eaf65b695 0000000000000000000000000000000000000000 bac16991d12ff45f9dc43c52da1946dfadb83e80 4f73f97080266ab8e0c0561ca8d0da3eaf65b695 18 | |
137 | 266ee3c0302a5a18f1cf96817ac79a51836179e9 edc0f6b8db80d68ae6aff2b19f7e5347ab68fa63 0000000000000000000000000000000000000000 2c0ec49482e8abe888b7bd090b5827acfc22b3d7 c7b583de053293870e145f45bd2d61643563fd06 149 |
|
137 | 266ee3c0302a5a18f1cf96817ac79a51836179e9 edc0f6b8db80d68ae6aff2b19f7e5347ab68fa63 0000000000000000000000000000000000000000 63476832d8ec6558cf9bbe3cbe0c757e5cf18043 c7b583de053293870e145f45bd2d61643563fd06 149 | |
138 |
698c6a36220548cd3903ca7dada27c59aa500c52 266ee3c0302a5a18f1cf96817ac79a51836179e9 0000000000000000000000000000000000000000 |
|
138 | 698c6a36220548cd3903ca7dada27c59aa500c52 266ee3c0302a5a18f1cf96817ac79a51836179e9 0000000000000000000000000000000000000000 13c0170174366b441dc68e8e33757232fa744458 266ee3c0302a5a18f1cf96817ac79a51836179e9 19 | |
139 |
|
139 | |||
140 | nf11 |
|
140 | nf11 | |
141 |
33fbc651630ffa7ccbebfe4eb91320a873e7291c 0000000000000000000000000000000000000000 0000000000000000000000000000000000000000 2 |
|
141 | 33fbc651630ffa7ccbebfe4eb91320a873e7291c 0000000000000000000000000000000000000000 0000000000000000000000000000000000000000 63476832d8ec6558cf9bbe3cbe0c757e5cf18043 0000000000000000000000000000000000000000 16 | |
142 |
|
142 | |||
143 | nf12 |
|
143 | nf12 | |
144 |
ddce0544363f037e9fb889faca058f52dc01c0a5 0000000000000000000000000000000000000000 0000000000000000000000000000000000000000 |
|
144 | ddce0544363f037e9fb889faca058f52dc01c0a5 0000000000000000000000000000000000000000 0000000000000000000000000000000000000000 13c0170174366b441dc68e8e33757232fa744458 0000000000000000000000000000000000000000 16 | |
145 |
|
145 | |||
146 | nf4 |
|
146 | nf4 | |
147 |
3c1407305701051cbed9f9cb9a68bdfb5997c235 0000000000000000000000000000000000000000 0000000000000000000000000000000000000000 |
|
147 | 3c1407305701051cbed9f9cb9a68bdfb5997c235 0000000000000000000000000000000000000000 0000000000000000000000000000000000000000 ff42371d57168345fdf1a3aac66a51f6a45d41d2 0000000000000000000000000000000000000000 15 | |
148 |
|
148 | |||
149 | nf5 |
|
149 | nf5 | |
150 |
0dbd89c185f53a1727c54cd1ce256482fa23968e 0000000000000000000000000000000000000000 0000000000000000000000000000000000000000 |
|
150 | 0dbd89c185f53a1727c54cd1ce256482fa23968e 0000000000000000000000000000000000000000 0000000000000000000000000000000000000000 bac16991d12ff45f9dc43c52da1946dfadb83e80 0000000000000000000000000000000000000000 15 | |
151 |
|
151 | |||
152 | Get branch and merge: |
|
152 | Get branch and merge: | |
153 |
|
153 | |||
154 | $ hg debuggetbundle repo bundle -C 10e64d654571f11577745b4d8372e859d9e4df63 -H 6e9a5adf5437e49c746288cf95c5ac34fa8f2f72 |
|
154 | $ hg debuggetbundle repo bundle -C 7704483d56b2a7b5db54dcee7c62378ac629b348 -H 0b2f73f04880d9cb6a5cd8a757f0db0ad01e32c3 | |
155 | $ hg debugbundle bundle |
|
155 | $ hg debugbundle bundle | |
156 | 6e23b016bc0f0e79c7bd9dd372ccee07055d7fd4 |
|
156 | 29a4d1f17bd3f0779ca0525bebb1cfb51067c738 | |
157 | 0f82d97ec2778746743fbc996740d409558fda22 |
|
157 | 713346a995c363120712aed1aee7e04afd867638 | |
158 | ea919464b16e003894c48b6cb68df3cd9411b544 |
|
158 | d5f6e1ea452285324836a49d7d3c2a63cfed1d31 | |
159 | 74a573f2ae100f1cedfad9aa7b96f8eaab1dabfc |
|
159 | ff42371d57168345fdf1a3aac66a51f6a45d41d2 | |
160 | 2114148793524fd045998f71a45b0aaf139f752b |
|
160 | bac16991d12ff45f9dc43c52da1946dfadb83e80 | |
161 | b6b2b682253df2ffedc10e9415e4114202b303c5 |
|
161 | 6621d79f61b23ec74cf4b69464343d9e0980ec8b | |
162 | a21d913c992197a2eb60b298521ec0f045a04799 |
|
162 | 8931463777131cd73923e560b760061f2aa8a4bc | |
163 | 18063366a155bd56b5618229ae2ac3e91849aa5e |
|
163 | f34414c64173e0ecb61b25dc55e116dbbcc89bee | |
164 | 6c725a58ad10aea441540bfd06c507f63e8b9cdd |
|
164 | 928b5f94cdb278bb536eba552de348a4e92ef24d | |
165 | c1818a9f5977dd4139a48f93f5425c67d44a9368 |
|
165 | 700b7e19db54103633c4bf4a6a6b6d55f4d50c03 | |
166 | 2c0ec49482e8abe888b7bd090b5827acfc22b3d7 |
|
166 | 63476832d8ec6558cf9bbe3cbe0c757e5cf18043 | |
167 | 6b57ee934bb2996050540f84cdfc8dcad1e7267d |
|
167 | 13c0170174366b441dc68e8e33757232fa744458 | |
168 | b5af5d6ea56d73ce24c40bc3cd19a862f74888ac |
|
168 | 5686dbbd9fc46cb806599c878d02fe1cb56b83d3 | |
169 | 733bf0910832b26b768a09172f325f995b5476e1 |
|
169 | 8365676dbab05860ce0d9110f2af51368b961bbd | |
170 | 6e9a5adf5437e49c746288cf95c5ac34fa8f2f72 |
|
170 | 0b2f73f04880d9cb6a5cd8a757f0db0ad01e32c3 | |
171 |
|
171 | |||
172 |
|
172 | |||
173 | = Test via HTTP = |
|
173 | = Test via HTTP = | |
@@ -178,33 +178,33 b' Get everything:' | |||||
178 | $ cat hg.pid >> $DAEMON_PIDS |
|
178 | $ cat hg.pid >> $DAEMON_PIDS | |
179 | $ hg debuggetbundle http://localhost:$HGPORT/ bundle |
|
179 | $ hg debuggetbundle http://localhost:$HGPORT/ bundle | |
180 | $ hg debugbundle bundle |
|
180 | $ hg debugbundle bundle | |
181 | 10e64d654571f11577745b4d8372e859d9e4df63 |
|
181 | 7704483d56b2a7b5db54dcee7c62378ac629b348 | |
182 | 6e23b016bc0f0e79c7bd9dd372ccee07055d7fd4 |
|
182 | 29a4d1f17bd3f0779ca0525bebb1cfb51067c738 | |
183 | 0f82d97ec2778746743fbc996740d409558fda22 |
|
183 | 713346a995c363120712aed1aee7e04afd867638 | |
184 | ea919464b16e003894c48b6cb68df3cd9411b544 |
|
184 | d5f6e1ea452285324836a49d7d3c2a63cfed1d31 | |
185 | 74a573f2ae100f1cedfad9aa7b96f8eaab1dabfc |
|
185 | ff42371d57168345fdf1a3aac66a51f6a45d41d2 | |
186 | 2114148793524fd045998f71a45b0aaf139f752b |
|
186 | bac16991d12ff45f9dc43c52da1946dfadb83e80 | |
187 | b6b2b682253df2ffedc10e9415e4114202b303c5 |
|
187 | 6621d79f61b23ec74cf4b69464343d9e0980ec8b | |
188 | a21d913c992197a2eb60b298521ec0f045a04799 |
|
188 | 8931463777131cd73923e560b760061f2aa8a4bc | |
189 | 18063366a155bd56b5618229ae2ac3e91849aa5e |
|
189 | f34414c64173e0ecb61b25dc55e116dbbcc89bee | |
190 | 6c725a58ad10aea441540bfd06c507f63e8b9cdd |
|
190 | 928b5f94cdb278bb536eba552de348a4e92ef24d | |
191 | c1818a9f5977dd4139a48f93f5425c67d44a9368 |
|
191 | 700b7e19db54103633c4bf4a6a6b6d55f4d50c03 | |
192 | 2c0ec49482e8abe888b7bd090b5827acfc22b3d7 |
|
192 | 63476832d8ec6558cf9bbe3cbe0c757e5cf18043 | |
193 | 6b57ee934bb2996050540f84cdfc8dcad1e7267d |
|
193 | 13c0170174366b441dc68e8e33757232fa744458 | |
194 | b5af5d6ea56d73ce24c40bc3cd19a862f74888ac |
|
194 | 5686dbbd9fc46cb806599c878d02fe1cb56b83d3 | |
195 | 733bf0910832b26b768a09172f325f995b5476e1 |
|
195 | 8365676dbab05860ce0d9110f2af51368b961bbd | |
196 | 6e9a5adf5437e49c746288cf95c5ac34fa8f2f72 |
|
196 | 0b2f73f04880d9cb6a5cd8a757f0db0ad01e32c3 | |
197 | d9e5488323c782fe684573f3043369d199038b6f |
|
197 | 4801a72e5d88cb515b0c7e40fae34180f3f837f2 | |
198 | 2bba2f40f321484159b395a43f20101d4bb7ead0 |
|
198 | 10c14a2cc935e1d8c31f9e98587dcf27fb08a6da | |
199 |
|
199 | |||
200 | Get parts of two branches: |
|
200 | Get parts of two branches: | |
201 |
|
201 | |||
202 | $ hg debuggetbundle http://localhost:$HGPORT/ bundle -H 6b57ee934bb2996050540f84cdfc8dcad1e7267d -C c1818a9f5977dd4139a48f93f5425c67d44a9368 -H 2114148793524fd045998f71a45b0aaf139f752b -C ea919464b16e003894c48b6cb68df3cd9411b544 |
|
202 | $ hg debuggetbundle http://localhost:$HGPORT/ bundle -H 13c0170174366b441dc68e8e33757232fa744458 -C 700b7e19db54103633c4bf4a6a6b6d55f4d50c03 -H bac16991d12ff45f9dc43c52da1946dfadb83e80 -C d5f6e1ea452285324836a49d7d3c2a63cfed1d31 | |
203 | $ hg debugbundle bundle |
|
203 | $ hg debugbundle bundle | |
204 | 74a573f2ae100f1cedfad9aa7b96f8eaab1dabfc |
|
204 | ff42371d57168345fdf1a3aac66a51f6a45d41d2 | |
205 | 2114148793524fd045998f71a45b0aaf139f752b |
|
205 | bac16991d12ff45f9dc43c52da1946dfadb83e80 | |
206 | 2c0ec49482e8abe888b7bd090b5827acfc22b3d7 |
|
206 | 63476832d8ec6558cf9bbe3cbe0c757e5cf18043 | |
207 | 6b57ee934bb2996050540f84cdfc8dcad1e7267d |
|
207 | 13c0170174366b441dc68e8e33757232fa744458 | |
208 |
|
208 | |||
209 | Check that we get all needed file changes: |
|
209 | Check that we get all needed file changes: | |
210 |
|
210 | |||
@@ -212,34 +212,34 b' Check that we get all needed file change' | |||||
212 | format: id, p1, p2, cset, delta base, len(delta) |
|
212 | format: id, p1, p2, cset, delta base, len(delta) | |
213 |
|
213 | |||
214 | changelog |
|
214 | changelog | |
215 | 74a573f2ae100f1cedfad9aa7b96f8eaab1dabfc ea919464b16e003894c48b6cb68df3cd9411b544 0000000000000000000000000000000000000000 74a573f2ae100f1cedfad9aa7b96f8eaab1dabfc ea919464b16e003894c48b6cb68df3cd9411b544 99 |
|
215 | ff42371d57168345fdf1a3aac66a51f6a45d41d2 d5f6e1ea452285324836a49d7d3c2a63cfed1d31 0000000000000000000000000000000000000000 ff42371d57168345fdf1a3aac66a51f6a45d41d2 d5f6e1ea452285324836a49d7d3c2a63cfed1d31 99 | |
216 | 2114148793524fd045998f71a45b0aaf139f752b 74a573f2ae100f1cedfad9aa7b96f8eaab1dabfc 0000000000000000000000000000000000000000 2114148793524fd045998f71a45b0aaf139f752b 74a573f2ae100f1cedfad9aa7b96f8eaab1dabfc 99 |
|
216 | bac16991d12ff45f9dc43c52da1946dfadb83e80 ff42371d57168345fdf1a3aac66a51f6a45d41d2 0000000000000000000000000000000000000000 bac16991d12ff45f9dc43c52da1946dfadb83e80 ff42371d57168345fdf1a3aac66a51f6a45d41d2 99 | |
217 | 2c0ec49482e8abe888b7bd090b5827acfc22b3d7 c1818a9f5977dd4139a48f93f5425c67d44a9368 0000000000000000000000000000000000000000 2c0ec49482e8abe888b7bd090b5827acfc22b3d7 2114148793524fd045998f71a45b0aaf139f752b 102 |
|
217 | 63476832d8ec6558cf9bbe3cbe0c757e5cf18043 700b7e19db54103633c4bf4a6a6b6d55f4d50c03 0000000000000000000000000000000000000000 63476832d8ec6558cf9bbe3cbe0c757e5cf18043 bac16991d12ff45f9dc43c52da1946dfadb83e80 102 | |
218 | 6b57ee934bb2996050540f84cdfc8dcad1e7267d 2c0ec49482e8abe888b7bd090b5827acfc22b3d7 0000000000000000000000000000000000000000 6b57ee934bb2996050540f84cdfc8dcad1e7267d 2c0ec49482e8abe888b7bd090b5827acfc22b3d7 102 |
|
218 | 13c0170174366b441dc68e8e33757232fa744458 63476832d8ec6558cf9bbe3cbe0c757e5cf18043 0000000000000000000000000000000000000000 13c0170174366b441dc68e8e33757232fa744458 63476832d8ec6558cf9bbe3cbe0c757e5cf18043 102 | |
219 |
|
219 | |||
220 | manifest |
|
220 | manifest | |
221 | dac7984588fc4eea7acbf39693a9c1b06f5b175d 591f732a3faf1fb903815273f3c199a514a61ccb 0000000000000000000000000000000000000000 74a573f2ae100f1cedfad9aa7b96f8eaab1dabfc 591f732a3faf1fb903815273f3c199a514a61ccb 113 |
|
221 | dac7984588fc4eea7acbf39693a9c1b06f5b175d 591f732a3faf1fb903815273f3c199a514a61ccb 0000000000000000000000000000000000000000 ff42371d57168345fdf1a3aac66a51f6a45d41d2 591f732a3faf1fb903815273f3c199a514a61ccb 113 | |
222 | 0772616e6b48a76afb6c1458e193cbb3dae2e4ff dac7984588fc4eea7acbf39693a9c1b06f5b175d 0000000000000000000000000000000000000000 2114148793524fd045998f71a45b0aaf139f752b dac7984588fc4eea7acbf39693a9c1b06f5b175d 113 |
|
222 | 0772616e6b48a76afb6c1458e193cbb3dae2e4ff dac7984588fc4eea7acbf39693a9c1b06f5b175d 0000000000000000000000000000000000000000 bac16991d12ff45f9dc43c52da1946dfadb83e80 dac7984588fc4eea7acbf39693a9c1b06f5b175d 113 | |
223 | eb498cd9af6c44108e43041e951ce829e29f6c80 bff2f4817ced57b386caf7c4e3e36a4bc9af7e93 0000000000000000000000000000000000000000 2c0ec49482e8abe888b7bd090b5827acfc22b3d7 0772616e6b48a76afb6c1458e193cbb3dae2e4ff 295 |
|
223 | eb498cd9af6c44108e43041e951ce829e29f6c80 bff2f4817ced57b386caf7c4e3e36a4bc9af7e93 0000000000000000000000000000000000000000 63476832d8ec6558cf9bbe3cbe0c757e5cf18043 0772616e6b48a76afb6c1458e193cbb3dae2e4ff 295 | |
224 | b15709c071ddd2d93188508ba156196ab4f19620 eb498cd9af6c44108e43041e951ce829e29f6c80 0000000000000000000000000000000000000000 6b57ee934bb2996050540f84cdfc8dcad1e7267d eb498cd9af6c44108e43041e951ce829e29f6c80 114 |
|
224 | b15709c071ddd2d93188508ba156196ab4f19620 eb498cd9af6c44108e43041e951ce829e29f6c80 0000000000000000000000000000000000000000 13c0170174366b441dc68e8e33757232fa744458 eb498cd9af6c44108e43041e951ce829e29f6c80 114 | |
225 |
|
225 | |||
226 | mf |
|
226 | mf | |
227 | 4f73f97080266ab8e0c0561ca8d0da3eaf65b695 301ca08d026bb72cb4258a9d211bdf7ca0bcd810 0000000000000000000000000000000000000000 74a573f2ae100f1cedfad9aa7b96f8eaab1dabfc 301ca08d026bb72cb4258a9d211bdf7ca0bcd810 17 |
|
227 | 4f73f97080266ab8e0c0561ca8d0da3eaf65b695 301ca08d026bb72cb4258a9d211bdf7ca0bcd810 0000000000000000000000000000000000000000 ff42371d57168345fdf1a3aac66a51f6a45d41d2 301ca08d026bb72cb4258a9d211bdf7ca0bcd810 17 | |
228 | c7b583de053293870e145f45bd2d61643563fd06 4f73f97080266ab8e0c0561ca8d0da3eaf65b695 0000000000000000000000000000000000000000 2114148793524fd045998f71a45b0aaf139f752b 4f73f97080266ab8e0c0561ca8d0da3eaf65b695 18 |
|
228 | c7b583de053293870e145f45bd2d61643563fd06 4f73f97080266ab8e0c0561ca8d0da3eaf65b695 0000000000000000000000000000000000000000 bac16991d12ff45f9dc43c52da1946dfadb83e80 4f73f97080266ab8e0c0561ca8d0da3eaf65b695 18 | |
229 | 266ee3c0302a5a18f1cf96817ac79a51836179e9 edc0f6b8db80d68ae6aff2b19f7e5347ab68fa63 0000000000000000000000000000000000000000 2c0ec49482e8abe888b7bd090b5827acfc22b3d7 c7b583de053293870e145f45bd2d61643563fd06 149 |
|
229 | 266ee3c0302a5a18f1cf96817ac79a51836179e9 edc0f6b8db80d68ae6aff2b19f7e5347ab68fa63 0000000000000000000000000000000000000000 63476832d8ec6558cf9bbe3cbe0c757e5cf18043 c7b583de053293870e145f45bd2d61643563fd06 149 | |
230 |
698c6a36220548cd3903ca7dada27c59aa500c52 266ee3c0302a5a18f1cf96817ac79a51836179e9 0000000000000000000000000000000000000000 |
|
230 | 698c6a36220548cd3903ca7dada27c59aa500c52 266ee3c0302a5a18f1cf96817ac79a51836179e9 0000000000000000000000000000000000000000 13c0170174366b441dc68e8e33757232fa744458 266ee3c0302a5a18f1cf96817ac79a51836179e9 19 | |
231 |
|
231 | |||
232 | nf11 |
|
232 | nf11 | |
233 |
33fbc651630ffa7ccbebfe4eb91320a873e7291c 0000000000000000000000000000000000000000 0000000000000000000000000000000000000000 2 |
|
233 | 33fbc651630ffa7ccbebfe4eb91320a873e7291c 0000000000000000000000000000000000000000 0000000000000000000000000000000000000000 63476832d8ec6558cf9bbe3cbe0c757e5cf18043 0000000000000000000000000000000000000000 16 | |
234 |
|
234 | |||
235 | nf12 |
|
235 | nf12 | |
236 |
ddce0544363f037e9fb889faca058f52dc01c0a5 0000000000000000000000000000000000000000 0000000000000000000000000000000000000000 |
|
236 | ddce0544363f037e9fb889faca058f52dc01c0a5 0000000000000000000000000000000000000000 0000000000000000000000000000000000000000 13c0170174366b441dc68e8e33757232fa744458 0000000000000000000000000000000000000000 16 | |
237 |
|
237 | |||
238 | nf4 |
|
238 | nf4 | |
239 |
3c1407305701051cbed9f9cb9a68bdfb5997c235 0000000000000000000000000000000000000000 0000000000000000000000000000000000000000 |
|
239 | 3c1407305701051cbed9f9cb9a68bdfb5997c235 0000000000000000000000000000000000000000 0000000000000000000000000000000000000000 ff42371d57168345fdf1a3aac66a51f6a45d41d2 0000000000000000000000000000000000000000 15 | |
240 |
|
240 | |||
241 | nf5 |
|
241 | nf5 | |
242 |
0dbd89c185f53a1727c54cd1ce256482fa23968e 0000000000000000000000000000000000000000 0000000000000000000000000000000000000000 |
|
242 | 0dbd89c185f53a1727c54cd1ce256482fa23968e 0000000000000000000000000000000000000000 0000000000000000000000000000000000000000 bac16991d12ff45f9dc43c52da1946dfadb83e80 0000000000000000000000000000000000000000 15 | |
243 |
|
243 | |||
244 | Verify we hit the HTTP server: |
|
244 | Verify we hit the HTTP server: | |
245 |
|
245 | |||
@@ -247,7 +247,7 b' Verify we hit the HTTP server:' | |||||
247 | * - - [*] "GET /?cmd=capabilities HTTP/1.1" 200 - (glob) |
|
247 | * - - [*] "GET /?cmd=capabilities HTTP/1.1" 200 - (glob) | |
248 | * - - [*] "GET /?cmd=getbundle HTTP/1.1" 200 - (glob) |
|
248 | * - - [*] "GET /?cmd=getbundle HTTP/1.1" 200 - (glob) | |
249 | * - - [*] "GET /?cmd=capabilities HTTP/1.1" 200 - (glob) |
|
249 | * - - [*] "GET /?cmd=capabilities HTTP/1.1" 200 - (glob) | |
250 | * - - [*] "GET /?cmd=getbundle HTTP/1.1" 200 - x-hgarg-1:common=c1818a9f5977dd4139a48f93f5425c67d44a9368+ea919464b16e003894c48b6cb68df3cd9411b544&heads=6b57ee934bb2996050540f84cdfc8dcad1e7267d+2114148793524fd045998f71a45b0aaf139f752b (glob) |
|
250 | * - - [*] "GET /?cmd=getbundle HTTP/1.1" 200 - x-hgarg-1:common=700b7e19db54103633c4bf4a6a6b6d55f4d50c03+d5f6e1ea452285324836a49d7d3c2a63cfed1d31&heads=13c0170174366b441dc68e8e33757232fa744458+bac16991d12ff45f9dc43c52da1946dfadb83e80 (glob) | |
251 |
|
251 | |||
252 | $ cat error.log |
|
252 | $ cat error.log | |
253 |
|
253 |
General Comments 0
You need to be logged in to leave comments.
Login now