##// END OF EJS Templates
debugcommands: print all CBOR objects...
Gregory Szorc -
r40053:426cb285 default
parent child Browse files
Show More
@@ -1,3379 +1,3379 b''
1 # debugcommands.py - command processing for debug* commands
1 # debugcommands.py - command processing for debug* commands
2 #
2 #
3 # Copyright 2005-2016 Matt Mackall <mpm@selenic.com>
3 # Copyright 2005-2016 Matt Mackall <mpm@selenic.com>
4 #
4 #
5 # This software may be used and distributed according to the terms of the
5 # This software may be used and distributed according to the terms of the
6 # GNU General Public License version 2 or any later version.
6 # GNU General Public License version 2 or any later version.
7
7
8 from __future__ import absolute_import
8 from __future__ import absolute_import
9
9
10 import codecs
10 import codecs
11 import collections
11 import collections
12 import difflib
12 import difflib
13 import errno
13 import errno
14 import operator
14 import operator
15 import os
15 import os
16 import random
16 import random
17 import re
17 import re
18 import socket
18 import socket
19 import ssl
19 import ssl
20 import stat
20 import stat
21 import string
21 import string
22 import subprocess
22 import subprocess
23 import sys
23 import sys
24 import time
24 import time
25
25
26 from .i18n import _
26 from .i18n import _
27 from .node import (
27 from .node import (
28 bin,
28 bin,
29 hex,
29 hex,
30 nullhex,
30 nullhex,
31 nullid,
31 nullid,
32 nullrev,
32 nullrev,
33 short,
33 short,
34 )
34 )
35 from . import (
35 from . import (
36 bundle2,
36 bundle2,
37 changegroup,
37 changegroup,
38 cmdutil,
38 cmdutil,
39 color,
39 color,
40 context,
40 context,
41 dagparser,
41 dagparser,
42 encoding,
42 encoding,
43 error,
43 error,
44 exchange,
44 exchange,
45 extensions,
45 extensions,
46 filemerge,
46 filemerge,
47 filesetlang,
47 filesetlang,
48 formatter,
48 formatter,
49 hg,
49 hg,
50 httppeer,
50 httppeer,
51 localrepo,
51 localrepo,
52 lock as lockmod,
52 lock as lockmod,
53 logcmdutil,
53 logcmdutil,
54 merge as mergemod,
54 merge as mergemod,
55 obsolete,
55 obsolete,
56 obsutil,
56 obsutil,
57 phases,
57 phases,
58 policy,
58 policy,
59 pvec,
59 pvec,
60 pycompat,
60 pycompat,
61 registrar,
61 registrar,
62 repair,
62 repair,
63 revlog,
63 revlog,
64 revset,
64 revset,
65 revsetlang,
65 revsetlang,
66 scmutil,
66 scmutil,
67 setdiscovery,
67 setdiscovery,
68 simplemerge,
68 simplemerge,
69 sshpeer,
69 sshpeer,
70 sslutil,
70 sslutil,
71 streamclone,
71 streamclone,
72 templater,
72 templater,
73 treediscovery,
73 treediscovery,
74 upgrade,
74 upgrade,
75 url as urlmod,
75 url as urlmod,
76 util,
76 util,
77 vfs as vfsmod,
77 vfs as vfsmod,
78 wireprotoframing,
78 wireprotoframing,
79 wireprotoserver,
79 wireprotoserver,
80 wireprotov2peer,
80 wireprotov2peer,
81 )
81 )
82 from .utils import (
82 from .utils import (
83 cborutil,
83 cborutil,
84 dateutil,
84 dateutil,
85 procutil,
85 procutil,
86 stringutil,
86 stringutil,
87 )
87 )
88
88
89 from .revlogutils import (
89 from .revlogutils import (
90 deltas as deltautil
90 deltas as deltautil
91 )
91 )
92
92
93 release = lockmod.release
93 release = lockmod.release
94
94
95 command = registrar.command()
95 command = registrar.command()
96
96
97 @command('debugancestor', [], _('[INDEX] REV1 REV2'), optionalrepo=True)
97 @command('debugancestor', [], _('[INDEX] REV1 REV2'), optionalrepo=True)
98 def debugancestor(ui, repo, *args):
98 def debugancestor(ui, repo, *args):
99 """find the ancestor revision of two revisions in a given index"""
99 """find the ancestor revision of two revisions in a given index"""
100 if len(args) == 3:
100 if len(args) == 3:
101 index, rev1, rev2 = args
101 index, rev1, rev2 = args
102 r = revlog.revlog(vfsmod.vfs(encoding.getcwd(), audit=False), index)
102 r = revlog.revlog(vfsmod.vfs(encoding.getcwd(), audit=False), index)
103 lookup = r.lookup
103 lookup = r.lookup
104 elif len(args) == 2:
104 elif len(args) == 2:
105 if not repo:
105 if not repo:
106 raise error.Abort(_('there is no Mercurial repository here '
106 raise error.Abort(_('there is no Mercurial repository here '
107 '(.hg not found)'))
107 '(.hg not found)'))
108 rev1, rev2 = args
108 rev1, rev2 = args
109 r = repo.changelog
109 r = repo.changelog
110 lookup = repo.lookup
110 lookup = repo.lookup
111 else:
111 else:
112 raise error.Abort(_('either two or three arguments required'))
112 raise error.Abort(_('either two or three arguments required'))
113 a = r.ancestor(lookup(rev1), lookup(rev2))
113 a = r.ancestor(lookup(rev1), lookup(rev2))
114 ui.write('%d:%s\n' % (r.rev(a), hex(a)))
114 ui.write('%d:%s\n' % (r.rev(a), hex(a)))
115
115
116 @command('debugapplystreamclonebundle', [], 'FILE')
116 @command('debugapplystreamclonebundle', [], 'FILE')
117 def debugapplystreamclonebundle(ui, repo, fname):
117 def debugapplystreamclonebundle(ui, repo, fname):
118 """apply a stream clone bundle file"""
118 """apply a stream clone bundle file"""
119 f = hg.openpath(ui, fname)
119 f = hg.openpath(ui, fname)
120 gen = exchange.readbundle(ui, f, fname)
120 gen = exchange.readbundle(ui, f, fname)
121 gen.apply(repo)
121 gen.apply(repo)
122
122
123 @command('debugbuilddag',
123 @command('debugbuilddag',
124 [('m', 'mergeable-file', None, _('add single file mergeable changes')),
124 [('m', 'mergeable-file', None, _('add single file mergeable changes')),
125 ('o', 'overwritten-file', None, _('add single file all revs overwrite')),
125 ('o', 'overwritten-file', None, _('add single file all revs overwrite')),
126 ('n', 'new-file', None, _('add new file at each rev'))],
126 ('n', 'new-file', None, _('add new file at each rev'))],
127 _('[OPTION]... [TEXT]'))
127 _('[OPTION]... [TEXT]'))
128 def debugbuilddag(ui, repo, text=None,
128 def debugbuilddag(ui, repo, text=None,
129 mergeable_file=False,
129 mergeable_file=False,
130 overwritten_file=False,
130 overwritten_file=False,
131 new_file=False):
131 new_file=False):
132 """builds a repo with a given DAG from scratch in the current empty repo
132 """builds a repo with a given DAG from scratch in the current empty repo
133
133
134 The description of the DAG is read from stdin if not given on the
134 The description of the DAG is read from stdin if not given on the
135 command line.
135 command line.
136
136
137 Elements:
137 Elements:
138
138
139 - "+n" is a linear run of n nodes based on the current default parent
139 - "+n" is a linear run of n nodes based on the current default parent
140 - "." is a single node based on the current default parent
140 - "." is a single node based on the current default parent
141 - "$" resets the default parent to null (implied at the start);
141 - "$" resets the default parent to null (implied at the start);
142 otherwise the default parent is always the last node created
142 otherwise the default parent is always the last node created
143 - "<p" sets the default parent to the backref p
143 - "<p" sets the default parent to the backref p
144 - "*p" is a fork at parent p, which is a backref
144 - "*p" is a fork at parent p, which is a backref
145 - "*p1/p2" is a merge of parents p1 and p2, which are backrefs
145 - "*p1/p2" is a merge of parents p1 and p2, which are backrefs
146 - "/p2" is a merge of the preceding node and p2
146 - "/p2" is a merge of the preceding node and p2
147 - ":tag" defines a local tag for the preceding node
147 - ":tag" defines a local tag for the preceding node
148 - "@branch" sets the named branch for subsequent nodes
148 - "@branch" sets the named branch for subsequent nodes
149 - "#...\\n" is a comment up to the end of the line
149 - "#...\\n" is a comment up to the end of the line
150
150
151 Whitespace between the above elements is ignored.
151 Whitespace between the above elements is ignored.
152
152
153 A backref is either
153 A backref is either
154
154
155 - a number n, which references the node curr-n, where curr is the current
155 - a number n, which references the node curr-n, where curr is the current
156 node, or
156 node, or
157 - the name of a local tag you placed earlier using ":tag", or
157 - the name of a local tag you placed earlier using ":tag", or
158 - empty to denote the default parent.
158 - empty to denote the default parent.
159
159
160 All string valued-elements are either strictly alphanumeric, or must
160 All string valued-elements are either strictly alphanumeric, or must
161 be enclosed in double quotes ("..."), with "\\" as escape character.
161 be enclosed in double quotes ("..."), with "\\" as escape character.
162 """
162 """
163
163
164 if text is None:
164 if text is None:
165 ui.status(_("reading DAG from stdin\n"))
165 ui.status(_("reading DAG from stdin\n"))
166 text = ui.fin.read()
166 text = ui.fin.read()
167
167
168 cl = repo.changelog
168 cl = repo.changelog
169 if len(cl) > 0:
169 if len(cl) > 0:
170 raise error.Abort(_('repository is not empty'))
170 raise error.Abort(_('repository is not empty'))
171
171
172 # determine number of revs in DAG
172 # determine number of revs in DAG
173 total = 0
173 total = 0
174 for type, data in dagparser.parsedag(text):
174 for type, data in dagparser.parsedag(text):
175 if type == 'n':
175 if type == 'n':
176 total += 1
176 total += 1
177
177
178 if mergeable_file:
178 if mergeable_file:
179 linesperrev = 2
179 linesperrev = 2
180 # make a file with k lines per rev
180 # make a file with k lines per rev
181 initialmergedlines = ['%d' % i
181 initialmergedlines = ['%d' % i
182 for i in pycompat.xrange(0, total * linesperrev)]
182 for i in pycompat.xrange(0, total * linesperrev)]
183 initialmergedlines.append("")
183 initialmergedlines.append("")
184
184
185 tags = []
185 tags = []
186 progress = ui.makeprogress(_('building'), unit=_('revisions'),
186 progress = ui.makeprogress(_('building'), unit=_('revisions'),
187 total=total)
187 total=total)
188 with progress, repo.wlock(), repo.lock(), repo.transaction("builddag"):
188 with progress, repo.wlock(), repo.lock(), repo.transaction("builddag"):
189 at = -1
189 at = -1
190 atbranch = 'default'
190 atbranch = 'default'
191 nodeids = []
191 nodeids = []
192 id = 0
192 id = 0
193 progress.update(id)
193 progress.update(id)
194 for type, data in dagparser.parsedag(text):
194 for type, data in dagparser.parsedag(text):
195 if type == 'n':
195 if type == 'n':
196 ui.note(('node %s\n' % pycompat.bytestr(data)))
196 ui.note(('node %s\n' % pycompat.bytestr(data)))
197 id, ps = data
197 id, ps = data
198
198
199 files = []
199 files = []
200 filecontent = {}
200 filecontent = {}
201
201
202 p2 = None
202 p2 = None
203 if mergeable_file:
203 if mergeable_file:
204 fn = "mf"
204 fn = "mf"
205 p1 = repo[ps[0]]
205 p1 = repo[ps[0]]
206 if len(ps) > 1:
206 if len(ps) > 1:
207 p2 = repo[ps[1]]
207 p2 = repo[ps[1]]
208 pa = p1.ancestor(p2)
208 pa = p1.ancestor(p2)
209 base, local, other = [x[fn].data() for x in (pa, p1,
209 base, local, other = [x[fn].data() for x in (pa, p1,
210 p2)]
210 p2)]
211 m3 = simplemerge.Merge3Text(base, local, other)
211 m3 = simplemerge.Merge3Text(base, local, other)
212 ml = [l.strip() for l in m3.merge_lines()]
212 ml = [l.strip() for l in m3.merge_lines()]
213 ml.append("")
213 ml.append("")
214 elif at > 0:
214 elif at > 0:
215 ml = p1[fn].data().split("\n")
215 ml = p1[fn].data().split("\n")
216 else:
216 else:
217 ml = initialmergedlines
217 ml = initialmergedlines
218 ml[id * linesperrev] += " r%i" % id
218 ml[id * linesperrev] += " r%i" % id
219 mergedtext = "\n".join(ml)
219 mergedtext = "\n".join(ml)
220 files.append(fn)
220 files.append(fn)
221 filecontent[fn] = mergedtext
221 filecontent[fn] = mergedtext
222
222
223 if overwritten_file:
223 if overwritten_file:
224 fn = "of"
224 fn = "of"
225 files.append(fn)
225 files.append(fn)
226 filecontent[fn] = "r%i\n" % id
226 filecontent[fn] = "r%i\n" % id
227
227
228 if new_file:
228 if new_file:
229 fn = "nf%i" % id
229 fn = "nf%i" % id
230 files.append(fn)
230 files.append(fn)
231 filecontent[fn] = "r%i\n" % id
231 filecontent[fn] = "r%i\n" % id
232 if len(ps) > 1:
232 if len(ps) > 1:
233 if not p2:
233 if not p2:
234 p2 = repo[ps[1]]
234 p2 = repo[ps[1]]
235 for fn in p2:
235 for fn in p2:
236 if fn.startswith("nf"):
236 if fn.startswith("nf"):
237 files.append(fn)
237 files.append(fn)
238 filecontent[fn] = p2[fn].data()
238 filecontent[fn] = p2[fn].data()
239
239
240 def fctxfn(repo, cx, path):
240 def fctxfn(repo, cx, path):
241 if path in filecontent:
241 if path in filecontent:
242 return context.memfilectx(repo, cx, path,
242 return context.memfilectx(repo, cx, path,
243 filecontent[path])
243 filecontent[path])
244 return None
244 return None
245
245
246 if len(ps) == 0 or ps[0] < 0:
246 if len(ps) == 0 or ps[0] < 0:
247 pars = [None, None]
247 pars = [None, None]
248 elif len(ps) == 1:
248 elif len(ps) == 1:
249 pars = [nodeids[ps[0]], None]
249 pars = [nodeids[ps[0]], None]
250 else:
250 else:
251 pars = [nodeids[p] for p in ps]
251 pars = [nodeids[p] for p in ps]
252 cx = context.memctx(repo, pars, "r%i" % id, files, fctxfn,
252 cx = context.memctx(repo, pars, "r%i" % id, files, fctxfn,
253 date=(id, 0),
253 date=(id, 0),
254 user="debugbuilddag",
254 user="debugbuilddag",
255 extra={'branch': atbranch})
255 extra={'branch': atbranch})
256 nodeid = repo.commitctx(cx)
256 nodeid = repo.commitctx(cx)
257 nodeids.append(nodeid)
257 nodeids.append(nodeid)
258 at = id
258 at = id
259 elif type == 'l':
259 elif type == 'l':
260 id, name = data
260 id, name = data
261 ui.note(('tag %s\n' % name))
261 ui.note(('tag %s\n' % name))
262 tags.append("%s %s\n" % (hex(repo.changelog.node(id)), name))
262 tags.append("%s %s\n" % (hex(repo.changelog.node(id)), name))
263 elif type == 'a':
263 elif type == 'a':
264 ui.note(('branch %s\n' % data))
264 ui.note(('branch %s\n' % data))
265 atbranch = data
265 atbranch = data
266 progress.update(id)
266 progress.update(id)
267
267
268 if tags:
268 if tags:
269 repo.vfs.write("localtags", "".join(tags))
269 repo.vfs.write("localtags", "".join(tags))
270
270
271 def _debugchangegroup(ui, gen, all=None, indent=0, **opts):
271 def _debugchangegroup(ui, gen, all=None, indent=0, **opts):
272 indent_string = ' ' * indent
272 indent_string = ' ' * indent
273 if all:
273 if all:
274 ui.write(("%sformat: id, p1, p2, cset, delta base, len(delta)\n")
274 ui.write(("%sformat: id, p1, p2, cset, delta base, len(delta)\n")
275 % indent_string)
275 % indent_string)
276
276
277 def showchunks(named):
277 def showchunks(named):
278 ui.write("\n%s%s\n" % (indent_string, named))
278 ui.write("\n%s%s\n" % (indent_string, named))
279 for deltadata in gen.deltaiter():
279 for deltadata in gen.deltaiter():
280 node, p1, p2, cs, deltabase, delta, flags = deltadata
280 node, p1, p2, cs, deltabase, delta, flags = deltadata
281 ui.write("%s%s %s %s %s %s %d\n" %
281 ui.write("%s%s %s %s %s %s %d\n" %
282 (indent_string, hex(node), hex(p1), hex(p2),
282 (indent_string, hex(node), hex(p1), hex(p2),
283 hex(cs), hex(deltabase), len(delta)))
283 hex(cs), hex(deltabase), len(delta)))
284
284
285 chunkdata = gen.changelogheader()
285 chunkdata = gen.changelogheader()
286 showchunks("changelog")
286 showchunks("changelog")
287 chunkdata = gen.manifestheader()
287 chunkdata = gen.manifestheader()
288 showchunks("manifest")
288 showchunks("manifest")
289 for chunkdata in iter(gen.filelogheader, {}):
289 for chunkdata in iter(gen.filelogheader, {}):
290 fname = chunkdata['filename']
290 fname = chunkdata['filename']
291 showchunks(fname)
291 showchunks(fname)
292 else:
292 else:
293 if isinstance(gen, bundle2.unbundle20):
293 if isinstance(gen, bundle2.unbundle20):
294 raise error.Abort(_('use debugbundle2 for this file'))
294 raise error.Abort(_('use debugbundle2 for this file'))
295 chunkdata = gen.changelogheader()
295 chunkdata = gen.changelogheader()
296 for deltadata in gen.deltaiter():
296 for deltadata in gen.deltaiter():
297 node, p1, p2, cs, deltabase, delta, flags = deltadata
297 node, p1, p2, cs, deltabase, delta, flags = deltadata
298 ui.write("%s%s\n" % (indent_string, hex(node)))
298 ui.write("%s%s\n" % (indent_string, hex(node)))
299
299
300 def _debugobsmarkers(ui, part, indent=0, **opts):
300 def _debugobsmarkers(ui, part, indent=0, **opts):
301 """display version and markers contained in 'data'"""
301 """display version and markers contained in 'data'"""
302 opts = pycompat.byteskwargs(opts)
302 opts = pycompat.byteskwargs(opts)
303 data = part.read()
303 data = part.read()
304 indent_string = ' ' * indent
304 indent_string = ' ' * indent
305 try:
305 try:
306 version, markers = obsolete._readmarkers(data)
306 version, markers = obsolete._readmarkers(data)
307 except error.UnknownVersion as exc:
307 except error.UnknownVersion as exc:
308 msg = "%sunsupported version: %s (%d bytes)\n"
308 msg = "%sunsupported version: %s (%d bytes)\n"
309 msg %= indent_string, exc.version, len(data)
309 msg %= indent_string, exc.version, len(data)
310 ui.write(msg)
310 ui.write(msg)
311 else:
311 else:
312 msg = "%sversion: %d (%d bytes)\n"
312 msg = "%sversion: %d (%d bytes)\n"
313 msg %= indent_string, version, len(data)
313 msg %= indent_string, version, len(data)
314 ui.write(msg)
314 ui.write(msg)
315 fm = ui.formatter('debugobsolete', opts)
315 fm = ui.formatter('debugobsolete', opts)
316 for rawmarker in sorted(markers):
316 for rawmarker in sorted(markers):
317 m = obsutil.marker(None, rawmarker)
317 m = obsutil.marker(None, rawmarker)
318 fm.startitem()
318 fm.startitem()
319 fm.plain(indent_string)
319 fm.plain(indent_string)
320 cmdutil.showmarker(fm, m)
320 cmdutil.showmarker(fm, m)
321 fm.end()
321 fm.end()
322
322
323 def _debugphaseheads(ui, data, indent=0):
323 def _debugphaseheads(ui, data, indent=0):
324 """display version and markers contained in 'data'"""
324 """display version and markers contained in 'data'"""
325 indent_string = ' ' * indent
325 indent_string = ' ' * indent
326 headsbyphase = phases.binarydecode(data)
326 headsbyphase = phases.binarydecode(data)
327 for phase in phases.allphases:
327 for phase in phases.allphases:
328 for head in headsbyphase[phase]:
328 for head in headsbyphase[phase]:
329 ui.write(indent_string)
329 ui.write(indent_string)
330 ui.write('%s %s\n' % (hex(head), phases.phasenames[phase]))
330 ui.write('%s %s\n' % (hex(head), phases.phasenames[phase]))
331
331
332 def _quasirepr(thing):
332 def _quasirepr(thing):
333 if isinstance(thing, (dict, util.sortdict, collections.OrderedDict)):
333 if isinstance(thing, (dict, util.sortdict, collections.OrderedDict)):
334 return '{%s}' % (
334 return '{%s}' % (
335 b', '.join(b'%s: %s' % (k, thing[k]) for k in sorted(thing)))
335 b', '.join(b'%s: %s' % (k, thing[k]) for k in sorted(thing)))
336 return pycompat.bytestr(repr(thing))
336 return pycompat.bytestr(repr(thing))
337
337
338 def _debugbundle2(ui, gen, all=None, **opts):
338 def _debugbundle2(ui, gen, all=None, **opts):
339 """lists the contents of a bundle2"""
339 """lists the contents of a bundle2"""
340 if not isinstance(gen, bundle2.unbundle20):
340 if not isinstance(gen, bundle2.unbundle20):
341 raise error.Abort(_('not a bundle2 file'))
341 raise error.Abort(_('not a bundle2 file'))
342 ui.write(('Stream params: %s\n' % _quasirepr(gen.params)))
342 ui.write(('Stream params: %s\n' % _quasirepr(gen.params)))
343 parttypes = opts.get(r'part_type', [])
343 parttypes = opts.get(r'part_type', [])
344 for part in gen.iterparts():
344 for part in gen.iterparts():
345 if parttypes and part.type not in parttypes:
345 if parttypes and part.type not in parttypes:
346 continue
346 continue
347 msg = '%s -- %s (mandatory: %r)\n'
347 msg = '%s -- %s (mandatory: %r)\n'
348 ui.write((msg % (part.type, _quasirepr(part.params), part.mandatory)))
348 ui.write((msg % (part.type, _quasirepr(part.params), part.mandatory)))
349 if part.type == 'changegroup':
349 if part.type == 'changegroup':
350 version = part.params.get('version', '01')
350 version = part.params.get('version', '01')
351 cg = changegroup.getunbundler(version, part, 'UN')
351 cg = changegroup.getunbundler(version, part, 'UN')
352 if not ui.quiet:
352 if not ui.quiet:
353 _debugchangegroup(ui, cg, all=all, indent=4, **opts)
353 _debugchangegroup(ui, cg, all=all, indent=4, **opts)
354 if part.type == 'obsmarkers':
354 if part.type == 'obsmarkers':
355 if not ui.quiet:
355 if not ui.quiet:
356 _debugobsmarkers(ui, part, indent=4, **opts)
356 _debugobsmarkers(ui, part, indent=4, **opts)
357 if part.type == 'phase-heads':
357 if part.type == 'phase-heads':
358 if not ui.quiet:
358 if not ui.quiet:
359 _debugphaseheads(ui, part, indent=4)
359 _debugphaseheads(ui, part, indent=4)
360
360
361 @command('debugbundle',
361 @command('debugbundle',
362 [('a', 'all', None, _('show all details')),
362 [('a', 'all', None, _('show all details')),
363 ('', 'part-type', [], _('show only the named part type')),
363 ('', 'part-type', [], _('show only the named part type')),
364 ('', 'spec', None, _('print the bundlespec of the bundle'))],
364 ('', 'spec', None, _('print the bundlespec of the bundle'))],
365 _('FILE'),
365 _('FILE'),
366 norepo=True)
366 norepo=True)
367 def debugbundle(ui, bundlepath, all=None, spec=None, **opts):
367 def debugbundle(ui, bundlepath, all=None, spec=None, **opts):
368 """lists the contents of a bundle"""
368 """lists the contents of a bundle"""
369 with hg.openpath(ui, bundlepath) as f:
369 with hg.openpath(ui, bundlepath) as f:
370 if spec:
370 if spec:
371 spec = exchange.getbundlespec(ui, f)
371 spec = exchange.getbundlespec(ui, f)
372 ui.write('%s\n' % spec)
372 ui.write('%s\n' % spec)
373 return
373 return
374
374
375 gen = exchange.readbundle(ui, f, bundlepath)
375 gen = exchange.readbundle(ui, f, bundlepath)
376 if isinstance(gen, bundle2.unbundle20):
376 if isinstance(gen, bundle2.unbundle20):
377 return _debugbundle2(ui, gen, all=all, **opts)
377 return _debugbundle2(ui, gen, all=all, **opts)
378 _debugchangegroup(ui, gen, all=all, **opts)
378 _debugchangegroup(ui, gen, all=all, **opts)
379
379
380 @command('debugcapabilities',
380 @command('debugcapabilities',
381 [], _('PATH'),
381 [], _('PATH'),
382 norepo=True)
382 norepo=True)
383 def debugcapabilities(ui, path, **opts):
383 def debugcapabilities(ui, path, **opts):
384 """lists the capabilities of a remote peer"""
384 """lists the capabilities of a remote peer"""
385 opts = pycompat.byteskwargs(opts)
385 opts = pycompat.byteskwargs(opts)
386 peer = hg.peer(ui, opts, path)
386 peer = hg.peer(ui, opts, path)
387 caps = peer.capabilities()
387 caps = peer.capabilities()
388 ui.write(('Main capabilities:\n'))
388 ui.write(('Main capabilities:\n'))
389 for c in sorted(caps):
389 for c in sorted(caps):
390 ui.write((' %s\n') % c)
390 ui.write((' %s\n') % c)
391 b2caps = bundle2.bundle2caps(peer)
391 b2caps = bundle2.bundle2caps(peer)
392 if b2caps:
392 if b2caps:
393 ui.write(('Bundle2 capabilities:\n'))
393 ui.write(('Bundle2 capabilities:\n'))
394 for key, values in sorted(b2caps.iteritems()):
394 for key, values in sorted(b2caps.iteritems()):
395 ui.write((' %s\n') % key)
395 ui.write((' %s\n') % key)
396 for v in values:
396 for v in values:
397 ui.write((' %s\n') % v)
397 ui.write((' %s\n') % v)
398
398
399 @command('debugcheckstate', [], '')
399 @command('debugcheckstate', [], '')
400 def debugcheckstate(ui, repo):
400 def debugcheckstate(ui, repo):
401 """validate the correctness of the current dirstate"""
401 """validate the correctness of the current dirstate"""
402 parent1, parent2 = repo.dirstate.parents()
402 parent1, parent2 = repo.dirstate.parents()
403 m1 = repo[parent1].manifest()
403 m1 = repo[parent1].manifest()
404 m2 = repo[parent2].manifest()
404 m2 = repo[parent2].manifest()
405 errors = 0
405 errors = 0
406 for f in repo.dirstate:
406 for f in repo.dirstate:
407 state = repo.dirstate[f]
407 state = repo.dirstate[f]
408 if state in "nr" and f not in m1:
408 if state in "nr" and f not in m1:
409 ui.warn(_("%s in state %s, but not in manifest1\n") % (f, state))
409 ui.warn(_("%s in state %s, but not in manifest1\n") % (f, state))
410 errors += 1
410 errors += 1
411 if state in "a" and f in m1:
411 if state in "a" and f in m1:
412 ui.warn(_("%s in state %s, but also in manifest1\n") % (f, state))
412 ui.warn(_("%s in state %s, but also in manifest1\n") % (f, state))
413 errors += 1
413 errors += 1
414 if state in "m" and f not in m1 and f not in m2:
414 if state in "m" and f not in m1 and f not in m2:
415 ui.warn(_("%s in state %s, but not in either manifest\n") %
415 ui.warn(_("%s in state %s, but not in either manifest\n") %
416 (f, state))
416 (f, state))
417 errors += 1
417 errors += 1
418 for f in m1:
418 for f in m1:
419 state = repo.dirstate[f]
419 state = repo.dirstate[f]
420 if state not in "nrm":
420 if state not in "nrm":
421 ui.warn(_("%s in manifest1, but listed as state %s") % (f, state))
421 ui.warn(_("%s in manifest1, but listed as state %s") % (f, state))
422 errors += 1
422 errors += 1
423 if errors:
423 if errors:
424 error = _(".hg/dirstate inconsistent with current parent's manifest")
424 error = _(".hg/dirstate inconsistent with current parent's manifest")
425 raise error.Abort(error)
425 raise error.Abort(error)
426
426
427 @command('debugcolor',
427 @command('debugcolor',
428 [('', 'style', None, _('show all configured styles'))],
428 [('', 'style', None, _('show all configured styles'))],
429 'hg debugcolor')
429 'hg debugcolor')
430 def debugcolor(ui, repo, **opts):
430 def debugcolor(ui, repo, **opts):
431 """show available color, effects or style"""
431 """show available color, effects or style"""
432 ui.write(('color mode: %s\n') % stringutil.pprint(ui._colormode))
432 ui.write(('color mode: %s\n') % stringutil.pprint(ui._colormode))
433 if opts.get(r'style'):
433 if opts.get(r'style'):
434 return _debugdisplaystyle(ui)
434 return _debugdisplaystyle(ui)
435 else:
435 else:
436 return _debugdisplaycolor(ui)
436 return _debugdisplaycolor(ui)
437
437
438 def _debugdisplaycolor(ui):
438 def _debugdisplaycolor(ui):
439 ui = ui.copy()
439 ui = ui.copy()
440 ui._styles.clear()
440 ui._styles.clear()
441 for effect in color._activeeffects(ui).keys():
441 for effect in color._activeeffects(ui).keys():
442 ui._styles[effect] = effect
442 ui._styles[effect] = effect
443 if ui._terminfoparams:
443 if ui._terminfoparams:
444 for k, v in ui.configitems('color'):
444 for k, v in ui.configitems('color'):
445 if k.startswith('color.'):
445 if k.startswith('color.'):
446 ui._styles[k] = k[6:]
446 ui._styles[k] = k[6:]
447 elif k.startswith('terminfo.'):
447 elif k.startswith('terminfo.'):
448 ui._styles[k] = k[9:]
448 ui._styles[k] = k[9:]
449 ui.write(_('available colors:\n'))
449 ui.write(_('available colors:\n'))
450 # sort label with a '_' after the other to group '_background' entry.
450 # sort label with a '_' after the other to group '_background' entry.
451 items = sorted(ui._styles.items(),
451 items = sorted(ui._styles.items(),
452 key=lambda i: ('_' in i[0], i[0], i[1]))
452 key=lambda i: ('_' in i[0], i[0], i[1]))
453 for colorname, label in items:
453 for colorname, label in items:
454 ui.write(('%s\n') % colorname, label=label)
454 ui.write(('%s\n') % colorname, label=label)
455
455
456 def _debugdisplaystyle(ui):
456 def _debugdisplaystyle(ui):
457 ui.write(_('available style:\n'))
457 ui.write(_('available style:\n'))
458 if not ui._styles:
458 if not ui._styles:
459 return
459 return
460 width = max(len(s) for s in ui._styles)
460 width = max(len(s) for s in ui._styles)
461 for label, effects in sorted(ui._styles.items()):
461 for label, effects in sorted(ui._styles.items()):
462 ui.write('%s' % label, label=label)
462 ui.write('%s' % label, label=label)
463 if effects:
463 if effects:
464 # 50
464 # 50
465 ui.write(': ')
465 ui.write(': ')
466 ui.write(' ' * (max(0, width - len(label))))
466 ui.write(' ' * (max(0, width - len(label))))
467 ui.write(', '.join(ui.label(e, e) for e in effects.split()))
467 ui.write(', '.join(ui.label(e, e) for e in effects.split()))
468 ui.write('\n')
468 ui.write('\n')
469
469
470 @command('debugcreatestreamclonebundle', [], 'FILE')
470 @command('debugcreatestreamclonebundle', [], 'FILE')
471 def debugcreatestreamclonebundle(ui, repo, fname):
471 def debugcreatestreamclonebundle(ui, repo, fname):
472 """create a stream clone bundle file
472 """create a stream clone bundle file
473
473
474 Stream bundles are special bundles that are essentially archives of
474 Stream bundles are special bundles that are essentially archives of
475 revlog files. They are commonly used for cloning very quickly.
475 revlog files. They are commonly used for cloning very quickly.
476 """
476 """
477 # TODO we may want to turn this into an abort when this functionality
477 # TODO we may want to turn this into an abort when this functionality
478 # is moved into `hg bundle`.
478 # is moved into `hg bundle`.
479 if phases.hassecret(repo):
479 if phases.hassecret(repo):
480 ui.warn(_('(warning: stream clone bundle will contain secret '
480 ui.warn(_('(warning: stream clone bundle will contain secret '
481 'revisions)\n'))
481 'revisions)\n'))
482
482
483 requirements, gen = streamclone.generatebundlev1(repo)
483 requirements, gen = streamclone.generatebundlev1(repo)
484 changegroup.writechunks(ui, gen, fname)
484 changegroup.writechunks(ui, gen, fname)
485
485
486 ui.write(_('bundle requirements: %s\n') % ', '.join(sorted(requirements)))
486 ui.write(_('bundle requirements: %s\n') % ', '.join(sorted(requirements)))
487
487
488 @command('debugdag',
488 @command('debugdag',
489 [('t', 'tags', None, _('use tags as labels')),
489 [('t', 'tags', None, _('use tags as labels')),
490 ('b', 'branches', None, _('annotate with branch names')),
490 ('b', 'branches', None, _('annotate with branch names')),
491 ('', 'dots', None, _('use dots for runs')),
491 ('', 'dots', None, _('use dots for runs')),
492 ('s', 'spaces', None, _('separate elements by spaces'))],
492 ('s', 'spaces', None, _('separate elements by spaces'))],
493 _('[OPTION]... [FILE [REV]...]'),
493 _('[OPTION]... [FILE [REV]...]'),
494 optionalrepo=True)
494 optionalrepo=True)
495 def debugdag(ui, repo, file_=None, *revs, **opts):
495 def debugdag(ui, repo, file_=None, *revs, **opts):
496 """format the changelog or an index DAG as a concise textual description
496 """format the changelog or an index DAG as a concise textual description
497
497
498 If you pass a revlog index, the revlog's DAG is emitted. If you list
498 If you pass a revlog index, the revlog's DAG is emitted. If you list
499 revision numbers, they get labeled in the output as rN.
499 revision numbers, they get labeled in the output as rN.
500
500
501 Otherwise, the changelog DAG of the current repo is emitted.
501 Otherwise, the changelog DAG of the current repo is emitted.
502 """
502 """
503 spaces = opts.get(r'spaces')
503 spaces = opts.get(r'spaces')
504 dots = opts.get(r'dots')
504 dots = opts.get(r'dots')
505 if file_:
505 if file_:
506 rlog = revlog.revlog(vfsmod.vfs(encoding.getcwd(), audit=False),
506 rlog = revlog.revlog(vfsmod.vfs(encoding.getcwd(), audit=False),
507 file_)
507 file_)
508 revs = set((int(r) for r in revs))
508 revs = set((int(r) for r in revs))
509 def events():
509 def events():
510 for r in rlog:
510 for r in rlog:
511 yield 'n', (r, list(p for p in rlog.parentrevs(r)
511 yield 'n', (r, list(p for p in rlog.parentrevs(r)
512 if p != -1))
512 if p != -1))
513 if r in revs:
513 if r in revs:
514 yield 'l', (r, "r%i" % r)
514 yield 'l', (r, "r%i" % r)
515 elif repo:
515 elif repo:
516 cl = repo.changelog
516 cl = repo.changelog
517 tags = opts.get(r'tags')
517 tags = opts.get(r'tags')
518 branches = opts.get(r'branches')
518 branches = opts.get(r'branches')
519 if tags:
519 if tags:
520 labels = {}
520 labels = {}
521 for l, n in repo.tags().items():
521 for l, n in repo.tags().items():
522 labels.setdefault(cl.rev(n), []).append(l)
522 labels.setdefault(cl.rev(n), []).append(l)
523 def events():
523 def events():
524 b = "default"
524 b = "default"
525 for r in cl:
525 for r in cl:
526 if branches:
526 if branches:
527 newb = cl.read(cl.node(r))[5]['branch']
527 newb = cl.read(cl.node(r))[5]['branch']
528 if newb != b:
528 if newb != b:
529 yield 'a', newb
529 yield 'a', newb
530 b = newb
530 b = newb
531 yield 'n', (r, list(p for p in cl.parentrevs(r)
531 yield 'n', (r, list(p for p in cl.parentrevs(r)
532 if p != -1))
532 if p != -1))
533 if tags:
533 if tags:
534 ls = labels.get(r)
534 ls = labels.get(r)
535 if ls:
535 if ls:
536 for l in ls:
536 for l in ls:
537 yield 'l', (r, l)
537 yield 'l', (r, l)
538 else:
538 else:
539 raise error.Abort(_('need repo for changelog dag'))
539 raise error.Abort(_('need repo for changelog dag'))
540
540
541 for line in dagparser.dagtextlines(events(),
541 for line in dagparser.dagtextlines(events(),
542 addspaces=spaces,
542 addspaces=spaces,
543 wraplabels=True,
543 wraplabels=True,
544 wrapannotations=True,
544 wrapannotations=True,
545 wrapnonlinear=dots,
545 wrapnonlinear=dots,
546 usedots=dots,
546 usedots=dots,
547 maxlinewidth=70):
547 maxlinewidth=70):
548 ui.write(line)
548 ui.write(line)
549 ui.write("\n")
549 ui.write("\n")
550
550
551 @command('debugdata', cmdutil.debugrevlogopts, _('-c|-m|FILE REV'))
551 @command('debugdata', cmdutil.debugrevlogopts, _('-c|-m|FILE REV'))
552 def debugdata(ui, repo, file_, rev=None, **opts):
552 def debugdata(ui, repo, file_, rev=None, **opts):
553 """dump the contents of a data file revision"""
553 """dump the contents of a data file revision"""
554 opts = pycompat.byteskwargs(opts)
554 opts = pycompat.byteskwargs(opts)
555 if opts.get('changelog') or opts.get('manifest') or opts.get('dir'):
555 if opts.get('changelog') or opts.get('manifest') or opts.get('dir'):
556 if rev is not None:
556 if rev is not None:
557 raise error.CommandError('debugdata', _('invalid arguments'))
557 raise error.CommandError('debugdata', _('invalid arguments'))
558 file_, rev = None, file_
558 file_, rev = None, file_
559 elif rev is None:
559 elif rev is None:
560 raise error.CommandError('debugdata', _('invalid arguments'))
560 raise error.CommandError('debugdata', _('invalid arguments'))
561 r = cmdutil.openstorage(repo, 'debugdata', file_, opts)
561 r = cmdutil.openstorage(repo, 'debugdata', file_, opts)
562 try:
562 try:
563 ui.write(r.revision(r.lookup(rev), raw=True))
563 ui.write(r.revision(r.lookup(rev), raw=True))
564 except KeyError:
564 except KeyError:
565 raise error.Abort(_('invalid revision identifier %s') % rev)
565 raise error.Abort(_('invalid revision identifier %s') % rev)
566
566
567 @command('debugdate',
567 @command('debugdate',
568 [('e', 'extended', None, _('try extended date formats'))],
568 [('e', 'extended', None, _('try extended date formats'))],
569 _('[-e] DATE [RANGE]'),
569 _('[-e] DATE [RANGE]'),
570 norepo=True, optionalrepo=True)
570 norepo=True, optionalrepo=True)
571 def debugdate(ui, date, range=None, **opts):
571 def debugdate(ui, date, range=None, **opts):
572 """parse and display a date"""
572 """parse and display a date"""
573 if opts[r"extended"]:
573 if opts[r"extended"]:
574 d = dateutil.parsedate(date, util.extendeddateformats)
574 d = dateutil.parsedate(date, util.extendeddateformats)
575 else:
575 else:
576 d = dateutil.parsedate(date)
576 d = dateutil.parsedate(date)
577 ui.write(("internal: %d %d\n") % d)
577 ui.write(("internal: %d %d\n") % d)
578 ui.write(("standard: %s\n") % dateutil.datestr(d))
578 ui.write(("standard: %s\n") % dateutil.datestr(d))
579 if range:
579 if range:
580 m = dateutil.matchdate(range)
580 m = dateutil.matchdate(range)
581 ui.write(("match: %s\n") % m(d[0]))
581 ui.write(("match: %s\n") % m(d[0]))
582
582
583 @command('debugdeltachain',
583 @command('debugdeltachain',
584 cmdutil.debugrevlogopts + cmdutil.formatteropts,
584 cmdutil.debugrevlogopts + cmdutil.formatteropts,
585 _('-c|-m|FILE'),
585 _('-c|-m|FILE'),
586 optionalrepo=True)
586 optionalrepo=True)
587 def debugdeltachain(ui, repo, file_=None, **opts):
587 def debugdeltachain(ui, repo, file_=None, **opts):
588 """dump information about delta chains in a revlog
588 """dump information about delta chains in a revlog
589
589
590 Output can be templatized. Available template keywords are:
590 Output can be templatized. Available template keywords are:
591
591
592 :``rev``: revision number
592 :``rev``: revision number
593 :``chainid``: delta chain identifier (numbered by unique base)
593 :``chainid``: delta chain identifier (numbered by unique base)
594 :``chainlen``: delta chain length to this revision
594 :``chainlen``: delta chain length to this revision
595 :``prevrev``: previous revision in delta chain
595 :``prevrev``: previous revision in delta chain
596 :``deltatype``: role of delta / how it was computed
596 :``deltatype``: role of delta / how it was computed
597 :``compsize``: compressed size of revision
597 :``compsize``: compressed size of revision
598 :``uncompsize``: uncompressed size of revision
598 :``uncompsize``: uncompressed size of revision
599 :``chainsize``: total size of compressed revisions in chain
599 :``chainsize``: total size of compressed revisions in chain
600 :``chainratio``: total chain size divided by uncompressed revision size
600 :``chainratio``: total chain size divided by uncompressed revision size
601 (new delta chains typically start at ratio 2.00)
601 (new delta chains typically start at ratio 2.00)
602 :``lindist``: linear distance from base revision in delta chain to end
602 :``lindist``: linear distance from base revision in delta chain to end
603 of this revision
603 of this revision
604 :``extradist``: total size of revisions not part of this delta chain from
604 :``extradist``: total size of revisions not part of this delta chain from
605 base of delta chain to end of this revision; a measurement
605 base of delta chain to end of this revision; a measurement
606 of how much extra data we need to read/seek across to read
606 of how much extra data we need to read/seek across to read
607 the delta chain for this revision
607 the delta chain for this revision
608 :``extraratio``: extradist divided by chainsize; another representation of
608 :``extraratio``: extradist divided by chainsize; another representation of
609 how much unrelated data is needed to load this delta chain
609 how much unrelated data is needed to load this delta chain
610
610
611 If the repository is configured to use the sparse read, additional keywords
611 If the repository is configured to use the sparse read, additional keywords
612 are available:
612 are available:
613
613
614 :``readsize``: total size of data read from the disk for a revision
614 :``readsize``: total size of data read from the disk for a revision
615 (sum of the sizes of all the blocks)
615 (sum of the sizes of all the blocks)
616 :``largestblock``: size of the largest block of data read from the disk
616 :``largestblock``: size of the largest block of data read from the disk
617 :``readdensity``: density of useful bytes in the data read from the disk
617 :``readdensity``: density of useful bytes in the data read from the disk
618 :``srchunks``: in how many data hunks the whole revision would be read
618 :``srchunks``: in how many data hunks the whole revision would be read
619
619
620 The sparse read can be enabled with experimental.sparse-read = True
620 The sparse read can be enabled with experimental.sparse-read = True
621 """
621 """
622 opts = pycompat.byteskwargs(opts)
622 opts = pycompat.byteskwargs(opts)
623 r = cmdutil.openrevlog(repo, 'debugdeltachain', file_, opts)
623 r = cmdutil.openrevlog(repo, 'debugdeltachain', file_, opts)
624 index = r.index
624 index = r.index
625 start = r.start
625 start = r.start
626 length = r.length
626 length = r.length
627 generaldelta = r.version & revlog.FLAG_GENERALDELTA
627 generaldelta = r.version & revlog.FLAG_GENERALDELTA
628 withsparseread = getattr(r, '_withsparseread', False)
628 withsparseread = getattr(r, '_withsparseread', False)
629
629
630 def revinfo(rev):
630 def revinfo(rev):
631 e = index[rev]
631 e = index[rev]
632 compsize = e[1]
632 compsize = e[1]
633 uncompsize = e[2]
633 uncompsize = e[2]
634 chainsize = 0
634 chainsize = 0
635
635
636 if generaldelta:
636 if generaldelta:
637 if e[3] == e[5]:
637 if e[3] == e[5]:
638 deltatype = 'p1'
638 deltatype = 'p1'
639 elif e[3] == e[6]:
639 elif e[3] == e[6]:
640 deltatype = 'p2'
640 deltatype = 'p2'
641 elif e[3] == rev - 1:
641 elif e[3] == rev - 1:
642 deltatype = 'prev'
642 deltatype = 'prev'
643 elif e[3] == rev:
643 elif e[3] == rev:
644 deltatype = 'base'
644 deltatype = 'base'
645 else:
645 else:
646 deltatype = 'other'
646 deltatype = 'other'
647 else:
647 else:
648 if e[3] == rev:
648 if e[3] == rev:
649 deltatype = 'base'
649 deltatype = 'base'
650 else:
650 else:
651 deltatype = 'prev'
651 deltatype = 'prev'
652
652
653 chain = r._deltachain(rev)[0]
653 chain = r._deltachain(rev)[0]
654 for iterrev in chain:
654 for iterrev in chain:
655 e = index[iterrev]
655 e = index[iterrev]
656 chainsize += e[1]
656 chainsize += e[1]
657
657
658 return compsize, uncompsize, deltatype, chain, chainsize
658 return compsize, uncompsize, deltatype, chain, chainsize
659
659
660 fm = ui.formatter('debugdeltachain', opts)
660 fm = ui.formatter('debugdeltachain', opts)
661
661
662 fm.plain(' rev chain# chainlen prev delta '
662 fm.plain(' rev chain# chainlen prev delta '
663 'size rawsize chainsize ratio lindist extradist '
663 'size rawsize chainsize ratio lindist extradist '
664 'extraratio')
664 'extraratio')
665 if withsparseread:
665 if withsparseread:
666 fm.plain(' readsize largestblk rddensity srchunks')
666 fm.plain(' readsize largestblk rddensity srchunks')
667 fm.plain('\n')
667 fm.plain('\n')
668
668
669 chainbases = {}
669 chainbases = {}
670 for rev in r:
670 for rev in r:
671 comp, uncomp, deltatype, chain, chainsize = revinfo(rev)
671 comp, uncomp, deltatype, chain, chainsize = revinfo(rev)
672 chainbase = chain[0]
672 chainbase = chain[0]
673 chainid = chainbases.setdefault(chainbase, len(chainbases) + 1)
673 chainid = chainbases.setdefault(chainbase, len(chainbases) + 1)
674 basestart = start(chainbase)
674 basestart = start(chainbase)
675 revstart = start(rev)
675 revstart = start(rev)
676 lineardist = revstart + comp - basestart
676 lineardist = revstart + comp - basestart
677 extradist = lineardist - chainsize
677 extradist = lineardist - chainsize
678 try:
678 try:
679 prevrev = chain[-2]
679 prevrev = chain[-2]
680 except IndexError:
680 except IndexError:
681 prevrev = -1
681 prevrev = -1
682
682
683 if uncomp != 0:
683 if uncomp != 0:
684 chainratio = float(chainsize) / float(uncomp)
684 chainratio = float(chainsize) / float(uncomp)
685 else:
685 else:
686 chainratio = chainsize
686 chainratio = chainsize
687
687
688 if chainsize != 0:
688 if chainsize != 0:
689 extraratio = float(extradist) / float(chainsize)
689 extraratio = float(extradist) / float(chainsize)
690 else:
690 else:
691 extraratio = extradist
691 extraratio = extradist
692
692
693 fm.startitem()
693 fm.startitem()
694 fm.write('rev chainid chainlen prevrev deltatype compsize '
694 fm.write('rev chainid chainlen prevrev deltatype compsize '
695 'uncompsize chainsize chainratio lindist extradist '
695 'uncompsize chainsize chainratio lindist extradist '
696 'extraratio',
696 'extraratio',
697 '%7d %7d %8d %8d %7s %10d %10d %10d %9.5f %9d %9d %10.5f',
697 '%7d %7d %8d %8d %7s %10d %10d %10d %9.5f %9d %9d %10.5f',
698 rev, chainid, len(chain), prevrev, deltatype, comp,
698 rev, chainid, len(chain), prevrev, deltatype, comp,
699 uncomp, chainsize, chainratio, lineardist, extradist,
699 uncomp, chainsize, chainratio, lineardist, extradist,
700 extraratio,
700 extraratio,
701 rev=rev, chainid=chainid, chainlen=len(chain),
701 rev=rev, chainid=chainid, chainlen=len(chain),
702 prevrev=prevrev, deltatype=deltatype, compsize=comp,
702 prevrev=prevrev, deltatype=deltatype, compsize=comp,
703 uncompsize=uncomp, chainsize=chainsize,
703 uncompsize=uncomp, chainsize=chainsize,
704 chainratio=chainratio, lindist=lineardist,
704 chainratio=chainratio, lindist=lineardist,
705 extradist=extradist, extraratio=extraratio)
705 extradist=extradist, extraratio=extraratio)
706 if withsparseread:
706 if withsparseread:
707 readsize = 0
707 readsize = 0
708 largestblock = 0
708 largestblock = 0
709 srchunks = 0
709 srchunks = 0
710
710
711 for revschunk in deltautil.slicechunk(r, chain):
711 for revschunk in deltautil.slicechunk(r, chain):
712 srchunks += 1
712 srchunks += 1
713 blkend = start(revschunk[-1]) + length(revschunk[-1])
713 blkend = start(revschunk[-1]) + length(revschunk[-1])
714 blksize = blkend - start(revschunk[0])
714 blksize = blkend - start(revschunk[0])
715
715
716 readsize += blksize
716 readsize += blksize
717 if largestblock < blksize:
717 if largestblock < blksize:
718 largestblock = blksize
718 largestblock = blksize
719
719
720 if readsize:
720 if readsize:
721 readdensity = float(chainsize) / float(readsize)
721 readdensity = float(chainsize) / float(readsize)
722 else:
722 else:
723 readdensity = 1
723 readdensity = 1
724
724
725 fm.write('readsize largestblock readdensity srchunks',
725 fm.write('readsize largestblock readdensity srchunks',
726 ' %10d %10d %9.5f %8d',
726 ' %10d %10d %9.5f %8d',
727 readsize, largestblock, readdensity, srchunks,
727 readsize, largestblock, readdensity, srchunks,
728 readsize=readsize, largestblock=largestblock,
728 readsize=readsize, largestblock=largestblock,
729 readdensity=readdensity, srchunks=srchunks)
729 readdensity=readdensity, srchunks=srchunks)
730
730
731 fm.plain('\n')
731 fm.plain('\n')
732
732
733 fm.end()
733 fm.end()
734
734
735 @command('debugdirstate|debugstate',
735 @command('debugdirstate|debugstate',
736 [('', 'nodates', None, _('do not display the saved mtime (DEPRECATED)')),
736 [('', 'nodates', None, _('do not display the saved mtime (DEPRECATED)')),
737 ('', 'dates', True, _('display the saved mtime')),
737 ('', 'dates', True, _('display the saved mtime')),
738 ('', 'datesort', None, _('sort by saved mtime'))],
738 ('', 'datesort', None, _('sort by saved mtime'))],
739 _('[OPTION]...'))
739 _('[OPTION]...'))
740 def debugstate(ui, repo, **opts):
740 def debugstate(ui, repo, **opts):
741 """show the contents of the current dirstate"""
741 """show the contents of the current dirstate"""
742
742
743 nodates = not opts[r'dates']
743 nodates = not opts[r'dates']
744 if opts.get(r'nodates') is not None:
744 if opts.get(r'nodates') is not None:
745 nodates = True
745 nodates = True
746 datesort = opts.get(r'datesort')
746 datesort = opts.get(r'datesort')
747
747
748 timestr = ""
748 timestr = ""
749 if datesort:
749 if datesort:
750 keyfunc = lambda x: (x[1][3], x[0]) # sort by mtime, then by filename
750 keyfunc = lambda x: (x[1][3], x[0]) # sort by mtime, then by filename
751 else:
751 else:
752 keyfunc = None # sort by filename
752 keyfunc = None # sort by filename
753 for file_, ent in sorted(repo.dirstate._map.iteritems(), key=keyfunc):
753 for file_, ent in sorted(repo.dirstate._map.iteritems(), key=keyfunc):
754 if ent[3] == -1:
754 if ent[3] == -1:
755 timestr = 'unset '
755 timestr = 'unset '
756 elif nodates:
756 elif nodates:
757 timestr = 'set '
757 timestr = 'set '
758 else:
758 else:
759 timestr = time.strftime(r"%Y-%m-%d %H:%M:%S ",
759 timestr = time.strftime(r"%Y-%m-%d %H:%M:%S ",
760 time.localtime(ent[3]))
760 time.localtime(ent[3]))
761 timestr = encoding.strtolocal(timestr)
761 timestr = encoding.strtolocal(timestr)
762 if ent[1] & 0o20000:
762 if ent[1] & 0o20000:
763 mode = 'lnk'
763 mode = 'lnk'
764 else:
764 else:
765 mode = '%3o' % (ent[1] & 0o777 & ~util.umask)
765 mode = '%3o' % (ent[1] & 0o777 & ~util.umask)
766 ui.write("%c %s %10d %s%s\n" % (ent[0], mode, ent[2], timestr, file_))
766 ui.write("%c %s %10d %s%s\n" % (ent[0], mode, ent[2], timestr, file_))
767 for f in repo.dirstate.copies():
767 for f in repo.dirstate.copies():
768 ui.write(_("copy: %s -> %s\n") % (repo.dirstate.copied(f), f))
768 ui.write(_("copy: %s -> %s\n") % (repo.dirstate.copied(f), f))
769
769
770 @command('debugdiscovery',
770 @command('debugdiscovery',
771 [('', 'old', None, _('use old-style discovery')),
771 [('', 'old', None, _('use old-style discovery')),
772 ('', 'nonheads', None,
772 ('', 'nonheads', None,
773 _('use old-style discovery with non-heads included')),
773 _('use old-style discovery with non-heads included')),
774 ('', 'rev', [], 'restrict discovery to this set of revs'),
774 ('', 'rev', [], 'restrict discovery to this set of revs'),
775 ] + cmdutil.remoteopts,
775 ] + cmdutil.remoteopts,
776 _('[--rev REV] [OTHER]'))
776 _('[--rev REV] [OTHER]'))
777 def debugdiscovery(ui, repo, remoteurl="default", **opts):
777 def debugdiscovery(ui, repo, remoteurl="default", **opts):
778 """runs the changeset discovery protocol in isolation"""
778 """runs the changeset discovery protocol in isolation"""
779 opts = pycompat.byteskwargs(opts)
779 opts = pycompat.byteskwargs(opts)
780 remoteurl, branches = hg.parseurl(ui.expandpath(remoteurl))
780 remoteurl, branches = hg.parseurl(ui.expandpath(remoteurl))
781 remote = hg.peer(repo, opts, remoteurl)
781 remote = hg.peer(repo, opts, remoteurl)
782 ui.status(_('comparing with %s\n') % util.hidepassword(remoteurl))
782 ui.status(_('comparing with %s\n') % util.hidepassword(remoteurl))
783
783
784 # make sure tests are repeatable
784 # make sure tests are repeatable
785 random.seed(12323)
785 random.seed(12323)
786
786
787 def doit(pushedrevs, remoteheads, remote=remote):
787 def doit(pushedrevs, remoteheads, remote=remote):
788 if opts.get('old'):
788 if opts.get('old'):
789 if not util.safehasattr(remote, 'branches'):
789 if not util.safehasattr(remote, 'branches'):
790 # enable in-client legacy support
790 # enable in-client legacy support
791 remote = localrepo.locallegacypeer(remote.local())
791 remote = localrepo.locallegacypeer(remote.local())
792 common, _in, hds = treediscovery.findcommonincoming(repo, remote,
792 common, _in, hds = treediscovery.findcommonincoming(repo, remote,
793 force=True)
793 force=True)
794 common = set(common)
794 common = set(common)
795 if not opts.get('nonheads'):
795 if not opts.get('nonheads'):
796 ui.write(("unpruned common: %s\n") %
796 ui.write(("unpruned common: %s\n") %
797 " ".join(sorted(short(n) for n in common)))
797 " ".join(sorted(short(n) for n in common)))
798
798
799 clnode = repo.changelog.node
799 clnode = repo.changelog.node
800 common = repo.revs('heads(::%ln)', common)
800 common = repo.revs('heads(::%ln)', common)
801 common = {clnode(r) for r in common}
801 common = {clnode(r) for r in common}
802 else:
802 else:
803 nodes = None
803 nodes = None
804 if pushedrevs:
804 if pushedrevs:
805 revs = scmutil.revrange(repo, pushedrevs)
805 revs = scmutil.revrange(repo, pushedrevs)
806 nodes = [repo[r].node() for r in revs]
806 nodes = [repo[r].node() for r in revs]
807 common, any, hds = setdiscovery.findcommonheads(ui, repo, remote,
807 common, any, hds = setdiscovery.findcommonheads(ui, repo, remote,
808 ancestorsof=nodes)
808 ancestorsof=nodes)
809 common = set(common)
809 common = set(common)
810 rheads = set(hds)
810 rheads = set(hds)
811 lheads = set(repo.heads())
811 lheads = set(repo.heads())
812 ui.write(("common heads: %s\n") %
812 ui.write(("common heads: %s\n") %
813 " ".join(sorted(short(n) for n in common)))
813 " ".join(sorted(short(n) for n in common)))
814 if lheads <= common:
814 if lheads <= common:
815 ui.write(("local is subset\n"))
815 ui.write(("local is subset\n"))
816 elif rheads <= common:
816 elif rheads <= common:
817 ui.write(("remote is subset\n"))
817 ui.write(("remote is subset\n"))
818
818
819 remoterevs, _checkout = hg.addbranchrevs(repo, remote, branches, revs=None)
819 remoterevs, _checkout = hg.addbranchrevs(repo, remote, branches, revs=None)
820 localrevs = opts['rev']
820 localrevs = opts['rev']
821 doit(localrevs, remoterevs)
821 doit(localrevs, remoterevs)
822
822
823 _chunksize = 4 << 10
823 _chunksize = 4 << 10
824
824
825 @command('debugdownload',
825 @command('debugdownload',
826 [
826 [
827 ('o', 'output', '', _('path')),
827 ('o', 'output', '', _('path')),
828 ],
828 ],
829 optionalrepo=True)
829 optionalrepo=True)
830 def debugdownload(ui, repo, url, output=None, **opts):
830 def debugdownload(ui, repo, url, output=None, **opts):
831 """download a resource using Mercurial logic and config
831 """download a resource using Mercurial logic and config
832 """
832 """
833 fh = urlmod.open(ui, url, output)
833 fh = urlmod.open(ui, url, output)
834
834
835 dest = ui
835 dest = ui
836 if output:
836 if output:
837 dest = open(output, "wb", _chunksize)
837 dest = open(output, "wb", _chunksize)
838 try:
838 try:
839 data = fh.read(_chunksize)
839 data = fh.read(_chunksize)
840 while data:
840 while data:
841 dest.write(data)
841 dest.write(data)
842 data = fh.read(_chunksize)
842 data = fh.read(_chunksize)
843 finally:
843 finally:
844 if output:
844 if output:
845 dest.close()
845 dest.close()
846
846
847 @command('debugextensions', cmdutil.formatteropts, [], optionalrepo=True)
847 @command('debugextensions', cmdutil.formatteropts, [], optionalrepo=True)
848 def debugextensions(ui, repo, **opts):
848 def debugextensions(ui, repo, **opts):
849 '''show information about active extensions'''
849 '''show information about active extensions'''
850 opts = pycompat.byteskwargs(opts)
850 opts = pycompat.byteskwargs(opts)
851 exts = extensions.extensions(ui)
851 exts = extensions.extensions(ui)
852 hgver = util.version()
852 hgver = util.version()
853 fm = ui.formatter('debugextensions', opts)
853 fm = ui.formatter('debugextensions', opts)
854 for extname, extmod in sorted(exts, key=operator.itemgetter(0)):
854 for extname, extmod in sorted(exts, key=operator.itemgetter(0)):
855 isinternal = extensions.ismoduleinternal(extmod)
855 isinternal = extensions.ismoduleinternal(extmod)
856 extsource = pycompat.fsencode(extmod.__file__)
856 extsource = pycompat.fsencode(extmod.__file__)
857 if isinternal:
857 if isinternal:
858 exttestedwith = [] # never expose magic string to users
858 exttestedwith = [] # never expose magic string to users
859 else:
859 else:
860 exttestedwith = getattr(extmod, 'testedwith', '').split()
860 exttestedwith = getattr(extmod, 'testedwith', '').split()
861 extbuglink = getattr(extmod, 'buglink', None)
861 extbuglink = getattr(extmod, 'buglink', None)
862
862
863 fm.startitem()
863 fm.startitem()
864
864
865 if ui.quiet or ui.verbose:
865 if ui.quiet or ui.verbose:
866 fm.write('name', '%s\n', extname)
866 fm.write('name', '%s\n', extname)
867 else:
867 else:
868 fm.write('name', '%s', extname)
868 fm.write('name', '%s', extname)
869 if isinternal or hgver in exttestedwith:
869 if isinternal or hgver in exttestedwith:
870 fm.plain('\n')
870 fm.plain('\n')
871 elif not exttestedwith:
871 elif not exttestedwith:
872 fm.plain(_(' (untested!)\n'))
872 fm.plain(_(' (untested!)\n'))
873 else:
873 else:
874 lasttestedversion = exttestedwith[-1]
874 lasttestedversion = exttestedwith[-1]
875 fm.plain(' (%s!)\n' % lasttestedversion)
875 fm.plain(' (%s!)\n' % lasttestedversion)
876
876
877 fm.condwrite(ui.verbose and extsource, 'source',
877 fm.condwrite(ui.verbose and extsource, 'source',
878 _(' location: %s\n'), extsource or "")
878 _(' location: %s\n'), extsource or "")
879
879
880 if ui.verbose:
880 if ui.verbose:
881 fm.plain(_(' bundled: %s\n') % ['no', 'yes'][isinternal])
881 fm.plain(_(' bundled: %s\n') % ['no', 'yes'][isinternal])
882 fm.data(bundled=isinternal)
882 fm.data(bundled=isinternal)
883
883
884 fm.condwrite(ui.verbose and exttestedwith, 'testedwith',
884 fm.condwrite(ui.verbose and exttestedwith, 'testedwith',
885 _(' tested with: %s\n'),
885 _(' tested with: %s\n'),
886 fm.formatlist(exttestedwith, name='ver'))
886 fm.formatlist(exttestedwith, name='ver'))
887
887
888 fm.condwrite(ui.verbose and extbuglink, 'buglink',
888 fm.condwrite(ui.verbose and extbuglink, 'buglink',
889 _(' bug reporting: %s\n'), extbuglink or "")
889 _(' bug reporting: %s\n'), extbuglink or "")
890
890
891 fm.end()
891 fm.end()
892
892
893 @command('debugfileset',
893 @command('debugfileset',
894 [('r', 'rev', '', _('apply the filespec on this revision'), _('REV')),
894 [('r', 'rev', '', _('apply the filespec on this revision'), _('REV')),
895 ('', 'all-files', False,
895 ('', 'all-files', False,
896 _('test files from all revisions and working directory')),
896 _('test files from all revisions and working directory')),
897 ('s', 'show-matcher', None,
897 ('s', 'show-matcher', None,
898 _('print internal representation of matcher')),
898 _('print internal representation of matcher')),
899 ('p', 'show-stage', [],
899 ('p', 'show-stage', [],
900 _('print parsed tree at the given stage'), _('NAME'))],
900 _('print parsed tree at the given stage'), _('NAME'))],
901 _('[-r REV] [--all-files] [OPTION]... FILESPEC'))
901 _('[-r REV] [--all-files] [OPTION]... FILESPEC'))
902 def debugfileset(ui, repo, expr, **opts):
902 def debugfileset(ui, repo, expr, **opts):
903 '''parse and apply a fileset specification'''
903 '''parse and apply a fileset specification'''
904 from . import fileset
904 from . import fileset
905 fileset.symbols # force import of fileset so we have predicates to optimize
905 fileset.symbols # force import of fileset so we have predicates to optimize
906 opts = pycompat.byteskwargs(opts)
906 opts = pycompat.byteskwargs(opts)
907 ctx = scmutil.revsingle(repo, opts.get('rev'), None)
907 ctx = scmutil.revsingle(repo, opts.get('rev'), None)
908
908
909 stages = [
909 stages = [
910 ('parsed', pycompat.identity),
910 ('parsed', pycompat.identity),
911 ('analyzed', filesetlang.analyze),
911 ('analyzed', filesetlang.analyze),
912 ('optimized', filesetlang.optimize),
912 ('optimized', filesetlang.optimize),
913 ]
913 ]
914 stagenames = set(n for n, f in stages)
914 stagenames = set(n for n, f in stages)
915
915
916 showalways = set()
916 showalways = set()
917 if ui.verbose and not opts['show_stage']:
917 if ui.verbose and not opts['show_stage']:
918 # show parsed tree by --verbose (deprecated)
918 # show parsed tree by --verbose (deprecated)
919 showalways.add('parsed')
919 showalways.add('parsed')
920 if opts['show_stage'] == ['all']:
920 if opts['show_stage'] == ['all']:
921 showalways.update(stagenames)
921 showalways.update(stagenames)
922 else:
922 else:
923 for n in opts['show_stage']:
923 for n in opts['show_stage']:
924 if n not in stagenames:
924 if n not in stagenames:
925 raise error.Abort(_('invalid stage name: %s') % n)
925 raise error.Abort(_('invalid stage name: %s') % n)
926 showalways.update(opts['show_stage'])
926 showalways.update(opts['show_stage'])
927
927
928 tree = filesetlang.parse(expr)
928 tree = filesetlang.parse(expr)
929 for n, f in stages:
929 for n, f in stages:
930 tree = f(tree)
930 tree = f(tree)
931 if n in showalways:
931 if n in showalways:
932 if opts['show_stage'] or n != 'parsed':
932 if opts['show_stage'] or n != 'parsed':
933 ui.write(("* %s:\n") % n)
933 ui.write(("* %s:\n") % n)
934 ui.write(filesetlang.prettyformat(tree), "\n")
934 ui.write(filesetlang.prettyformat(tree), "\n")
935
935
936 files = set()
936 files = set()
937 if opts['all_files']:
937 if opts['all_files']:
938 for r in repo:
938 for r in repo:
939 c = repo[r]
939 c = repo[r]
940 files.update(c.files())
940 files.update(c.files())
941 files.update(c.substate)
941 files.update(c.substate)
942 if opts['all_files'] or ctx.rev() is None:
942 if opts['all_files'] or ctx.rev() is None:
943 wctx = repo[None]
943 wctx = repo[None]
944 files.update(repo.dirstate.walk(scmutil.matchall(repo),
944 files.update(repo.dirstate.walk(scmutil.matchall(repo),
945 subrepos=list(wctx.substate),
945 subrepos=list(wctx.substate),
946 unknown=True, ignored=True))
946 unknown=True, ignored=True))
947 files.update(wctx.substate)
947 files.update(wctx.substate)
948 else:
948 else:
949 files.update(ctx.files())
949 files.update(ctx.files())
950 files.update(ctx.substate)
950 files.update(ctx.substate)
951
951
952 m = ctx.matchfileset(expr)
952 m = ctx.matchfileset(expr)
953 if opts['show_matcher'] or (opts['show_matcher'] is None and ui.verbose):
953 if opts['show_matcher'] or (opts['show_matcher'] is None and ui.verbose):
954 ui.write(('* matcher:\n'), stringutil.prettyrepr(m), '\n')
954 ui.write(('* matcher:\n'), stringutil.prettyrepr(m), '\n')
955 for f in sorted(files):
955 for f in sorted(files):
956 if not m(f):
956 if not m(f):
957 continue
957 continue
958 ui.write("%s\n" % f)
958 ui.write("%s\n" % f)
959
959
960 @command('debugformat',
960 @command('debugformat',
961 [] + cmdutil.formatteropts)
961 [] + cmdutil.formatteropts)
962 def debugformat(ui, repo, **opts):
962 def debugformat(ui, repo, **opts):
963 """display format information about the current repository
963 """display format information about the current repository
964
964
965 Use --verbose to get extra information about current config value and
965 Use --verbose to get extra information about current config value and
966 Mercurial default."""
966 Mercurial default."""
967 opts = pycompat.byteskwargs(opts)
967 opts = pycompat.byteskwargs(opts)
968 maxvariantlength = max(len(fv.name) for fv in upgrade.allformatvariant)
968 maxvariantlength = max(len(fv.name) for fv in upgrade.allformatvariant)
969 maxvariantlength = max(len('format-variant'), maxvariantlength)
969 maxvariantlength = max(len('format-variant'), maxvariantlength)
970
970
971 def makeformatname(name):
971 def makeformatname(name):
972 return '%s:' + (' ' * (maxvariantlength - len(name)))
972 return '%s:' + (' ' * (maxvariantlength - len(name)))
973
973
974 fm = ui.formatter('debugformat', opts)
974 fm = ui.formatter('debugformat', opts)
975 if fm.isplain():
975 if fm.isplain():
976 def formatvalue(value):
976 def formatvalue(value):
977 if util.safehasattr(value, 'startswith'):
977 if util.safehasattr(value, 'startswith'):
978 return value
978 return value
979 if value:
979 if value:
980 return 'yes'
980 return 'yes'
981 else:
981 else:
982 return 'no'
982 return 'no'
983 else:
983 else:
984 formatvalue = pycompat.identity
984 formatvalue = pycompat.identity
985
985
986 fm.plain('format-variant')
986 fm.plain('format-variant')
987 fm.plain(' ' * (maxvariantlength - len('format-variant')))
987 fm.plain(' ' * (maxvariantlength - len('format-variant')))
988 fm.plain(' repo')
988 fm.plain(' repo')
989 if ui.verbose:
989 if ui.verbose:
990 fm.plain(' config default')
990 fm.plain(' config default')
991 fm.plain('\n')
991 fm.plain('\n')
992 for fv in upgrade.allformatvariant:
992 for fv in upgrade.allformatvariant:
993 fm.startitem()
993 fm.startitem()
994 repovalue = fv.fromrepo(repo)
994 repovalue = fv.fromrepo(repo)
995 configvalue = fv.fromconfig(repo)
995 configvalue = fv.fromconfig(repo)
996
996
997 if repovalue != configvalue:
997 if repovalue != configvalue:
998 namelabel = 'formatvariant.name.mismatchconfig'
998 namelabel = 'formatvariant.name.mismatchconfig'
999 repolabel = 'formatvariant.repo.mismatchconfig'
999 repolabel = 'formatvariant.repo.mismatchconfig'
1000 elif repovalue != fv.default:
1000 elif repovalue != fv.default:
1001 namelabel = 'formatvariant.name.mismatchdefault'
1001 namelabel = 'formatvariant.name.mismatchdefault'
1002 repolabel = 'formatvariant.repo.mismatchdefault'
1002 repolabel = 'formatvariant.repo.mismatchdefault'
1003 else:
1003 else:
1004 namelabel = 'formatvariant.name.uptodate'
1004 namelabel = 'formatvariant.name.uptodate'
1005 repolabel = 'formatvariant.repo.uptodate'
1005 repolabel = 'formatvariant.repo.uptodate'
1006
1006
1007 fm.write('name', makeformatname(fv.name), fv.name,
1007 fm.write('name', makeformatname(fv.name), fv.name,
1008 label=namelabel)
1008 label=namelabel)
1009 fm.write('repo', ' %3s', formatvalue(repovalue),
1009 fm.write('repo', ' %3s', formatvalue(repovalue),
1010 label=repolabel)
1010 label=repolabel)
1011 if fv.default != configvalue:
1011 if fv.default != configvalue:
1012 configlabel = 'formatvariant.config.special'
1012 configlabel = 'formatvariant.config.special'
1013 else:
1013 else:
1014 configlabel = 'formatvariant.config.default'
1014 configlabel = 'formatvariant.config.default'
1015 fm.condwrite(ui.verbose, 'config', ' %6s', formatvalue(configvalue),
1015 fm.condwrite(ui.verbose, 'config', ' %6s', formatvalue(configvalue),
1016 label=configlabel)
1016 label=configlabel)
1017 fm.condwrite(ui.verbose, 'default', ' %7s', formatvalue(fv.default),
1017 fm.condwrite(ui.verbose, 'default', ' %7s', formatvalue(fv.default),
1018 label='formatvariant.default')
1018 label='formatvariant.default')
1019 fm.plain('\n')
1019 fm.plain('\n')
1020 fm.end()
1020 fm.end()
1021
1021
1022 @command('debugfsinfo', [], _('[PATH]'), norepo=True)
1022 @command('debugfsinfo', [], _('[PATH]'), norepo=True)
1023 def debugfsinfo(ui, path="."):
1023 def debugfsinfo(ui, path="."):
1024 """show information detected about current filesystem"""
1024 """show information detected about current filesystem"""
1025 ui.write(('path: %s\n') % path)
1025 ui.write(('path: %s\n') % path)
1026 ui.write(('mounted on: %s\n') % (util.getfsmountpoint(path) or '(unknown)'))
1026 ui.write(('mounted on: %s\n') % (util.getfsmountpoint(path) or '(unknown)'))
1027 ui.write(('exec: %s\n') % (util.checkexec(path) and 'yes' or 'no'))
1027 ui.write(('exec: %s\n') % (util.checkexec(path) and 'yes' or 'no'))
1028 ui.write(('fstype: %s\n') % (util.getfstype(path) or '(unknown)'))
1028 ui.write(('fstype: %s\n') % (util.getfstype(path) or '(unknown)'))
1029 ui.write(('symlink: %s\n') % (util.checklink(path) and 'yes' or 'no'))
1029 ui.write(('symlink: %s\n') % (util.checklink(path) and 'yes' or 'no'))
1030 ui.write(('hardlink: %s\n') % (util.checknlink(path) and 'yes' or 'no'))
1030 ui.write(('hardlink: %s\n') % (util.checknlink(path) and 'yes' or 'no'))
1031 casesensitive = '(unknown)'
1031 casesensitive = '(unknown)'
1032 try:
1032 try:
1033 with pycompat.namedtempfile(prefix='.debugfsinfo', dir=path) as f:
1033 with pycompat.namedtempfile(prefix='.debugfsinfo', dir=path) as f:
1034 casesensitive = util.fscasesensitive(f.name) and 'yes' or 'no'
1034 casesensitive = util.fscasesensitive(f.name) and 'yes' or 'no'
1035 except OSError:
1035 except OSError:
1036 pass
1036 pass
1037 ui.write(('case-sensitive: %s\n') % casesensitive)
1037 ui.write(('case-sensitive: %s\n') % casesensitive)
1038
1038
1039 @command('debuggetbundle',
1039 @command('debuggetbundle',
1040 [('H', 'head', [], _('id of head node'), _('ID')),
1040 [('H', 'head', [], _('id of head node'), _('ID')),
1041 ('C', 'common', [], _('id of common node'), _('ID')),
1041 ('C', 'common', [], _('id of common node'), _('ID')),
1042 ('t', 'type', 'bzip2', _('bundle compression type to use'), _('TYPE'))],
1042 ('t', 'type', 'bzip2', _('bundle compression type to use'), _('TYPE'))],
1043 _('REPO FILE [-H|-C ID]...'),
1043 _('REPO FILE [-H|-C ID]...'),
1044 norepo=True)
1044 norepo=True)
1045 def debuggetbundle(ui, repopath, bundlepath, head=None, common=None, **opts):
1045 def debuggetbundle(ui, repopath, bundlepath, head=None, common=None, **opts):
1046 """retrieves a bundle from a repo
1046 """retrieves a bundle from a repo
1047
1047
1048 Every ID must be a full-length hex node id string. Saves the bundle to the
1048 Every ID must be a full-length hex node id string. Saves the bundle to the
1049 given file.
1049 given file.
1050 """
1050 """
1051 opts = pycompat.byteskwargs(opts)
1051 opts = pycompat.byteskwargs(opts)
1052 repo = hg.peer(ui, opts, repopath)
1052 repo = hg.peer(ui, opts, repopath)
1053 if not repo.capable('getbundle'):
1053 if not repo.capable('getbundle'):
1054 raise error.Abort("getbundle() not supported by target repository")
1054 raise error.Abort("getbundle() not supported by target repository")
1055 args = {}
1055 args = {}
1056 if common:
1056 if common:
1057 args[r'common'] = [bin(s) for s in common]
1057 args[r'common'] = [bin(s) for s in common]
1058 if head:
1058 if head:
1059 args[r'heads'] = [bin(s) for s in head]
1059 args[r'heads'] = [bin(s) for s in head]
1060 # TODO: get desired bundlecaps from command line.
1060 # TODO: get desired bundlecaps from command line.
1061 args[r'bundlecaps'] = None
1061 args[r'bundlecaps'] = None
1062 bundle = repo.getbundle('debug', **args)
1062 bundle = repo.getbundle('debug', **args)
1063
1063
1064 bundletype = opts.get('type', 'bzip2').lower()
1064 bundletype = opts.get('type', 'bzip2').lower()
1065 btypes = {'none': 'HG10UN',
1065 btypes = {'none': 'HG10UN',
1066 'bzip2': 'HG10BZ',
1066 'bzip2': 'HG10BZ',
1067 'gzip': 'HG10GZ',
1067 'gzip': 'HG10GZ',
1068 'bundle2': 'HG20'}
1068 'bundle2': 'HG20'}
1069 bundletype = btypes.get(bundletype)
1069 bundletype = btypes.get(bundletype)
1070 if bundletype not in bundle2.bundletypes:
1070 if bundletype not in bundle2.bundletypes:
1071 raise error.Abort(_('unknown bundle type specified with --type'))
1071 raise error.Abort(_('unknown bundle type specified with --type'))
1072 bundle2.writebundle(ui, bundle, bundlepath, bundletype)
1072 bundle2.writebundle(ui, bundle, bundlepath, bundletype)
1073
1073
1074 @command('debugignore', [], '[FILE]')
1074 @command('debugignore', [], '[FILE]')
1075 def debugignore(ui, repo, *files, **opts):
1075 def debugignore(ui, repo, *files, **opts):
1076 """display the combined ignore pattern and information about ignored files
1076 """display the combined ignore pattern and information about ignored files
1077
1077
1078 With no argument display the combined ignore pattern.
1078 With no argument display the combined ignore pattern.
1079
1079
1080 Given space separated file names, shows if the given file is ignored and
1080 Given space separated file names, shows if the given file is ignored and
1081 if so, show the ignore rule (file and line number) that matched it.
1081 if so, show the ignore rule (file and line number) that matched it.
1082 """
1082 """
1083 ignore = repo.dirstate._ignore
1083 ignore = repo.dirstate._ignore
1084 if not files:
1084 if not files:
1085 # Show all the patterns
1085 # Show all the patterns
1086 ui.write("%s\n" % pycompat.byterepr(ignore))
1086 ui.write("%s\n" % pycompat.byterepr(ignore))
1087 else:
1087 else:
1088 m = scmutil.match(repo[None], pats=files)
1088 m = scmutil.match(repo[None], pats=files)
1089 for f in m.files():
1089 for f in m.files():
1090 nf = util.normpath(f)
1090 nf = util.normpath(f)
1091 ignored = None
1091 ignored = None
1092 ignoredata = None
1092 ignoredata = None
1093 if nf != '.':
1093 if nf != '.':
1094 if ignore(nf):
1094 if ignore(nf):
1095 ignored = nf
1095 ignored = nf
1096 ignoredata = repo.dirstate._ignorefileandline(nf)
1096 ignoredata = repo.dirstate._ignorefileandline(nf)
1097 else:
1097 else:
1098 for p in util.finddirs(nf):
1098 for p in util.finddirs(nf):
1099 if ignore(p):
1099 if ignore(p):
1100 ignored = p
1100 ignored = p
1101 ignoredata = repo.dirstate._ignorefileandline(p)
1101 ignoredata = repo.dirstate._ignorefileandline(p)
1102 break
1102 break
1103 if ignored:
1103 if ignored:
1104 if ignored == nf:
1104 if ignored == nf:
1105 ui.write(_("%s is ignored\n") % m.uipath(f))
1105 ui.write(_("%s is ignored\n") % m.uipath(f))
1106 else:
1106 else:
1107 ui.write(_("%s is ignored because of "
1107 ui.write(_("%s is ignored because of "
1108 "containing folder %s\n")
1108 "containing folder %s\n")
1109 % (m.uipath(f), ignored))
1109 % (m.uipath(f), ignored))
1110 ignorefile, lineno, line = ignoredata
1110 ignorefile, lineno, line = ignoredata
1111 ui.write(_("(ignore rule in %s, line %d: '%s')\n")
1111 ui.write(_("(ignore rule in %s, line %d: '%s')\n")
1112 % (ignorefile, lineno, line))
1112 % (ignorefile, lineno, line))
1113 else:
1113 else:
1114 ui.write(_("%s is not ignored\n") % m.uipath(f))
1114 ui.write(_("%s is not ignored\n") % m.uipath(f))
1115
1115
1116 @command('debugindex', cmdutil.debugrevlogopts + cmdutil.formatteropts,
1116 @command('debugindex', cmdutil.debugrevlogopts + cmdutil.formatteropts,
1117 _('-c|-m|FILE'))
1117 _('-c|-m|FILE'))
1118 def debugindex(ui, repo, file_=None, **opts):
1118 def debugindex(ui, repo, file_=None, **opts):
1119 """dump index data for a storage primitive"""
1119 """dump index data for a storage primitive"""
1120 opts = pycompat.byteskwargs(opts)
1120 opts = pycompat.byteskwargs(opts)
1121 store = cmdutil.openstorage(repo, 'debugindex', file_, opts)
1121 store = cmdutil.openstorage(repo, 'debugindex', file_, opts)
1122
1122
1123 if ui.debugflag:
1123 if ui.debugflag:
1124 shortfn = hex
1124 shortfn = hex
1125 else:
1125 else:
1126 shortfn = short
1126 shortfn = short
1127
1127
1128 idlen = 12
1128 idlen = 12
1129 for i in store:
1129 for i in store:
1130 idlen = len(shortfn(store.node(i)))
1130 idlen = len(shortfn(store.node(i)))
1131 break
1131 break
1132
1132
1133 fm = ui.formatter('debugindex', opts)
1133 fm = ui.formatter('debugindex', opts)
1134 fm.plain(b' rev linkrev %s %s p2\n' % (
1134 fm.plain(b' rev linkrev %s %s p2\n' % (
1135 b'nodeid'.ljust(idlen),
1135 b'nodeid'.ljust(idlen),
1136 b'p1'.ljust(idlen)))
1136 b'p1'.ljust(idlen)))
1137
1137
1138 for rev in store:
1138 for rev in store:
1139 node = store.node(rev)
1139 node = store.node(rev)
1140 parents = store.parents(node)
1140 parents = store.parents(node)
1141
1141
1142 fm.startitem()
1142 fm.startitem()
1143 fm.write(b'rev', b'%6d ', rev)
1143 fm.write(b'rev', b'%6d ', rev)
1144 fm.write(b'linkrev', '%7d ', store.linkrev(rev))
1144 fm.write(b'linkrev', '%7d ', store.linkrev(rev))
1145 fm.write(b'node', '%s ', shortfn(node))
1145 fm.write(b'node', '%s ', shortfn(node))
1146 fm.write(b'p1', '%s ', shortfn(parents[0]))
1146 fm.write(b'p1', '%s ', shortfn(parents[0]))
1147 fm.write(b'p2', '%s', shortfn(parents[1]))
1147 fm.write(b'p2', '%s', shortfn(parents[1]))
1148 fm.plain(b'\n')
1148 fm.plain(b'\n')
1149
1149
1150 fm.end()
1150 fm.end()
1151
1151
1152 @command('debugindexdot', cmdutil.debugrevlogopts,
1152 @command('debugindexdot', cmdutil.debugrevlogopts,
1153 _('-c|-m|FILE'), optionalrepo=True)
1153 _('-c|-m|FILE'), optionalrepo=True)
1154 def debugindexdot(ui, repo, file_=None, **opts):
1154 def debugindexdot(ui, repo, file_=None, **opts):
1155 """dump an index DAG as a graphviz dot file"""
1155 """dump an index DAG as a graphviz dot file"""
1156 opts = pycompat.byteskwargs(opts)
1156 opts = pycompat.byteskwargs(opts)
1157 r = cmdutil.openstorage(repo, 'debugindexdot', file_, opts)
1157 r = cmdutil.openstorage(repo, 'debugindexdot', file_, opts)
1158 ui.write(("digraph G {\n"))
1158 ui.write(("digraph G {\n"))
1159 for i in r:
1159 for i in r:
1160 node = r.node(i)
1160 node = r.node(i)
1161 pp = r.parents(node)
1161 pp = r.parents(node)
1162 ui.write("\t%d -> %d\n" % (r.rev(pp[0]), i))
1162 ui.write("\t%d -> %d\n" % (r.rev(pp[0]), i))
1163 if pp[1] != nullid:
1163 if pp[1] != nullid:
1164 ui.write("\t%d -> %d\n" % (r.rev(pp[1]), i))
1164 ui.write("\t%d -> %d\n" % (r.rev(pp[1]), i))
1165 ui.write("}\n")
1165 ui.write("}\n")
1166
1166
1167 @command('debugindexstats', [])
1167 @command('debugindexstats', [])
1168 def debugindexstats(ui, repo):
1168 def debugindexstats(ui, repo):
1169 """show stats related to the changelog index"""
1169 """show stats related to the changelog index"""
1170 repo.changelog.shortest(nullid, 1)
1170 repo.changelog.shortest(nullid, 1)
1171 for k, v in sorted(repo.changelog.index.stats().items()):
1171 for k, v in sorted(repo.changelog.index.stats().items()):
1172 ui.write('%s: %s\n' % (k, v))
1172 ui.write('%s: %s\n' % (k, v))
1173
1173
1174 @command('debuginstall', [] + cmdutil.formatteropts, '', norepo=True)
1174 @command('debuginstall', [] + cmdutil.formatteropts, '', norepo=True)
1175 def debuginstall(ui, **opts):
1175 def debuginstall(ui, **opts):
1176 '''test Mercurial installation
1176 '''test Mercurial installation
1177
1177
1178 Returns 0 on success.
1178 Returns 0 on success.
1179 '''
1179 '''
1180 opts = pycompat.byteskwargs(opts)
1180 opts = pycompat.byteskwargs(opts)
1181
1181
1182 def writetemp(contents):
1182 def writetemp(contents):
1183 (fd, name) = pycompat.mkstemp(prefix="hg-debuginstall-")
1183 (fd, name) = pycompat.mkstemp(prefix="hg-debuginstall-")
1184 f = os.fdopen(fd, r"wb")
1184 f = os.fdopen(fd, r"wb")
1185 f.write(contents)
1185 f.write(contents)
1186 f.close()
1186 f.close()
1187 return name
1187 return name
1188
1188
1189 problems = 0
1189 problems = 0
1190
1190
1191 fm = ui.formatter('debuginstall', opts)
1191 fm = ui.formatter('debuginstall', opts)
1192 fm.startitem()
1192 fm.startitem()
1193
1193
1194 # encoding
1194 # encoding
1195 fm.write('encoding', _("checking encoding (%s)...\n"), encoding.encoding)
1195 fm.write('encoding', _("checking encoding (%s)...\n"), encoding.encoding)
1196 err = None
1196 err = None
1197 try:
1197 try:
1198 codecs.lookup(pycompat.sysstr(encoding.encoding))
1198 codecs.lookup(pycompat.sysstr(encoding.encoding))
1199 except LookupError as inst:
1199 except LookupError as inst:
1200 err = stringutil.forcebytestr(inst)
1200 err = stringutil.forcebytestr(inst)
1201 problems += 1
1201 problems += 1
1202 fm.condwrite(err, 'encodingerror', _(" %s\n"
1202 fm.condwrite(err, 'encodingerror', _(" %s\n"
1203 " (check that your locale is properly set)\n"), err)
1203 " (check that your locale is properly set)\n"), err)
1204
1204
1205 # Python
1205 # Python
1206 fm.write('pythonexe', _("checking Python executable (%s)\n"),
1206 fm.write('pythonexe', _("checking Python executable (%s)\n"),
1207 pycompat.sysexecutable)
1207 pycompat.sysexecutable)
1208 fm.write('pythonver', _("checking Python version (%s)\n"),
1208 fm.write('pythonver', _("checking Python version (%s)\n"),
1209 ("%d.%d.%d" % sys.version_info[:3]))
1209 ("%d.%d.%d" % sys.version_info[:3]))
1210 fm.write('pythonlib', _("checking Python lib (%s)...\n"),
1210 fm.write('pythonlib', _("checking Python lib (%s)...\n"),
1211 os.path.dirname(pycompat.fsencode(os.__file__)))
1211 os.path.dirname(pycompat.fsencode(os.__file__)))
1212
1212
1213 security = set(sslutil.supportedprotocols)
1213 security = set(sslutil.supportedprotocols)
1214 if sslutil.hassni:
1214 if sslutil.hassni:
1215 security.add('sni')
1215 security.add('sni')
1216
1216
1217 fm.write('pythonsecurity', _("checking Python security support (%s)\n"),
1217 fm.write('pythonsecurity', _("checking Python security support (%s)\n"),
1218 fm.formatlist(sorted(security), name='protocol',
1218 fm.formatlist(sorted(security), name='protocol',
1219 fmt='%s', sep=','))
1219 fmt='%s', sep=','))
1220
1220
1221 # These are warnings, not errors. So don't increment problem count. This
1221 # These are warnings, not errors. So don't increment problem count. This
1222 # may change in the future.
1222 # may change in the future.
1223 if 'tls1.2' not in security:
1223 if 'tls1.2' not in security:
1224 fm.plain(_(' TLS 1.2 not supported by Python install; '
1224 fm.plain(_(' TLS 1.2 not supported by Python install; '
1225 'network connections lack modern security\n'))
1225 'network connections lack modern security\n'))
1226 if 'sni' not in security:
1226 if 'sni' not in security:
1227 fm.plain(_(' SNI not supported by Python install; may have '
1227 fm.plain(_(' SNI not supported by Python install; may have '
1228 'connectivity issues with some servers\n'))
1228 'connectivity issues with some servers\n'))
1229
1229
1230 # TODO print CA cert info
1230 # TODO print CA cert info
1231
1231
1232 # hg version
1232 # hg version
1233 hgver = util.version()
1233 hgver = util.version()
1234 fm.write('hgver', _("checking Mercurial version (%s)\n"),
1234 fm.write('hgver', _("checking Mercurial version (%s)\n"),
1235 hgver.split('+')[0])
1235 hgver.split('+')[0])
1236 fm.write('hgverextra', _("checking Mercurial custom build (%s)\n"),
1236 fm.write('hgverextra', _("checking Mercurial custom build (%s)\n"),
1237 '+'.join(hgver.split('+')[1:]))
1237 '+'.join(hgver.split('+')[1:]))
1238
1238
1239 # compiled modules
1239 # compiled modules
1240 fm.write('hgmodulepolicy', _("checking module policy (%s)\n"),
1240 fm.write('hgmodulepolicy', _("checking module policy (%s)\n"),
1241 policy.policy)
1241 policy.policy)
1242 fm.write('hgmodules', _("checking installed modules (%s)...\n"),
1242 fm.write('hgmodules', _("checking installed modules (%s)...\n"),
1243 os.path.dirname(pycompat.fsencode(__file__)))
1243 os.path.dirname(pycompat.fsencode(__file__)))
1244
1244
1245 if policy.policy in ('c', 'allow'):
1245 if policy.policy in ('c', 'allow'):
1246 err = None
1246 err = None
1247 try:
1247 try:
1248 from .cext import (
1248 from .cext import (
1249 base85,
1249 base85,
1250 bdiff,
1250 bdiff,
1251 mpatch,
1251 mpatch,
1252 osutil,
1252 osutil,
1253 )
1253 )
1254 dir(bdiff), dir(mpatch), dir(base85), dir(osutil) # quiet pyflakes
1254 dir(bdiff), dir(mpatch), dir(base85), dir(osutil) # quiet pyflakes
1255 except Exception as inst:
1255 except Exception as inst:
1256 err = stringutil.forcebytestr(inst)
1256 err = stringutil.forcebytestr(inst)
1257 problems += 1
1257 problems += 1
1258 fm.condwrite(err, 'extensionserror', " %s\n", err)
1258 fm.condwrite(err, 'extensionserror', " %s\n", err)
1259
1259
1260 compengines = util.compengines._engines.values()
1260 compengines = util.compengines._engines.values()
1261 fm.write('compengines', _('checking registered compression engines (%s)\n'),
1261 fm.write('compengines', _('checking registered compression engines (%s)\n'),
1262 fm.formatlist(sorted(e.name() for e in compengines),
1262 fm.formatlist(sorted(e.name() for e in compengines),
1263 name='compengine', fmt='%s', sep=', '))
1263 name='compengine', fmt='%s', sep=', '))
1264 fm.write('compenginesavail', _('checking available compression engines '
1264 fm.write('compenginesavail', _('checking available compression engines '
1265 '(%s)\n'),
1265 '(%s)\n'),
1266 fm.formatlist(sorted(e.name() for e in compengines
1266 fm.formatlist(sorted(e.name() for e in compengines
1267 if e.available()),
1267 if e.available()),
1268 name='compengine', fmt='%s', sep=', '))
1268 name='compengine', fmt='%s', sep=', '))
1269 wirecompengines = util.compengines.supportedwireengines(util.SERVERROLE)
1269 wirecompengines = util.compengines.supportedwireengines(util.SERVERROLE)
1270 fm.write('compenginesserver', _('checking available compression engines '
1270 fm.write('compenginesserver', _('checking available compression engines '
1271 'for wire protocol (%s)\n'),
1271 'for wire protocol (%s)\n'),
1272 fm.formatlist([e.name() for e in wirecompengines
1272 fm.formatlist([e.name() for e in wirecompengines
1273 if e.wireprotosupport()],
1273 if e.wireprotosupport()],
1274 name='compengine', fmt='%s', sep=', '))
1274 name='compengine', fmt='%s', sep=', '))
1275 re2 = 'missing'
1275 re2 = 'missing'
1276 if util._re2:
1276 if util._re2:
1277 re2 = 'available'
1277 re2 = 'available'
1278 fm.plain(_('checking "re2" regexp engine (%s)\n') % re2)
1278 fm.plain(_('checking "re2" regexp engine (%s)\n') % re2)
1279 fm.data(re2=bool(util._re2))
1279 fm.data(re2=bool(util._re2))
1280
1280
1281 # templates
1281 # templates
1282 p = templater.templatepaths()
1282 p = templater.templatepaths()
1283 fm.write('templatedirs', 'checking templates (%s)...\n', ' '.join(p))
1283 fm.write('templatedirs', 'checking templates (%s)...\n', ' '.join(p))
1284 fm.condwrite(not p, '', _(" no template directories found\n"))
1284 fm.condwrite(not p, '', _(" no template directories found\n"))
1285 if p:
1285 if p:
1286 m = templater.templatepath("map-cmdline.default")
1286 m = templater.templatepath("map-cmdline.default")
1287 if m:
1287 if m:
1288 # template found, check if it is working
1288 # template found, check if it is working
1289 err = None
1289 err = None
1290 try:
1290 try:
1291 templater.templater.frommapfile(m)
1291 templater.templater.frommapfile(m)
1292 except Exception as inst:
1292 except Exception as inst:
1293 err = stringutil.forcebytestr(inst)
1293 err = stringutil.forcebytestr(inst)
1294 p = None
1294 p = None
1295 fm.condwrite(err, 'defaulttemplateerror', " %s\n", err)
1295 fm.condwrite(err, 'defaulttemplateerror', " %s\n", err)
1296 else:
1296 else:
1297 p = None
1297 p = None
1298 fm.condwrite(p, 'defaulttemplate',
1298 fm.condwrite(p, 'defaulttemplate',
1299 _("checking default template (%s)\n"), m)
1299 _("checking default template (%s)\n"), m)
1300 fm.condwrite(not m, 'defaulttemplatenotfound',
1300 fm.condwrite(not m, 'defaulttemplatenotfound',
1301 _(" template '%s' not found\n"), "default")
1301 _(" template '%s' not found\n"), "default")
1302 if not p:
1302 if not p:
1303 problems += 1
1303 problems += 1
1304 fm.condwrite(not p, '',
1304 fm.condwrite(not p, '',
1305 _(" (templates seem to have been installed incorrectly)\n"))
1305 _(" (templates seem to have been installed incorrectly)\n"))
1306
1306
1307 # editor
1307 # editor
1308 editor = ui.geteditor()
1308 editor = ui.geteditor()
1309 editor = util.expandpath(editor)
1309 editor = util.expandpath(editor)
1310 editorbin = procutil.shellsplit(editor)[0]
1310 editorbin = procutil.shellsplit(editor)[0]
1311 fm.write('editor', _("checking commit editor... (%s)\n"), editorbin)
1311 fm.write('editor', _("checking commit editor... (%s)\n"), editorbin)
1312 cmdpath = procutil.findexe(editorbin)
1312 cmdpath = procutil.findexe(editorbin)
1313 fm.condwrite(not cmdpath and editor == 'vi', 'vinotfound',
1313 fm.condwrite(not cmdpath and editor == 'vi', 'vinotfound',
1314 _(" No commit editor set and can't find %s in PATH\n"
1314 _(" No commit editor set and can't find %s in PATH\n"
1315 " (specify a commit editor in your configuration"
1315 " (specify a commit editor in your configuration"
1316 " file)\n"), not cmdpath and editor == 'vi' and editorbin)
1316 " file)\n"), not cmdpath and editor == 'vi' and editorbin)
1317 fm.condwrite(not cmdpath and editor != 'vi', 'editornotfound',
1317 fm.condwrite(not cmdpath and editor != 'vi', 'editornotfound',
1318 _(" Can't find editor '%s' in PATH\n"
1318 _(" Can't find editor '%s' in PATH\n"
1319 " (specify a commit editor in your configuration"
1319 " (specify a commit editor in your configuration"
1320 " file)\n"), not cmdpath and editorbin)
1320 " file)\n"), not cmdpath and editorbin)
1321 if not cmdpath and editor != 'vi':
1321 if not cmdpath and editor != 'vi':
1322 problems += 1
1322 problems += 1
1323
1323
1324 # check username
1324 # check username
1325 username = None
1325 username = None
1326 err = None
1326 err = None
1327 try:
1327 try:
1328 username = ui.username()
1328 username = ui.username()
1329 except error.Abort as e:
1329 except error.Abort as e:
1330 err = stringutil.forcebytestr(e)
1330 err = stringutil.forcebytestr(e)
1331 problems += 1
1331 problems += 1
1332
1332
1333 fm.condwrite(username, 'username', _("checking username (%s)\n"), username)
1333 fm.condwrite(username, 'username', _("checking username (%s)\n"), username)
1334 fm.condwrite(err, 'usernameerror', _("checking username...\n %s\n"
1334 fm.condwrite(err, 'usernameerror', _("checking username...\n %s\n"
1335 " (specify a username in your configuration file)\n"), err)
1335 " (specify a username in your configuration file)\n"), err)
1336
1336
1337 fm.condwrite(not problems, '',
1337 fm.condwrite(not problems, '',
1338 _("no problems detected\n"))
1338 _("no problems detected\n"))
1339 if not problems:
1339 if not problems:
1340 fm.data(problems=problems)
1340 fm.data(problems=problems)
1341 fm.condwrite(problems, 'problems',
1341 fm.condwrite(problems, 'problems',
1342 _("%d problems detected,"
1342 _("%d problems detected,"
1343 " please check your install!\n"), problems)
1343 " please check your install!\n"), problems)
1344 fm.end()
1344 fm.end()
1345
1345
1346 return problems
1346 return problems
1347
1347
1348 @command('debugknown', [], _('REPO ID...'), norepo=True)
1348 @command('debugknown', [], _('REPO ID...'), norepo=True)
1349 def debugknown(ui, repopath, *ids, **opts):
1349 def debugknown(ui, repopath, *ids, **opts):
1350 """test whether node ids are known to a repo
1350 """test whether node ids are known to a repo
1351
1351
1352 Every ID must be a full-length hex node id string. Returns a list of 0s
1352 Every ID must be a full-length hex node id string. Returns a list of 0s
1353 and 1s indicating unknown/known.
1353 and 1s indicating unknown/known.
1354 """
1354 """
1355 opts = pycompat.byteskwargs(opts)
1355 opts = pycompat.byteskwargs(opts)
1356 repo = hg.peer(ui, opts, repopath)
1356 repo = hg.peer(ui, opts, repopath)
1357 if not repo.capable('known'):
1357 if not repo.capable('known'):
1358 raise error.Abort("known() not supported by target repository")
1358 raise error.Abort("known() not supported by target repository")
1359 flags = repo.known([bin(s) for s in ids])
1359 flags = repo.known([bin(s) for s in ids])
1360 ui.write("%s\n" % ("".join([f and "1" or "0" for f in flags])))
1360 ui.write("%s\n" % ("".join([f and "1" or "0" for f in flags])))
1361
1361
1362 @command('debuglabelcomplete', [], _('LABEL...'))
1362 @command('debuglabelcomplete', [], _('LABEL...'))
1363 def debuglabelcomplete(ui, repo, *args):
1363 def debuglabelcomplete(ui, repo, *args):
1364 '''backwards compatibility with old bash completion scripts (DEPRECATED)'''
1364 '''backwards compatibility with old bash completion scripts (DEPRECATED)'''
1365 debugnamecomplete(ui, repo, *args)
1365 debugnamecomplete(ui, repo, *args)
1366
1366
1367 @command('debuglocks',
1367 @command('debuglocks',
1368 [('L', 'force-lock', None, _('free the store lock (DANGEROUS)')),
1368 [('L', 'force-lock', None, _('free the store lock (DANGEROUS)')),
1369 ('W', 'force-wlock', None,
1369 ('W', 'force-wlock', None,
1370 _('free the working state lock (DANGEROUS)')),
1370 _('free the working state lock (DANGEROUS)')),
1371 ('s', 'set-lock', None, _('set the store lock until stopped')),
1371 ('s', 'set-lock', None, _('set the store lock until stopped')),
1372 ('S', 'set-wlock', None,
1372 ('S', 'set-wlock', None,
1373 _('set the working state lock until stopped'))],
1373 _('set the working state lock until stopped'))],
1374 _('[OPTION]...'))
1374 _('[OPTION]...'))
1375 def debuglocks(ui, repo, **opts):
1375 def debuglocks(ui, repo, **opts):
1376 """show or modify state of locks
1376 """show or modify state of locks
1377
1377
1378 By default, this command will show which locks are held. This
1378 By default, this command will show which locks are held. This
1379 includes the user and process holding the lock, the amount of time
1379 includes the user and process holding the lock, the amount of time
1380 the lock has been held, and the machine name where the process is
1380 the lock has been held, and the machine name where the process is
1381 running if it's not local.
1381 running if it's not local.
1382
1382
1383 Locks protect the integrity of Mercurial's data, so should be
1383 Locks protect the integrity of Mercurial's data, so should be
1384 treated with care. System crashes or other interruptions may cause
1384 treated with care. System crashes or other interruptions may cause
1385 locks to not be properly released, though Mercurial will usually
1385 locks to not be properly released, though Mercurial will usually
1386 detect and remove such stale locks automatically.
1386 detect and remove such stale locks automatically.
1387
1387
1388 However, detecting stale locks may not always be possible (for
1388 However, detecting stale locks may not always be possible (for
1389 instance, on a shared filesystem). Removing locks may also be
1389 instance, on a shared filesystem). Removing locks may also be
1390 blocked by filesystem permissions.
1390 blocked by filesystem permissions.
1391
1391
1392 Setting a lock will prevent other commands from changing the data.
1392 Setting a lock will prevent other commands from changing the data.
1393 The command will wait until an interruption (SIGINT, SIGTERM, ...) occurs.
1393 The command will wait until an interruption (SIGINT, SIGTERM, ...) occurs.
1394 The set locks are removed when the command exits.
1394 The set locks are removed when the command exits.
1395
1395
1396 Returns 0 if no locks are held.
1396 Returns 0 if no locks are held.
1397
1397
1398 """
1398 """
1399
1399
1400 if opts.get(r'force_lock'):
1400 if opts.get(r'force_lock'):
1401 repo.svfs.unlink('lock')
1401 repo.svfs.unlink('lock')
1402 if opts.get(r'force_wlock'):
1402 if opts.get(r'force_wlock'):
1403 repo.vfs.unlink('wlock')
1403 repo.vfs.unlink('wlock')
1404 if opts.get(r'force_lock') or opts.get(r'force_wlock'):
1404 if opts.get(r'force_lock') or opts.get(r'force_wlock'):
1405 return 0
1405 return 0
1406
1406
1407 locks = []
1407 locks = []
1408 try:
1408 try:
1409 if opts.get(r'set_wlock'):
1409 if opts.get(r'set_wlock'):
1410 try:
1410 try:
1411 locks.append(repo.wlock(False))
1411 locks.append(repo.wlock(False))
1412 except error.LockHeld:
1412 except error.LockHeld:
1413 raise error.Abort(_('wlock is already held'))
1413 raise error.Abort(_('wlock is already held'))
1414 if opts.get(r'set_lock'):
1414 if opts.get(r'set_lock'):
1415 try:
1415 try:
1416 locks.append(repo.lock(False))
1416 locks.append(repo.lock(False))
1417 except error.LockHeld:
1417 except error.LockHeld:
1418 raise error.Abort(_('lock is already held'))
1418 raise error.Abort(_('lock is already held'))
1419 if len(locks):
1419 if len(locks):
1420 ui.promptchoice(_("ready to release the lock (y)? $$ &Yes"))
1420 ui.promptchoice(_("ready to release the lock (y)? $$ &Yes"))
1421 return 0
1421 return 0
1422 finally:
1422 finally:
1423 release(*locks)
1423 release(*locks)
1424
1424
1425 now = time.time()
1425 now = time.time()
1426 held = 0
1426 held = 0
1427
1427
1428 def report(vfs, name, method):
1428 def report(vfs, name, method):
1429 # this causes stale locks to get reaped for more accurate reporting
1429 # this causes stale locks to get reaped for more accurate reporting
1430 try:
1430 try:
1431 l = method(False)
1431 l = method(False)
1432 except error.LockHeld:
1432 except error.LockHeld:
1433 l = None
1433 l = None
1434
1434
1435 if l:
1435 if l:
1436 l.release()
1436 l.release()
1437 else:
1437 else:
1438 try:
1438 try:
1439 st = vfs.lstat(name)
1439 st = vfs.lstat(name)
1440 age = now - st[stat.ST_MTIME]
1440 age = now - st[stat.ST_MTIME]
1441 user = util.username(st.st_uid)
1441 user = util.username(st.st_uid)
1442 locker = vfs.readlock(name)
1442 locker = vfs.readlock(name)
1443 if ":" in locker:
1443 if ":" in locker:
1444 host, pid = locker.split(':')
1444 host, pid = locker.split(':')
1445 if host == socket.gethostname():
1445 if host == socket.gethostname():
1446 locker = 'user %s, process %s' % (user or b'None', pid)
1446 locker = 'user %s, process %s' % (user or b'None', pid)
1447 else:
1447 else:
1448 locker = 'user %s, process %s, host %s' \
1448 locker = 'user %s, process %s, host %s' \
1449 % (user or b'None', pid, host)
1449 % (user or b'None', pid, host)
1450 ui.write(("%-6s %s (%ds)\n") % (name + ":", locker, age))
1450 ui.write(("%-6s %s (%ds)\n") % (name + ":", locker, age))
1451 return 1
1451 return 1
1452 except OSError as e:
1452 except OSError as e:
1453 if e.errno != errno.ENOENT:
1453 if e.errno != errno.ENOENT:
1454 raise
1454 raise
1455
1455
1456 ui.write(("%-6s free\n") % (name + ":"))
1456 ui.write(("%-6s free\n") % (name + ":"))
1457 return 0
1457 return 0
1458
1458
1459 held += report(repo.svfs, "lock", repo.lock)
1459 held += report(repo.svfs, "lock", repo.lock)
1460 held += report(repo.vfs, "wlock", repo.wlock)
1460 held += report(repo.vfs, "wlock", repo.wlock)
1461
1461
1462 return held
1462 return held
1463
1463
1464 @command('debugmanifestfulltextcache', [
1464 @command('debugmanifestfulltextcache', [
1465 ('', 'clear', False, _('clear the cache')),
1465 ('', 'clear', False, _('clear the cache')),
1466 ('a', 'add', '', _('add the given manifest node to the cache'),
1466 ('a', 'add', '', _('add the given manifest node to the cache'),
1467 _('NODE'))
1467 _('NODE'))
1468 ], '')
1468 ], '')
1469 def debugmanifestfulltextcache(ui, repo, add=None, **opts):
1469 def debugmanifestfulltextcache(ui, repo, add=None, **opts):
1470 """show, clear or amend the contents of the manifest fulltext cache"""
1470 """show, clear or amend the contents of the manifest fulltext cache"""
1471 with repo.lock():
1471 with repo.lock():
1472 r = repo.manifestlog.getstorage(b'')
1472 r = repo.manifestlog.getstorage(b'')
1473 try:
1473 try:
1474 cache = r._fulltextcache
1474 cache = r._fulltextcache
1475 except AttributeError:
1475 except AttributeError:
1476 ui.warn(_(
1476 ui.warn(_(
1477 "Current revlog implementation doesn't appear to have a "
1477 "Current revlog implementation doesn't appear to have a "
1478 'manifest fulltext cache\n'))
1478 'manifest fulltext cache\n'))
1479 return
1479 return
1480
1480
1481 if opts.get(r'clear'):
1481 if opts.get(r'clear'):
1482 cache.clear()
1482 cache.clear()
1483
1483
1484 if add:
1484 if add:
1485 try:
1485 try:
1486 manifest = repo.manifestlog[r.lookup(add)]
1486 manifest = repo.manifestlog[r.lookup(add)]
1487 except error.LookupError as e:
1487 except error.LookupError as e:
1488 raise error.Abort(e, hint="Check your manifest node id")
1488 raise error.Abort(e, hint="Check your manifest node id")
1489 manifest.read() # stores revisision in cache too
1489 manifest.read() # stores revisision in cache too
1490
1490
1491 if not len(cache):
1491 if not len(cache):
1492 ui.write(_('Cache empty'))
1492 ui.write(_('Cache empty'))
1493 else:
1493 else:
1494 ui.write(
1494 ui.write(
1495 _('Cache contains %d manifest entries, in order of most to '
1495 _('Cache contains %d manifest entries, in order of most to '
1496 'least recent:\n') % (len(cache),))
1496 'least recent:\n') % (len(cache),))
1497 totalsize = 0
1497 totalsize = 0
1498 for nodeid in cache:
1498 for nodeid in cache:
1499 # Use cache.get to not update the LRU order
1499 # Use cache.get to not update the LRU order
1500 data = cache.get(nodeid)
1500 data = cache.get(nodeid)
1501 size = len(data)
1501 size = len(data)
1502 totalsize += size + 24 # 20 bytes nodeid, 4 bytes size
1502 totalsize += size + 24 # 20 bytes nodeid, 4 bytes size
1503 ui.write(_('id: %s, size %s\n') % (
1503 ui.write(_('id: %s, size %s\n') % (
1504 hex(nodeid), util.bytecount(size)))
1504 hex(nodeid), util.bytecount(size)))
1505 ondisk = cache._opener.stat('manifestfulltextcache').st_size
1505 ondisk = cache._opener.stat('manifestfulltextcache').st_size
1506 ui.write(
1506 ui.write(
1507 _('Total cache data size %s, on-disk %s\n') % (
1507 _('Total cache data size %s, on-disk %s\n') % (
1508 util.bytecount(totalsize), util.bytecount(ondisk))
1508 util.bytecount(totalsize), util.bytecount(ondisk))
1509 )
1509 )
1510
1510
1511 @command('debugmergestate', [], '')
1511 @command('debugmergestate', [], '')
1512 def debugmergestate(ui, repo, *args):
1512 def debugmergestate(ui, repo, *args):
1513 """print merge state
1513 """print merge state
1514
1514
1515 Use --verbose to print out information about whether v1 or v2 merge state
1515 Use --verbose to print out information about whether v1 or v2 merge state
1516 was chosen."""
1516 was chosen."""
1517 def _hashornull(h):
1517 def _hashornull(h):
1518 if h == nullhex:
1518 if h == nullhex:
1519 return 'null'
1519 return 'null'
1520 else:
1520 else:
1521 return h
1521 return h
1522
1522
1523 def printrecords(version):
1523 def printrecords(version):
1524 ui.write(('* version %d records\n') % version)
1524 ui.write(('* version %d records\n') % version)
1525 if version == 1:
1525 if version == 1:
1526 records = v1records
1526 records = v1records
1527 else:
1527 else:
1528 records = v2records
1528 records = v2records
1529
1529
1530 for rtype, record in records:
1530 for rtype, record in records:
1531 # pretty print some record types
1531 # pretty print some record types
1532 if rtype == 'L':
1532 if rtype == 'L':
1533 ui.write(('local: %s\n') % record)
1533 ui.write(('local: %s\n') % record)
1534 elif rtype == 'O':
1534 elif rtype == 'O':
1535 ui.write(('other: %s\n') % record)
1535 ui.write(('other: %s\n') % record)
1536 elif rtype == 'm':
1536 elif rtype == 'm':
1537 driver, mdstate = record.split('\0', 1)
1537 driver, mdstate = record.split('\0', 1)
1538 ui.write(('merge driver: %s (state "%s")\n')
1538 ui.write(('merge driver: %s (state "%s")\n')
1539 % (driver, mdstate))
1539 % (driver, mdstate))
1540 elif rtype in 'FDC':
1540 elif rtype in 'FDC':
1541 r = record.split('\0')
1541 r = record.split('\0')
1542 f, state, hash, lfile, afile, anode, ofile = r[0:7]
1542 f, state, hash, lfile, afile, anode, ofile = r[0:7]
1543 if version == 1:
1543 if version == 1:
1544 onode = 'not stored in v1 format'
1544 onode = 'not stored in v1 format'
1545 flags = r[7]
1545 flags = r[7]
1546 else:
1546 else:
1547 onode, flags = r[7:9]
1547 onode, flags = r[7:9]
1548 ui.write(('file: %s (record type "%s", state "%s", hash %s)\n')
1548 ui.write(('file: %s (record type "%s", state "%s", hash %s)\n')
1549 % (f, rtype, state, _hashornull(hash)))
1549 % (f, rtype, state, _hashornull(hash)))
1550 ui.write((' local path: %s (flags "%s")\n') % (lfile, flags))
1550 ui.write((' local path: %s (flags "%s")\n') % (lfile, flags))
1551 ui.write((' ancestor path: %s (node %s)\n')
1551 ui.write((' ancestor path: %s (node %s)\n')
1552 % (afile, _hashornull(anode)))
1552 % (afile, _hashornull(anode)))
1553 ui.write((' other path: %s (node %s)\n')
1553 ui.write((' other path: %s (node %s)\n')
1554 % (ofile, _hashornull(onode)))
1554 % (ofile, _hashornull(onode)))
1555 elif rtype == 'f':
1555 elif rtype == 'f':
1556 filename, rawextras = record.split('\0', 1)
1556 filename, rawextras = record.split('\0', 1)
1557 extras = rawextras.split('\0')
1557 extras = rawextras.split('\0')
1558 i = 0
1558 i = 0
1559 extrastrings = []
1559 extrastrings = []
1560 while i < len(extras):
1560 while i < len(extras):
1561 extrastrings.append('%s = %s' % (extras[i], extras[i + 1]))
1561 extrastrings.append('%s = %s' % (extras[i], extras[i + 1]))
1562 i += 2
1562 i += 2
1563
1563
1564 ui.write(('file extras: %s (%s)\n')
1564 ui.write(('file extras: %s (%s)\n')
1565 % (filename, ', '.join(extrastrings)))
1565 % (filename, ', '.join(extrastrings)))
1566 elif rtype == 'l':
1566 elif rtype == 'l':
1567 labels = record.split('\0', 2)
1567 labels = record.split('\0', 2)
1568 labels = [l for l in labels if len(l) > 0]
1568 labels = [l for l in labels if len(l) > 0]
1569 ui.write(('labels:\n'))
1569 ui.write(('labels:\n'))
1570 ui.write((' local: %s\n' % labels[0]))
1570 ui.write((' local: %s\n' % labels[0]))
1571 ui.write((' other: %s\n' % labels[1]))
1571 ui.write((' other: %s\n' % labels[1]))
1572 if len(labels) > 2:
1572 if len(labels) > 2:
1573 ui.write((' base: %s\n' % labels[2]))
1573 ui.write((' base: %s\n' % labels[2]))
1574 else:
1574 else:
1575 ui.write(('unrecognized entry: %s\t%s\n')
1575 ui.write(('unrecognized entry: %s\t%s\n')
1576 % (rtype, record.replace('\0', '\t')))
1576 % (rtype, record.replace('\0', '\t')))
1577
1577
1578 # Avoid mergestate.read() since it may raise an exception for unsupported
1578 # Avoid mergestate.read() since it may raise an exception for unsupported
1579 # merge state records. We shouldn't be doing this, but this is OK since this
1579 # merge state records. We shouldn't be doing this, but this is OK since this
1580 # command is pretty low-level.
1580 # command is pretty low-level.
1581 ms = mergemod.mergestate(repo)
1581 ms = mergemod.mergestate(repo)
1582
1582
1583 # sort so that reasonable information is on top
1583 # sort so that reasonable information is on top
1584 v1records = ms._readrecordsv1()
1584 v1records = ms._readrecordsv1()
1585 v2records = ms._readrecordsv2()
1585 v2records = ms._readrecordsv2()
1586 order = 'LOml'
1586 order = 'LOml'
1587 def key(r):
1587 def key(r):
1588 idx = order.find(r[0])
1588 idx = order.find(r[0])
1589 if idx == -1:
1589 if idx == -1:
1590 return (1, r[1])
1590 return (1, r[1])
1591 else:
1591 else:
1592 return (0, idx)
1592 return (0, idx)
1593 v1records.sort(key=key)
1593 v1records.sort(key=key)
1594 v2records.sort(key=key)
1594 v2records.sort(key=key)
1595
1595
1596 if not v1records and not v2records:
1596 if not v1records and not v2records:
1597 ui.write(('no merge state found\n'))
1597 ui.write(('no merge state found\n'))
1598 elif not v2records:
1598 elif not v2records:
1599 ui.note(('no version 2 merge state\n'))
1599 ui.note(('no version 2 merge state\n'))
1600 printrecords(1)
1600 printrecords(1)
1601 elif ms._v1v2match(v1records, v2records):
1601 elif ms._v1v2match(v1records, v2records):
1602 ui.note(('v1 and v2 states match: using v2\n'))
1602 ui.note(('v1 and v2 states match: using v2\n'))
1603 printrecords(2)
1603 printrecords(2)
1604 else:
1604 else:
1605 ui.note(('v1 and v2 states mismatch: using v1\n'))
1605 ui.note(('v1 and v2 states mismatch: using v1\n'))
1606 printrecords(1)
1606 printrecords(1)
1607 if ui.verbose:
1607 if ui.verbose:
1608 printrecords(2)
1608 printrecords(2)
1609
1609
1610 @command('debugnamecomplete', [], _('NAME...'))
1610 @command('debugnamecomplete', [], _('NAME...'))
1611 def debugnamecomplete(ui, repo, *args):
1611 def debugnamecomplete(ui, repo, *args):
1612 '''complete "names" - tags, open branch names, bookmark names'''
1612 '''complete "names" - tags, open branch names, bookmark names'''
1613
1613
1614 names = set()
1614 names = set()
1615 # since we previously only listed open branches, we will handle that
1615 # since we previously only listed open branches, we will handle that
1616 # specially (after this for loop)
1616 # specially (after this for loop)
1617 for name, ns in repo.names.iteritems():
1617 for name, ns in repo.names.iteritems():
1618 if name != 'branches':
1618 if name != 'branches':
1619 names.update(ns.listnames(repo))
1619 names.update(ns.listnames(repo))
1620 names.update(tag for (tag, heads, tip, closed)
1620 names.update(tag for (tag, heads, tip, closed)
1621 in repo.branchmap().iterbranches() if not closed)
1621 in repo.branchmap().iterbranches() if not closed)
1622 completions = set()
1622 completions = set()
1623 if not args:
1623 if not args:
1624 args = ['']
1624 args = ['']
1625 for a in args:
1625 for a in args:
1626 completions.update(n for n in names if n.startswith(a))
1626 completions.update(n for n in names if n.startswith(a))
1627 ui.write('\n'.join(sorted(completions)))
1627 ui.write('\n'.join(sorted(completions)))
1628 ui.write('\n')
1628 ui.write('\n')
1629
1629
1630 @command('debugobsolete',
1630 @command('debugobsolete',
1631 [('', 'flags', 0, _('markers flag')),
1631 [('', 'flags', 0, _('markers flag')),
1632 ('', 'record-parents', False,
1632 ('', 'record-parents', False,
1633 _('record parent information for the precursor')),
1633 _('record parent information for the precursor')),
1634 ('r', 'rev', [], _('display markers relevant to REV')),
1634 ('r', 'rev', [], _('display markers relevant to REV')),
1635 ('', 'exclusive', False, _('restrict display to markers only '
1635 ('', 'exclusive', False, _('restrict display to markers only '
1636 'relevant to REV')),
1636 'relevant to REV')),
1637 ('', 'index', False, _('display index of the marker')),
1637 ('', 'index', False, _('display index of the marker')),
1638 ('', 'delete', [], _('delete markers specified by indices')),
1638 ('', 'delete', [], _('delete markers specified by indices')),
1639 ] + cmdutil.commitopts2 + cmdutil.formatteropts,
1639 ] + cmdutil.commitopts2 + cmdutil.formatteropts,
1640 _('[OBSOLETED [REPLACEMENT ...]]'))
1640 _('[OBSOLETED [REPLACEMENT ...]]'))
1641 def debugobsolete(ui, repo, precursor=None, *successors, **opts):
1641 def debugobsolete(ui, repo, precursor=None, *successors, **opts):
1642 """create arbitrary obsolete marker
1642 """create arbitrary obsolete marker
1643
1643
1644 With no arguments, displays the list of obsolescence markers."""
1644 With no arguments, displays the list of obsolescence markers."""
1645
1645
1646 opts = pycompat.byteskwargs(opts)
1646 opts = pycompat.byteskwargs(opts)
1647
1647
1648 def parsenodeid(s):
1648 def parsenodeid(s):
1649 try:
1649 try:
1650 # We do not use revsingle/revrange functions here to accept
1650 # We do not use revsingle/revrange functions here to accept
1651 # arbitrary node identifiers, possibly not present in the
1651 # arbitrary node identifiers, possibly not present in the
1652 # local repository.
1652 # local repository.
1653 n = bin(s)
1653 n = bin(s)
1654 if len(n) != len(nullid):
1654 if len(n) != len(nullid):
1655 raise TypeError()
1655 raise TypeError()
1656 return n
1656 return n
1657 except TypeError:
1657 except TypeError:
1658 raise error.Abort('changeset references must be full hexadecimal '
1658 raise error.Abort('changeset references must be full hexadecimal '
1659 'node identifiers')
1659 'node identifiers')
1660
1660
1661 if opts.get('delete'):
1661 if opts.get('delete'):
1662 indices = []
1662 indices = []
1663 for v in opts.get('delete'):
1663 for v in opts.get('delete'):
1664 try:
1664 try:
1665 indices.append(int(v))
1665 indices.append(int(v))
1666 except ValueError:
1666 except ValueError:
1667 raise error.Abort(_('invalid index value: %r') % v,
1667 raise error.Abort(_('invalid index value: %r') % v,
1668 hint=_('use integers for indices'))
1668 hint=_('use integers for indices'))
1669
1669
1670 if repo.currenttransaction():
1670 if repo.currenttransaction():
1671 raise error.Abort(_('cannot delete obsmarkers in the middle '
1671 raise error.Abort(_('cannot delete obsmarkers in the middle '
1672 'of transaction.'))
1672 'of transaction.'))
1673
1673
1674 with repo.lock():
1674 with repo.lock():
1675 n = repair.deleteobsmarkers(repo.obsstore, indices)
1675 n = repair.deleteobsmarkers(repo.obsstore, indices)
1676 ui.write(_('deleted %i obsolescence markers\n') % n)
1676 ui.write(_('deleted %i obsolescence markers\n') % n)
1677
1677
1678 return
1678 return
1679
1679
1680 if precursor is not None:
1680 if precursor is not None:
1681 if opts['rev']:
1681 if opts['rev']:
1682 raise error.Abort('cannot select revision when creating marker')
1682 raise error.Abort('cannot select revision when creating marker')
1683 metadata = {}
1683 metadata = {}
1684 metadata['user'] = encoding.fromlocal(opts['user'] or ui.username())
1684 metadata['user'] = encoding.fromlocal(opts['user'] or ui.username())
1685 succs = tuple(parsenodeid(succ) for succ in successors)
1685 succs = tuple(parsenodeid(succ) for succ in successors)
1686 l = repo.lock()
1686 l = repo.lock()
1687 try:
1687 try:
1688 tr = repo.transaction('debugobsolete')
1688 tr = repo.transaction('debugobsolete')
1689 try:
1689 try:
1690 date = opts.get('date')
1690 date = opts.get('date')
1691 if date:
1691 if date:
1692 date = dateutil.parsedate(date)
1692 date = dateutil.parsedate(date)
1693 else:
1693 else:
1694 date = None
1694 date = None
1695 prec = parsenodeid(precursor)
1695 prec = parsenodeid(precursor)
1696 parents = None
1696 parents = None
1697 if opts['record_parents']:
1697 if opts['record_parents']:
1698 if prec not in repo.unfiltered():
1698 if prec not in repo.unfiltered():
1699 raise error.Abort('cannot used --record-parents on '
1699 raise error.Abort('cannot used --record-parents on '
1700 'unknown changesets')
1700 'unknown changesets')
1701 parents = repo.unfiltered()[prec].parents()
1701 parents = repo.unfiltered()[prec].parents()
1702 parents = tuple(p.node() for p in parents)
1702 parents = tuple(p.node() for p in parents)
1703 repo.obsstore.create(tr, prec, succs, opts['flags'],
1703 repo.obsstore.create(tr, prec, succs, opts['flags'],
1704 parents=parents, date=date,
1704 parents=parents, date=date,
1705 metadata=metadata, ui=ui)
1705 metadata=metadata, ui=ui)
1706 tr.close()
1706 tr.close()
1707 except ValueError as exc:
1707 except ValueError as exc:
1708 raise error.Abort(_('bad obsmarker input: %s') %
1708 raise error.Abort(_('bad obsmarker input: %s') %
1709 pycompat.bytestr(exc))
1709 pycompat.bytestr(exc))
1710 finally:
1710 finally:
1711 tr.release()
1711 tr.release()
1712 finally:
1712 finally:
1713 l.release()
1713 l.release()
1714 else:
1714 else:
1715 if opts['rev']:
1715 if opts['rev']:
1716 revs = scmutil.revrange(repo, opts['rev'])
1716 revs = scmutil.revrange(repo, opts['rev'])
1717 nodes = [repo[r].node() for r in revs]
1717 nodes = [repo[r].node() for r in revs]
1718 markers = list(obsutil.getmarkers(repo, nodes=nodes,
1718 markers = list(obsutil.getmarkers(repo, nodes=nodes,
1719 exclusive=opts['exclusive']))
1719 exclusive=opts['exclusive']))
1720 markers.sort(key=lambda x: x._data)
1720 markers.sort(key=lambda x: x._data)
1721 else:
1721 else:
1722 markers = obsutil.getmarkers(repo)
1722 markers = obsutil.getmarkers(repo)
1723
1723
1724 markerstoiter = markers
1724 markerstoiter = markers
1725 isrelevant = lambda m: True
1725 isrelevant = lambda m: True
1726 if opts.get('rev') and opts.get('index'):
1726 if opts.get('rev') and opts.get('index'):
1727 markerstoiter = obsutil.getmarkers(repo)
1727 markerstoiter = obsutil.getmarkers(repo)
1728 markerset = set(markers)
1728 markerset = set(markers)
1729 isrelevant = lambda m: m in markerset
1729 isrelevant = lambda m: m in markerset
1730
1730
1731 fm = ui.formatter('debugobsolete', opts)
1731 fm = ui.formatter('debugobsolete', opts)
1732 for i, m in enumerate(markerstoiter):
1732 for i, m in enumerate(markerstoiter):
1733 if not isrelevant(m):
1733 if not isrelevant(m):
1734 # marker can be irrelevant when we're iterating over a set
1734 # marker can be irrelevant when we're iterating over a set
1735 # of markers (markerstoiter) which is bigger than the set
1735 # of markers (markerstoiter) which is bigger than the set
1736 # of markers we want to display (markers)
1736 # of markers we want to display (markers)
1737 # this can happen if both --index and --rev options are
1737 # this can happen if both --index and --rev options are
1738 # provided and thus we need to iterate over all of the markers
1738 # provided and thus we need to iterate over all of the markers
1739 # to get the correct indices, but only display the ones that
1739 # to get the correct indices, but only display the ones that
1740 # are relevant to --rev value
1740 # are relevant to --rev value
1741 continue
1741 continue
1742 fm.startitem()
1742 fm.startitem()
1743 ind = i if opts.get('index') else None
1743 ind = i if opts.get('index') else None
1744 cmdutil.showmarker(fm, m, index=ind)
1744 cmdutil.showmarker(fm, m, index=ind)
1745 fm.end()
1745 fm.end()
1746
1746
1747 @command('debugpathcomplete',
1747 @command('debugpathcomplete',
1748 [('f', 'full', None, _('complete an entire path')),
1748 [('f', 'full', None, _('complete an entire path')),
1749 ('n', 'normal', None, _('show only normal files')),
1749 ('n', 'normal', None, _('show only normal files')),
1750 ('a', 'added', None, _('show only added files')),
1750 ('a', 'added', None, _('show only added files')),
1751 ('r', 'removed', None, _('show only removed files'))],
1751 ('r', 'removed', None, _('show only removed files'))],
1752 _('FILESPEC...'))
1752 _('FILESPEC...'))
1753 def debugpathcomplete(ui, repo, *specs, **opts):
1753 def debugpathcomplete(ui, repo, *specs, **opts):
1754 '''complete part or all of a tracked path
1754 '''complete part or all of a tracked path
1755
1755
1756 This command supports shells that offer path name completion. It
1756 This command supports shells that offer path name completion. It
1757 currently completes only files already known to the dirstate.
1757 currently completes only files already known to the dirstate.
1758
1758
1759 Completion extends only to the next path segment unless
1759 Completion extends only to the next path segment unless
1760 --full is specified, in which case entire paths are used.'''
1760 --full is specified, in which case entire paths are used.'''
1761
1761
1762 def complete(path, acceptable):
1762 def complete(path, acceptable):
1763 dirstate = repo.dirstate
1763 dirstate = repo.dirstate
1764 spec = os.path.normpath(os.path.join(encoding.getcwd(), path))
1764 spec = os.path.normpath(os.path.join(encoding.getcwd(), path))
1765 rootdir = repo.root + pycompat.ossep
1765 rootdir = repo.root + pycompat.ossep
1766 if spec != repo.root and not spec.startswith(rootdir):
1766 if spec != repo.root and not spec.startswith(rootdir):
1767 return [], []
1767 return [], []
1768 if os.path.isdir(spec):
1768 if os.path.isdir(spec):
1769 spec += '/'
1769 spec += '/'
1770 spec = spec[len(rootdir):]
1770 spec = spec[len(rootdir):]
1771 fixpaths = pycompat.ossep != '/'
1771 fixpaths = pycompat.ossep != '/'
1772 if fixpaths:
1772 if fixpaths:
1773 spec = spec.replace(pycompat.ossep, '/')
1773 spec = spec.replace(pycompat.ossep, '/')
1774 speclen = len(spec)
1774 speclen = len(spec)
1775 fullpaths = opts[r'full']
1775 fullpaths = opts[r'full']
1776 files, dirs = set(), set()
1776 files, dirs = set(), set()
1777 adddir, addfile = dirs.add, files.add
1777 adddir, addfile = dirs.add, files.add
1778 for f, st in dirstate.iteritems():
1778 for f, st in dirstate.iteritems():
1779 if f.startswith(spec) and st[0] in acceptable:
1779 if f.startswith(spec) and st[0] in acceptable:
1780 if fixpaths:
1780 if fixpaths:
1781 f = f.replace('/', pycompat.ossep)
1781 f = f.replace('/', pycompat.ossep)
1782 if fullpaths:
1782 if fullpaths:
1783 addfile(f)
1783 addfile(f)
1784 continue
1784 continue
1785 s = f.find(pycompat.ossep, speclen)
1785 s = f.find(pycompat.ossep, speclen)
1786 if s >= 0:
1786 if s >= 0:
1787 adddir(f[:s])
1787 adddir(f[:s])
1788 else:
1788 else:
1789 addfile(f)
1789 addfile(f)
1790 return files, dirs
1790 return files, dirs
1791
1791
1792 acceptable = ''
1792 acceptable = ''
1793 if opts[r'normal']:
1793 if opts[r'normal']:
1794 acceptable += 'nm'
1794 acceptable += 'nm'
1795 if opts[r'added']:
1795 if opts[r'added']:
1796 acceptable += 'a'
1796 acceptable += 'a'
1797 if opts[r'removed']:
1797 if opts[r'removed']:
1798 acceptable += 'r'
1798 acceptable += 'r'
1799 cwd = repo.getcwd()
1799 cwd = repo.getcwd()
1800 if not specs:
1800 if not specs:
1801 specs = ['.']
1801 specs = ['.']
1802
1802
1803 files, dirs = set(), set()
1803 files, dirs = set(), set()
1804 for spec in specs:
1804 for spec in specs:
1805 f, d = complete(spec, acceptable or 'nmar')
1805 f, d = complete(spec, acceptable or 'nmar')
1806 files.update(f)
1806 files.update(f)
1807 dirs.update(d)
1807 dirs.update(d)
1808 files.update(dirs)
1808 files.update(dirs)
1809 ui.write('\n'.join(repo.pathto(p, cwd) for p in sorted(files)))
1809 ui.write('\n'.join(repo.pathto(p, cwd) for p in sorted(files)))
1810 ui.write('\n')
1810 ui.write('\n')
1811
1811
1812 @command('debugpeer', [], _('PATH'), norepo=True)
1812 @command('debugpeer', [], _('PATH'), norepo=True)
1813 def debugpeer(ui, path):
1813 def debugpeer(ui, path):
1814 """establish a connection to a peer repository"""
1814 """establish a connection to a peer repository"""
1815 # Always enable peer request logging. Requires --debug to display
1815 # Always enable peer request logging. Requires --debug to display
1816 # though.
1816 # though.
1817 overrides = {
1817 overrides = {
1818 ('devel', 'debug.peer-request'): True,
1818 ('devel', 'debug.peer-request'): True,
1819 }
1819 }
1820
1820
1821 with ui.configoverride(overrides):
1821 with ui.configoverride(overrides):
1822 peer = hg.peer(ui, {}, path)
1822 peer = hg.peer(ui, {}, path)
1823
1823
1824 local = peer.local() is not None
1824 local = peer.local() is not None
1825 canpush = peer.canpush()
1825 canpush = peer.canpush()
1826
1826
1827 ui.write(_('url: %s\n') % peer.url())
1827 ui.write(_('url: %s\n') % peer.url())
1828 ui.write(_('local: %s\n') % (_('yes') if local else _('no')))
1828 ui.write(_('local: %s\n') % (_('yes') if local else _('no')))
1829 ui.write(_('pushable: %s\n') % (_('yes') if canpush else _('no')))
1829 ui.write(_('pushable: %s\n') % (_('yes') if canpush else _('no')))
1830
1830
1831 @command('debugpickmergetool',
1831 @command('debugpickmergetool',
1832 [('r', 'rev', '', _('check for files in this revision'), _('REV')),
1832 [('r', 'rev', '', _('check for files in this revision'), _('REV')),
1833 ('', 'changedelete', None, _('emulate merging change and delete')),
1833 ('', 'changedelete', None, _('emulate merging change and delete')),
1834 ] + cmdutil.walkopts + cmdutil.mergetoolopts,
1834 ] + cmdutil.walkopts + cmdutil.mergetoolopts,
1835 _('[PATTERN]...'),
1835 _('[PATTERN]...'),
1836 inferrepo=True)
1836 inferrepo=True)
1837 def debugpickmergetool(ui, repo, *pats, **opts):
1837 def debugpickmergetool(ui, repo, *pats, **opts):
1838 """examine which merge tool is chosen for specified file
1838 """examine which merge tool is chosen for specified file
1839
1839
1840 As described in :hg:`help merge-tools`, Mercurial examines
1840 As described in :hg:`help merge-tools`, Mercurial examines
1841 configurations below in this order to decide which merge tool is
1841 configurations below in this order to decide which merge tool is
1842 chosen for specified file.
1842 chosen for specified file.
1843
1843
1844 1. ``--tool`` option
1844 1. ``--tool`` option
1845 2. ``HGMERGE`` environment variable
1845 2. ``HGMERGE`` environment variable
1846 3. configurations in ``merge-patterns`` section
1846 3. configurations in ``merge-patterns`` section
1847 4. configuration of ``ui.merge``
1847 4. configuration of ``ui.merge``
1848 5. configurations in ``merge-tools`` section
1848 5. configurations in ``merge-tools`` section
1849 6. ``hgmerge`` tool (for historical reason only)
1849 6. ``hgmerge`` tool (for historical reason only)
1850 7. default tool for fallback (``:merge`` or ``:prompt``)
1850 7. default tool for fallback (``:merge`` or ``:prompt``)
1851
1851
1852 This command writes out examination result in the style below::
1852 This command writes out examination result in the style below::
1853
1853
1854 FILE = MERGETOOL
1854 FILE = MERGETOOL
1855
1855
1856 By default, all files known in the first parent context of the
1856 By default, all files known in the first parent context of the
1857 working directory are examined. Use file patterns and/or -I/-X
1857 working directory are examined. Use file patterns and/or -I/-X
1858 options to limit target files. -r/--rev is also useful to examine
1858 options to limit target files. -r/--rev is also useful to examine
1859 files in another context without actual updating to it.
1859 files in another context without actual updating to it.
1860
1860
1861 With --debug, this command shows warning messages while matching
1861 With --debug, this command shows warning messages while matching
1862 against ``merge-patterns`` and so on, too. It is recommended to
1862 against ``merge-patterns`` and so on, too. It is recommended to
1863 use this option with explicit file patterns and/or -I/-X options,
1863 use this option with explicit file patterns and/or -I/-X options,
1864 because this option increases amount of output per file according
1864 because this option increases amount of output per file according
1865 to configurations in hgrc.
1865 to configurations in hgrc.
1866
1866
1867 With -v/--verbose, this command shows configurations below at
1867 With -v/--verbose, this command shows configurations below at
1868 first (only if specified).
1868 first (only if specified).
1869
1869
1870 - ``--tool`` option
1870 - ``--tool`` option
1871 - ``HGMERGE`` environment variable
1871 - ``HGMERGE`` environment variable
1872 - configuration of ``ui.merge``
1872 - configuration of ``ui.merge``
1873
1873
1874 If merge tool is chosen before matching against
1874 If merge tool is chosen before matching against
1875 ``merge-patterns``, this command can't show any helpful
1875 ``merge-patterns``, this command can't show any helpful
1876 information, even with --debug. In such case, information above is
1876 information, even with --debug. In such case, information above is
1877 useful to know why a merge tool is chosen.
1877 useful to know why a merge tool is chosen.
1878 """
1878 """
1879 opts = pycompat.byteskwargs(opts)
1879 opts = pycompat.byteskwargs(opts)
1880 overrides = {}
1880 overrides = {}
1881 if opts['tool']:
1881 if opts['tool']:
1882 overrides[('ui', 'forcemerge')] = opts['tool']
1882 overrides[('ui', 'forcemerge')] = opts['tool']
1883 ui.note(('with --tool %r\n') % (pycompat.bytestr(opts['tool'])))
1883 ui.note(('with --tool %r\n') % (pycompat.bytestr(opts['tool'])))
1884
1884
1885 with ui.configoverride(overrides, 'debugmergepatterns'):
1885 with ui.configoverride(overrides, 'debugmergepatterns'):
1886 hgmerge = encoding.environ.get("HGMERGE")
1886 hgmerge = encoding.environ.get("HGMERGE")
1887 if hgmerge is not None:
1887 if hgmerge is not None:
1888 ui.note(('with HGMERGE=%r\n') % (pycompat.bytestr(hgmerge)))
1888 ui.note(('with HGMERGE=%r\n') % (pycompat.bytestr(hgmerge)))
1889 uimerge = ui.config("ui", "merge")
1889 uimerge = ui.config("ui", "merge")
1890 if uimerge:
1890 if uimerge:
1891 ui.note(('with ui.merge=%r\n') % (pycompat.bytestr(uimerge)))
1891 ui.note(('with ui.merge=%r\n') % (pycompat.bytestr(uimerge)))
1892
1892
1893 ctx = scmutil.revsingle(repo, opts.get('rev'))
1893 ctx = scmutil.revsingle(repo, opts.get('rev'))
1894 m = scmutil.match(ctx, pats, opts)
1894 m = scmutil.match(ctx, pats, opts)
1895 changedelete = opts['changedelete']
1895 changedelete = opts['changedelete']
1896 for path in ctx.walk(m):
1896 for path in ctx.walk(m):
1897 fctx = ctx[path]
1897 fctx = ctx[path]
1898 try:
1898 try:
1899 if not ui.debugflag:
1899 if not ui.debugflag:
1900 ui.pushbuffer(error=True)
1900 ui.pushbuffer(error=True)
1901 tool, toolpath = filemerge._picktool(repo, ui, path,
1901 tool, toolpath = filemerge._picktool(repo, ui, path,
1902 fctx.isbinary(),
1902 fctx.isbinary(),
1903 'l' in fctx.flags(),
1903 'l' in fctx.flags(),
1904 changedelete)
1904 changedelete)
1905 finally:
1905 finally:
1906 if not ui.debugflag:
1906 if not ui.debugflag:
1907 ui.popbuffer()
1907 ui.popbuffer()
1908 ui.write(('%s = %s\n') % (path, tool))
1908 ui.write(('%s = %s\n') % (path, tool))
1909
1909
1910 @command('debugpushkey', [], _('REPO NAMESPACE [KEY OLD NEW]'), norepo=True)
1910 @command('debugpushkey', [], _('REPO NAMESPACE [KEY OLD NEW]'), norepo=True)
1911 def debugpushkey(ui, repopath, namespace, *keyinfo, **opts):
1911 def debugpushkey(ui, repopath, namespace, *keyinfo, **opts):
1912 '''access the pushkey key/value protocol
1912 '''access the pushkey key/value protocol
1913
1913
1914 With two args, list the keys in the given namespace.
1914 With two args, list the keys in the given namespace.
1915
1915
1916 With five args, set a key to new if it currently is set to old.
1916 With five args, set a key to new if it currently is set to old.
1917 Reports success or failure.
1917 Reports success or failure.
1918 '''
1918 '''
1919
1919
1920 target = hg.peer(ui, {}, repopath)
1920 target = hg.peer(ui, {}, repopath)
1921 if keyinfo:
1921 if keyinfo:
1922 key, old, new = keyinfo
1922 key, old, new = keyinfo
1923 with target.commandexecutor() as e:
1923 with target.commandexecutor() as e:
1924 r = e.callcommand('pushkey', {
1924 r = e.callcommand('pushkey', {
1925 'namespace': namespace,
1925 'namespace': namespace,
1926 'key': key,
1926 'key': key,
1927 'old': old,
1927 'old': old,
1928 'new': new,
1928 'new': new,
1929 }).result()
1929 }).result()
1930
1930
1931 ui.status(pycompat.bytestr(r) + '\n')
1931 ui.status(pycompat.bytestr(r) + '\n')
1932 return not r
1932 return not r
1933 else:
1933 else:
1934 for k, v in sorted(target.listkeys(namespace).iteritems()):
1934 for k, v in sorted(target.listkeys(namespace).iteritems()):
1935 ui.write("%s\t%s\n" % (stringutil.escapestr(k),
1935 ui.write("%s\t%s\n" % (stringutil.escapestr(k),
1936 stringutil.escapestr(v)))
1936 stringutil.escapestr(v)))
1937
1937
1938 @command('debugpvec', [], _('A B'))
1938 @command('debugpvec', [], _('A B'))
1939 def debugpvec(ui, repo, a, b=None):
1939 def debugpvec(ui, repo, a, b=None):
1940 ca = scmutil.revsingle(repo, a)
1940 ca = scmutil.revsingle(repo, a)
1941 cb = scmutil.revsingle(repo, b)
1941 cb = scmutil.revsingle(repo, b)
1942 pa = pvec.ctxpvec(ca)
1942 pa = pvec.ctxpvec(ca)
1943 pb = pvec.ctxpvec(cb)
1943 pb = pvec.ctxpvec(cb)
1944 if pa == pb:
1944 if pa == pb:
1945 rel = "="
1945 rel = "="
1946 elif pa > pb:
1946 elif pa > pb:
1947 rel = ">"
1947 rel = ">"
1948 elif pa < pb:
1948 elif pa < pb:
1949 rel = "<"
1949 rel = "<"
1950 elif pa | pb:
1950 elif pa | pb:
1951 rel = "|"
1951 rel = "|"
1952 ui.write(_("a: %s\n") % pa)
1952 ui.write(_("a: %s\n") % pa)
1953 ui.write(_("b: %s\n") % pb)
1953 ui.write(_("b: %s\n") % pb)
1954 ui.write(_("depth(a): %d depth(b): %d\n") % (pa._depth, pb._depth))
1954 ui.write(_("depth(a): %d depth(b): %d\n") % (pa._depth, pb._depth))
1955 ui.write(_("delta: %d hdist: %d distance: %d relation: %s\n") %
1955 ui.write(_("delta: %d hdist: %d distance: %d relation: %s\n") %
1956 (abs(pa._depth - pb._depth), pvec._hamming(pa._vec, pb._vec),
1956 (abs(pa._depth - pb._depth), pvec._hamming(pa._vec, pb._vec),
1957 pa.distance(pb), rel))
1957 pa.distance(pb), rel))
1958
1958
1959 @command('debugrebuilddirstate|debugrebuildstate',
1959 @command('debugrebuilddirstate|debugrebuildstate',
1960 [('r', 'rev', '', _('revision to rebuild to'), _('REV')),
1960 [('r', 'rev', '', _('revision to rebuild to'), _('REV')),
1961 ('', 'minimal', None, _('only rebuild files that are inconsistent with '
1961 ('', 'minimal', None, _('only rebuild files that are inconsistent with '
1962 'the working copy parent')),
1962 'the working copy parent')),
1963 ],
1963 ],
1964 _('[-r REV]'))
1964 _('[-r REV]'))
1965 def debugrebuilddirstate(ui, repo, rev, **opts):
1965 def debugrebuilddirstate(ui, repo, rev, **opts):
1966 """rebuild the dirstate as it would look like for the given revision
1966 """rebuild the dirstate as it would look like for the given revision
1967
1967
1968 If no revision is specified the first current parent will be used.
1968 If no revision is specified the first current parent will be used.
1969
1969
1970 The dirstate will be set to the files of the given revision.
1970 The dirstate will be set to the files of the given revision.
1971 The actual working directory content or existing dirstate
1971 The actual working directory content or existing dirstate
1972 information such as adds or removes is not considered.
1972 information such as adds or removes is not considered.
1973
1973
1974 ``minimal`` will only rebuild the dirstate status for files that claim to be
1974 ``minimal`` will only rebuild the dirstate status for files that claim to be
1975 tracked but are not in the parent manifest, or that exist in the parent
1975 tracked but are not in the parent manifest, or that exist in the parent
1976 manifest but are not in the dirstate. It will not change adds, removes, or
1976 manifest but are not in the dirstate. It will not change adds, removes, or
1977 modified files that are in the working copy parent.
1977 modified files that are in the working copy parent.
1978
1978
1979 One use of this command is to make the next :hg:`status` invocation
1979 One use of this command is to make the next :hg:`status` invocation
1980 check the actual file content.
1980 check the actual file content.
1981 """
1981 """
1982 ctx = scmutil.revsingle(repo, rev)
1982 ctx = scmutil.revsingle(repo, rev)
1983 with repo.wlock():
1983 with repo.wlock():
1984 dirstate = repo.dirstate
1984 dirstate = repo.dirstate
1985 changedfiles = None
1985 changedfiles = None
1986 # See command doc for what minimal does.
1986 # See command doc for what minimal does.
1987 if opts.get(r'minimal'):
1987 if opts.get(r'minimal'):
1988 manifestfiles = set(ctx.manifest().keys())
1988 manifestfiles = set(ctx.manifest().keys())
1989 dirstatefiles = set(dirstate)
1989 dirstatefiles = set(dirstate)
1990 manifestonly = manifestfiles - dirstatefiles
1990 manifestonly = manifestfiles - dirstatefiles
1991 dsonly = dirstatefiles - manifestfiles
1991 dsonly = dirstatefiles - manifestfiles
1992 dsnotadded = set(f for f in dsonly if dirstate[f] != 'a')
1992 dsnotadded = set(f for f in dsonly if dirstate[f] != 'a')
1993 changedfiles = manifestonly | dsnotadded
1993 changedfiles = manifestonly | dsnotadded
1994
1994
1995 dirstate.rebuild(ctx.node(), ctx.manifest(), changedfiles)
1995 dirstate.rebuild(ctx.node(), ctx.manifest(), changedfiles)
1996
1996
1997 @command('debugrebuildfncache', [], '')
1997 @command('debugrebuildfncache', [], '')
1998 def debugrebuildfncache(ui, repo):
1998 def debugrebuildfncache(ui, repo):
1999 """rebuild the fncache file"""
1999 """rebuild the fncache file"""
2000 repair.rebuildfncache(ui, repo)
2000 repair.rebuildfncache(ui, repo)
2001
2001
2002 @command('debugrename',
2002 @command('debugrename',
2003 [('r', 'rev', '', _('revision to debug'), _('REV'))],
2003 [('r', 'rev', '', _('revision to debug'), _('REV'))],
2004 _('[-r REV] FILE'))
2004 _('[-r REV] FILE'))
2005 def debugrename(ui, repo, file1, *pats, **opts):
2005 def debugrename(ui, repo, file1, *pats, **opts):
2006 """dump rename information"""
2006 """dump rename information"""
2007
2007
2008 opts = pycompat.byteskwargs(opts)
2008 opts = pycompat.byteskwargs(opts)
2009 ctx = scmutil.revsingle(repo, opts.get('rev'))
2009 ctx = scmutil.revsingle(repo, opts.get('rev'))
2010 m = scmutil.match(ctx, (file1,) + pats, opts)
2010 m = scmutil.match(ctx, (file1,) + pats, opts)
2011 for abs in ctx.walk(m):
2011 for abs in ctx.walk(m):
2012 fctx = ctx[abs]
2012 fctx = ctx[abs]
2013 o = fctx.filelog().renamed(fctx.filenode())
2013 o = fctx.filelog().renamed(fctx.filenode())
2014 rel = m.rel(abs)
2014 rel = m.rel(abs)
2015 if o:
2015 if o:
2016 ui.write(_("%s renamed from %s:%s\n") % (rel, o[0], hex(o[1])))
2016 ui.write(_("%s renamed from %s:%s\n") % (rel, o[0], hex(o[1])))
2017 else:
2017 else:
2018 ui.write(_("%s not renamed\n") % rel)
2018 ui.write(_("%s not renamed\n") % rel)
2019
2019
2020 @command('debugrevlog', cmdutil.debugrevlogopts +
2020 @command('debugrevlog', cmdutil.debugrevlogopts +
2021 [('d', 'dump', False, _('dump index data'))],
2021 [('d', 'dump', False, _('dump index data'))],
2022 _('-c|-m|FILE'),
2022 _('-c|-m|FILE'),
2023 optionalrepo=True)
2023 optionalrepo=True)
2024 def debugrevlog(ui, repo, file_=None, **opts):
2024 def debugrevlog(ui, repo, file_=None, **opts):
2025 """show data and statistics about a revlog"""
2025 """show data and statistics about a revlog"""
2026 opts = pycompat.byteskwargs(opts)
2026 opts = pycompat.byteskwargs(opts)
2027 r = cmdutil.openrevlog(repo, 'debugrevlog', file_, opts)
2027 r = cmdutil.openrevlog(repo, 'debugrevlog', file_, opts)
2028
2028
2029 if opts.get("dump"):
2029 if opts.get("dump"):
2030 numrevs = len(r)
2030 numrevs = len(r)
2031 ui.write(("# rev p1rev p2rev start end deltastart base p1 p2"
2031 ui.write(("# rev p1rev p2rev start end deltastart base p1 p2"
2032 " rawsize totalsize compression heads chainlen\n"))
2032 " rawsize totalsize compression heads chainlen\n"))
2033 ts = 0
2033 ts = 0
2034 heads = set()
2034 heads = set()
2035
2035
2036 for rev in pycompat.xrange(numrevs):
2036 for rev in pycompat.xrange(numrevs):
2037 dbase = r.deltaparent(rev)
2037 dbase = r.deltaparent(rev)
2038 if dbase == -1:
2038 if dbase == -1:
2039 dbase = rev
2039 dbase = rev
2040 cbase = r.chainbase(rev)
2040 cbase = r.chainbase(rev)
2041 clen = r.chainlen(rev)
2041 clen = r.chainlen(rev)
2042 p1, p2 = r.parentrevs(rev)
2042 p1, p2 = r.parentrevs(rev)
2043 rs = r.rawsize(rev)
2043 rs = r.rawsize(rev)
2044 ts = ts + rs
2044 ts = ts + rs
2045 heads -= set(r.parentrevs(rev))
2045 heads -= set(r.parentrevs(rev))
2046 heads.add(rev)
2046 heads.add(rev)
2047 try:
2047 try:
2048 compression = ts / r.end(rev)
2048 compression = ts / r.end(rev)
2049 except ZeroDivisionError:
2049 except ZeroDivisionError:
2050 compression = 0
2050 compression = 0
2051 ui.write("%5d %5d %5d %5d %5d %10d %4d %4d %4d %7d %9d "
2051 ui.write("%5d %5d %5d %5d %5d %10d %4d %4d %4d %7d %9d "
2052 "%11d %5d %8d\n" %
2052 "%11d %5d %8d\n" %
2053 (rev, p1, p2, r.start(rev), r.end(rev),
2053 (rev, p1, p2, r.start(rev), r.end(rev),
2054 r.start(dbase), r.start(cbase),
2054 r.start(dbase), r.start(cbase),
2055 r.start(p1), r.start(p2),
2055 r.start(p1), r.start(p2),
2056 rs, ts, compression, len(heads), clen))
2056 rs, ts, compression, len(heads), clen))
2057 return 0
2057 return 0
2058
2058
2059 v = r.version
2059 v = r.version
2060 format = v & 0xFFFF
2060 format = v & 0xFFFF
2061 flags = []
2061 flags = []
2062 gdelta = False
2062 gdelta = False
2063 if v & revlog.FLAG_INLINE_DATA:
2063 if v & revlog.FLAG_INLINE_DATA:
2064 flags.append('inline')
2064 flags.append('inline')
2065 if v & revlog.FLAG_GENERALDELTA:
2065 if v & revlog.FLAG_GENERALDELTA:
2066 gdelta = True
2066 gdelta = True
2067 flags.append('generaldelta')
2067 flags.append('generaldelta')
2068 if not flags:
2068 if not flags:
2069 flags = ['(none)']
2069 flags = ['(none)']
2070
2070
2071 ### tracks merge vs single parent
2071 ### tracks merge vs single parent
2072 nummerges = 0
2072 nummerges = 0
2073
2073
2074 ### tracks ways the "delta" are build
2074 ### tracks ways the "delta" are build
2075 # nodelta
2075 # nodelta
2076 numempty = 0
2076 numempty = 0
2077 numemptytext = 0
2077 numemptytext = 0
2078 numemptydelta = 0
2078 numemptydelta = 0
2079 # full file content
2079 # full file content
2080 numfull = 0
2080 numfull = 0
2081 # intermediate snapshot against a prior snapshot
2081 # intermediate snapshot against a prior snapshot
2082 numsemi = 0
2082 numsemi = 0
2083 # snapshot count per depth
2083 # snapshot count per depth
2084 numsnapdepth = collections.defaultdict(lambda: 0)
2084 numsnapdepth = collections.defaultdict(lambda: 0)
2085 # delta against previous revision
2085 # delta against previous revision
2086 numprev = 0
2086 numprev = 0
2087 # delta against first or second parent (not prev)
2087 # delta against first or second parent (not prev)
2088 nump1 = 0
2088 nump1 = 0
2089 nump2 = 0
2089 nump2 = 0
2090 # delta against neither prev nor parents
2090 # delta against neither prev nor parents
2091 numother = 0
2091 numother = 0
2092 # delta against prev that are also first or second parent
2092 # delta against prev that are also first or second parent
2093 # (details of `numprev`)
2093 # (details of `numprev`)
2094 nump1prev = 0
2094 nump1prev = 0
2095 nump2prev = 0
2095 nump2prev = 0
2096
2096
2097 # data about delta chain of each revs
2097 # data about delta chain of each revs
2098 chainlengths = []
2098 chainlengths = []
2099 chainbases = []
2099 chainbases = []
2100 chainspans = []
2100 chainspans = []
2101
2101
2102 # data about each revision
2102 # data about each revision
2103 datasize = [None, 0, 0]
2103 datasize = [None, 0, 0]
2104 fullsize = [None, 0, 0]
2104 fullsize = [None, 0, 0]
2105 semisize = [None, 0, 0]
2105 semisize = [None, 0, 0]
2106 # snapshot count per depth
2106 # snapshot count per depth
2107 snapsizedepth = collections.defaultdict(lambda: [None, 0, 0])
2107 snapsizedepth = collections.defaultdict(lambda: [None, 0, 0])
2108 deltasize = [None, 0, 0]
2108 deltasize = [None, 0, 0]
2109 chunktypecounts = {}
2109 chunktypecounts = {}
2110 chunktypesizes = {}
2110 chunktypesizes = {}
2111
2111
2112 def addsize(size, l):
2112 def addsize(size, l):
2113 if l[0] is None or size < l[0]:
2113 if l[0] is None or size < l[0]:
2114 l[0] = size
2114 l[0] = size
2115 if size > l[1]:
2115 if size > l[1]:
2116 l[1] = size
2116 l[1] = size
2117 l[2] += size
2117 l[2] += size
2118
2118
2119 numrevs = len(r)
2119 numrevs = len(r)
2120 for rev in pycompat.xrange(numrevs):
2120 for rev in pycompat.xrange(numrevs):
2121 p1, p2 = r.parentrevs(rev)
2121 p1, p2 = r.parentrevs(rev)
2122 delta = r.deltaparent(rev)
2122 delta = r.deltaparent(rev)
2123 if format > 0:
2123 if format > 0:
2124 addsize(r.rawsize(rev), datasize)
2124 addsize(r.rawsize(rev), datasize)
2125 if p2 != nullrev:
2125 if p2 != nullrev:
2126 nummerges += 1
2126 nummerges += 1
2127 size = r.length(rev)
2127 size = r.length(rev)
2128 if delta == nullrev:
2128 if delta == nullrev:
2129 chainlengths.append(0)
2129 chainlengths.append(0)
2130 chainbases.append(r.start(rev))
2130 chainbases.append(r.start(rev))
2131 chainspans.append(size)
2131 chainspans.append(size)
2132 if size == 0:
2132 if size == 0:
2133 numempty += 1
2133 numempty += 1
2134 numemptytext += 1
2134 numemptytext += 1
2135 else:
2135 else:
2136 numfull += 1
2136 numfull += 1
2137 numsnapdepth[0] += 1
2137 numsnapdepth[0] += 1
2138 addsize(size, fullsize)
2138 addsize(size, fullsize)
2139 addsize(size, snapsizedepth[0])
2139 addsize(size, snapsizedepth[0])
2140 else:
2140 else:
2141 chainlengths.append(chainlengths[delta] + 1)
2141 chainlengths.append(chainlengths[delta] + 1)
2142 baseaddr = chainbases[delta]
2142 baseaddr = chainbases[delta]
2143 revaddr = r.start(rev)
2143 revaddr = r.start(rev)
2144 chainbases.append(baseaddr)
2144 chainbases.append(baseaddr)
2145 chainspans.append((revaddr - baseaddr) + size)
2145 chainspans.append((revaddr - baseaddr) + size)
2146 if size == 0:
2146 if size == 0:
2147 numempty += 1
2147 numempty += 1
2148 numemptydelta += 1
2148 numemptydelta += 1
2149 elif r.issnapshot(rev):
2149 elif r.issnapshot(rev):
2150 addsize(size, semisize)
2150 addsize(size, semisize)
2151 numsemi += 1
2151 numsemi += 1
2152 depth = r.snapshotdepth(rev)
2152 depth = r.snapshotdepth(rev)
2153 numsnapdepth[depth] += 1
2153 numsnapdepth[depth] += 1
2154 addsize(size, snapsizedepth[depth])
2154 addsize(size, snapsizedepth[depth])
2155 else:
2155 else:
2156 addsize(size, deltasize)
2156 addsize(size, deltasize)
2157 if delta == rev - 1:
2157 if delta == rev - 1:
2158 numprev += 1
2158 numprev += 1
2159 if delta == p1:
2159 if delta == p1:
2160 nump1prev += 1
2160 nump1prev += 1
2161 elif delta == p2:
2161 elif delta == p2:
2162 nump2prev += 1
2162 nump2prev += 1
2163 elif delta == p1:
2163 elif delta == p1:
2164 nump1 += 1
2164 nump1 += 1
2165 elif delta == p2:
2165 elif delta == p2:
2166 nump2 += 1
2166 nump2 += 1
2167 elif delta != nullrev:
2167 elif delta != nullrev:
2168 numother += 1
2168 numother += 1
2169
2169
2170 # Obtain data on the raw chunks in the revlog.
2170 # Obtain data on the raw chunks in the revlog.
2171 if util.safehasattr(r, '_getsegmentforrevs'):
2171 if util.safehasattr(r, '_getsegmentforrevs'):
2172 segment = r._getsegmentforrevs(rev, rev)[1]
2172 segment = r._getsegmentforrevs(rev, rev)[1]
2173 else:
2173 else:
2174 segment = r._revlog._getsegmentforrevs(rev, rev)[1]
2174 segment = r._revlog._getsegmentforrevs(rev, rev)[1]
2175 if segment:
2175 if segment:
2176 chunktype = bytes(segment[0:1])
2176 chunktype = bytes(segment[0:1])
2177 else:
2177 else:
2178 chunktype = 'empty'
2178 chunktype = 'empty'
2179
2179
2180 if chunktype not in chunktypecounts:
2180 if chunktype not in chunktypecounts:
2181 chunktypecounts[chunktype] = 0
2181 chunktypecounts[chunktype] = 0
2182 chunktypesizes[chunktype] = 0
2182 chunktypesizes[chunktype] = 0
2183
2183
2184 chunktypecounts[chunktype] += 1
2184 chunktypecounts[chunktype] += 1
2185 chunktypesizes[chunktype] += size
2185 chunktypesizes[chunktype] += size
2186
2186
2187 # Adjust size min value for empty cases
2187 # Adjust size min value for empty cases
2188 for size in (datasize, fullsize, semisize, deltasize):
2188 for size in (datasize, fullsize, semisize, deltasize):
2189 if size[0] is None:
2189 if size[0] is None:
2190 size[0] = 0
2190 size[0] = 0
2191
2191
2192 numdeltas = numrevs - numfull - numempty - numsemi
2192 numdeltas = numrevs - numfull - numempty - numsemi
2193 numoprev = numprev - nump1prev - nump2prev
2193 numoprev = numprev - nump1prev - nump2prev
2194 totalrawsize = datasize[2]
2194 totalrawsize = datasize[2]
2195 datasize[2] /= numrevs
2195 datasize[2] /= numrevs
2196 fulltotal = fullsize[2]
2196 fulltotal = fullsize[2]
2197 fullsize[2] /= numfull
2197 fullsize[2] /= numfull
2198 semitotal = semisize[2]
2198 semitotal = semisize[2]
2199 snaptotal = {}
2199 snaptotal = {}
2200 if 0 < numsemi:
2200 if 0 < numsemi:
2201 semisize[2] /= numsemi
2201 semisize[2] /= numsemi
2202 for depth in snapsizedepth:
2202 for depth in snapsizedepth:
2203 snaptotal[depth] = snapsizedepth[depth][2]
2203 snaptotal[depth] = snapsizedepth[depth][2]
2204 snapsizedepth[depth][2] /= numsnapdepth[depth]
2204 snapsizedepth[depth][2] /= numsnapdepth[depth]
2205
2205
2206 deltatotal = deltasize[2]
2206 deltatotal = deltasize[2]
2207 if numdeltas > 0:
2207 if numdeltas > 0:
2208 deltasize[2] /= numdeltas
2208 deltasize[2] /= numdeltas
2209 totalsize = fulltotal + semitotal + deltatotal
2209 totalsize = fulltotal + semitotal + deltatotal
2210 avgchainlen = sum(chainlengths) / numrevs
2210 avgchainlen = sum(chainlengths) / numrevs
2211 maxchainlen = max(chainlengths)
2211 maxchainlen = max(chainlengths)
2212 maxchainspan = max(chainspans)
2212 maxchainspan = max(chainspans)
2213 compratio = 1
2213 compratio = 1
2214 if totalsize:
2214 if totalsize:
2215 compratio = totalrawsize / totalsize
2215 compratio = totalrawsize / totalsize
2216
2216
2217 basedfmtstr = '%%%dd\n'
2217 basedfmtstr = '%%%dd\n'
2218 basepcfmtstr = '%%%dd %s(%%5.2f%%%%)\n'
2218 basepcfmtstr = '%%%dd %s(%%5.2f%%%%)\n'
2219
2219
2220 def dfmtstr(max):
2220 def dfmtstr(max):
2221 return basedfmtstr % len(str(max))
2221 return basedfmtstr % len(str(max))
2222 def pcfmtstr(max, padding=0):
2222 def pcfmtstr(max, padding=0):
2223 return basepcfmtstr % (len(str(max)), ' ' * padding)
2223 return basepcfmtstr % (len(str(max)), ' ' * padding)
2224
2224
2225 def pcfmt(value, total):
2225 def pcfmt(value, total):
2226 if total:
2226 if total:
2227 return (value, 100 * float(value) / total)
2227 return (value, 100 * float(value) / total)
2228 else:
2228 else:
2229 return value, 100.0
2229 return value, 100.0
2230
2230
2231 ui.write(('format : %d\n') % format)
2231 ui.write(('format : %d\n') % format)
2232 ui.write(('flags : %s\n') % ', '.join(flags))
2232 ui.write(('flags : %s\n') % ', '.join(flags))
2233
2233
2234 ui.write('\n')
2234 ui.write('\n')
2235 fmt = pcfmtstr(totalsize)
2235 fmt = pcfmtstr(totalsize)
2236 fmt2 = dfmtstr(totalsize)
2236 fmt2 = dfmtstr(totalsize)
2237 ui.write(('revisions : ') + fmt2 % numrevs)
2237 ui.write(('revisions : ') + fmt2 % numrevs)
2238 ui.write((' merges : ') + fmt % pcfmt(nummerges, numrevs))
2238 ui.write((' merges : ') + fmt % pcfmt(nummerges, numrevs))
2239 ui.write((' normal : ') + fmt % pcfmt(numrevs - nummerges, numrevs))
2239 ui.write((' normal : ') + fmt % pcfmt(numrevs - nummerges, numrevs))
2240 ui.write(('revisions : ') + fmt2 % numrevs)
2240 ui.write(('revisions : ') + fmt2 % numrevs)
2241 ui.write((' empty : ') + fmt % pcfmt(numempty, numrevs))
2241 ui.write((' empty : ') + fmt % pcfmt(numempty, numrevs))
2242 ui.write((' text : ')
2242 ui.write((' text : ')
2243 + fmt % pcfmt(numemptytext, numemptytext + numemptydelta))
2243 + fmt % pcfmt(numemptytext, numemptytext + numemptydelta))
2244 ui.write((' delta : ')
2244 ui.write((' delta : ')
2245 + fmt % pcfmt(numemptydelta, numemptytext + numemptydelta))
2245 + fmt % pcfmt(numemptydelta, numemptytext + numemptydelta))
2246 ui.write((' snapshot : ') + fmt % pcfmt(numfull + numsemi, numrevs))
2246 ui.write((' snapshot : ') + fmt % pcfmt(numfull + numsemi, numrevs))
2247 for depth in sorted(numsnapdepth):
2247 for depth in sorted(numsnapdepth):
2248 ui.write((' lvl-%-3d : ' % depth)
2248 ui.write((' lvl-%-3d : ' % depth)
2249 + fmt % pcfmt(numsnapdepth[depth], numrevs))
2249 + fmt % pcfmt(numsnapdepth[depth], numrevs))
2250 ui.write((' deltas : ') + fmt % pcfmt(numdeltas, numrevs))
2250 ui.write((' deltas : ') + fmt % pcfmt(numdeltas, numrevs))
2251 ui.write(('revision size : ') + fmt2 % totalsize)
2251 ui.write(('revision size : ') + fmt2 % totalsize)
2252 ui.write((' snapshot : ')
2252 ui.write((' snapshot : ')
2253 + fmt % pcfmt(fulltotal + semitotal, totalsize))
2253 + fmt % pcfmt(fulltotal + semitotal, totalsize))
2254 for depth in sorted(numsnapdepth):
2254 for depth in sorted(numsnapdepth):
2255 ui.write((' lvl-%-3d : ' % depth)
2255 ui.write((' lvl-%-3d : ' % depth)
2256 + fmt % pcfmt(snaptotal[depth], totalsize))
2256 + fmt % pcfmt(snaptotal[depth], totalsize))
2257 ui.write((' deltas : ') + fmt % pcfmt(deltatotal, totalsize))
2257 ui.write((' deltas : ') + fmt % pcfmt(deltatotal, totalsize))
2258
2258
2259 def fmtchunktype(chunktype):
2259 def fmtchunktype(chunktype):
2260 if chunktype == 'empty':
2260 if chunktype == 'empty':
2261 return ' %s : ' % chunktype
2261 return ' %s : ' % chunktype
2262 elif chunktype in pycompat.bytestr(string.ascii_letters):
2262 elif chunktype in pycompat.bytestr(string.ascii_letters):
2263 return ' 0x%s (%s) : ' % (hex(chunktype), chunktype)
2263 return ' 0x%s (%s) : ' % (hex(chunktype), chunktype)
2264 else:
2264 else:
2265 return ' 0x%s : ' % hex(chunktype)
2265 return ' 0x%s : ' % hex(chunktype)
2266
2266
2267 ui.write('\n')
2267 ui.write('\n')
2268 ui.write(('chunks : ') + fmt2 % numrevs)
2268 ui.write(('chunks : ') + fmt2 % numrevs)
2269 for chunktype in sorted(chunktypecounts):
2269 for chunktype in sorted(chunktypecounts):
2270 ui.write(fmtchunktype(chunktype))
2270 ui.write(fmtchunktype(chunktype))
2271 ui.write(fmt % pcfmt(chunktypecounts[chunktype], numrevs))
2271 ui.write(fmt % pcfmt(chunktypecounts[chunktype], numrevs))
2272 ui.write(('chunks size : ') + fmt2 % totalsize)
2272 ui.write(('chunks size : ') + fmt2 % totalsize)
2273 for chunktype in sorted(chunktypecounts):
2273 for chunktype in sorted(chunktypecounts):
2274 ui.write(fmtchunktype(chunktype))
2274 ui.write(fmtchunktype(chunktype))
2275 ui.write(fmt % pcfmt(chunktypesizes[chunktype], totalsize))
2275 ui.write(fmt % pcfmt(chunktypesizes[chunktype], totalsize))
2276
2276
2277 ui.write('\n')
2277 ui.write('\n')
2278 fmt = dfmtstr(max(avgchainlen, maxchainlen, maxchainspan, compratio))
2278 fmt = dfmtstr(max(avgchainlen, maxchainlen, maxchainspan, compratio))
2279 ui.write(('avg chain length : ') + fmt % avgchainlen)
2279 ui.write(('avg chain length : ') + fmt % avgchainlen)
2280 ui.write(('max chain length : ') + fmt % maxchainlen)
2280 ui.write(('max chain length : ') + fmt % maxchainlen)
2281 ui.write(('max chain reach : ') + fmt % maxchainspan)
2281 ui.write(('max chain reach : ') + fmt % maxchainspan)
2282 ui.write(('compression ratio : ') + fmt % compratio)
2282 ui.write(('compression ratio : ') + fmt % compratio)
2283
2283
2284 if format > 0:
2284 if format > 0:
2285 ui.write('\n')
2285 ui.write('\n')
2286 ui.write(('uncompressed data size (min/max/avg) : %d / %d / %d\n')
2286 ui.write(('uncompressed data size (min/max/avg) : %d / %d / %d\n')
2287 % tuple(datasize))
2287 % tuple(datasize))
2288 ui.write(('full revision size (min/max/avg) : %d / %d / %d\n')
2288 ui.write(('full revision size (min/max/avg) : %d / %d / %d\n')
2289 % tuple(fullsize))
2289 % tuple(fullsize))
2290 ui.write(('inter-snapshot size (min/max/avg) : %d / %d / %d\n')
2290 ui.write(('inter-snapshot size (min/max/avg) : %d / %d / %d\n')
2291 % tuple(semisize))
2291 % tuple(semisize))
2292 for depth in sorted(snapsizedepth):
2292 for depth in sorted(snapsizedepth):
2293 if depth == 0:
2293 if depth == 0:
2294 continue
2294 continue
2295 ui.write((' level-%-3d (min/max/avg) : %d / %d / %d\n')
2295 ui.write((' level-%-3d (min/max/avg) : %d / %d / %d\n')
2296 % ((depth,) + tuple(snapsizedepth[depth])))
2296 % ((depth,) + tuple(snapsizedepth[depth])))
2297 ui.write(('delta size (min/max/avg) : %d / %d / %d\n')
2297 ui.write(('delta size (min/max/avg) : %d / %d / %d\n')
2298 % tuple(deltasize))
2298 % tuple(deltasize))
2299
2299
2300 if numdeltas > 0:
2300 if numdeltas > 0:
2301 ui.write('\n')
2301 ui.write('\n')
2302 fmt = pcfmtstr(numdeltas)
2302 fmt = pcfmtstr(numdeltas)
2303 fmt2 = pcfmtstr(numdeltas, 4)
2303 fmt2 = pcfmtstr(numdeltas, 4)
2304 ui.write(('deltas against prev : ') + fmt % pcfmt(numprev, numdeltas))
2304 ui.write(('deltas against prev : ') + fmt % pcfmt(numprev, numdeltas))
2305 if numprev > 0:
2305 if numprev > 0:
2306 ui.write((' where prev = p1 : ') + fmt2 % pcfmt(nump1prev,
2306 ui.write((' where prev = p1 : ') + fmt2 % pcfmt(nump1prev,
2307 numprev))
2307 numprev))
2308 ui.write((' where prev = p2 : ') + fmt2 % pcfmt(nump2prev,
2308 ui.write((' where prev = p2 : ') + fmt2 % pcfmt(nump2prev,
2309 numprev))
2309 numprev))
2310 ui.write((' other : ') + fmt2 % pcfmt(numoprev,
2310 ui.write((' other : ') + fmt2 % pcfmt(numoprev,
2311 numprev))
2311 numprev))
2312 if gdelta:
2312 if gdelta:
2313 ui.write(('deltas against p1 : ')
2313 ui.write(('deltas against p1 : ')
2314 + fmt % pcfmt(nump1, numdeltas))
2314 + fmt % pcfmt(nump1, numdeltas))
2315 ui.write(('deltas against p2 : ')
2315 ui.write(('deltas against p2 : ')
2316 + fmt % pcfmt(nump2, numdeltas))
2316 + fmt % pcfmt(nump2, numdeltas))
2317 ui.write(('deltas against other : ') + fmt % pcfmt(numother,
2317 ui.write(('deltas against other : ') + fmt % pcfmt(numother,
2318 numdeltas))
2318 numdeltas))
2319
2319
2320 @command('debugrevlogindex', cmdutil.debugrevlogopts +
2320 @command('debugrevlogindex', cmdutil.debugrevlogopts +
2321 [('f', 'format', 0, _('revlog format'), _('FORMAT'))],
2321 [('f', 'format', 0, _('revlog format'), _('FORMAT'))],
2322 _('[-f FORMAT] -c|-m|FILE'),
2322 _('[-f FORMAT] -c|-m|FILE'),
2323 optionalrepo=True)
2323 optionalrepo=True)
2324 def debugrevlogindex(ui, repo, file_=None, **opts):
2324 def debugrevlogindex(ui, repo, file_=None, **opts):
2325 """dump the contents of a revlog index"""
2325 """dump the contents of a revlog index"""
2326 opts = pycompat.byteskwargs(opts)
2326 opts = pycompat.byteskwargs(opts)
2327 r = cmdutil.openrevlog(repo, 'debugrevlogindex', file_, opts)
2327 r = cmdutil.openrevlog(repo, 'debugrevlogindex', file_, opts)
2328 format = opts.get('format', 0)
2328 format = opts.get('format', 0)
2329 if format not in (0, 1):
2329 if format not in (0, 1):
2330 raise error.Abort(_("unknown format %d") % format)
2330 raise error.Abort(_("unknown format %d") % format)
2331
2331
2332 if ui.debugflag:
2332 if ui.debugflag:
2333 shortfn = hex
2333 shortfn = hex
2334 else:
2334 else:
2335 shortfn = short
2335 shortfn = short
2336
2336
2337 # There might not be anything in r, so have a sane default
2337 # There might not be anything in r, so have a sane default
2338 idlen = 12
2338 idlen = 12
2339 for i in r:
2339 for i in r:
2340 idlen = len(shortfn(r.node(i)))
2340 idlen = len(shortfn(r.node(i)))
2341 break
2341 break
2342
2342
2343 if format == 0:
2343 if format == 0:
2344 if ui.verbose:
2344 if ui.verbose:
2345 ui.write((" rev offset length linkrev"
2345 ui.write((" rev offset length linkrev"
2346 " %s %s p2\n") % ("nodeid".ljust(idlen),
2346 " %s %s p2\n") % ("nodeid".ljust(idlen),
2347 "p1".ljust(idlen)))
2347 "p1".ljust(idlen)))
2348 else:
2348 else:
2349 ui.write((" rev linkrev %s %s p2\n") % (
2349 ui.write((" rev linkrev %s %s p2\n") % (
2350 "nodeid".ljust(idlen), "p1".ljust(idlen)))
2350 "nodeid".ljust(idlen), "p1".ljust(idlen)))
2351 elif format == 1:
2351 elif format == 1:
2352 if ui.verbose:
2352 if ui.verbose:
2353 ui.write((" rev flag offset length size link p1"
2353 ui.write((" rev flag offset length size link p1"
2354 " p2 %s\n") % "nodeid".rjust(idlen))
2354 " p2 %s\n") % "nodeid".rjust(idlen))
2355 else:
2355 else:
2356 ui.write((" rev flag size link p1 p2 %s\n") %
2356 ui.write((" rev flag size link p1 p2 %s\n") %
2357 "nodeid".rjust(idlen))
2357 "nodeid".rjust(idlen))
2358
2358
2359 for i in r:
2359 for i in r:
2360 node = r.node(i)
2360 node = r.node(i)
2361 if format == 0:
2361 if format == 0:
2362 try:
2362 try:
2363 pp = r.parents(node)
2363 pp = r.parents(node)
2364 except Exception:
2364 except Exception:
2365 pp = [nullid, nullid]
2365 pp = [nullid, nullid]
2366 if ui.verbose:
2366 if ui.verbose:
2367 ui.write("% 6d % 9d % 7d % 7d %s %s %s\n" % (
2367 ui.write("% 6d % 9d % 7d % 7d %s %s %s\n" % (
2368 i, r.start(i), r.length(i), r.linkrev(i),
2368 i, r.start(i), r.length(i), r.linkrev(i),
2369 shortfn(node), shortfn(pp[0]), shortfn(pp[1])))
2369 shortfn(node), shortfn(pp[0]), shortfn(pp[1])))
2370 else:
2370 else:
2371 ui.write("% 6d % 7d %s %s %s\n" % (
2371 ui.write("% 6d % 7d %s %s %s\n" % (
2372 i, r.linkrev(i), shortfn(node), shortfn(pp[0]),
2372 i, r.linkrev(i), shortfn(node), shortfn(pp[0]),
2373 shortfn(pp[1])))
2373 shortfn(pp[1])))
2374 elif format == 1:
2374 elif format == 1:
2375 pr = r.parentrevs(i)
2375 pr = r.parentrevs(i)
2376 if ui.verbose:
2376 if ui.verbose:
2377 ui.write("% 6d %04x % 8d % 8d % 8d % 6d % 6d % 6d %s\n" % (
2377 ui.write("% 6d %04x % 8d % 8d % 8d % 6d % 6d % 6d %s\n" % (
2378 i, r.flags(i), r.start(i), r.length(i), r.rawsize(i),
2378 i, r.flags(i), r.start(i), r.length(i), r.rawsize(i),
2379 r.linkrev(i), pr[0], pr[1], shortfn(node)))
2379 r.linkrev(i), pr[0], pr[1], shortfn(node)))
2380 else:
2380 else:
2381 ui.write("% 6d %04x % 8d % 6d % 6d % 6d %s\n" % (
2381 ui.write("% 6d %04x % 8d % 6d % 6d % 6d %s\n" % (
2382 i, r.flags(i), r.rawsize(i), r.linkrev(i), pr[0], pr[1],
2382 i, r.flags(i), r.rawsize(i), r.linkrev(i), pr[0], pr[1],
2383 shortfn(node)))
2383 shortfn(node)))
2384
2384
2385 @command('debugrevspec',
2385 @command('debugrevspec',
2386 [('', 'optimize', None,
2386 [('', 'optimize', None,
2387 _('print parsed tree after optimizing (DEPRECATED)')),
2387 _('print parsed tree after optimizing (DEPRECATED)')),
2388 ('', 'show-revs', True, _('print list of result revisions (default)')),
2388 ('', 'show-revs', True, _('print list of result revisions (default)')),
2389 ('s', 'show-set', None, _('print internal representation of result set')),
2389 ('s', 'show-set', None, _('print internal representation of result set')),
2390 ('p', 'show-stage', [],
2390 ('p', 'show-stage', [],
2391 _('print parsed tree at the given stage'), _('NAME')),
2391 _('print parsed tree at the given stage'), _('NAME')),
2392 ('', 'no-optimized', False, _('evaluate tree without optimization')),
2392 ('', 'no-optimized', False, _('evaluate tree without optimization')),
2393 ('', 'verify-optimized', False, _('verify optimized result')),
2393 ('', 'verify-optimized', False, _('verify optimized result')),
2394 ],
2394 ],
2395 ('REVSPEC'))
2395 ('REVSPEC'))
2396 def debugrevspec(ui, repo, expr, **opts):
2396 def debugrevspec(ui, repo, expr, **opts):
2397 """parse and apply a revision specification
2397 """parse and apply a revision specification
2398
2398
2399 Use -p/--show-stage option to print the parsed tree at the given stages.
2399 Use -p/--show-stage option to print the parsed tree at the given stages.
2400 Use -p all to print tree at every stage.
2400 Use -p all to print tree at every stage.
2401
2401
2402 Use --no-show-revs option with -s or -p to print only the set
2402 Use --no-show-revs option with -s or -p to print only the set
2403 representation or the parsed tree respectively.
2403 representation or the parsed tree respectively.
2404
2404
2405 Use --verify-optimized to compare the optimized result with the unoptimized
2405 Use --verify-optimized to compare the optimized result with the unoptimized
2406 one. Returns 1 if the optimized result differs.
2406 one. Returns 1 if the optimized result differs.
2407 """
2407 """
2408 opts = pycompat.byteskwargs(opts)
2408 opts = pycompat.byteskwargs(opts)
2409 aliases = ui.configitems('revsetalias')
2409 aliases = ui.configitems('revsetalias')
2410 stages = [
2410 stages = [
2411 ('parsed', lambda tree: tree),
2411 ('parsed', lambda tree: tree),
2412 ('expanded', lambda tree: revsetlang.expandaliases(tree, aliases,
2412 ('expanded', lambda tree: revsetlang.expandaliases(tree, aliases,
2413 ui.warn)),
2413 ui.warn)),
2414 ('concatenated', revsetlang.foldconcat),
2414 ('concatenated', revsetlang.foldconcat),
2415 ('analyzed', revsetlang.analyze),
2415 ('analyzed', revsetlang.analyze),
2416 ('optimized', revsetlang.optimize),
2416 ('optimized', revsetlang.optimize),
2417 ]
2417 ]
2418 if opts['no_optimized']:
2418 if opts['no_optimized']:
2419 stages = stages[:-1]
2419 stages = stages[:-1]
2420 if opts['verify_optimized'] and opts['no_optimized']:
2420 if opts['verify_optimized'] and opts['no_optimized']:
2421 raise error.Abort(_('cannot use --verify-optimized with '
2421 raise error.Abort(_('cannot use --verify-optimized with '
2422 '--no-optimized'))
2422 '--no-optimized'))
2423 stagenames = set(n for n, f in stages)
2423 stagenames = set(n for n, f in stages)
2424
2424
2425 showalways = set()
2425 showalways = set()
2426 showchanged = set()
2426 showchanged = set()
2427 if ui.verbose and not opts['show_stage']:
2427 if ui.verbose and not opts['show_stage']:
2428 # show parsed tree by --verbose (deprecated)
2428 # show parsed tree by --verbose (deprecated)
2429 showalways.add('parsed')
2429 showalways.add('parsed')
2430 showchanged.update(['expanded', 'concatenated'])
2430 showchanged.update(['expanded', 'concatenated'])
2431 if opts['optimize']:
2431 if opts['optimize']:
2432 showalways.add('optimized')
2432 showalways.add('optimized')
2433 if opts['show_stage'] and opts['optimize']:
2433 if opts['show_stage'] and opts['optimize']:
2434 raise error.Abort(_('cannot use --optimize with --show-stage'))
2434 raise error.Abort(_('cannot use --optimize with --show-stage'))
2435 if opts['show_stage'] == ['all']:
2435 if opts['show_stage'] == ['all']:
2436 showalways.update(stagenames)
2436 showalways.update(stagenames)
2437 else:
2437 else:
2438 for n in opts['show_stage']:
2438 for n in opts['show_stage']:
2439 if n not in stagenames:
2439 if n not in stagenames:
2440 raise error.Abort(_('invalid stage name: %s') % n)
2440 raise error.Abort(_('invalid stage name: %s') % n)
2441 showalways.update(opts['show_stage'])
2441 showalways.update(opts['show_stage'])
2442
2442
2443 treebystage = {}
2443 treebystage = {}
2444 printedtree = None
2444 printedtree = None
2445 tree = revsetlang.parse(expr, lookup=revset.lookupfn(repo))
2445 tree = revsetlang.parse(expr, lookup=revset.lookupfn(repo))
2446 for n, f in stages:
2446 for n, f in stages:
2447 treebystage[n] = tree = f(tree)
2447 treebystage[n] = tree = f(tree)
2448 if n in showalways or (n in showchanged and tree != printedtree):
2448 if n in showalways or (n in showchanged and tree != printedtree):
2449 if opts['show_stage'] or n != 'parsed':
2449 if opts['show_stage'] or n != 'parsed':
2450 ui.write(("* %s:\n") % n)
2450 ui.write(("* %s:\n") % n)
2451 ui.write(revsetlang.prettyformat(tree), "\n")
2451 ui.write(revsetlang.prettyformat(tree), "\n")
2452 printedtree = tree
2452 printedtree = tree
2453
2453
2454 if opts['verify_optimized']:
2454 if opts['verify_optimized']:
2455 arevs = revset.makematcher(treebystage['analyzed'])(repo)
2455 arevs = revset.makematcher(treebystage['analyzed'])(repo)
2456 brevs = revset.makematcher(treebystage['optimized'])(repo)
2456 brevs = revset.makematcher(treebystage['optimized'])(repo)
2457 if opts['show_set'] or (opts['show_set'] is None and ui.verbose):
2457 if opts['show_set'] or (opts['show_set'] is None and ui.verbose):
2458 ui.write(("* analyzed set:\n"), stringutil.prettyrepr(arevs), "\n")
2458 ui.write(("* analyzed set:\n"), stringutil.prettyrepr(arevs), "\n")
2459 ui.write(("* optimized set:\n"), stringutil.prettyrepr(brevs), "\n")
2459 ui.write(("* optimized set:\n"), stringutil.prettyrepr(brevs), "\n")
2460 arevs = list(arevs)
2460 arevs = list(arevs)
2461 brevs = list(brevs)
2461 brevs = list(brevs)
2462 if arevs == brevs:
2462 if arevs == brevs:
2463 return 0
2463 return 0
2464 ui.write(('--- analyzed\n'), label='diff.file_a')
2464 ui.write(('--- analyzed\n'), label='diff.file_a')
2465 ui.write(('+++ optimized\n'), label='diff.file_b')
2465 ui.write(('+++ optimized\n'), label='diff.file_b')
2466 sm = difflib.SequenceMatcher(None, arevs, brevs)
2466 sm = difflib.SequenceMatcher(None, arevs, brevs)
2467 for tag, alo, ahi, blo, bhi in sm.get_opcodes():
2467 for tag, alo, ahi, blo, bhi in sm.get_opcodes():
2468 if tag in ('delete', 'replace'):
2468 if tag in ('delete', 'replace'):
2469 for c in arevs[alo:ahi]:
2469 for c in arevs[alo:ahi]:
2470 ui.write('-%s\n' % c, label='diff.deleted')
2470 ui.write('-%s\n' % c, label='diff.deleted')
2471 if tag in ('insert', 'replace'):
2471 if tag in ('insert', 'replace'):
2472 for c in brevs[blo:bhi]:
2472 for c in brevs[blo:bhi]:
2473 ui.write('+%s\n' % c, label='diff.inserted')
2473 ui.write('+%s\n' % c, label='diff.inserted')
2474 if tag == 'equal':
2474 if tag == 'equal':
2475 for c in arevs[alo:ahi]:
2475 for c in arevs[alo:ahi]:
2476 ui.write(' %s\n' % c)
2476 ui.write(' %s\n' % c)
2477 return 1
2477 return 1
2478
2478
2479 func = revset.makematcher(tree)
2479 func = revset.makematcher(tree)
2480 revs = func(repo)
2480 revs = func(repo)
2481 if opts['show_set'] or (opts['show_set'] is None and ui.verbose):
2481 if opts['show_set'] or (opts['show_set'] is None and ui.verbose):
2482 ui.write(("* set:\n"), stringutil.prettyrepr(revs), "\n")
2482 ui.write(("* set:\n"), stringutil.prettyrepr(revs), "\n")
2483 if not opts['show_revs']:
2483 if not opts['show_revs']:
2484 return
2484 return
2485 for c in revs:
2485 for c in revs:
2486 ui.write("%d\n" % c)
2486 ui.write("%d\n" % c)
2487
2487
2488 @command('debugserve', [
2488 @command('debugserve', [
2489 ('', 'sshstdio', False, _('run an SSH server bound to process handles')),
2489 ('', 'sshstdio', False, _('run an SSH server bound to process handles')),
2490 ('', 'logiofd', '', _('file descriptor to log server I/O to')),
2490 ('', 'logiofd', '', _('file descriptor to log server I/O to')),
2491 ('', 'logiofile', '', _('file to log server I/O to')),
2491 ('', 'logiofile', '', _('file to log server I/O to')),
2492 ], '')
2492 ], '')
2493 def debugserve(ui, repo, **opts):
2493 def debugserve(ui, repo, **opts):
2494 """run a server with advanced settings
2494 """run a server with advanced settings
2495
2495
2496 This command is similar to :hg:`serve`. It exists partially as a
2496 This command is similar to :hg:`serve`. It exists partially as a
2497 workaround to the fact that ``hg serve --stdio`` must have specific
2497 workaround to the fact that ``hg serve --stdio`` must have specific
2498 arguments for security reasons.
2498 arguments for security reasons.
2499 """
2499 """
2500 opts = pycompat.byteskwargs(opts)
2500 opts = pycompat.byteskwargs(opts)
2501
2501
2502 if not opts['sshstdio']:
2502 if not opts['sshstdio']:
2503 raise error.Abort(_('only --sshstdio is currently supported'))
2503 raise error.Abort(_('only --sshstdio is currently supported'))
2504
2504
2505 logfh = None
2505 logfh = None
2506
2506
2507 if opts['logiofd'] and opts['logiofile']:
2507 if opts['logiofd'] and opts['logiofile']:
2508 raise error.Abort(_('cannot use both --logiofd and --logiofile'))
2508 raise error.Abort(_('cannot use both --logiofd and --logiofile'))
2509
2509
2510 if opts['logiofd']:
2510 if opts['logiofd']:
2511 # Line buffered because output is line based.
2511 # Line buffered because output is line based.
2512 try:
2512 try:
2513 logfh = os.fdopen(int(opts['logiofd']), r'ab', 1)
2513 logfh = os.fdopen(int(opts['logiofd']), r'ab', 1)
2514 except OSError as e:
2514 except OSError as e:
2515 if e.errno != errno.ESPIPE:
2515 if e.errno != errno.ESPIPE:
2516 raise
2516 raise
2517 # can't seek a pipe, so `ab` mode fails on py3
2517 # can't seek a pipe, so `ab` mode fails on py3
2518 logfh = os.fdopen(int(opts['logiofd']), r'wb', 1)
2518 logfh = os.fdopen(int(opts['logiofd']), r'wb', 1)
2519 elif opts['logiofile']:
2519 elif opts['logiofile']:
2520 logfh = open(opts['logiofile'], 'ab', 1)
2520 logfh = open(opts['logiofile'], 'ab', 1)
2521
2521
2522 s = wireprotoserver.sshserver(ui, repo, logfh=logfh)
2522 s = wireprotoserver.sshserver(ui, repo, logfh=logfh)
2523 s.serve_forever()
2523 s.serve_forever()
2524
2524
2525 @command('debugsetparents', [], _('REV1 [REV2]'))
2525 @command('debugsetparents', [], _('REV1 [REV2]'))
2526 def debugsetparents(ui, repo, rev1, rev2=None):
2526 def debugsetparents(ui, repo, rev1, rev2=None):
2527 """manually set the parents of the current working directory
2527 """manually set the parents of the current working directory
2528
2528
2529 This is useful for writing repository conversion tools, but should
2529 This is useful for writing repository conversion tools, but should
2530 be used with care. For example, neither the working directory nor the
2530 be used with care. For example, neither the working directory nor the
2531 dirstate is updated, so file status may be incorrect after running this
2531 dirstate is updated, so file status may be incorrect after running this
2532 command.
2532 command.
2533
2533
2534 Returns 0 on success.
2534 Returns 0 on success.
2535 """
2535 """
2536
2536
2537 node1 = scmutil.revsingle(repo, rev1).node()
2537 node1 = scmutil.revsingle(repo, rev1).node()
2538 node2 = scmutil.revsingle(repo, rev2, 'null').node()
2538 node2 = scmutil.revsingle(repo, rev2, 'null').node()
2539
2539
2540 with repo.wlock():
2540 with repo.wlock():
2541 repo.setparents(node1, node2)
2541 repo.setparents(node1, node2)
2542
2542
2543 @command('debugssl', [], '[SOURCE]', optionalrepo=True)
2543 @command('debugssl', [], '[SOURCE]', optionalrepo=True)
2544 def debugssl(ui, repo, source=None, **opts):
2544 def debugssl(ui, repo, source=None, **opts):
2545 '''test a secure connection to a server
2545 '''test a secure connection to a server
2546
2546
2547 This builds the certificate chain for the server on Windows, installing the
2547 This builds the certificate chain for the server on Windows, installing the
2548 missing intermediates and trusted root via Windows Update if necessary. It
2548 missing intermediates and trusted root via Windows Update if necessary. It
2549 does nothing on other platforms.
2549 does nothing on other platforms.
2550
2550
2551 If SOURCE is omitted, the 'default' path will be used. If a URL is given,
2551 If SOURCE is omitted, the 'default' path will be used. If a URL is given,
2552 that server is used. See :hg:`help urls` for more information.
2552 that server is used. See :hg:`help urls` for more information.
2553
2553
2554 If the update succeeds, retry the original operation. Otherwise, the cause
2554 If the update succeeds, retry the original operation. Otherwise, the cause
2555 of the SSL error is likely another issue.
2555 of the SSL error is likely another issue.
2556 '''
2556 '''
2557 if not pycompat.iswindows:
2557 if not pycompat.iswindows:
2558 raise error.Abort(_('certificate chain building is only possible on '
2558 raise error.Abort(_('certificate chain building is only possible on '
2559 'Windows'))
2559 'Windows'))
2560
2560
2561 if not source:
2561 if not source:
2562 if not repo:
2562 if not repo:
2563 raise error.Abort(_("there is no Mercurial repository here, and no "
2563 raise error.Abort(_("there is no Mercurial repository here, and no "
2564 "server specified"))
2564 "server specified"))
2565 source = "default"
2565 source = "default"
2566
2566
2567 source, branches = hg.parseurl(ui.expandpath(source))
2567 source, branches = hg.parseurl(ui.expandpath(source))
2568 url = util.url(source)
2568 url = util.url(source)
2569 addr = None
2569 addr = None
2570
2570
2571 defaultport = {'https': 443, 'ssh': 22}
2571 defaultport = {'https': 443, 'ssh': 22}
2572 if url.scheme in defaultport:
2572 if url.scheme in defaultport:
2573 try:
2573 try:
2574 addr = (url.host, int(url.port or defaultport[url.scheme]))
2574 addr = (url.host, int(url.port or defaultport[url.scheme]))
2575 except ValueError:
2575 except ValueError:
2576 raise error.Abort(_("malformed port number in URL"))
2576 raise error.Abort(_("malformed port number in URL"))
2577 else:
2577 else:
2578 raise error.Abort(_("only https and ssh connections are supported"))
2578 raise error.Abort(_("only https and ssh connections are supported"))
2579
2579
2580 from . import win32
2580 from . import win32
2581
2581
2582 s = ssl.wrap_socket(socket.socket(), ssl_version=ssl.PROTOCOL_TLS,
2582 s = ssl.wrap_socket(socket.socket(), ssl_version=ssl.PROTOCOL_TLS,
2583 cert_reqs=ssl.CERT_NONE, ca_certs=None)
2583 cert_reqs=ssl.CERT_NONE, ca_certs=None)
2584
2584
2585 try:
2585 try:
2586 s.connect(addr)
2586 s.connect(addr)
2587 cert = s.getpeercert(True)
2587 cert = s.getpeercert(True)
2588
2588
2589 ui.status(_('checking the certificate chain for %s\n') % url.host)
2589 ui.status(_('checking the certificate chain for %s\n') % url.host)
2590
2590
2591 complete = win32.checkcertificatechain(cert, build=False)
2591 complete = win32.checkcertificatechain(cert, build=False)
2592
2592
2593 if not complete:
2593 if not complete:
2594 ui.status(_('certificate chain is incomplete, updating... '))
2594 ui.status(_('certificate chain is incomplete, updating... '))
2595
2595
2596 if not win32.checkcertificatechain(cert):
2596 if not win32.checkcertificatechain(cert):
2597 ui.status(_('failed.\n'))
2597 ui.status(_('failed.\n'))
2598 else:
2598 else:
2599 ui.status(_('done.\n'))
2599 ui.status(_('done.\n'))
2600 else:
2600 else:
2601 ui.status(_('full certificate chain is available\n'))
2601 ui.status(_('full certificate chain is available\n'))
2602 finally:
2602 finally:
2603 s.close()
2603 s.close()
2604
2604
2605 @command('debugsub',
2605 @command('debugsub',
2606 [('r', 'rev', '',
2606 [('r', 'rev', '',
2607 _('revision to check'), _('REV'))],
2607 _('revision to check'), _('REV'))],
2608 _('[-r REV] [REV]'))
2608 _('[-r REV] [REV]'))
2609 def debugsub(ui, repo, rev=None):
2609 def debugsub(ui, repo, rev=None):
2610 ctx = scmutil.revsingle(repo, rev, None)
2610 ctx = scmutil.revsingle(repo, rev, None)
2611 for k, v in sorted(ctx.substate.items()):
2611 for k, v in sorted(ctx.substate.items()):
2612 ui.write(('path %s\n') % k)
2612 ui.write(('path %s\n') % k)
2613 ui.write((' source %s\n') % v[0])
2613 ui.write((' source %s\n') % v[0])
2614 ui.write((' revision %s\n') % v[1])
2614 ui.write((' revision %s\n') % v[1])
2615
2615
2616 @command('debugsuccessorssets',
2616 @command('debugsuccessorssets',
2617 [('', 'closest', False, _('return closest successors sets only'))],
2617 [('', 'closest', False, _('return closest successors sets only'))],
2618 _('[REV]'))
2618 _('[REV]'))
2619 def debugsuccessorssets(ui, repo, *revs, **opts):
2619 def debugsuccessorssets(ui, repo, *revs, **opts):
2620 """show set of successors for revision
2620 """show set of successors for revision
2621
2621
2622 A successors set of changeset A is a consistent group of revisions that
2622 A successors set of changeset A is a consistent group of revisions that
2623 succeed A. It contains non-obsolete changesets only unless closests
2623 succeed A. It contains non-obsolete changesets only unless closests
2624 successors set is set.
2624 successors set is set.
2625
2625
2626 In most cases a changeset A has a single successors set containing a single
2626 In most cases a changeset A has a single successors set containing a single
2627 successor (changeset A replaced by A').
2627 successor (changeset A replaced by A').
2628
2628
2629 A changeset that is made obsolete with no successors are called "pruned".
2629 A changeset that is made obsolete with no successors are called "pruned".
2630 Such changesets have no successors sets at all.
2630 Such changesets have no successors sets at all.
2631
2631
2632 A changeset that has been "split" will have a successors set containing
2632 A changeset that has been "split" will have a successors set containing
2633 more than one successor.
2633 more than one successor.
2634
2634
2635 A changeset that has been rewritten in multiple different ways is called
2635 A changeset that has been rewritten in multiple different ways is called
2636 "divergent". Such changesets have multiple successor sets (each of which
2636 "divergent". Such changesets have multiple successor sets (each of which
2637 may also be split, i.e. have multiple successors).
2637 may also be split, i.e. have multiple successors).
2638
2638
2639 Results are displayed as follows::
2639 Results are displayed as follows::
2640
2640
2641 <rev1>
2641 <rev1>
2642 <successors-1A>
2642 <successors-1A>
2643 <rev2>
2643 <rev2>
2644 <successors-2A>
2644 <successors-2A>
2645 <successors-2B1> <successors-2B2> <successors-2B3>
2645 <successors-2B1> <successors-2B2> <successors-2B3>
2646
2646
2647 Here rev2 has two possible (i.e. divergent) successors sets. The first
2647 Here rev2 has two possible (i.e. divergent) successors sets. The first
2648 holds one element, whereas the second holds three (i.e. the changeset has
2648 holds one element, whereas the second holds three (i.e. the changeset has
2649 been split).
2649 been split).
2650 """
2650 """
2651 # passed to successorssets caching computation from one call to another
2651 # passed to successorssets caching computation from one call to another
2652 cache = {}
2652 cache = {}
2653 ctx2str = bytes
2653 ctx2str = bytes
2654 node2str = short
2654 node2str = short
2655 for rev in scmutil.revrange(repo, revs):
2655 for rev in scmutil.revrange(repo, revs):
2656 ctx = repo[rev]
2656 ctx = repo[rev]
2657 ui.write('%s\n'% ctx2str(ctx))
2657 ui.write('%s\n'% ctx2str(ctx))
2658 for succsset in obsutil.successorssets(repo, ctx.node(),
2658 for succsset in obsutil.successorssets(repo, ctx.node(),
2659 closest=opts[r'closest'],
2659 closest=opts[r'closest'],
2660 cache=cache):
2660 cache=cache):
2661 if succsset:
2661 if succsset:
2662 ui.write(' ')
2662 ui.write(' ')
2663 ui.write(node2str(succsset[0]))
2663 ui.write(node2str(succsset[0]))
2664 for node in succsset[1:]:
2664 for node in succsset[1:]:
2665 ui.write(' ')
2665 ui.write(' ')
2666 ui.write(node2str(node))
2666 ui.write(node2str(node))
2667 ui.write('\n')
2667 ui.write('\n')
2668
2668
2669 @command('debugtemplate',
2669 @command('debugtemplate',
2670 [('r', 'rev', [], _('apply template on changesets'), _('REV')),
2670 [('r', 'rev', [], _('apply template on changesets'), _('REV')),
2671 ('D', 'define', [], _('define template keyword'), _('KEY=VALUE'))],
2671 ('D', 'define', [], _('define template keyword'), _('KEY=VALUE'))],
2672 _('[-r REV]... [-D KEY=VALUE]... TEMPLATE'),
2672 _('[-r REV]... [-D KEY=VALUE]... TEMPLATE'),
2673 optionalrepo=True)
2673 optionalrepo=True)
2674 def debugtemplate(ui, repo, tmpl, **opts):
2674 def debugtemplate(ui, repo, tmpl, **opts):
2675 """parse and apply a template
2675 """parse and apply a template
2676
2676
2677 If -r/--rev is given, the template is processed as a log template and
2677 If -r/--rev is given, the template is processed as a log template and
2678 applied to the given changesets. Otherwise, it is processed as a generic
2678 applied to the given changesets. Otherwise, it is processed as a generic
2679 template.
2679 template.
2680
2680
2681 Use --verbose to print the parsed tree.
2681 Use --verbose to print the parsed tree.
2682 """
2682 """
2683 revs = None
2683 revs = None
2684 if opts[r'rev']:
2684 if opts[r'rev']:
2685 if repo is None:
2685 if repo is None:
2686 raise error.RepoError(_('there is no Mercurial repository here '
2686 raise error.RepoError(_('there is no Mercurial repository here '
2687 '(.hg not found)'))
2687 '(.hg not found)'))
2688 revs = scmutil.revrange(repo, opts[r'rev'])
2688 revs = scmutil.revrange(repo, opts[r'rev'])
2689
2689
2690 props = {}
2690 props = {}
2691 for d in opts[r'define']:
2691 for d in opts[r'define']:
2692 try:
2692 try:
2693 k, v = (e.strip() for e in d.split('=', 1))
2693 k, v = (e.strip() for e in d.split('=', 1))
2694 if not k or k == 'ui':
2694 if not k or k == 'ui':
2695 raise ValueError
2695 raise ValueError
2696 props[k] = v
2696 props[k] = v
2697 except ValueError:
2697 except ValueError:
2698 raise error.Abort(_('malformed keyword definition: %s') % d)
2698 raise error.Abort(_('malformed keyword definition: %s') % d)
2699
2699
2700 if ui.verbose:
2700 if ui.verbose:
2701 aliases = ui.configitems('templatealias')
2701 aliases = ui.configitems('templatealias')
2702 tree = templater.parse(tmpl)
2702 tree = templater.parse(tmpl)
2703 ui.note(templater.prettyformat(tree), '\n')
2703 ui.note(templater.prettyformat(tree), '\n')
2704 newtree = templater.expandaliases(tree, aliases)
2704 newtree = templater.expandaliases(tree, aliases)
2705 if newtree != tree:
2705 if newtree != tree:
2706 ui.note(("* expanded:\n"), templater.prettyformat(newtree), '\n')
2706 ui.note(("* expanded:\n"), templater.prettyformat(newtree), '\n')
2707
2707
2708 if revs is None:
2708 if revs is None:
2709 tres = formatter.templateresources(ui, repo)
2709 tres = formatter.templateresources(ui, repo)
2710 t = formatter.maketemplater(ui, tmpl, resources=tres)
2710 t = formatter.maketemplater(ui, tmpl, resources=tres)
2711 if ui.verbose:
2711 if ui.verbose:
2712 kwds, funcs = t.symbolsuseddefault()
2712 kwds, funcs = t.symbolsuseddefault()
2713 ui.write(("* keywords: %s\n") % ', '.join(sorted(kwds)))
2713 ui.write(("* keywords: %s\n") % ', '.join(sorted(kwds)))
2714 ui.write(("* functions: %s\n") % ', '.join(sorted(funcs)))
2714 ui.write(("* functions: %s\n") % ', '.join(sorted(funcs)))
2715 ui.write(t.renderdefault(props))
2715 ui.write(t.renderdefault(props))
2716 else:
2716 else:
2717 displayer = logcmdutil.maketemplater(ui, repo, tmpl)
2717 displayer = logcmdutil.maketemplater(ui, repo, tmpl)
2718 if ui.verbose:
2718 if ui.verbose:
2719 kwds, funcs = displayer.t.symbolsuseddefault()
2719 kwds, funcs = displayer.t.symbolsuseddefault()
2720 ui.write(("* keywords: %s\n") % ', '.join(sorted(kwds)))
2720 ui.write(("* keywords: %s\n") % ', '.join(sorted(kwds)))
2721 ui.write(("* functions: %s\n") % ', '.join(sorted(funcs)))
2721 ui.write(("* functions: %s\n") % ', '.join(sorted(funcs)))
2722 for r in revs:
2722 for r in revs:
2723 displayer.show(repo[r], **pycompat.strkwargs(props))
2723 displayer.show(repo[r], **pycompat.strkwargs(props))
2724 displayer.close()
2724 displayer.close()
2725
2725
2726 @command('debuguigetpass', [
2726 @command('debuguigetpass', [
2727 ('p', 'prompt', '', _('prompt text'), _('TEXT')),
2727 ('p', 'prompt', '', _('prompt text'), _('TEXT')),
2728 ], _('[-p TEXT]'), norepo=True)
2728 ], _('[-p TEXT]'), norepo=True)
2729 def debuguigetpass(ui, prompt=''):
2729 def debuguigetpass(ui, prompt=''):
2730 """show prompt to type password"""
2730 """show prompt to type password"""
2731 r = ui.getpass(prompt)
2731 r = ui.getpass(prompt)
2732 ui.write(('respose: %s\n') % r)
2732 ui.write(('respose: %s\n') % r)
2733
2733
2734 @command('debuguiprompt', [
2734 @command('debuguiprompt', [
2735 ('p', 'prompt', '', _('prompt text'), _('TEXT')),
2735 ('p', 'prompt', '', _('prompt text'), _('TEXT')),
2736 ], _('[-p TEXT]'), norepo=True)
2736 ], _('[-p TEXT]'), norepo=True)
2737 def debuguiprompt(ui, prompt=''):
2737 def debuguiprompt(ui, prompt=''):
2738 """show plain prompt"""
2738 """show plain prompt"""
2739 r = ui.prompt(prompt)
2739 r = ui.prompt(prompt)
2740 ui.write(('response: %s\n') % r)
2740 ui.write(('response: %s\n') % r)
2741
2741
2742 @command('debugupdatecaches', [])
2742 @command('debugupdatecaches', [])
2743 def debugupdatecaches(ui, repo, *pats, **opts):
2743 def debugupdatecaches(ui, repo, *pats, **opts):
2744 """warm all known caches in the repository"""
2744 """warm all known caches in the repository"""
2745 with repo.wlock(), repo.lock():
2745 with repo.wlock(), repo.lock():
2746 repo.updatecaches(full=True)
2746 repo.updatecaches(full=True)
2747
2747
2748 @command('debugupgraderepo', [
2748 @command('debugupgraderepo', [
2749 ('o', 'optimize', [], _('extra optimization to perform'), _('NAME')),
2749 ('o', 'optimize', [], _('extra optimization to perform'), _('NAME')),
2750 ('', 'run', False, _('performs an upgrade')),
2750 ('', 'run', False, _('performs an upgrade')),
2751 ])
2751 ])
2752 def debugupgraderepo(ui, repo, run=False, optimize=None):
2752 def debugupgraderepo(ui, repo, run=False, optimize=None):
2753 """upgrade a repository to use different features
2753 """upgrade a repository to use different features
2754
2754
2755 If no arguments are specified, the repository is evaluated for upgrade
2755 If no arguments are specified, the repository is evaluated for upgrade
2756 and a list of problems and potential optimizations is printed.
2756 and a list of problems and potential optimizations is printed.
2757
2757
2758 With ``--run``, a repository upgrade is performed. Behavior of the upgrade
2758 With ``--run``, a repository upgrade is performed. Behavior of the upgrade
2759 can be influenced via additional arguments. More details will be provided
2759 can be influenced via additional arguments. More details will be provided
2760 by the command output when run without ``--run``.
2760 by the command output when run without ``--run``.
2761
2761
2762 During the upgrade, the repository will be locked and no writes will be
2762 During the upgrade, the repository will be locked and no writes will be
2763 allowed.
2763 allowed.
2764
2764
2765 At the end of the upgrade, the repository may not be readable while new
2765 At the end of the upgrade, the repository may not be readable while new
2766 repository data is swapped in. This window will be as long as it takes to
2766 repository data is swapped in. This window will be as long as it takes to
2767 rename some directories inside the ``.hg`` directory. On most machines, this
2767 rename some directories inside the ``.hg`` directory. On most machines, this
2768 should complete almost instantaneously and the chances of a consumer being
2768 should complete almost instantaneously and the chances of a consumer being
2769 unable to access the repository should be low.
2769 unable to access the repository should be low.
2770 """
2770 """
2771 return upgrade.upgraderepo(ui, repo, run=run, optimize=optimize)
2771 return upgrade.upgraderepo(ui, repo, run=run, optimize=optimize)
2772
2772
2773 @command('debugwalk', cmdutil.walkopts, _('[OPTION]... [FILE]...'),
2773 @command('debugwalk', cmdutil.walkopts, _('[OPTION]... [FILE]...'),
2774 inferrepo=True)
2774 inferrepo=True)
2775 def debugwalk(ui, repo, *pats, **opts):
2775 def debugwalk(ui, repo, *pats, **opts):
2776 """show how files match on given patterns"""
2776 """show how files match on given patterns"""
2777 opts = pycompat.byteskwargs(opts)
2777 opts = pycompat.byteskwargs(opts)
2778 m = scmutil.match(repo[None], pats, opts)
2778 m = scmutil.match(repo[None], pats, opts)
2779 if ui.verbose:
2779 if ui.verbose:
2780 ui.write(('* matcher:\n'), stringutil.prettyrepr(m), '\n')
2780 ui.write(('* matcher:\n'), stringutil.prettyrepr(m), '\n')
2781 items = list(repo[None].walk(m))
2781 items = list(repo[None].walk(m))
2782 if not items:
2782 if not items:
2783 return
2783 return
2784 f = lambda fn: fn
2784 f = lambda fn: fn
2785 if ui.configbool('ui', 'slash') and pycompat.ossep != '/':
2785 if ui.configbool('ui', 'slash') and pycompat.ossep != '/':
2786 f = lambda fn: util.normpath(fn)
2786 f = lambda fn: util.normpath(fn)
2787 fmt = 'f %%-%ds %%-%ds %%s' % (
2787 fmt = 'f %%-%ds %%-%ds %%s' % (
2788 max([len(abs) for abs in items]),
2788 max([len(abs) for abs in items]),
2789 max([len(m.rel(abs)) for abs in items]))
2789 max([len(m.rel(abs)) for abs in items]))
2790 for abs in items:
2790 for abs in items:
2791 line = fmt % (abs, f(m.rel(abs)), m.exact(abs) and 'exact' or '')
2791 line = fmt % (abs, f(m.rel(abs)), m.exact(abs) and 'exact' or '')
2792 ui.write("%s\n" % line.rstrip())
2792 ui.write("%s\n" % line.rstrip())
2793
2793
2794 @command('debugwhyunstable', [], _('REV'))
2794 @command('debugwhyunstable', [], _('REV'))
2795 def debugwhyunstable(ui, repo, rev):
2795 def debugwhyunstable(ui, repo, rev):
2796 """explain instabilities of a changeset"""
2796 """explain instabilities of a changeset"""
2797 for entry in obsutil.whyunstable(repo, scmutil.revsingle(repo, rev)):
2797 for entry in obsutil.whyunstable(repo, scmutil.revsingle(repo, rev)):
2798 dnodes = ''
2798 dnodes = ''
2799 if entry.get('divergentnodes'):
2799 if entry.get('divergentnodes'):
2800 dnodes = ' '.join('%s (%s)' % (ctx.hex(), ctx.phasestr())
2800 dnodes = ' '.join('%s (%s)' % (ctx.hex(), ctx.phasestr())
2801 for ctx in entry['divergentnodes']) + ' '
2801 for ctx in entry['divergentnodes']) + ' '
2802 ui.write('%s: %s%s %s\n' % (entry['instability'], dnodes,
2802 ui.write('%s: %s%s %s\n' % (entry['instability'], dnodes,
2803 entry['reason'], entry['node']))
2803 entry['reason'], entry['node']))
2804
2804
2805 @command('debugwireargs',
2805 @command('debugwireargs',
2806 [('', 'three', '', 'three'),
2806 [('', 'three', '', 'three'),
2807 ('', 'four', '', 'four'),
2807 ('', 'four', '', 'four'),
2808 ('', 'five', '', 'five'),
2808 ('', 'five', '', 'five'),
2809 ] + cmdutil.remoteopts,
2809 ] + cmdutil.remoteopts,
2810 _('REPO [OPTIONS]... [ONE [TWO]]'),
2810 _('REPO [OPTIONS]... [ONE [TWO]]'),
2811 norepo=True)
2811 norepo=True)
2812 def debugwireargs(ui, repopath, *vals, **opts):
2812 def debugwireargs(ui, repopath, *vals, **opts):
2813 opts = pycompat.byteskwargs(opts)
2813 opts = pycompat.byteskwargs(opts)
2814 repo = hg.peer(ui, opts, repopath)
2814 repo = hg.peer(ui, opts, repopath)
2815 for opt in cmdutil.remoteopts:
2815 for opt in cmdutil.remoteopts:
2816 del opts[opt[1]]
2816 del opts[opt[1]]
2817 args = {}
2817 args = {}
2818 for k, v in opts.iteritems():
2818 for k, v in opts.iteritems():
2819 if v:
2819 if v:
2820 args[k] = v
2820 args[k] = v
2821 args = pycompat.strkwargs(args)
2821 args = pycompat.strkwargs(args)
2822 # run twice to check that we don't mess up the stream for the next command
2822 # run twice to check that we don't mess up the stream for the next command
2823 res1 = repo.debugwireargs(*vals, **args)
2823 res1 = repo.debugwireargs(*vals, **args)
2824 res2 = repo.debugwireargs(*vals, **args)
2824 res2 = repo.debugwireargs(*vals, **args)
2825 ui.write("%s\n" % res1)
2825 ui.write("%s\n" % res1)
2826 if res1 != res2:
2826 if res1 != res2:
2827 ui.warn("%s\n" % res2)
2827 ui.warn("%s\n" % res2)
2828
2828
2829 def _parsewirelangblocks(fh):
2829 def _parsewirelangblocks(fh):
2830 activeaction = None
2830 activeaction = None
2831 blocklines = []
2831 blocklines = []
2832
2832
2833 for line in fh:
2833 for line in fh:
2834 line = line.rstrip()
2834 line = line.rstrip()
2835 if not line:
2835 if not line:
2836 continue
2836 continue
2837
2837
2838 if line.startswith(b'#'):
2838 if line.startswith(b'#'):
2839 continue
2839 continue
2840
2840
2841 if not line.startswith(b' '):
2841 if not line.startswith(b' '):
2842 # New block. Flush previous one.
2842 # New block. Flush previous one.
2843 if activeaction:
2843 if activeaction:
2844 yield activeaction, blocklines
2844 yield activeaction, blocklines
2845
2845
2846 activeaction = line
2846 activeaction = line
2847 blocklines = []
2847 blocklines = []
2848 continue
2848 continue
2849
2849
2850 # Else we start with an indent.
2850 # Else we start with an indent.
2851
2851
2852 if not activeaction:
2852 if not activeaction:
2853 raise error.Abort(_('indented line outside of block'))
2853 raise error.Abort(_('indented line outside of block'))
2854
2854
2855 blocklines.append(line)
2855 blocklines.append(line)
2856
2856
2857 # Flush last block.
2857 # Flush last block.
2858 if activeaction:
2858 if activeaction:
2859 yield activeaction, blocklines
2859 yield activeaction, blocklines
2860
2860
2861 @command('debugwireproto',
2861 @command('debugwireproto',
2862 [
2862 [
2863 ('', 'localssh', False, _('start an SSH server for this repo')),
2863 ('', 'localssh', False, _('start an SSH server for this repo')),
2864 ('', 'peer', '', _('construct a specific version of the peer')),
2864 ('', 'peer', '', _('construct a specific version of the peer')),
2865 ('', 'noreadstderr', False, _('do not read from stderr of the remote')),
2865 ('', 'noreadstderr', False, _('do not read from stderr of the remote')),
2866 ('', 'nologhandshake', False,
2866 ('', 'nologhandshake', False,
2867 _('do not log I/O related to the peer handshake')),
2867 _('do not log I/O related to the peer handshake')),
2868 ] + cmdutil.remoteopts,
2868 ] + cmdutil.remoteopts,
2869 _('[PATH]'),
2869 _('[PATH]'),
2870 optionalrepo=True)
2870 optionalrepo=True)
2871 def debugwireproto(ui, repo, path=None, **opts):
2871 def debugwireproto(ui, repo, path=None, **opts):
2872 """send wire protocol commands to a server
2872 """send wire protocol commands to a server
2873
2873
2874 This command can be used to issue wire protocol commands to remote
2874 This command can be used to issue wire protocol commands to remote
2875 peers and to debug the raw data being exchanged.
2875 peers and to debug the raw data being exchanged.
2876
2876
2877 ``--localssh`` will start an SSH server against the current repository
2877 ``--localssh`` will start an SSH server against the current repository
2878 and connect to that. By default, the connection will perform a handshake
2878 and connect to that. By default, the connection will perform a handshake
2879 and establish an appropriate peer instance.
2879 and establish an appropriate peer instance.
2880
2880
2881 ``--peer`` can be used to bypass the handshake protocol and construct a
2881 ``--peer`` can be used to bypass the handshake protocol and construct a
2882 peer instance using the specified class type. Valid values are ``raw``,
2882 peer instance using the specified class type. Valid values are ``raw``,
2883 ``http2``, ``ssh1``, and ``ssh2``. ``raw`` instances only allow sending
2883 ``http2``, ``ssh1``, and ``ssh2``. ``raw`` instances only allow sending
2884 raw data payloads and don't support higher-level command actions.
2884 raw data payloads and don't support higher-level command actions.
2885
2885
2886 ``--noreadstderr`` can be used to disable automatic reading from stderr
2886 ``--noreadstderr`` can be used to disable automatic reading from stderr
2887 of the peer (for SSH connections only). Disabling automatic reading of
2887 of the peer (for SSH connections only). Disabling automatic reading of
2888 stderr is useful for making output more deterministic.
2888 stderr is useful for making output more deterministic.
2889
2889
2890 Commands are issued via a mini language which is specified via stdin.
2890 Commands are issued via a mini language which is specified via stdin.
2891 The language consists of individual actions to perform. An action is
2891 The language consists of individual actions to perform. An action is
2892 defined by a block. A block is defined as a line with no leading
2892 defined by a block. A block is defined as a line with no leading
2893 space followed by 0 or more lines with leading space. Blocks are
2893 space followed by 0 or more lines with leading space. Blocks are
2894 effectively a high-level command with additional metadata.
2894 effectively a high-level command with additional metadata.
2895
2895
2896 Lines beginning with ``#`` are ignored.
2896 Lines beginning with ``#`` are ignored.
2897
2897
2898 The following sections denote available actions.
2898 The following sections denote available actions.
2899
2899
2900 raw
2900 raw
2901 ---
2901 ---
2902
2902
2903 Send raw data to the server.
2903 Send raw data to the server.
2904
2904
2905 The block payload contains the raw data to send as one atomic send
2905 The block payload contains the raw data to send as one atomic send
2906 operation. The data may not actually be delivered in a single system
2906 operation. The data may not actually be delivered in a single system
2907 call: it depends on the abilities of the transport being used.
2907 call: it depends on the abilities of the transport being used.
2908
2908
2909 Each line in the block is de-indented and concatenated. Then, that
2909 Each line in the block is de-indented and concatenated. Then, that
2910 value is evaluated as a Python b'' literal. This allows the use of
2910 value is evaluated as a Python b'' literal. This allows the use of
2911 backslash escaping, etc.
2911 backslash escaping, etc.
2912
2912
2913 raw+
2913 raw+
2914 ----
2914 ----
2915
2915
2916 Behaves like ``raw`` except flushes output afterwards.
2916 Behaves like ``raw`` except flushes output afterwards.
2917
2917
2918 command <X>
2918 command <X>
2919 -----------
2919 -----------
2920
2920
2921 Send a request to run a named command, whose name follows the ``command``
2921 Send a request to run a named command, whose name follows the ``command``
2922 string.
2922 string.
2923
2923
2924 Arguments to the command are defined as lines in this block. The format of
2924 Arguments to the command are defined as lines in this block. The format of
2925 each line is ``<key> <value>``. e.g.::
2925 each line is ``<key> <value>``. e.g.::
2926
2926
2927 command listkeys
2927 command listkeys
2928 namespace bookmarks
2928 namespace bookmarks
2929
2929
2930 If the value begins with ``eval:``, it will be interpreted as a Python
2930 If the value begins with ``eval:``, it will be interpreted as a Python
2931 literal expression. Otherwise values are interpreted as Python b'' literals.
2931 literal expression. Otherwise values are interpreted as Python b'' literals.
2932 This allows sending complex types and encoding special byte sequences via
2932 This allows sending complex types and encoding special byte sequences via
2933 backslash escaping.
2933 backslash escaping.
2934
2934
2935 The following arguments have special meaning:
2935 The following arguments have special meaning:
2936
2936
2937 ``PUSHFILE``
2937 ``PUSHFILE``
2938 When defined, the *push* mechanism of the peer will be used instead
2938 When defined, the *push* mechanism of the peer will be used instead
2939 of the static request-response mechanism and the content of the
2939 of the static request-response mechanism and the content of the
2940 file specified in the value of this argument will be sent as the
2940 file specified in the value of this argument will be sent as the
2941 command payload.
2941 command payload.
2942
2942
2943 This can be used to submit a local bundle file to the remote.
2943 This can be used to submit a local bundle file to the remote.
2944
2944
2945 batchbegin
2945 batchbegin
2946 ----------
2946 ----------
2947
2947
2948 Instruct the peer to begin a batched send.
2948 Instruct the peer to begin a batched send.
2949
2949
2950 All ``command`` blocks are queued for execution until the next
2950 All ``command`` blocks are queued for execution until the next
2951 ``batchsubmit`` block.
2951 ``batchsubmit`` block.
2952
2952
2953 batchsubmit
2953 batchsubmit
2954 -----------
2954 -----------
2955
2955
2956 Submit previously queued ``command`` blocks as a batch request.
2956 Submit previously queued ``command`` blocks as a batch request.
2957
2957
2958 This action MUST be paired with a ``batchbegin`` action.
2958 This action MUST be paired with a ``batchbegin`` action.
2959
2959
2960 httprequest <method> <path>
2960 httprequest <method> <path>
2961 ---------------------------
2961 ---------------------------
2962
2962
2963 (HTTP peer only)
2963 (HTTP peer only)
2964
2964
2965 Send an HTTP request to the peer.
2965 Send an HTTP request to the peer.
2966
2966
2967 The HTTP request line follows the ``httprequest`` action. e.g. ``GET /foo``.
2967 The HTTP request line follows the ``httprequest`` action. e.g. ``GET /foo``.
2968
2968
2969 Arguments of the form ``<key>: <value>`` are interpreted as HTTP request
2969 Arguments of the form ``<key>: <value>`` are interpreted as HTTP request
2970 headers to add to the request. e.g. ``Accept: foo``.
2970 headers to add to the request. e.g. ``Accept: foo``.
2971
2971
2972 The following arguments are special:
2972 The following arguments are special:
2973
2973
2974 ``BODYFILE``
2974 ``BODYFILE``
2975 The content of the file defined as the value to this argument will be
2975 The content of the file defined as the value to this argument will be
2976 transferred verbatim as the HTTP request body.
2976 transferred verbatim as the HTTP request body.
2977
2977
2978 ``frame <type> <flags> <payload>``
2978 ``frame <type> <flags> <payload>``
2979 Send a unified protocol frame as part of the request body.
2979 Send a unified protocol frame as part of the request body.
2980
2980
2981 All frames will be collected and sent as the body to the HTTP
2981 All frames will be collected and sent as the body to the HTTP
2982 request.
2982 request.
2983
2983
2984 close
2984 close
2985 -----
2985 -----
2986
2986
2987 Close the connection to the server.
2987 Close the connection to the server.
2988
2988
2989 flush
2989 flush
2990 -----
2990 -----
2991
2991
2992 Flush data written to the server.
2992 Flush data written to the server.
2993
2993
2994 readavailable
2994 readavailable
2995 -------------
2995 -------------
2996
2996
2997 Close the write end of the connection and read all available data from
2997 Close the write end of the connection and read all available data from
2998 the server.
2998 the server.
2999
2999
3000 If the connection to the server encompasses multiple pipes, we poll both
3000 If the connection to the server encompasses multiple pipes, we poll both
3001 pipes and read available data.
3001 pipes and read available data.
3002
3002
3003 readline
3003 readline
3004 --------
3004 --------
3005
3005
3006 Read a line of output from the server. If there are multiple output
3006 Read a line of output from the server. If there are multiple output
3007 pipes, reads only the main pipe.
3007 pipes, reads only the main pipe.
3008
3008
3009 ereadline
3009 ereadline
3010 ---------
3010 ---------
3011
3011
3012 Like ``readline``, but read from the stderr pipe, if available.
3012 Like ``readline``, but read from the stderr pipe, if available.
3013
3013
3014 read <X>
3014 read <X>
3015 --------
3015 --------
3016
3016
3017 ``read()`` N bytes from the server's main output pipe.
3017 ``read()`` N bytes from the server's main output pipe.
3018
3018
3019 eread <X>
3019 eread <X>
3020 ---------
3020 ---------
3021
3021
3022 ``read()`` N bytes from the server's stderr pipe, if available.
3022 ``read()`` N bytes from the server's stderr pipe, if available.
3023
3023
3024 Specifying Unified Frame-Based Protocol Frames
3024 Specifying Unified Frame-Based Protocol Frames
3025 ----------------------------------------------
3025 ----------------------------------------------
3026
3026
3027 It is possible to emit a *Unified Frame-Based Protocol* by using special
3027 It is possible to emit a *Unified Frame-Based Protocol* by using special
3028 syntax.
3028 syntax.
3029
3029
3030 A frame is composed as a type, flags, and payload. These can be parsed
3030 A frame is composed as a type, flags, and payload. These can be parsed
3031 from a string of the form:
3031 from a string of the form:
3032
3032
3033 <request-id> <stream-id> <stream-flags> <type> <flags> <payload>
3033 <request-id> <stream-id> <stream-flags> <type> <flags> <payload>
3034
3034
3035 ``request-id`` and ``stream-id`` are integers defining the request and
3035 ``request-id`` and ``stream-id`` are integers defining the request and
3036 stream identifiers.
3036 stream identifiers.
3037
3037
3038 ``type`` can be an integer value for the frame type or the string name
3038 ``type`` can be an integer value for the frame type or the string name
3039 of the type. The strings are defined in ``wireprotoframing.py``. e.g.
3039 of the type. The strings are defined in ``wireprotoframing.py``. e.g.
3040 ``command-name``.
3040 ``command-name``.
3041
3041
3042 ``stream-flags`` and ``flags`` are a ``|`` delimited list of flag
3042 ``stream-flags`` and ``flags`` are a ``|`` delimited list of flag
3043 components. Each component (and there can be just one) can be an integer
3043 components. Each component (and there can be just one) can be an integer
3044 or a flag name for stream flags or frame flags, respectively. Values are
3044 or a flag name for stream flags or frame flags, respectively. Values are
3045 resolved to integers and then bitwise OR'd together.
3045 resolved to integers and then bitwise OR'd together.
3046
3046
3047 ``payload`` represents the raw frame payload. If it begins with
3047 ``payload`` represents the raw frame payload. If it begins with
3048 ``cbor:``, the following string is evaluated as Python code and the
3048 ``cbor:``, the following string is evaluated as Python code and the
3049 resulting object is fed into a CBOR encoder. Otherwise it is interpreted
3049 resulting object is fed into a CBOR encoder. Otherwise it is interpreted
3050 as a Python byte string literal.
3050 as a Python byte string literal.
3051 """
3051 """
3052 opts = pycompat.byteskwargs(opts)
3052 opts = pycompat.byteskwargs(opts)
3053
3053
3054 if opts['localssh'] and not repo:
3054 if opts['localssh'] and not repo:
3055 raise error.Abort(_('--localssh requires a repository'))
3055 raise error.Abort(_('--localssh requires a repository'))
3056
3056
3057 if opts['peer'] and opts['peer'] not in ('raw', 'http2', 'ssh1', 'ssh2'):
3057 if opts['peer'] and opts['peer'] not in ('raw', 'http2', 'ssh1', 'ssh2'):
3058 raise error.Abort(_('invalid value for --peer'),
3058 raise error.Abort(_('invalid value for --peer'),
3059 hint=_('valid values are "raw", "ssh1", and "ssh2"'))
3059 hint=_('valid values are "raw", "ssh1", and "ssh2"'))
3060
3060
3061 if path and opts['localssh']:
3061 if path and opts['localssh']:
3062 raise error.Abort(_('cannot specify --localssh with an explicit '
3062 raise error.Abort(_('cannot specify --localssh with an explicit '
3063 'path'))
3063 'path'))
3064
3064
3065 if ui.interactive():
3065 if ui.interactive():
3066 ui.write(_('(waiting for commands on stdin)\n'))
3066 ui.write(_('(waiting for commands on stdin)\n'))
3067
3067
3068 blocks = list(_parsewirelangblocks(ui.fin))
3068 blocks = list(_parsewirelangblocks(ui.fin))
3069
3069
3070 proc = None
3070 proc = None
3071 stdin = None
3071 stdin = None
3072 stdout = None
3072 stdout = None
3073 stderr = None
3073 stderr = None
3074 opener = None
3074 opener = None
3075
3075
3076 if opts['localssh']:
3076 if opts['localssh']:
3077 # We start the SSH server in its own process so there is process
3077 # We start the SSH server in its own process so there is process
3078 # separation. This prevents a whole class of potential bugs around
3078 # separation. This prevents a whole class of potential bugs around
3079 # shared state from interfering with server operation.
3079 # shared state from interfering with server operation.
3080 args = procutil.hgcmd() + [
3080 args = procutil.hgcmd() + [
3081 '-R', repo.root,
3081 '-R', repo.root,
3082 'debugserve', '--sshstdio',
3082 'debugserve', '--sshstdio',
3083 ]
3083 ]
3084 proc = subprocess.Popen(pycompat.rapply(procutil.tonativestr, args),
3084 proc = subprocess.Popen(pycompat.rapply(procutil.tonativestr, args),
3085 stdin=subprocess.PIPE,
3085 stdin=subprocess.PIPE,
3086 stdout=subprocess.PIPE, stderr=subprocess.PIPE,
3086 stdout=subprocess.PIPE, stderr=subprocess.PIPE,
3087 bufsize=0)
3087 bufsize=0)
3088
3088
3089 stdin = proc.stdin
3089 stdin = proc.stdin
3090 stdout = proc.stdout
3090 stdout = proc.stdout
3091 stderr = proc.stderr
3091 stderr = proc.stderr
3092
3092
3093 # We turn the pipes into observers so we can log I/O.
3093 # We turn the pipes into observers so we can log I/O.
3094 if ui.verbose or opts['peer'] == 'raw':
3094 if ui.verbose or opts['peer'] == 'raw':
3095 stdin = util.makeloggingfileobject(ui, proc.stdin, b'i',
3095 stdin = util.makeloggingfileobject(ui, proc.stdin, b'i',
3096 logdata=True)
3096 logdata=True)
3097 stdout = util.makeloggingfileobject(ui, proc.stdout, b'o',
3097 stdout = util.makeloggingfileobject(ui, proc.stdout, b'o',
3098 logdata=True)
3098 logdata=True)
3099 stderr = util.makeloggingfileobject(ui, proc.stderr, b'e',
3099 stderr = util.makeloggingfileobject(ui, proc.stderr, b'e',
3100 logdata=True)
3100 logdata=True)
3101
3101
3102 # --localssh also implies the peer connection settings.
3102 # --localssh also implies the peer connection settings.
3103
3103
3104 url = 'ssh://localserver'
3104 url = 'ssh://localserver'
3105 autoreadstderr = not opts['noreadstderr']
3105 autoreadstderr = not opts['noreadstderr']
3106
3106
3107 if opts['peer'] == 'ssh1':
3107 if opts['peer'] == 'ssh1':
3108 ui.write(_('creating ssh peer for wire protocol version 1\n'))
3108 ui.write(_('creating ssh peer for wire protocol version 1\n'))
3109 peer = sshpeer.sshv1peer(ui, url, proc, stdin, stdout, stderr,
3109 peer = sshpeer.sshv1peer(ui, url, proc, stdin, stdout, stderr,
3110 None, autoreadstderr=autoreadstderr)
3110 None, autoreadstderr=autoreadstderr)
3111 elif opts['peer'] == 'ssh2':
3111 elif opts['peer'] == 'ssh2':
3112 ui.write(_('creating ssh peer for wire protocol version 2\n'))
3112 ui.write(_('creating ssh peer for wire protocol version 2\n'))
3113 peer = sshpeer.sshv2peer(ui, url, proc, stdin, stdout, stderr,
3113 peer = sshpeer.sshv2peer(ui, url, proc, stdin, stdout, stderr,
3114 None, autoreadstderr=autoreadstderr)
3114 None, autoreadstderr=autoreadstderr)
3115 elif opts['peer'] == 'raw':
3115 elif opts['peer'] == 'raw':
3116 ui.write(_('using raw connection to peer\n'))
3116 ui.write(_('using raw connection to peer\n'))
3117 peer = None
3117 peer = None
3118 else:
3118 else:
3119 ui.write(_('creating ssh peer from handshake results\n'))
3119 ui.write(_('creating ssh peer from handshake results\n'))
3120 peer = sshpeer.makepeer(ui, url, proc, stdin, stdout, stderr,
3120 peer = sshpeer.makepeer(ui, url, proc, stdin, stdout, stderr,
3121 autoreadstderr=autoreadstderr)
3121 autoreadstderr=autoreadstderr)
3122
3122
3123 elif path:
3123 elif path:
3124 # We bypass hg.peer() so we can proxy the sockets.
3124 # We bypass hg.peer() so we can proxy the sockets.
3125 # TODO consider not doing this because we skip
3125 # TODO consider not doing this because we skip
3126 # ``hg.wirepeersetupfuncs`` and potentially other useful functionality.
3126 # ``hg.wirepeersetupfuncs`` and potentially other useful functionality.
3127 u = util.url(path)
3127 u = util.url(path)
3128 if u.scheme != 'http':
3128 if u.scheme != 'http':
3129 raise error.Abort(_('only http:// paths are currently supported'))
3129 raise error.Abort(_('only http:// paths are currently supported'))
3130
3130
3131 url, authinfo = u.authinfo()
3131 url, authinfo = u.authinfo()
3132 openerargs = {
3132 openerargs = {
3133 r'useragent': b'Mercurial debugwireproto',
3133 r'useragent': b'Mercurial debugwireproto',
3134 }
3134 }
3135
3135
3136 # Turn pipes/sockets into observers so we can log I/O.
3136 # Turn pipes/sockets into observers so we can log I/O.
3137 if ui.verbose:
3137 if ui.verbose:
3138 openerargs.update({
3138 openerargs.update({
3139 r'loggingfh': ui,
3139 r'loggingfh': ui,
3140 r'loggingname': b's',
3140 r'loggingname': b's',
3141 r'loggingopts': {
3141 r'loggingopts': {
3142 r'logdata': True,
3142 r'logdata': True,
3143 r'logdataapis': False,
3143 r'logdataapis': False,
3144 },
3144 },
3145 })
3145 })
3146
3146
3147 if ui.debugflag:
3147 if ui.debugflag:
3148 openerargs[r'loggingopts'][r'logdataapis'] = True
3148 openerargs[r'loggingopts'][r'logdataapis'] = True
3149
3149
3150 # Don't send default headers when in raw mode. This allows us to
3150 # Don't send default headers when in raw mode. This allows us to
3151 # bypass most of the behavior of our URL handling code so we can
3151 # bypass most of the behavior of our URL handling code so we can
3152 # have near complete control over what's sent on the wire.
3152 # have near complete control over what's sent on the wire.
3153 if opts['peer'] == 'raw':
3153 if opts['peer'] == 'raw':
3154 openerargs[r'sendaccept'] = False
3154 openerargs[r'sendaccept'] = False
3155
3155
3156 opener = urlmod.opener(ui, authinfo, **openerargs)
3156 opener = urlmod.opener(ui, authinfo, **openerargs)
3157
3157
3158 if opts['peer'] == 'http2':
3158 if opts['peer'] == 'http2':
3159 ui.write(_('creating http peer for wire protocol version 2\n'))
3159 ui.write(_('creating http peer for wire protocol version 2\n'))
3160 # We go through makepeer() because we need an API descriptor for
3160 # We go through makepeer() because we need an API descriptor for
3161 # the peer instance to be useful.
3161 # the peer instance to be useful.
3162 with ui.configoverride({
3162 with ui.configoverride({
3163 ('experimental', 'httppeer.advertise-v2'): True}):
3163 ('experimental', 'httppeer.advertise-v2'): True}):
3164 if opts['nologhandshake']:
3164 if opts['nologhandshake']:
3165 ui.pushbuffer()
3165 ui.pushbuffer()
3166
3166
3167 peer = httppeer.makepeer(ui, path, opener=opener)
3167 peer = httppeer.makepeer(ui, path, opener=opener)
3168
3168
3169 if opts['nologhandshake']:
3169 if opts['nologhandshake']:
3170 ui.popbuffer()
3170 ui.popbuffer()
3171
3171
3172 if not isinstance(peer, httppeer.httpv2peer):
3172 if not isinstance(peer, httppeer.httpv2peer):
3173 raise error.Abort(_('could not instantiate HTTP peer for '
3173 raise error.Abort(_('could not instantiate HTTP peer for '
3174 'wire protocol version 2'),
3174 'wire protocol version 2'),
3175 hint=_('the server may not have the feature '
3175 hint=_('the server may not have the feature '
3176 'enabled or is not allowing this '
3176 'enabled or is not allowing this '
3177 'client version'))
3177 'client version'))
3178
3178
3179 elif opts['peer'] == 'raw':
3179 elif opts['peer'] == 'raw':
3180 ui.write(_('using raw connection to peer\n'))
3180 ui.write(_('using raw connection to peer\n'))
3181 peer = None
3181 peer = None
3182 elif opts['peer']:
3182 elif opts['peer']:
3183 raise error.Abort(_('--peer %s not supported with HTTP peers') %
3183 raise error.Abort(_('--peer %s not supported with HTTP peers') %
3184 opts['peer'])
3184 opts['peer'])
3185 else:
3185 else:
3186 peer = httppeer.makepeer(ui, path, opener=opener)
3186 peer = httppeer.makepeer(ui, path, opener=opener)
3187
3187
3188 # We /could/ populate stdin/stdout with sock.makefile()...
3188 # We /could/ populate stdin/stdout with sock.makefile()...
3189 else:
3189 else:
3190 raise error.Abort(_('unsupported connection configuration'))
3190 raise error.Abort(_('unsupported connection configuration'))
3191
3191
3192 batchedcommands = None
3192 batchedcommands = None
3193
3193
3194 # Now perform actions based on the parsed wire language instructions.
3194 # Now perform actions based on the parsed wire language instructions.
3195 for action, lines in blocks:
3195 for action, lines in blocks:
3196 if action in ('raw', 'raw+'):
3196 if action in ('raw', 'raw+'):
3197 if not stdin:
3197 if not stdin:
3198 raise error.Abort(_('cannot call raw/raw+ on this peer'))
3198 raise error.Abort(_('cannot call raw/raw+ on this peer'))
3199
3199
3200 # Concatenate the data together.
3200 # Concatenate the data together.
3201 data = ''.join(l.lstrip() for l in lines)
3201 data = ''.join(l.lstrip() for l in lines)
3202 data = stringutil.unescapestr(data)
3202 data = stringutil.unescapestr(data)
3203 stdin.write(data)
3203 stdin.write(data)
3204
3204
3205 if action == 'raw+':
3205 if action == 'raw+':
3206 stdin.flush()
3206 stdin.flush()
3207 elif action == 'flush':
3207 elif action == 'flush':
3208 if not stdin:
3208 if not stdin:
3209 raise error.Abort(_('cannot call flush on this peer'))
3209 raise error.Abort(_('cannot call flush on this peer'))
3210 stdin.flush()
3210 stdin.flush()
3211 elif action.startswith('command'):
3211 elif action.startswith('command'):
3212 if not peer:
3212 if not peer:
3213 raise error.Abort(_('cannot send commands unless peer instance '
3213 raise error.Abort(_('cannot send commands unless peer instance '
3214 'is available'))
3214 'is available'))
3215
3215
3216 command = action.split(' ', 1)[1]
3216 command = action.split(' ', 1)[1]
3217
3217
3218 args = {}
3218 args = {}
3219 for line in lines:
3219 for line in lines:
3220 # We need to allow empty values.
3220 # We need to allow empty values.
3221 fields = line.lstrip().split(' ', 1)
3221 fields = line.lstrip().split(' ', 1)
3222 if len(fields) == 1:
3222 if len(fields) == 1:
3223 key = fields[0]
3223 key = fields[0]
3224 value = ''
3224 value = ''
3225 else:
3225 else:
3226 key, value = fields
3226 key, value = fields
3227
3227
3228 if value.startswith('eval:'):
3228 if value.startswith('eval:'):
3229 value = stringutil.evalpythonliteral(value[5:])
3229 value = stringutil.evalpythonliteral(value[5:])
3230 else:
3230 else:
3231 value = stringutil.unescapestr(value)
3231 value = stringutil.unescapestr(value)
3232
3232
3233 args[key] = value
3233 args[key] = value
3234
3234
3235 if batchedcommands is not None:
3235 if batchedcommands is not None:
3236 batchedcommands.append((command, args))
3236 batchedcommands.append((command, args))
3237 continue
3237 continue
3238
3238
3239 ui.status(_('sending %s command\n') % command)
3239 ui.status(_('sending %s command\n') % command)
3240
3240
3241 if 'PUSHFILE' in args:
3241 if 'PUSHFILE' in args:
3242 with open(args['PUSHFILE'], r'rb') as fh:
3242 with open(args['PUSHFILE'], r'rb') as fh:
3243 del args['PUSHFILE']
3243 del args['PUSHFILE']
3244 res, output = peer._callpush(command, fh,
3244 res, output = peer._callpush(command, fh,
3245 **pycompat.strkwargs(args))
3245 **pycompat.strkwargs(args))
3246 ui.status(_('result: %s\n') % stringutil.escapestr(res))
3246 ui.status(_('result: %s\n') % stringutil.escapestr(res))
3247 ui.status(_('remote output: %s\n') %
3247 ui.status(_('remote output: %s\n') %
3248 stringutil.escapestr(output))
3248 stringutil.escapestr(output))
3249 else:
3249 else:
3250 with peer.commandexecutor() as e:
3250 with peer.commandexecutor() as e:
3251 res = e.callcommand(command, args).result()
3251 res = e.callcommand(command, args).result()
3252
3252
3253 if isinstance(res, wireprotov2peer.commandresponse):
3253 if isinstance(res, wireprotov2peer.commandresponse):
3254 val = res.objects()
3254 val = res.objects()
3255 ui.status(_('response: %s\n') %
3255 ui.status(_('response: %s\n') %
3256 stringutil.pprint(val, bprefix=True, indent=2))
3256 stringutil.pprint(val, bprefix=True, indent=2))
3257 else:
3257 else:
3258 ui.status(_('response: %s\n') %
3258 ui.status(_('response: %s\n') %
3259 stringutil.pprint(res, bprefix=True, indent=2))
3259 stringutil.pprint(res, bprefix=True, indent=2))
3260
3260
3261 elif action == 'batchbegin':
3261 elif action == 'batchbegin':
3262 if batchedcommands is not None:
3262 if batchedcommands is not None:
3263 raise error.Abort(_('nested batchbegin not allowed'))
3263 raise error.Abort(_('nested batchbegin not allowed'))
3264
3264
3265 batchedcommands = []
3265 batchedcommands = []
3266 elif action == 'batchsubmit':
3266 elif action == 'batchsubmit':
3267 # There is a batching API we could go through. But it would be
3267 # There is a batching API we could go through. But it would be
3268 # difficult to normalize requests into function calls. It is easier
3268 # difficult to normalize requests into function calls. It is easier
3269 # to bypass this layer and normalize to commands + args.
3269 # to bypass this layer and normalize to commands + args.
3270 ui.status(_('sending batch with %d sub-commands\n') %
3270 ui.status(_('sending batch with %d sub-commands\n') %
3271 len(batchedcommands))
3271 len(batchedcommands))
3272 for i, chunk in enumerate(peer._submitbatch(batchedcommands)):
3272 for i, chunk in enumerate(peer._submitbatch(batchedcommands)):
3273 ui.status(_('response #%d: %s\n') %
3273 ui.status(_('response #%d: %s\n') %
3274 (i, stringutil.escapestr(chunk)))
3274 (i, stringutil.escapestr(chunk)))
3275
3275
3276 batchedcommands = None
3276 batchedcommands = None
3277
3277
3278 elif action.startswith('httprequest '):
3278 elif action.startswith('httprequest '):
3279 if not opener:
3279 if not opener:
3280 raise error.Abort(_('cannot use httprequest without an HTTP '
3280 raise error.Abort(_('cannot use httprequest without an HTTP '
3281 'peer'))
3281 'peer'))
3282
3282
3283 request = action.split(' ', 2)
3283 request = action.split(' ', 2)
3284 if len(request) != 3:
3284 if len(request) != 3:
3285 raise error.Abort(_('invalid httprequest: expected format is '
3285 raise error.Abort(_('invalid httprequest: expected format is '
3286 '"httprequest <method> <path>'))
3286 '"httprequest <method> <path>'))
3287
3287
3288 method, httppath = request[1:]
3288 method, httppath = request[1:]
3289 headers = {}
3289 headers = {}
3290 body = None
3290 body = None
3291 frames = []
3291 frames = []
3292 for line in lines:
3292 for line in lines:
3293 line = line.lstrip()
3293 line = line.lstrip()
3294 m = re.match(b'^([a-zA-Z0-9_-]+): (.*)$', line)
3294 m = re.match(b'^([a-zA-Z0-9_-]+): (.*)$', line)
3295 if m:
3295 if m:
3296 # Headers need to use native strings.
3296 # Headers need to use native strings.
3297 key = pycompat.strurl(m.group(1))
3297 key = pycompat.strurl(m.group(1))
3298 value = pycompat.strurl(m.group(2))
3298 value = pycompat.strurl(m.group(2))
3299 headers[key] = value
3299 headers[key] = value
3300 continue
3300 continue
3301
3301
3302 if line.startswith(b'BODYFILE '):
3302 if line.startswith(b'BODYFILE '):
3303 with open(line.split(b' ', 1), 'rb') as fh:
3303 with open(line.split(b' ', 1), 'rb') as fh:
3304 body = fh.read()
3304 body = fh.read()
3305 elif line.startswith(b'frame '):
3305 elif line.startswith(b'frame '):
3306 frame = wireprotoframing.makeframefromhumanstring(
3306 frame = wireprotoframing.makeframefromhumanstring(
3307 line[len(b'frame '):])
3307 line[len(b'frame '):])
3308
3308
3309 frames.append(frame)
3309 frames.append(frame)
3310 else:
3310 else:
3311 raise error.Abort(_('unknown argument to httprequest: %s') %
3311 raise error.Abort(_('unknown argument to httprequest: %s') %
3312 line)
3312 line)
3313
3313
3314 url = path + httppath
3314 url = path + httppath
3315
3315
3316 if frames:
3316 if frames:
3317 body = b''.join(bytes(f) for f in frames)
3317 body = b''.join(bytes(f) for f in frames)
3318
3318
3319 req = urlmod.urlreq.request(pycompat.strurl(url), body, headers)
3319 req = urlmod.urlreq.request(pycompat.strurl(url), body, headers)
3320
3320
3321 # urllib.Request insists on using has_data() as a proxy for
3321 # urllib.Request insists on using has_data() as a proxy for
3322 # determining the request method. Override that to use our
3322 # determining the request method. Override that to use our
3323 # explicitly requested method.
3323 # explicitly requested method.
3324 req.get_method = lambda: pycompat.sysstr(method)
3324 req.get_method = lambda: pycompat.sysstr(method)
3325
3325
3326 try:
3326 try:
3327 res = opener.open(req)
3327 res = opener.open(req)
3328 body = res.read()
3328 body = res.read()
3329 except util.urlerr.urlerror as e:
3329 except util.urlerr.urlerror as e:
3330 # read() method must be called, but only exists in Python 2
3330 # read() method must be called, but only exists in Python 2
3331 getattr(e, 'read', lambda: None)()
3331 getattr(e, 'read', lambda: None)()
3332 continue
3332 continue
3333
3333
3334 ct = res.headers.get(r'Content-Type')
3334 ct = res.headers.get(r'Content-Type')
3335 if ct == r'application/mercurial-cbor':
3335 if ct == r'application/mercurial-cbor':
3336 ui.write(_('cbor> %s\n') %
3336 ui.write(_('cbor> %s\n') %
3337 stringutil.pprint(cborutil.decodeall(body)[0],
3337 stringutil.pprint(cborutil.decodeall(body),
3338 bprefix=True,
3338 bprefix=True,
3339 indent=2))
3339 indent=2))
3340
3340
3341 elif action == 'close':
3341 elif action == 'close':
3342 peer.close()
3342 peer.close()
3343 elif action == 'readavailable':
3343 elif action == 'readavailable':
3344 if not stdout or not stderr:
3344 if not stdout or not stderr:
3345 raise error.Abort(_('readavailable not available on this peer'))
3345 raise error.Abort(_('readavailable not available on this peer'))
3346
3346
3347 stdin.close()
3347 stdin.close()
3348 stdout.read()
3348 stdout.read()
3349 stderr.read()
3349 stderr.read()
3350
3350
3351 elif action == 'readline':
3351 elif action == 'readline':
3352 if not stdout:
3352 if not stdout:
3353 raise error.Abort(_('readline not available on this peer'))
3353 raise error.Abort(_('readline not available on this peer'))
3354 stdout.readline()
3354 stdout.readline()
3355 elif action == 'ereadline':
3355 elif action == 'ereadline':
3356 if not stderr:
3356 if not stderr:
3357 raise error.Abort(_('ereadline not available on this peer'))
3357 raise error.Abort(_('ereadline not available on this peer'))
3358 stderr.readline()
3358 stderr.readline()
3359 elif action.startswith('read '):
3359 elif action.startswith('read '):
3360 count = int(action.split(' ', 1)[1])
3360 count = int(action.split(' ', 1)[1])
3361 if not stdout:
3361 if not stdout:
3362 raise error.Abort(_('read not available on this peer'))
3362 raise error.Abort(_('read not available on this peer'))
3363 stdout.read(count)
3363 stdout.read(count)
3364 elif action.startswith('eread '):
3364 elif action.startswith('eread '):
3365 count = int(action.split(' ', 1)[1])
3365 count = int(action.split(' ', 1)[1])
3366 if not stderr:
3366 if not stderr:
3367 raise error.Abort(_('eread not available on this peer'))
3367 raise error.Abort(_('eread not available on this peer'))
3368 stderr.read(count)
3368 stderr.read(count)
3369 else:
3369 else:
3370 raise error.Abort(_('unknown action: %s') % action)
3370 raise error.Abort(_('unknown action: %s') % action)
3371
3371
3372 if batchedcommands is not None:
3372 if batchedcommands is not None:
3373 raise error.Abort(_('unclosed "batchbegin" request'))
3373 raise error.Abort(_('unclosed "batchbegin" request'))
3374
3374
3375 if peer:
3375 if peer:
3376 peer.close()
3376 peer.close()
3377
3377
3378 if proc:
3378 if proc:
3379 proc.kill()
3379 proc.kill()
@@ -1,666 +1,672 b''
1 #require no-chg
1 #require no-chg
2
2
3 $ . $TESTDIR/wireprotohelpers.sh
3 $ . $TESTDIR/wireprotohelpers.sh
4
4
5 $ hg init server
5 $ hg init server
6
6
7 zstd isn't present in plain builds. Make tests easier by removing
7 zstd isn't present in plain builds. Make tests easier by removing
8 zstd from the equation.
8 zstd from the equation.
9
9
10 $ cat >> server/.hg/hgrc << EOF
10 $ cat >> server/.hg/hgrc << EOF
11 > [server]
11 > [server]
12 > compressionengines = zlib
12 > compressionengines = zlib
13 > EOF
13 > EOF
14
14
15 $ hg -R server serve -p $HGPORT -d --pid-file hg.pid -E error.log
15 $ hg -R server serve -p $HGPORT -d --pid-file hg.pid -E error.log
16 $ cat hg.pid > $DAEMON_PIDS
16 $ cat hg.pid > $DAEMON_PIDS
17
17
18 A normal capabilities request is serviced for version 1
18 A normal capabilities request is serviced for version 1
19
19
20 $ sendhttpraw << EOF
20 $ sendhttpraw << EOF
21 > httprequest GET ?cmd=capabilities
21 > httprequest GET ?cmd=capabilities
22 > user-agent: test
22 > user-agent: test
23 > EOF
23 > EOF
24 using raw connection to peer
24 using raw connection to peer
25 s> GET /?cmd=capabilities HTTP/1.1\r\n
25 s> GET /?cmd=capabilities HTTP/1.1\r\n
26 s> Accept-Encoding: identity\r\n
26 s> Accept-Encoding: identity\r\n
27 s> user-agent: test\r\n
27 s> user-agent: test\r\n
28 s> host: $LOCALIP:$HGPORT\r\n (glob)
28 s> host: $LOCALIP:$HGPORT\r\n (glob)
29 s> \r\n
29 s> \r\n
30 s> makefile('rb', None)
30 s> makefile('rb', None)
31 s> HTTP/1.1 200 Script output follows\r\n
31 s> HTTP/1.1 200 Script output follows\r\n
32 s> Server: testing stub value\r\n
32 s> Server: testing stub value\r\n
33 s> Date: $HTTP_DATE$\r\n
33 s> Date: $HTTP_DATE$\r\n
34 s> Content-Type: application/mercurial-0.1\r\n
34 s> Content-Type: application/mercurial-0.1\r\n
35 s> Content-Length: *\r\n (glob)
35 s> Content-Length: *\r\n (glob)
36 s> \r\n
36 s> \r\n
37 s> batch branchmap $USUAL_BUNDLE2_CAPS$ changegroupsubset compression=$BUNDLE2_COMPRESSIONS$ getbundle httpheader=1024 httpmediatype=0.1rx,0.1tx,0.2tx known lookup pushkey streamreqs=generaldelta,revlogv1 unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash
37 s> batch branchmap $USUAL_BUNDLE2_CAPS$ changegroupsubset compression=$BUNDLE2_COMPRESSIONS$ getbundle httpheader=1024 httpmediatype=0.1rx,0.1tx,0.2tx known lookup pushkey streamreqs=generaldelta,revlogv1 unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash
38
38
39 A proper request without the API server enabled returns the legacy response
39 A proper request without the API server enabled returns the legacy response
40
40
41 $ sendhttpraw << EOF
41 $ sendhttpraw << EOF
42 > httprequest GET ?cmd=capabilities
42 > httprequest GET ?cmd=capabilities
43 > user-agent: test
43 > user-agent: test
44 > x-hgupgrade-1: foo
44 > x-hgupgrade-1: foo
45 > x-hgproto-1: cbor
45 > x-hgproto-1: cbor
46 > EOF
46 > EOF
47 using raw connection to peer
47 using raw connection to peer
48 s> GET /?cmd=capabilities HTTP/1.1\r\n
48 s> GET /?cmd=capabilities HTTP/1.1\r\n
49 s> Accept-Encoding: identity\r\n
49 s> Accept-Encoding: identity\r\n
50 s> user-agent: test\r\n
50 s> user-agent: test\r\n
51 s> x-hgproto-1: cbor\r\n
51 s> x-hgproto-1: cbor\r\n
52 s> x-hgupgrade-1: foo\r\n
52 s> x-hgupgrade-1: foo\r\n
53 s> host: $LOCALIP:$HGPORT\r\n (glob)
53 s> host: $LOCALIP:$HGPORT\r\n (glob)
54 s> \r\n
54 s> \r\n
55 s> makefile('rb', None)
55 s> makefile('rb', None)
56 s> HTTP/1.1 200 Script output follows\r\n
56 s> HTTP/1.1 200 Script output follows\r\n
57 s> Server: testing stub value\r\n
57 s> Server: testing stub value\r\n
58 s> Date: $HTTP_DATE$\r\n
58 s> Date: $HTTP_DATE$\r\n
59 s> Content-Type: application/mercurial-0.1\r\n
59 s> Content-Type: application/mercurial-0.1\r\n
60 s> Content-Length: *\r\n (glob)
60 s> Content-Length: *\r\n (glob)
61 s> \r\n
61 s> \r\n
62 s> batch branchmap $USUAL_BUNDLE2_CAPS$ changegroupsubset compression=$BUNDLE2_COMPRESSIONS$ getbundle httpheader=1024 httpmediatype=0.1rx,0.1tx,0.2tx known lookup pushkey streamreqs=generaldelta,revlogv1 unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash
62 s> batch branchmap $USUAL_BUNDLE2_CAPS$ changegroupsubset compression=$BUNDLE2_COMPRESSIONS$ getbundle httpheader=1024 httpmediatype=0.1rx,0.1tx,0.2tx known lookup pushkey streamreqs=generaldelta,revlogv1 unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash
63
63
64 Restart with just API server enabled. This enables serving the new format.
64 Restart with just API server enabled. This enables serving the new format.
65
65
66 $ killdaemons.py
66 $ killdaemons.py
67 $ cat error.log
67 $ cat error.log
68
68
69 $ cat >> server/.hg/hgrc << EOF
69 $ cat >> server/.hg/hgrc << EOF
70 > [experimental]
70 > [experimental]
71 > web.apiserver = true
71 > web.apiserver = true
72 > EOF
72 > EOF
73
73
74 $ hg -R server serve -p $HGPORT -d --pid-file hg.pid -E error.log
74 $ hg -R server serve -p $HGPORT -d --pid-file hg.pid -E error.log
75 $ cat hg.pid > $DAEMON_PIDS
75 $ cat hg.pid > $DAEMON_PIDS
76
76
77 X-HgUpgrade-<N> without CBOR advertisement uses legacy response
77 X-HgUpgrade-<N> without CBOR advertisement uses legacy response
78
78
79 $ sendhttpraw << EOF
79 $ sendhttpraw << EOF
80 > httprequest GET ?cmd=capabilities
80 > httprequest GET ?cmd=capabilities
81 > user-agent: test
81 > user-agent: test
82 > x-hgupgrade-1: foo bar
82 > x-hgupgrade-1: foo bar
83 > EOF
83 > EOF
84 using raw connection to peer
84 using raw connection to peer
85 s> GET /?cmd=capabilities HTTP/1.1\r\n
85 s> GET /?cmd=capabilities HTTP/1.1\r\n
86 s> Accept-Encoding: identity\r\n
86 s> Accept-Encoding: identity\r\n
87 s> user-agent: test\r\n
87 s> user-agent: test\r\n
88 s> x-hgupgrade-1: foo bar\r\n
88 s> x-hgupgrade-1: foo bar\r\n
89 s> host: $LOCALIP:$HGPORT\r\n (glob)
89 s> host: $LOCALIP:$HGPORT\r\n (glob)
90 s> \r\n
90 s> \r\n
91 s> makefile('rb', None)
91 s> makefile('rb', None)
92 s> HTTP/1.1 200 Script output follows\r\n
92 s> HTTP/1.1 200 Script output follows\r\n
93 s> Server: testing stub value\r\n
93 s> Server: testing stub value\r\n
94 s> Date: $HTTP_DATE$\r\n
94 s> Date: $HTTP_DATE$\r\n
95 s> Content-Type: application/mercurial-0.1\r\n
95 s> Content-Type: application/mercurial-0.1\r\n
96 s> Content-Length: *\r\n (glob)
96 s> Content-Length: *\r\n (glob)
97 s> \r\n
97 s> \r\n
98 s> batch branchmap $USUAL_BUNDLE2_CAPS$ changegroupsubset compression=$BUNDLE2_COMPRESSIONS$ getbundle httpheader=1024 httpmediatype=0.1rx,0.1tx,0.2tx known lookup pushkey streamreqs=generaldelta,revlogv1 unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash
98 s> batch branchmap $USUAL_BUNDLE2_CAPS$ changegroupsubset compression=$BUNDLE2_COMPRESSIONS$ getbundle httpheader=1024 httpmediatype=0.1rx,0.1tx,0.2tx known lookup pushkey streamreqs=generaldelta,revlogv1 unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash
99
99
100 X-HgUpgrade-<N> without known serialization in X-HgProto-<N> uses legacy response
100 X-HgUpgrade-<N> without known serialization in X-HgProto-<N> uses legacy response
101
101
102 $ sendhttpraw << EOF
102 $ sendhttpraw << EOF
103 > httprequest GET ?cmd=capabilities
103 > httprequest GET ?cmd=capabilities
104 > user-agent: test
104 > user-agent: test
105 > x-hgupgrade-1: foo bar
105 > x-hgupgrade-1: foo bar
106 > x-hgproto-1: some value
106 > x-hgproto-1: some value
107 > EOF
107 > EOF
108 using raw connection to peer
108 using raw connection to peer
109 s> GET /?cmd=capabilities HTTP/1.1\r\n
109 s> GET /?cmd=capabilities HTTP/1.1\r\n
110 s> Accept-Encoding: identity\r\n
110 s> Accept-Encoding: identity\r\n
111 s> user-agent: test\r\n
111 s> user-agent: test\r\n
112 s> x-hgproto-1: some value\r\n
112 s> x-hgproto-1: some value\r\n
113 s> x-hgupgrade-1: foo bar\r\n
113 s> x-hgupgrade-1: foo bar\r\n
114 s> host: $LOCALIP:$HGPORT\r\n (glob)
114 s> host: $LOCALIP:$HGPORT\r\n (glob)
115 s> \r\n
115 s> \r\n
116 s> makefile('rb', None)
116 s> makefile('rb', None)
117 s> HTTP/1.1 200 Script output follows\r\n
117 s> HTTP/1.1 200 Script output follows\r\n
118 s> Server: testing stub value\r\n
118 s> Server: testing stub value\r\n
119 s> Date: $HTTP_DATE$\r\n
119 s> Date: $HTTP_DATE$\r\n
120 s> Content-Type: application/mercurial-0.1\r\n
120 s> Content-Type: application/mercurial-0.1\r\n
121 s> Content-Length: *\r\n (glob)
121 s> Content-Length: *\r\n (glob)
122 s> \r\n
122 s> \r\n
123 s> batch branchmap $USUAL_BUNDLE2_CAPS$ changegroupsubset compression=$BUNDLE2_COMPRESSIONS$ getbundle httpheader=1024 httpmediatype=0.1rx,0.1tx,0.2tx known lookup pushkey streamreqs=generaldelta,revlogv1 unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash
123 s> batch branchmap $USUAL_BUNDLE2_CAPS$ changegroupsubset compression=$BUNDLE2_COMPRESSIONS$ getbundle httpheader=1024 httpmediatype=0.1rx,0.1tx,0.2tx known lookup pushkey streamreqs=generaldelta,revlogv1 unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash
124
124
125 X-HgUpgrade-<N> + X-HgProto-<N> headers trigger new response format
125 X-HgUpgrade-<N> + X-HgProto-<N> headers trigger new response format
126
126
127 $ sendhttpraw << EOF
127 $ sendhttpraw << EOF
128 > httprequest GET ?cmd=capabilities
128 > httprequest GET ?cmd=capabilities
129 > user-agent: test
129 > user-agent: test
130 > x-hgupgrade-1: foo bar
130 > x-hgupgrade-1: foo bar
131 > x-hgproto-1: cbor
131 > x-hgproto-1: cbor
132 > EOF
132 > EOF
133 using raw connection to peer
133 using raw connection to peer
134 s> GET /?cmd=capabilities HTTP/1.1\r\n
134 s> GET /?cmd=capabilities HTTP/1.1\r\n
135 s> Accept-Encoding: identity\r\n
135 s> Accept-Encoding: identity\r\n
136 s> user-agent: test\r\n
136 s> user-agent: test\r\n
137 s> x-hgproto-1: cbor\r\n
137 s> x-hgproto-1: cbor\r\n
138 s> x-hgupgrade-1: foo bar\r\n
138 s> x-hgupgrade-1: foo bar\r\n
139 s> host: $LOCALIP:$HGPORT\r\n (glob)
139 s> host: $LOCALIP:$HGPORT\r\n (glob)
140 s> \r\n
140 s> \r\n
141 s> makefile('rb', None)
141 s> makefile('rb', None)
142 s> HTTP/1.1 200 OK\r\n
142 s> HTTP/1.1 200 OK\r\n
143 s> Server: testing stub value\r\n
143 s> Server: testing stub value\r\n
144 s> Date: $HTTP_DATE$\r\n
144 s> Date: $HTTP_DATE$\r\n
145 s> Content-Type: application/mercurial-cbor\r\n
145 s> Content-Type: application/mercurial-cbor\r\n
146 s> Content-Length: *\r\n (glob)
146 s> Content-Length: *\r\n (glob)
147 s> \r\n
147 s> \r\n
148 s> \xa3GapibaseDapi/Dapis\xa0Nv1capabilitiesY\x01\xd3batch branchmap $USUAL_BUNDLE2_CAPS$ changegroupsubset compression=$BUNDLE2_COMPRESSIONS$ getbundle httpheader=1024 httpmediatype=0.1rx,0.1tx,0.2tx known lookup pushkey streamreqs=generaldelta,revlogv1 unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash
148 s> \xa3GapibaseDapi/Dapis\xa0Nv1capabilitiesY\x01\xd3batch branchmap $USUAL_BUNDLE2_CAPS$ changegroupsubset compression=$BUNDLE2_COMPRESSIONS$ getbundle httpheader=1024 httpmediatype=0.1rx,0.1tx,0.2tx known lookup pushkey streamreqs=generaldelta,revlogv1 unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash
149 cbor> {
149 cbor> [
150 b'apibase': b'api/',
150 {
151 b'apis': {},
151 b'apibase': b'api/',
152 b'v1capabilities': b'batch branchmap $USUAL_BUNDLE2_CAPS$ changegroupsubset compression=$BUNDLE2_COMPRESSIONS$ getbundle httpheader=1024 httpmediatype=0.1rx,0.1tx,0.2tx known lookup pushkey streamreqs=generaldelta,revlogv1 unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash'
152 b'apis': {},
153 }
153 b'v1capabilities': b'batch branchmap $USUAL_BUNDLE2_CAPS$ changegroupsubset compression=$BUNDLE2_COMPRESSIONS$ getbundle httpheader=1024 httpmediatype=0.1rx,0.1tx,0.2tx known lookup pushkey streamreqs=generaldelta,revlogv1 unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash'
154 }
155 ]
154
156
155 Restart server to enable HTTPv2
157 Restart server to enable HTTPv2
156
158
157 $ killdaemons.py
159 $ killdaemons.py
158 $ enablehttpv2 server
160 $ enablehttpv2 server
159 $ hg -R server serve -p $HGPORT -d --pid-file hg.pid -E error.log
161 $ hg -R server serve -p $HGPORT -d --pid-file hg.pid -E error.log
160 $ cat hg.pid > $DAEMON_PIDS
162 $ cat hg.pid > $DAEMON_PIDS
161
163
162 Only requested API services are returned
164 Only requested API services are returned
163
165
164 $ sendhttpraw << EOF
166 $ sendhttpraw << EOF
165 > httprequest GET ?cmd=capabilities
167 > httprequest GET ?cmd=capabilities
166 > user-agent: test
168 > user-agent: test
167 > x-hgupgrade-1: foo bar
169 > x-hgupgrade-1: foo bar
168 > x-hgproto-1: cbor
170 > x-hgproto-1: cbor
169 > EOF
171 > EOF
170 using raw connection to peer
172 using raw connection to peer
171 s> GET /?cmd=capabilities HTTP/1.1\r\n
173 s> GET /?cmd=capabilities HTTP/1.1\r\n
172 s> Accept-Encoding: identity\r\n
174 s> Accept-Encoding: identity\r\n
173 s> user-agent: test\r\n
175 s> user-agent: test\r\n
174 s> x-hgproto-1: cbor\r\n
176 s> x-hgproto-1: cbor\r\n
175 s> x-hgupgrade-1: foo bar\r\n
177 s> x-hgupgrade-1: foo bar\r\n
176 s> host: $LOCALIP:$HGPORT\r\n (glob)
178 s> host: $LOCALIP:$HGPORT\r\n (glob)
177 s> \r\n
179 s> \r\n
178 s> makefile('rb', None)
180 s> makefile('rb', None)
179 s> HTTP/1.1 200 OK\r\n
181 s> HTTP/1.1 200 OK\r\n
180 s> Server: testing stub value\r\n
182 s> Server: testing stub value\r\n
181 s> Date: $HTTP_DATE$\r\n
183 s> Date: $HTTP_DATE$\r\n
182 s> Content-Type: application/mercurial-cbor\r\n
184 s> Content-Type: application/mercurial-cbor\r\n
183 s> Content-Length: *\r\n (glob)
185 s> Content-Length: *\r\n (glob)
184 s> \r\n
186 s> \r\n
185 s> \xa3GapibaseDapi/Dapis\xa0Nv1capabilitiesY\x01\xd3batch branchmap $USUAL_BUNDLE2_CAPS$ changegroupsubset compression=$BUNDLE2_COMPRESSIONS$ getbundle httpheader=1024 httpmediatype=0.1rx,0.1tx,0.2tx known lookup pushkey streamreqs=generaldelta,revlogv1 unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash
187 s> \xa3GapibaseDapi/Dapis\xa0Nv1capabilitiesY\x01\xd3batch branchmap $USUAL_BUNDLE2_CAPS$ changegroupsubset compression=$BUNDLE2_COMPRESSIONS$ getbundle httpheader=1024 httpmediatype=0.1rx,0.1tx,0.2tx known lookup pushkey streamreqs=generaldelta,revlogv1 unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash
186 cbor> {
188 cbor> [
187 b'apibase': b'api/',
189 {
188 b'apis': {},
190 b'apibase': b'api/',
189 b'v1capabilities': b'batch branchmap $USUAL_BUNDLE2_CAPS$ changegroupsubset compression=$BUNDLE2_COMPRESSIONS$ getbundle httpheader=1024 httpmediatype=0.1rx,0.1tx,0.2tx known lookup pushkey streamreqs=generaldelta,revlogv1 unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash'
191 b'apis': {},
190 }
192 b'v1capabilities': b'batch branchmap $USUAL_BUNDLE2_CAPS$ changegroupsubset compression=$BUNDLE2_COMPRESSIONS$ getbundle httpheader=1024 httpmediatype=0.1rx,0.1tx,0.2tx known lookup pushkey streamreqs=generaldelta,revlogv1 unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash'
193 }
194 ]
191
195
192 Request for HTTPv2 service returns information about it
196 Request for HTTPv2 service returns information about it
193
197
194 $ sendhttpraw << EOF
198 $ sendhttpraw << EOF
195 > httprequest GET ?cmd=capabilities
199 > httprequest GET ?cmd=capabilities
196 > user-agent: test
200 > user-agent: test
197 > x-hgupgrade-1: exp-http-v2-0002 foo bar
201 > x-hgupgrade-1: exp-http-v2-0002 foo bar
198 > x-hgproto-1: cbor
202 > x-hgproto-1: cbor
199 > EOF
203 > EOF
200 using raw connection to peer
204 using raw connection to peer
201 s> GET /?cmd=capabilities HTTP/1.1\r\n
205 s> GET /?cmd=capabilities HTTP/1.1\r\n
202 s> Accept-Encoding: identity\r\n
206 s> Accept-Encoding: identity\r\n
203 s> user-agent: test\r\n
207 s> user-agent: test\r\n
204 s> x-hgproto-1: cbor\r\n
208 s> x-hgproto-1: cbor\r\n
205 s> x-hgupgrade-1: exp-http-v2-0002 foo bar\r\n
209 s> x-hgupgrade-1: exp-http-v2-0002 foo bar\r\n
206 s> host: $LOCALIP:$HGPORT\r\n (glob)
210 s> host: $LOCALIP:$HGPORT\r\n (glob)
207 s> \r\n
211 s> \r\n
208 s> makefile('rb', None)
212 s> makefile('rb', None)
209 s> HTTP/1.1 200 OK\r\n
213 s> HTTP/1.1 200 OK\r\n
210 s> Server: testing stub value\r\n
214 s> Server: testing stub value\r\n
211 s> Date: $HTTP_DATE$\r\n
215 s> Date: $HTTP_DATE$\r\n
212 s> Content-Type: application/mercurial-cbor\r\n
216 s> Content-Type: application/mercurial-cbor\r\n
213 s> Content-Length: *\r\n (glob)
217 s> Content-Length: *\r\n (glob)
214 s> \r\n
218 s> \r\n
215 s> \xa3GapibaseDapi/Dapis\xa1Pexp-http-v2-0002\xa5Hcommands\xaaIbranchmap\xa2Dargs\xa0Kpermissions\x81DpullLcapabilities\xa2Dargs\xa0Kpermissions\x81DpullMchangesetdata\xa2Dargs\xa4Ffields\xa4Gdefault\xd9\x01\x02\x80Hrequired\xf4DtypeCsetKvalidvalues\xd9\x01\x02\x84IbookmarksGparentsEphaseHrevisionInoderange\xa3Gdefault\xf6Hrequired\xf4DtypeDlistEnodes\xa3Gdefault\xf6Hrequired\xf4DtypeDlistJnodesdepth\xa3Gdefault\xf6Hrequired\xf4DtypeCintKpermissions\x81DpullHfiledata\xa2Dargs\xa4Ffields\xa4Gdefault\xd9\x01\x02\x80Hrequired\xf4DtypeCsetKvalidvalues\xd9\x01\x02\x82GparentsHrevisionKhaveparents\xa3Gdefault\xf4Hrequired\xf4DtypeDboolEnodes\xa2Hrequired\xf5DtypeDlistDpath\xa2Hrequired\xf5DtypeEbytesKpermissions\x81DpullEheads\xa2Dargs\xa1Jpubliconly\xa3Gdefault\xf4Hrequired\xf4DtypeDboolKpermissions\x81DpullEknown\xa2Dargs\xa1Enodes\xa3Gdefault\x80Hrequired\xf4DtypeDlistKpermissions\x81DpullHlistkeys\xa2Dargs\xa1Inamespace\xa2Hrequired\xf5DtypeEbytesKpermissions\x81DpullFlookup\xa2Dargs\xa1Ckey\xa2Hrequired\xf5DtypeEbytesKpermissions\x81DpullLmanifestdata\xa2Dargs\xa4Ffields\xa4Gdefault\xd9\x01\x02\x80Hrequired\xf4DtypeCsetKvalidvalues\xd9\x01\x02\x82GparentsHrevisionKhaveparents\xa3Gdefault\xf4Hrequired\xf4DtypeDboolEnodes\xa2Hrequired\xf5DtypeDlistDtree\xa2Hrequired\xf5DtypeEbytesKpermissions\x81DpullGpushkey\xa2Dargs\xa4Ckey\xa2Hrequired\xf5DtypeEbytesInamespace\xa2Hrequired\xf5DtypeEbytesCnew\xa2Hrequired\xf5DtypeEbytesCold\xa2Hrequired\xf5DtypeEbytesKpermissions\x81DpushKcompression\x81\xa1DnameDzlibQframingmediatypes\x81X&application/mercurial-exp-framing-0005Rpathfilterprefixes\xd9\x01\x02\x82Epath:Lrootfilesin:Nrawrepoformats\x82LgeneraldeltaHrevlogv1Nv1capabilitiesY\x01\xd3batch branchmap $USUAL_BUNDLE2_CAPS$ changegroupsubset compression=$BUNDLE2_COMPRESSIONS$ getbundle httpheader=1024 httpmediatype=0.1rx,0.1tx,0.2tx known lookup pushkey streamreqs=generaldelta,revlogv1 unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash
219 s> \xa3GapibaseDapi/Dapis\xa1Pexp-http-v2-0002\xa5Hcommands\xaaIbranchmap\xa2Dargs\xa0Kpermissions\x81DpullLcapabilities\xa2Dargs\xa0Kpermissions\x81DpullMchangesetdata\xa2Dargs\xa4Ffields\xa4Gdefault\xd9\x01\x02\x80Hrequired\xf4DtypeCsetKvalidvalues\xd9\x01\x02\x84IbookmarksGparentsEphaseHrevisionInoderange\xa3Gdefault\xf6Hrequired\xf4DtypeDlistEnodes\xa3Gdefault\xf6Hrequired\xf4DtypeDlistJnodesdepth\xa3Gdefault\xf6Hrequired\xf4DtypeCintKpermissions\x81DpullHfiledata\xa2Dargs\xa4Ffields\xa4Gdefault\xd9\x01\x02\x80Hrequired\xf4DtypeCsetKvalidvalues\xd9\x01\x02\x82GparentsHrevisionKhaveparents\xa3Gdefault\xf4Hrequired\xf4DtypeDboolEnodes\xa2Hrequired\xf5DtypeDlistDpath\xa2Hrequired\xf5DtypeEbytesKpermissions\x81DpullEheads\xa2Dargs\xa1Jpubliconly\xa3Gdefault\xf4Hrequired\xf4DtypeDboolKpermissions\x81DpullEknown\xa2Dargs\xa1Enodes\xa3Gdefault\x80Hrequired\xf4DtypeDlistKpermissions\x81DpullHlistkeys\xa2Dargs\xa1Inamespace\xa2Hrequired\xf5DtypeEbytesKpermissions\x81DpullFlookup\xa2Dargs\xa1Ckey\xa2Hrequired\xf5DtypeEbytesKpermissions\x81DpullLmanifestdata\xa2Dargs\xa4Ffields\xa4Gdefault\xd9\x01\x02\x80Hrequired\xf4DtypeCsetKvalidvalues\xd9\x01\x02\x82GparentsHrevisionKhaveparents\xa3Gdefault\xf4Hrequired\xf4DtypeDboolEnodes\xa2Hrequired\xf5DtypeDlistDtree\xa2Hrequired\xf5DtypeEbytesKpermissions\x81DpullGpushkey\xa2Dargs\xa4Ckey\xa2Hrequired\xf5DtypeEbytesInamespace\xa2Hrequired\xf5DtypeEbytesCnew\xa2Hrequired\xf5DtypeEbytesCold\xa2Hrequired\xf5DtypeEbytesKpermissions\x81DpushKcompression\x81\xa1DnameDzlibQframingmediatypes\x81X&application/mercurial-exp-framing-0005Rpathfilterprefixes\xd9\x01\x02\x82Epath:Lrootfilesin:Nrawrepoformats\x82LgeneraldeltaHrevlogv1Nv1capabilitiesY\x01\xd3batch branchmap $USUAL_BUNDLE2_CAPS$ changegroupsubset compression=$BUNDLE2_COMPRESSIONS$ getbundle httpheader=1024 httpmediatype=0.1rx,0.1tx,0.2tx known lookup pushkey streamreqs=generaldelta,revlogv1 unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash
216 cbor> {
220 cbor> [
217 b'apibase': b'api/',
221 {
218 b'apis': {
222 b'apibase': b'api/',
219 b'exp-http-v2-0002': {
223 b'apis': {
220 b'commands': {
224 b'exp-http-v2-0002': {
221 b'branchmap': {
225 b'commands': {
222 b'args': {},
226 b'branchmap': {
223 b'permissions': [
227 b'args': {},
224 b'pull'
228 b'permissions': [
225 ]
229 b'pull'
226 },
230 ]
227 b'capabilities': {
231 },
228 b'args': {},
232 b'capabilities': {
229 b'permissions': [
233 b'args': {},
230 b'pull'
234 b'permissions': [
231 ]
235 b'pull'
232 },
236 ]
233 b'changesetdata': {
234 b'args': {
235 b'fields': {
236 b'default': set([]),
237 b'required': False,
238 b'type': b'set',
239 b'validvalues': set([
240 b'bookmarks',
241 b'parents',
242 b'phase',
243 b'revision'
244 ])
245 },
246 b'noderange': {
247 b'default': None,
248 b'required': False,
249 b'type': b'list'
250 },
251 b'nodes': {
252 b'default': None,
253 b'required': False,
254 b'type': b'list'
255 },
256 b'nodesdepth': {
257 b'default': None,
258 b'required': False,
259 b'type': b'int'
260 }
261 },
237 },
262 b'permissions': [
238 b'changesetdata': {
263 b'pull'
239 b'args': {
264 ]
240 b'fields': {
265 },
241 b'default': set([]),
266 b'filedata': {
242 b'required': False,
267 b'args': {
243 b'type': b'set',
268 b'fields': {
244 b'validvalues': set([
269 b'default': set([]),
245 b'bookmarks',
270 b'required': False,
246 b'parents',
271 b'type': b'set',
247 b'phase',
272 b'validvalues': set([
248 b'revision'
273 b'parents',
249 ])
274 b'revision'
250 },
275 ])
251 b'noderange': {
276 },
252 b'default': None,
277 b'haveparents': {
253 b'required': False,
278 b'default': False,
254 b'type': b'list'
279 b'required': False,
255 },
280 b'type': b'bool'
256 b'nodes': {
281 },
257 b'default': None,
282 b'nodes': {
258 b'required': False,
283 b'required': True,
259 b'type': b'list'
284 b'type': b'list'
260 },
261 b'nodesdepth': {
262 b'default': None,
263 b'required': False,
264 b'type': b'int'
265 }
285 },
266 },
286 b'path': {
267 b'permissions': [
287 b'required': True,
268 b'pull'
288 b'type': b'bytes'
269 ]
289 }
290 },
270 },
291 b'permissions': [
271 b'filedata': {
292 b'pull'
272 b'args': {
293 ]
273 b'fields': {
294 },
274 b'default': set([]),
295 b'heads': {
275 b'required': False,
296 b'args': {
276 b'type': b'set',
297 b'publiconly': {
277 b'validvalues': set([
298 b'default': False,
278 b'parents',
299 b'required': False,
279 b'revision'
300 b'type': b'bool'
280 ])
301 }
281 },
282 b'haveparents': {
283 b'default': False,
284 b'required': False,
285 b'type': b'bool'
286 },
287 b'nodes': {
288 b'required': True,
289 b'type': b'list'
290 },
291 b'path': {
292 b'required': True,
293 b'type': b'bytes'
294 }
295 },
296 b'permissions': [
297 b'pull'
298 ]
302 },
299 },
303 b'permissions': [
300 b'heads': {
304 b'pull'
301 b'args': {
305 ]
302 b'publiconly': {
306 },
303 b'default': False,
307 b'known': {
304 b'required': False,
308 b'args': {
305 b'type': b'bool'
309 b'nodes': {
306 }
310 b'default': [],
307 },
311 b'required': False,
308 b'permissions': [
312 b'type': b'list'
309 b'pull'
313 }
310 ]
314 },
311 },
315 b'permissions': [
312 b'known': {
316 b'pull'
313 b'args': {
317 ]
314 b'nodes': {
318 },
315 b'default': [],
319 b'listkeys': {
316 b'required': False,
320 b'args': {
317 b'type': b'list'
321 b'namespace': {
318 }
322 b'required': True,
319 },
323 b'type': b'bytes'
320 b'permissions': [
324 }
321 b'pull'
325 },
322 ]
326 b'permissions': [
327 b'pull'
328 ]
329 },
330 b'lookup': {
331 b'args': {
332 b'key': {
333 b'required': True,
334 b'type': b'bytes'
335 }
336 },
323 },
337 b'permissions': [
324 b'listkeys': {
338 b'pull'
325 b'args': {
339 ]
326 b'namespace': {
340 },
327 b'required': True,
341 b'manifestdata': {
328 b'type': b'bytes'
342 b'args': {
329 }
343 b'fields': {
344 b'default': set([]),
345 b'required': False,
346 b'type': b'set',
347 b'validvalues': set([
348 b'parents',
349 b'revision'
350 ])
351 },
330 },
352 b'haveparents': {
331 b'permissions': [
353 b'default': False,
332 b'pull'
354 b'required': False,
333 ]
355 b'type': b'bool'
334 },
356 },
335 b'lookup': {
357 b'nodes': {
336 b'args': {
358 b'required': True,
337 b'key': {
359 b'type': b'list'
338 b'required': True,
339 b'type': b'bytes'
340 }
360 },
341 },
361 b'tree': {
342 b'permissions': [
362 b'required': True,
343 b'pull'
363 b'type': b'bytes'
344 ]
364 }
365 },
345 },
366 b'permissions': [
346 b'manifestdata': {
367 b'pull'
347 b'args': {
368 ]
348 b'fields': {
369 },
349 b'default': set([]),
370 b'pushkey': {
350 b'required': False,
371 b'args': {
351 b'type': b'set',
372 b'key': {
352 b'validvalues': set([
373 b'required': True,
353 b'parents',
374 b'type': b'bytes'
354 b'revision'
375 },
355 ])
376 b'namespace': {
356 },
377 b'required': True,
357 b'haveparents': {
378 b'type': b'bytes'
358 b'default': False,
379 },
359 b'required': False,
380 b'new': {
360 b'type': b'bool'
381 b'required': True,
361 },
382 b'type': b'bytes'
362 b'nodes': {
363 b'required': True,
364 b'type': b'list'
365 },
366 b'tree': {
367 b'required': True,
368 b'type': b'bytes'
369 }
383 },
370 },
384 b'old': {
371 b'permissions': [
385 b'required': True,
372 b'pull'
386 b'type': b'bytes'
373 ]
387 }
388 },
374 },
389 b'permissions': [
375 b'pushkey': {
390 b'push'
376 b'args': {
391 ]
377 b'key': {
392 }
378 b'required': True,
393 },
379 b'type': b'bytes'
394 b'compression': [
380 },
395 {
381 b'namespace': {
396 b'name': b'zlib'
382 b'required': True,
397 }
383 b'type': b'bytes'
398 ],
384 },
399 b'framingmediatypes': [
385 b'new': {
400 b'application/mercurial-exp-framing-0005'
386 b'required': True,
401 ],
387 b'type': b'bytes'
402 b'pathfilterprefixes': set([
388 },
403 b'path:',
389 b'old': {
404 b'rootfilesin:'
390 b'required': True,
405 ]),
391 b'type': b'bytes'
406 b'rawrepoformats': [
392 }
407 b'generaldelta',
393 },
408 b'revlogv1'
394 b'permissions': [
409 ]
395 b'push'
410 }
396 ]
411 },
397 }
412 b'v1capabilities': b'batch branchmap $USUAL_BUNDLE2_CAPS$ changegroupsubset compression=$BUNDLE2_COMPRESSIONS$ getbundle httpheader=1024 httpmediatype=0.1rx,0.1tx,0.2tx known lookup pushkey streamreqs=generaldelta,revlogv1 unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash'
398 },
413 }
399 b'compression': [
400 {
401 b'name': b'zlib'
402 }
403 ],
404 b'framingmediatypes': [
405 b'application/mercurial-exp-framing-0005'
406 ],
407 b'pathfilterprefixes': set([
408 b'path:',
409 b'rootfilesin:'
410 ]),
411 b'rawrepoformats': [
412 b'generaldelta',
413 b'revlogv1'
414 ]
415 }
416 },
417 b'v1capabilities': b'batch branchmap $USUAL_BUNDLE2_CAPS$ changegroupsubset compression=$BUNDLE2_COMPRESSIONS$ getbundle httpheader=1024 httpmediatype=0.1rx,0.1tx,0.2tx known lookup pushkey streamreqs=generaldelta,revlogv1 unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash'
418 }
419 ]
414
420
415 capabilities command returns expected info
421 capabilities command returns expected info
416
422
417 $ sendhttpv2peerhandshake << EOF
423 $ sendhttpv2peerhandshake << EOF
418 > command capabilities
424 > command capabilities
419 > EOF
425 > EOF
420 creating http peer for wire protocol version 2
426 creating http peer for wire protocol version 2
421 s> GET /?cmd=capabilities HTTP/1.1\r\n
427 s> GET /?cmd=capabilities HTTP/1.1\r\n
422 s> Accept-Encoding: identity\r\n
428 s> Accept-Encoding: identity\r\n
423 s> vary: X-HgProto-1,X-HgUpgrade-1\r\n
429 s> vary: X-HgProto-1,X-HgUpgrade-1\r\n
424 s> x-hgproto-1: cbor\r\n
430 s> x-hgproto-1: cbor\r\n
425 s> x-hgupgrade-1: exp-http-v2-0002\r\n
431 s> x-hgupgrade-1: exp-http-v2-0002\r\n
426 s> accept: application/mercurial-0.1\r\n
432 s> accept: application/mercurial-0.1\r\n
427 s> host: $LOCALIP:$HGPORT\r\n (glob)
433 s> host: $LOCALIP:$HGPORT\r\n (glob)
428 s> user-agent: Mercurial debugwireproto\r\n
434 s> user-agent: Mercurial debugwireproto\r\n
429 s> \r\n
435 s> \r\n
430 s> makefile('rb', None)
436 s> makefile('rb', None)
431 s> HTTP/1.1 200 OK\r\n
437 s> HTTP/1.1 200 OK\r\n
432 s> Server: testing stub value\r\n
438 s> Server: testing stub value\r\n
433 s> Date: $HTTP_DATE$\r\n
439 s> Date: $HTTP_DATE$\r\n
434 s> Content-Type: application/mercurial-cbor\r\n
440 s> Content-Type: application/mercurial-cbor\r\n
435 s> Content-Length: *\r\n (glob)
441 s> Content-Length: *\r\n (glob)
436 s> \r\n
442 s> \r\n
437 s> \xa3GapibaseDapi/Dapis\xa1Pexp-http-v2-0002\xa5Hcommands\xaaIbranchmap\xa2Dargs\xa0Kpermissions\x81DpullLcapabilities\xa2Dargs\xa0Kpermissions\x81DpullMchangesetdata\xa2Dargs\xa4Ffields\xa4Gdefault\xd9\x01\x02\x80Hrequired\xf4DtypeCsetKvalidvalues\xd9\x01\x02\x84IbookmarksGparentsEphaseHrevisionInoderange\xa3Gdefault\xf6Hrequired\xf4DtypeDlistEnodes\xa3Gdefault\xf6Hrequired\xf4DtypeDlistJnodesdepth\xa3Gdefault\xf6Hrequired\xf4DtypeCintKpermissions\x81DpullHfiledata\xa2Dargs\xa4Ffields\xa4Gdefault\xd9\x01\x02\x80Hrequired\xf4DtypeCsetKvalidvalues\xd9\x01\x02\x82GparentsHrevisionKhaveparents\xa3Gdefault\xf4Hrequired\xf4DtypeDboolEnodes\xa2Hrequired\xf5DtypeDlistDpath\xa2Hrequired\xf5DtypeEbytesKpermissions\x81DpullEheads\xa2Dargs\xa1Jpubliconly\xa3Gdefault\xf4Hrequired\xf4DtypeDboolKpermissions\x81DpullEknown\xa2Dargs\xa1Enodes\xa3Gdefault\x80Hrequired\xf4DtypeDlistKpermissions\x81DpullHlistkeys\xa2Dargs\xa1Inamespace\xa2Hrequired\xf5DtypeEbytesKpermissions\x81DpullFlookup\xa2Dargs\xa1Ckey\xa2Hrequired\xf5DtypeEbytesKpermissions\x81DpullLmanifestdata\xa2Dargs\xa4Ffields\xa4Gdefault\xd9\x01\x02\x80Hrequired\xf4DtypeCsetKvalidvalues\xd9\x01\x02\x82GparentsHrevisionKhaveparents\xa3Gdefault\xf4Hrequired\xf4DtypeDboolEnodes\xa2Hrequired\xf5DtypeDlistDtree\xa2Hrequired\xf5DtypeEbytesKpermissions\x81DpullGpushkey\xa2Dargs\xa4Ckey\xa2Hrequired\xf5DtypeEbytesInamespace\xa2Hrequired\xf5DtypeEbytesCnew\xa2Hrequired\xf5DtypeEbytesCold\xa2Hrequired\xf5DtypeEbytesKpermissions\x81DpushKcompression\x81\xa1DnameDzlibQframingmediatypes\x81X&application/mercurial-exp-framing-0005Rpathfilterprefixes\xd9\x01\x02\x82Epath:Lrootfilesin:Nrawrepoformats\x82LgeneraldeltaHrevlogv1Nv1capabilitiesY\x01\xd3batch branchmap $USUAL_BUNDLE2_CAPS$ changegroupsubset compression=$BUNDLE2_COMPRESSIONS$ getbundle httpheader=1024 httpmediatype=0.1rx,0.1tx,0.2tx known lookup pushkey streamreqs=generaldelta,revlogv1 unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash
443 s> \xa3GapibaseDapi/Dapis\xa1Pexp-http-v2-0002\xa5Hcommands\xaaIbranchmap\xa2Dargs\xa0Kpermissions\x81DpullLcapabilities\xa2Dargs\xa0Kpermissions\x81DpullMchangesetdata\xa2Dargs\xa4Ffields\xa4Gdefault\xd9\x01\x02\x80Hrequired\xf4DtypeCsetKvalidvalues\xd9\x01\x02\x84IbookmarksGparentsEphaseHrevisionInoderange\xa3Gdefault\xf6Hrequired\xf4DtypeDlistEnodes\xa3Gdefault\xf6Hrequired\xf4DtypeDlistJnodesdepth\xa3Gdefault\xf6Hrequired\xf4DtypeCintKpermissions\x81DpullHfiledata\xa2Dargs\xa4Ffields\xa4Gdefault\xd9\x01\x02\x80Hrequired\xf4DtypeCsetKvalidvalues\xd9\x01\x02\x82GparentsHrevisionKhaveparents\xa3Gdefault\xf4Hrequired\xf4DtypeDboolEnodes\xa2Hrequired\xf5DtypeDlistDpath\xa2Hrequired\xf5DtypeEbytesKpermissions\x81DpullEheads\xa2Dargs\xa1Jpubliconly\xa3Gdefault\xf4Hrequired\xf4DtypeDboolKpermissions\x81DpullEknown\xa2Dargs\xa1Enodes\xa3Gdefault\x80Hrequired\xf4DtypeDlistKpermissions\x81DpullHlistkeys\xa2Dargs\xa1Inamespace\xa2Hrequired\xf5DtypeEbytesKpermissions\x81DpullFlookup\xa2Dargs\xa1Ckey\xa2Hrequired\xf5DtypeEbytesKpermissions\x81DpullLmanifestdata\xa2Dargs\xa4Ffields\xa4Gdefault\xd9\x01\x02\x80Hrequired\xf4DtypeCsetKvalidvalues\xd9\x01\x02\x82GparentsHrevisionKhaveparents\xa3Gdefault\xf4Hrequired\xf4DtypeDboolEnodes\xa2Hrequired\xf5DtypeDlistDtree\xa2Hrequired\xf5DtypeEbytesKpermissions\x81DpullGpushkey\xa2Dargs\xa4Ckey\xa2Hrequired\xf5DtypeEbytesInamespace\xa2Hrequired\xf5DtypeEbytesCnew\xa2Hrequired\xf5DtypeEbytesCold\xa2Hrequired\xf5DtypeEbytesKpermissions\x81DpushKcompression\x81\xa1DnameDzlibQframingmediatypes\x81X&application/mercurial-exp-framing-0005Rpathfilterprefixes\xd9\x01\x02\x82Epath:Lrootfilesin:Nrawrepoformats\x82LgeneraldeltaHrevlogv1Nv1capabilitiesY\x01\xd3batch branchmap $USUAL_BUNDLE2_CAPS$ changegroupsubset compression=$BUNDLE2_COMPRESSIONS$ getbundle httpheader=1024 httpmediatype=0.1rx,0.1tx,0.2tx known lookup pushkey streamreqs=generaldelta,revlogv1 unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash
438 sending capabilities command
444 sending capabilities command
439 s> POST /api/exp-http-v2-0002/ro/capabilities HTTP/1.1\r\n
445 s> POST /api/exp-http-v2-0002/ro/capabilities HTTP/1.1\r\n
440 s> Accept-Encoding: identity\r\n
446 s> Accept-Encoding: identity\r\n
441 s> accept: application/mercurial-exp-framing-0005\r\n
447 s> accept: application/mercurial-exp-framing-0005\r\n
442 s> content-type: application/mercurial-exp-framing-0005\r\n
448 s> content-type: application/mercurial-exp-framing-0005\r\n
443 s> content-length: 27\r\n
449 s> content-length: 27\r\n
444 s> host: $LOCALIP:$HGPORT\r\n (glob)
450 s> host: $LOCALIP:$HGPORT\r\n (glob)
445 s> user-agent: Mercurial debugwireproto\r\n
451 s> user-agent: Mercurial debugwireproto\r\n
446 s> \r\n
452 s> \r\n
447 s> \x13\x00\x00\x01\x00\x01\x01\x11\xa1DnameLcapabilities
453 s> \x13\x00\x00\x01\x00\x01\x01\x11\xa1DnameLcapabilities
448 s> makefile('rb', None)
454 s> makefile('rb', None)
449 s> HTTP/1.1 200 OK\r\n
455 s> HTTP/1.1 200 OK\r\n
450 s> Server: testing stub value\r\n
456 s> Server: testing stub value\r\n
451 s> Date: $HTTP_DATE$\r\n
457 s> Date: $HTTP_DATE$\r\n
452 s> Content-Type: application/mercurial-exp-framing-0005\r\n
458 s> Content-Type: application/mercurial-exp-framing-0005\r\n
453 s> Transfer-Encoding: chunked\r\n
459 s> Transfer-Encoding: chunked\r\n
454 s> \r\n
460 s> \r\n
455 s> 13\r\n
461 s> 13\r\n
456 s> \x0b\x00\x00\x01\x00\x02\x011
462 s> \x0b\x00\x00\x01\x00\x02\x011
457 s> \xa1FstatusBok
463 s> \xa1FstatusBok
458 s> \r\n
464 s> \r\n
459 received frame(size=11; request=1; stream=2; streamflags=stream-begin; type=command-response; flags=continuation)
465 received frame(size=11; request=1; stream=2; streamflags=stream-begin; type=command-response; flags=continuation)
460 s> 520\r\n
466 s> 520\r\n
461 s> \x18\x05\x00\x01\x00\x02\x001
467 s> \x18\x05\x00\x01\x00\x02\x001
462 s> \xa5Hcommands\xaaIbranchmap\xa2Dargs\xa0Kpermissions\x81DpullLcapabilities\xa2Dargs\xa0Kpermissions\x81DpullMchangesetdata\xa2Dargs\xa4Ffields\xa4Gdefault\xd9\x01\x02\x80Hrequired\xf4DtypeCsetKvalidvalues\xd9\x01\x02\x84IbookmarksGparentsEphaseHrevisionInoderange\xa3Gdefault\xf6Hrequired\xf4DtypeDlistEnodes\xa3Gdefault\xf6Hrequired\xf4DtypeDlistJnodesdepth\xa3Gdefault\xf6Hrequired\xf4DtypeCintKpermissions\x81DpullHfiledata\xa2Dargs\xa4Ffields\xa4Gdefault\xd9\x01\x02\x80Hrequired\xf4DtypeCsetKvalidvalues\xd9\x01\x02\x82GparentsHrevisionKhaveparents\xa3Gdefault\xf4Hrequired\xf4DtypeDboolEnodes\xa2Hrequired\xf5DtypeDlistDpath\xa2Hrequired\xf5DtypeEbytesKpermissions\x81DpullEheads\xa2Dargs\xa1Jpubliconly\xa3Gdefault\xf4Hrequired\xf4DtypeDboolKpermissions\x81DpullEknown\xa2Dargs\xa1Enodes\xa3Gdefault\x80Hrequired\xf4DtypeDlistKpermissions\x81DpullHlistkeys\xa2Dargs\xa1Inamespace\xa2Hrequired\xf5DtypeEbytesKpermissions\x81DpullFlookup\xa2Dargs\xa1Ckey\xa2Hrequired\xf5DtypeEbytesKpermissions\x81DpullLmanifestdata\xa2Dargs\xa4Ffields\xa4Gdefault\xd9\x01\x02\x80Hrequired\xf4DtypeCsetKvalidvalues\xd9\x01\x02\x82GparentsHrevisionKhaveparents\xa3Gdefault\xf4Hrequired\xf4DtypeDboolEnodes\xa2Hrequired\xf5DtypeDlistDtree\xa2Hrequired\xf5DtypeEbytesKpermissions\x81DpullGpushkey\xa2Dargs\xa4Ckey\xa2Hrequired\xf5DtypeEbytesInamespace\xa2Hrequired\xf5DtypeEbytesCnew\xa2Hrequired\xf5DtypeEbytesCold\xa2Hrequired\xf5DtypeEbytesKpermissions\x81DpushKcompression\x81\xa1DnameDzlibQframingmediatypes\x81X&application/mercurial-exp-framing-0005Rpathfilterprefixes\xd9\x01\x02\x82Epath:Lrootfilesin:Nrawrepoformats\x82LgeneraldeltaHrevlogv1
468 s> \xa5Hcommands\xaaIbranchmap\xa2Dargs\xa0Kpermissions\x81DpullLcapabilities\xa2Dargs\xa0Kpermissions\x81DpullMchangesetdata\xa2Dargs\xa4Ffields\xa4Gdefault\xd9\x01\x02\x80Hrequired\xf4DtypeCsetKvalidvalues\xd9\x01\x02\x84IbookmarksGparentsEphaseHrevisionInoderange\xa3Gdefault\xf6Hrequired\xf4DtypeDlistEnodes\xa3Gdefault\xf6Hrequired\xf4DtypeDlistJnodesdepth\xa3Gdefault\xf6Hrequired\xf4DtypeCintKpermissions\x81DpullHfiledata\xa2Dargs\xa4Ffields\xa4Gdefault\xd9\x01\x02\x80Hrequired\xf4DtypeCsetKvalidvalues\xd9\x01\x02\x82GparentsHrevisionKhaveparents\xa3Gdefault\xf4Hrequired\xf4DtypeDboolEnodes\xa2Hrequired\xf5DtypeDlistDpath\xa2Hrequired\xf5DtypeEbytesKpermissions\x81DpullEheads\xa2Dargs\xa1Jpubliconly\xa3Gdefault\xf4Hrequired\xf4DtypeDboolKpermissions\x81DpullEknown\xa2Dargs\xa1Enodes\xa3Gdefault\x80Hrequired\xf4DtypeDlistKpermissions\x81DpullHlistkeys\xa2Dargs\xa1Inamespace\xa2Hrequired\xf5DtypeEbytesKpermissions\x81DpullFlookup\xa2Dargs\xa1Ckey\xa2Hrequired\xf5DtypeEbytesKpermissions\x81DpullLmanifestdata\xa2Dargs\xa4Ffields\xa4Gdefault\xd9\x01\x02\x80Hrequired\xf4DtypeCsetKvalidvalues\xd9\x01\x02\x82GparentsHrevisionKhaveparents\xa3Gdefault\xf4Hrequired\xf4DtypeDboolEnodes\xa2Hrequired\xf5DtypeDlistDtree\xa2Hrequired\xf5DtypeEbytesKpermissions\x81DpullGpushkey\xa2Dargs\xa4Ckey\xa2Hrequired\xf5DtypeEbytesInamespace\xa2Hrequired\xf5DtypeEbytesCnew\xa2Hrequired\xf5DtypeEbytesCold\xa2Hrequired\xf5DtypeEbytesKpermissions\x81DpushKcompression\x81\xa1DnameDzlibQframingmediatypes\x81X&application/mercurial-exp-framing-0005Rpathfilterprefixes\xd9\x01\x02\x82Epath:Lrootfilesin:Nrawrepoformats\x82LgeneraldeltaHrevlogv1
463 s> \r\n
469 s> \r\n
464 received frame(size=1304; request=1; stream=2; streamflags=; type=command-response; flags=continuation)
470 received frame(size=1304; request=1; stream=2; streamflags=; type=command-response; flags=continuation)
465 s> 8\r\n
471 s> 8\r\n
466 s> \x00\x00\x00\x01\x00\x02\x002
472 s> \x00\x00\x00\x01\x00\x02\x002
467 s> \r\n
473 s> \r\n
468 s> 0\r\n
474 s> 0\r\n
469 s> \r\n
475 s> \r\n
470 received frame(size=0; request=1; stream=2; streamflags=; type=command-response; flags=eos)
476 received frame(size=0; request=1; stream=2; streamflags=; type=command-response; flags=eos)
471 response: gen[
477 response: gen[
472 {
478 {
473 b'commands': {
479 b'commands': {
474 b'branchmap': {
480 b'branchmap': {
475 b'args': {},
481 b'args': {},
476 b'permissions': [
482 b'permissions': [
477 b'pull'
483 b'pull'
478 ]
484 ]
479 },
485 },
480 b'capabilities': {
486 b'capabilities': {
481 b'args': {},
487 b'args': {},
482 b'permissions': [
488 b'permissions': [
483 b'pull'
489 b'pull'
484 ]
490 ]
485 },
491 },
486 b'changesetdata': {
492 b'changesetdata': {
487 b'args': {
493 b'args': {
488 b'fields': {
494 b'fields': {
489 b'default': set([]),
495 b'default': set([]),
490 b'required': False,
496 b'required': False,
491 b'type': b'set',
497 b'type': b'set',
492 b'validvalues': set([
498 b'validvalues': set([
493 b'bookmarks',
499 b'bookmarks',
494 b'parents',
500 b'parents',
495 b'phase',
501 b'phase',
496 b'revision'
502 b'revision'
497 ])
503 ])
498 },
504 },
499 b'noderange': {
505 b'noderange': {
500 b'default': None,
506 b'default': None,
501 b'required': False,
507 b'required': False,
502 b'type': b'list'
508 b'type': b'list'
503 },
509 },
504 b'nodes': {
510 b'nodes': {
505 b'default': None,
511 b'default': None,
506 b'required': False,
512 b'required': False,
507 b'type': b'list'
513 b'type': b'list'
508 },
514 },
509 b'nodesdepth': {
515 b'nodesdepth': {
510 b'default': None,
516 b'default': None,
511 b'required': False,
517 b'required': False,
512 b'type': b'int'
518 b'type': b'int'
513 }
519 }
514 },
520 },
515 b'permissions': [
521 b'permissions': [
516 b'pull'
522 b'pull'
517 ]
523 ]
518 },
524 },
519 b'filedata': {
525 b'filedata': {
520 b'args': {
526 b'args': {
521 b'fields': {
527 b'fields': {
522 b'default': set([]),
528 b'default': set([]),
523 b'required': False,
529 b'required': False,
524 b'type': b'set',
530 b'type': b'set',
525 b'validvalues': set([
531 b'validvalues': set([
526 b'parents',
532 b'parents',
527 b'revision'
533 b'revision'
528 ])
534 ])
529 },
535 },
530 b'haveparents': {
536 b'haveparents': {
531 b'default': False,
537 b'default': False,
532 b'required': False,
538 b'required': False,
533 b'type': b'bool'
539 b'type': b'bool'
534 },
540 },
535 b'nodes': {
541 b'nodes': {
536 b'required': True,
542 b'required': True,
537 b'type': b'list'
543 b'type': b'list'
538 },
544 },
539 b'path': {
545 b'path': {
540 b'required': True,
546 b'required': True,
541 b'type': b'bytes'
547 b'type': b'bytes'
542 }
548 }
543 },
549 },
544 b'permissions': [
550 b'permissions': [
545 b'pull'
551 b'pull'
546 ]
552 ]
547 },
553 },
548 b'heads': {
554 b'heads': {
549 b'args': {
555 b'args': {
550 b'publiconly': {
556 b'publiconly': {
551 b'default': False,
557 b'default': False,
552 b'required': False,
558 b'required': False,
553 b'type': b'bool'
559 b'type': b'bool'
554 }
560 }
555 },
561 },
556 b'permissions': [
562 b'permissions': [
557 b'pull'
563 b'pull'
558 ]
564 ]
559 },
565 },
560 b'known': {
566 b'known': {
561 b'args': {
567 b'args': {
562 b'nodes': {
568 b'nodes': {
563 b'default': [],
569 b'default': [],
564 b'required': False,
570 b'required': False,
565 b'type': b'list'
571 b'type': b'list'
566 }
572 }
567 },
573 },
568 b'permissions': [
574 b'permissions': [
569 b'pull'
575 b'pull'
570 ]
576 ]
571 },
577 },
572 b'listkeys': {
578 b'listkeys': {
573 b'args': {
579 b'args': {
574 b'namespace': {
580 b'namespace': {
575 b'required': True,
581 b'required': True,
576 b'type': b'bytes'
582 b'type': b'bytes'
577 }
583 }
578 },
584 },
579 b'permissions': [
585 b'permissions': [
580 b'pull'
586 b'pull'
581 ]
587 ]
582 },
588 },
583 b'lookup': {
589 b'lookup': {
584 b'args': {
590 b'args': {
585 b'key': {
591 b'key': {
586 b'required': True,
592 b'required': True,
587 b'type': b'bytes'
593 b'type': b'bytes'
588 }
594 }
589 },
595 },
590 b'permissions': [
596 b'permissions': [
591 b'pull'
597 b'pull'
592 ]
598 ]
593 },
599 },
594 b'manifestdata': {
600 b'manifestdata': {
595 b'args': {
601 b'args': {
596 b'fields': {
602 b'fields': {
597 b'default': set([]),
603 b'default': set([]),
598 b'required': False,
604 b'required': False,
599 b'type': b'set',
605 b'type': b'set',
600 b'validvalues': set([
606 b'validvalues': set([
601 b'parents',
607 b'parents',
602 b'revision'
608 b'revision'
603 ])
609 ])
604 },
610 },
605 b'haveparents': {
611 b'haveparents': {
606 b'default': False,
612 b'default': False,
607 b'required': False,
613 b'required': False,
608 b'type': b'bool'
614 b'type': b'bool'
609 },
615 },
610 b'nodes': {
616 b'nodes': {
611 b'required': True,
617 b'required': True,
612 b'type': b'list'
618 b'type': b'list'
613 },
619 },
614 b'tree': {
620 b'tree': {
615 b'required': True,
621 b'required': True,
616 b'type': b'bytes'
622 b'type': b'bytes'
617 }
623 }
618 },
624 },
619 b'permissions': [
625 b'permissions': [
620 b'pull'
626 b'pull'
621 ]
627 ]
622 },
628 },
623 b'pushkey': {
629 b'pushkey': {
624 b'args': {
630 b'args': {
625 b'key': {
631 b'key': {
626 b'required': True,
632 b'required': True,
627 b'type': b'bytes'
633 b'type': b'bytes'
628 },
634 },
629 b'namespace': {
635 b'namespace': {
630 b'required': True,
636 b'required': True,
631 b'type': b'bytes'
637 b'type': b'bytes'
632 },
638 },
633 b'new': {
639 b'new': {
634 b'required': True,
640 b'required': True,
635 b'type': b'bytes'
641 b'type': b'bytes'
636 },
642 },
637 b'old': {
643 b'old': {
638 b'required': True,
644 b'required': True,
639 b'type': b'bytes'
645 b'type': b'bytes'
640 }
646 }
641 },
647 },
642 b'permissions': [
648 b'permissions': [
643 b'push'
649 b'push'
644 ]
650 ]
645 }
651 }
646 },
652 },
647 b'compression': [
653 b'compression': [
648 {
654 {
649 b'name': b'zlib'
655 b'name': b'zlib'
650 }
656 }
651 ],
657 ],
652 b'framingmediatypes': [
658 b'framingmediatypes': [
653 b'application/mercurial-exp-framing-0005'
659 b'application/mercurial-exp-framing-0005'
654 ],
660 ],
655 b'pathfilterprefixes': set([
661 b'pathfilterprefixes': set([
656 b'path:',
662 b'path:',
657 b'rootfilesin:'
663 b'rootfilesin:'
658 ]),
664 ]),
659 b'rawrepoformats': [
665 b'rawrepoformats': [
660 b'generaldelta',
666 b'generaldelta',
661 b'revlogv1'
667 b'revlogv1'
662 ]
668 ]
663 }
669 }
664 ]
670 ]
665
671
666 $ cat error.log
672 $ cat error.log
General Comments 0
You need to be logged in to leave comments. Login now