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