##// END OF EJS Templates
debugdiscovery: use `get_unique_pull_path`...
marmoute -
r47721:9e021cff default
parent child Browse files
Show More
@@ -1,4817 +1,4819
1 # debugcommands.py - command processing for debug* commands
1 # debugcommands.py - command processing for debug* commands
2 #
2 #
3 # Copyright 2005-2016 Olivia Mackall <olivia@selenic.com>
3 # Copyright 2005-2016 Olivia Mackall <olivia@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 contextlib
12 import contextlib
13 import difflib
13 import difflib
14 import errno
14 import errno
15 import glob
15 import glob
16 import operator
16 import operator
17 import os
17 import os
18 import platform
18 import platform
19 import random
19 import random
20 import re
20 import re
21 import socket
21 import socket
22 import ssl
22 import ssl
23 import stat
23 import stat
24 import string
24 import string
25 import subprocess
25 import subprocess
26 import sys
26 import sys
27 import time
27 import time
28
28
29 from .i18n import _
29 from .i18n import _
30 from .node import (
30 from .node import (
31 bin,
31 bin,
32 hex,
32 hex,
33 nullid,
33 nullid,
34 nullrev,
34 nullrev,
35 short,
35 short,
36 )
36 )
37 from .pycompat import (
37 from .pycompat import (
38 getattr,
38 getattr,
39 open,
39 open,
40 )
40 )
41 from . import (
41 from . import (
42 bundle2,
42 bundle2,
43 bundlerepo,
43 bundlerepo,
44 changegroup,
44 changegroup,
45 cmdutil,
45 cmdutil,
46 color,
46 color,
47 context,
47 context,
48 copies,
48 copies,
49 dagparser,
49 dagparser,
50 encoding,
50 encoding,
51 error,
51 error,
52 exchange,
52 exchange,
53 extensions,
53 extensions,
54 filemerge,
54 filemerge,
55 filesetlang,
55 filesetlang,
56 formatter,
56 formatter,
57 hg,
57 hg,
58 httppeer,
58 httppeer,
59 localrepo,
59 localrepo,
60 lock as lockmod,
60 lock as lockmod,
61 logcmdutil,
61 logcmdutil,
62 mergestate as mergestatemod,
62 mergestate as mergestatemod,
63 metadata,
63 metadata,
64 obsolete,
64 obsolete,
65 obsutil,
65 obsutil,
66 pathutil,
66 pathutil,
67 phases,
67 phases,
68 policy,
68 policy,
69 pvec,
69 pvec,
70 pycompat,
70 pycompat,
71 registrar,
71 registrar,
72 repair,
72 repair,
73 repoview,
73 repoview,
74 revlog,
74 revlog,
75 revset,
75 revset,
76 revsetlang,
76 revsetlang,
77 scmutil,
77 scmutil,
78 setdiscovery,
78 setdiscovery,
79 simplemerge,
79 simplemerge,
80 sshpeer,
80 sshpeer,
81 sslutil,
81 sslutil,
82 streamclone,
82 streamclone,
83 strip,
83 strip,
84 tags as tagsmod,
84 tags as tagsmod,
85 templater,
85 templater,
86 treediscovery,
86 treediscovery,
87 upgrade,
87 upgrade,
88 url as urlmod,
88 url as urlmod,
89 util,
89 util,
90 vfs as vfsmod,
90 vfs as vfsmod,
91 wireprotoframing,
91 wireprotoframing,
92 wireprotoserver,
92 wireprotoserver,
93 wireprotov2peer,
93 wireprotov2peer,
94 )
94 )
95 from .utils import (
95 from .utils import (
96 cborutil,
96 cborutil,
97 compression,
97 compression,
98 dateutil,
98 dateutil,
99 procutil,
99 procutil,
100 stringutil,
100 stringutil,
101 urlutil,
101 urlutil,
102 )
102 )
103
103
104 from .revlogutils import (
104 from .revlogutils import (
105 deltas as deltautil,
105 deltas as deltautil,
106 nodemap,
106 nodemap,
107 sidedata,
107 sidedata,
108 )
108 )
109
109
110 release = lockmod.release
110 release = lockmod.release
111
111
112 table = {}
112 table = {}
113 table.update(strip.command._table)
113 table.update(strip.command._table)
114 command = registrar.command(table)
114 command = registrar.command(table)
115
115
116
116
117 @command(b'debugancestor', [], _(b'[INDEX] REV1 REV2'), optionalrepo=True)
117 @command(b'debugancestor', [], _(b'[INDEX] REV1 REV2'), optionalrepo=True)
118 def debugancestor(ui, repo, *args):
118 def debugancestor(ui, repo, *args):
119 """find the ancestor revision of two revisions in a given index"""
119 """find the ancestor revision of two revisions in a given index"""
120 if len(args) == 3:
120 if len(args) == 3:
121 index, rev1, rev2 = args
121 index, rev1, rev2 = args
122 r = revlog.revlog(vfsmod.vfs(encoding.getcwd(), audit=False), index)
122 r = revlog.revlog(vfsmod.vfs(encoding.getcwd(), audit=False), index)
123 lookup = r.lookup
123 lookup = r.lookup
124 elif len(args) == 2:
124 elif len(args) == 2:
125 if not repo:
125 if not repo:
126 raise error.Abort(
126 raise error.Abort(
127 _(b'there is no Mercurial repository here (.hg not found)')
127 _(b'there is no Mercurial repository here (.hg not found)')
128 )
128 )
129 rev1, rev2 = args
129 rev1, rev2 = args
130 r = repo.changelog
130 r = repo.changelog
131 lookup = repo.lookup
131 lookup = repo.lookup
132 else:
132 else:
133 raise error.Abort(_(b'either two or three arguments required'))
133 raise error.Abort(_(b'either two or three arguments required'))
134 a = r.ancestor(lookup(rev1), lookup(rev2))
134 a = r.ancestor(lookup(rev1), lookup(rev2))
135 ui.write(b'%d:%s\n' % (r.rev(a), hex(a)))
135 ui.write(b'%d:%s\n' % (r.rev(a), hex(a)))
136
136
137
137
138 @command(b'debugantivirusrunning', [])
138 @command(b'debugantivirusrunning', [])
139 def debugantivirusrunning(ui, repo):
139 def debugantivirusrunning(ui, repo):
140 """attempt to trigger an antivirus scanner to see if one is active"""
140 """attempt to trigger an antivirus scanner to see if one is active"""
141 with repo.cachevfs.open('eicar-test-file.com', b'wb') as f:
141 with repo.cachevfs.open('eicar-test-file.com', b'wb') as f:
142 f.write(
142 f.write(
143 util.b85decode(
143 util.b85decode(
144 # This is a base85-armored version of the EICAR test file. See
144 # This is a base85-armored version of the EICAR test file. See
145 # https://en.wikipedia.org/wiki/EICAR_test_file for details.
145 # https://en.wikipedia.org/wiki/EICAR_test_file for details.
146 b'ST#=}P$fV?P+K%yP+C|uG$>GBDK|qyDK~v2MM*<JQY}+dK~6+LQba95P'
146 b'ST#=}P$fV?P+K%yP+C|uG$>GBDK|qyDK~v2MM*<JQY}+dK~6+LQba95P'
147 b'E<)&Nm5l)EmTEQR4qnHOhq9iNGnJx'
147 b'E<)&Nm5l)EmTEQR4qnHOhq9iNGnJx'
148 )
148 )
149 )
149 )
150 # Give an AV engine time to scan the file.
150 # Give an AV engine time to scan the file.
151 time.sleep(2)
151 time.sleep(2)
152 util.unlink(repo.cachevfs.join('eicar-test-file.com'))
152 util.unlink(repo.cachevfs.join('eicar-test-file.com'))
153
153
154
154
155 @command(b'debugapplystreamclonebundle', [], b'FILE')
155 @command(b'debugapplystreamclonebundle', [], b'FILE')
156 def debugapplystreamclonebundle(ui, repo, fname):
156 def debugapplystreamclonebundle(ui, repo, fname):
157 """apply a stream clone bundle file"""
157 """apply a stream clone bundle file"""
158 f = hg.openpath(ui, fname)
158 f = hg.openpath(ui, fname)
159 gen = exchange.readbundle(ui, f, fname)
159 gen = exchange.readbundle(ui, f, fname)
160 gen.apply(repo)
160 gen.apply(repo)
161
161
162
162
163 @command(
163 @command(
164 b'debugbuilddag',
164 b'debugbuilddag',
165 [
165 [
166 (
166 (
167 b'm',
167 b'm',
168 b'mergeable-file',
168 b'mergeable-file',
169 None,
169 None,
170 _(b'add single file mergeable changes'),
170 _(b'add single file mergeable changes'),
171 ),
171 ),
172 (
172 (
173 b'o',
173 b'o',
174 b'overwritten-file',
174 b'overwritten-file',
175 None,
175 None,
176 _(b'add single file all revs overwrite'),
176 _(b'add single file all revs overwrite'),
177 ),
177 ),
178 (b'n', b'new-file', None, _(b'add new file at each rev')),
178 (b'n', b'new-file', None, _(b'add new file at each rev')),
179 ],
179 ],
180 _(b'[OPTION]... [TEXT]'),
180 _(b'[OPTION]... [TEXT]'),
181 )
181 )
182 def debugbuilddag(
182 def debugbuilddag(
183 ui,
183 ui,
184 repo,
184 repo,
185 text=None,
185 text=None,
186 mergeable_file=False,
186 mergeable_file=False,
187 overwritten_file=False,
187 overwritten_file=False,
188 new_file=False,
188 new_file=False,
189 ):
189 ):
190 """builds a repo with a given DAG from scratch in the current empty repo
190 """builds a repo with a given DAG from scratch in the current empty repo
191
191
192 The description of the DAG is read from stdin if not given on the
192 The description of the DAG is read from stdin if not given on the
193 command line.
193 command line.
194
194
195 Elements:
195 Elements:
196
196
197 - "+n" is a linear run of n nodes based on the current default parent
197 - "+n" is a linear run of n nodes based on the current default parent
198 - "." is a single node based on the current default parent
198 - "." is a single node based on the current default parent
199 - "$" resets the default parent to null (implied at the start);
199 - "$" resets the default parent to null (implied at the start);
200 otherwise the default parent is always the last node created
200 otherwise the default parent is always the last node created
201 - "<p" sets the default parent to the backref p
201 - "<p" sets the default parent to the backref p
202 - "*p" is a fork at parent p, which is a backref
202 - "*p" is a fork at parent p, which is a backref
203 - "*p1/p2" is a merge of parents p1 and p2, which are backrefs
203 - "*p1/p2" is a merge of parents p1 and p2, which are backrefs
204 - "/p2" is a merge of the preceding node and p2
204 - "/p2" is a merge of the preceding node and p2
205 - ":tag" defines a local tag for the preceding node
205 - ":tag" defines a local tag for the preceding node
206 - "@branch" sets the named branch for subsequent nodes
206 - "@branch" sets the named branch for subsequent nodes
207 - "#...\\n" is a comment up to the end of the line
207 - "#...\\n" is a comment up to the end of the line
208
208
209 Whitespace between the above elements is ignored.
209 Whitespace between the above elements is ignored.
210
210
211 A backref is either
211 A backref is either
212
212
213 - a number n, which references the node curr-n, where curr is the current
213 - a number n, which references the node curr-n, where curr is the current
214 node, or
214 node, or
215 - the name of a local tag you placed earlier using ":tag", or
215 - the name of a local tag you placed earlier using ":tag", or
216 - empty to denote the default parent.
216 - empty to denote the default parent.
217
217
218 All string valued-elements are either strictly alphanumeric, or must
218 All string valued-elements are either strictly alphanumeric, or must
219 be enclosed in double quotes ("..."), with "\\" as escape character.
219 be enclosed in double quotes ("..."), with "\\" as escape character.
220 """
220 """
221
221
222 if text is None:
222 if text is None:
223 ui.status(_(b"reading DAG from stdin\n"))
223 ui.status(_(b"reading DAG from stdin\n"))
224 text = ui.fin.read()
224 text = ui.fin.read()
225
225
226 cl = repo.changelog
226 cl = repo.changelog
227 if len(cl) > 0:
227 if len(cl) > 0:
228 raise error.Abort(_(b'repository is not empty'))
228 raise error.Abort(_(b'repository is not empty'))
229
229
230 # determine number of revs in DAG
230 # determine number of revs in DAG
231 total = 0
231 total = 0
232 for type, data in dagparser.parsedag(text):
232 for type, data in dagparser.parsedag(text):
233 if type == b'n':
233 if type == b'n':
234 total += 1
234 total += 1
235
235
236 if mergeable_file:
236 if mergeable_file:
237 linesperrev = 2
237 linesperrev = 2
238 # make a file with k lines per rev
238 # make a file with k lines per rev
239 initialmergedlines = [
239 initialmergedlines = [
240 b'%d' % i for i in pycompat.xrange(0, total * linesperrev)
240 b'%d' % i for i in pycompat.xrange(0, total * linesperrev)
241 ]
241 ]
242 initialmergedlines.append(b"")
242 initialmergedlines.append(b"")
243
243
244 tags = []
244 tags = []
245 progress = ui.makeprogress(
245 progress = ui.makeprogress(
246 _(b'building'), unit=_(b'revisions'), total=total
246 _(b'building'), unit=_(b'revisions'), total=total
247 )
247 )
248 with progress, repo.wlock(), repo.lock(), repo.transaction(b"builddag"):
248 with progress, repo.wlock(), repo.lock(), repo.transaction(b"builddag"):
249 at = -1
249 at = -1
250 atbranch = b'default'
250 atbranch = b'default'
251 nodeids = []
251 nodeids = []
252 id = 0
252 id = 0
253 progress.update(id)
253 progress.update(id)
254 for type, data in dagparser.parsedag(text):
254 for type, data in dagparser.parsedag(text):
255 if type == b'n':
255 if type == b'n':
256 ui.note((b'node %s\n' % pycompat.bytestr(data)))
256 ui.note((b'node %s\n' % pycompat.bytestr(data)))
257 id, ps = data
257 id, ps = data
258
258
259 files = []
259 files = []
260 filecontent = {}
260 filecontent = {}
261
261
262 p2 = None
262 p2 = None
263 if mergeable_file:
263 if mergeable_file:
264 fn = b"mf"
264 fn = b"mf"
265 p1 = repo[ps[0]]
265 p1 = repo[ps[0]]
266 if len(ps) > 1:
266 if len(ps) > 1:
267 p2 = repo[ps[1]]
267 p2 = repo[ps[1]]
268 pa = p1.ancestor(p2)
268 pa = p1.ancestor(p2)
269 base, local, other = [
269 base, local, other = [
270 x[fn].data() for x in (pa, p1, p2)
270 x[fn].data() for x in (pa, p1, p2)
271 ]
271 ]
272 m3 = simplemerge.Merge3Text(base, local, other)
272 m3 = simplemerge.Merge3Text(base, local, other)
273 ml = [l.strip() for l in m3.merge_lines()]
273 ml = [l.strip() for l in m3.merge_lines()]
274 ml.append(b"")
274 ml.append(b"")
275 elif at > 0:
275 elif at > 0:
276 ml = p1[fn].data().split(b"\n")
276 ml = p1[fn].data().split(b"\n")
277 else:
277 else:
278 ml = initialmergedlines
278 ml = initialmergedlines
279 ml[id * linesperrev] += b" r%i" % id
279 ml[id * linesperrev] += b" r%i" % id
280 mergedtext = b"\n".join(ml)
280 mergedtext = b"\n".join(ml)
281 files.append(fn)
281 files.append(fn)
282 filecontent[fn] = mergedtext
282 filecontent[fn] = mergedtext
283
283
284 if overwritten_file:
284 if overwritten_file:
285 fn = b"of"
285 fn = b"of"
286 files.append(fn)
286 files.append(fn)
287 filecontent[fn] = b"r%i\n" % id
287 filecontent[fn] = b"r%i\n" % id
288
288
289 if new_file:
289 if new_file:
290 fn = b"nf%i" % id
290 fn = b"nf%i" % id
291 files.append(fn)
291 files.append(fn)
292 filecontent[fn] = b"r%i\n" % id
292 filecontent[fn] = b"r%i\n" % id
293 if len(ps) > 1:
293 if len(ps) > 1:
294 if not p2:
294 if not p2:
295 p2 = repo[ps[1]]
295 p2 = repo[ps[1]]
296 for fn in p2:
296 for fn in p2:
297 if fn.startswith(b"nf"):
297 if fn.startswith(b"nf"):
298 files.append(fn)
298 files.append(fn)
299 filecontent[fn] = p2[fn].data()
299 filecontent[fn] = p2[fn].data()
300
300
301 def fctxfn(repo, cx, path):
301 def fctxfn(repo, cx, path):
302 if path in filecontent:
302 if path in filecontent:
303 return context.memfilectx(
303 return context.memfilectx(
304 repo, cx, path, filecontent[path]
304 repo, cx, path, filecontent[path]
305 )
305 )
306 return None
306 return None
307
307
308 if len(ps) == 0 or ps[0] < 0:
308 if len(ps) == 0 or ps[0] < 0:
309 pars = [None, None]
309 pars = [None, None]
310 elif len(ps) == 1:
310 elif len(ps) == 1:
311 pars = [nodeids[ps[0]], None]
311 pars = [nodeids[ps[0]], None]
312 else:
312 else:
313 pars = [nodeids[p] for p in ps]
313 pars = [nodeids[p] for p in ps]
314 cx = context.memctx(
314 cx = context.memctx(
315 repo,
315 repo,
316 pars,
316 pars,
317 b"r%i" % id,
317 b"r%i" % id,
318 files,
318 files,
319 fctxfn,
319 fctxfn,
320 date=(id, 0),
320 date=(id, 0),
321 user=b"debugbuilddag",
321 user=b"debugbuilddag",
322 extra={b'branch': atbranch},
322 extra={b'branch': atbranch},
323 )
323 )
324 nodeid = repo.commitctx(cx)
324 nodeid = repo.commitctx(cx)
325 nodeids.append(nodeid)
325 nodeids.append(nodeid)
326 at = id
326 at = id
327 elif type == b'l':
327 elif type == b'l':
328 id, name = data
328 id, name = data
329 ui.note((b'tag %s\n' % name))
329 ui.note((b'tag %s\n' % name))
330 tags.append(b"%s %s\n" % (hex(repo.changelog.node(id)), name))
330 tags.append(b"%s %s\n" % (hex(repo.changelog.node(id)), name))
331 elif type == b'a':
331 elif type == b'a':
332 ui.note((b'branch %s\n' % data))
332 ui.note((b'branch %s\n' % data))
333 atbranch = data
333 atbranch = data
334 progress.update(id)
334 progress.update(id)
335
335
336 if tags:
336 if tags:
337 repo.vfs.write(b"localtags", b"".join(tags))
337 repo.vfs.write(b"localtags", b"".join(tags))
338
338
339
339
340 def _debugchangegroup(ui, gen, all=None, indent=0, **opts):
340 def _debugchangegroup(ui, gen, all=None, indent=0, **opts):
341 indent_string = b' ' * indent
341 indent_string = b' ' * indent
342 if all:
342 if all:
343 ui.writenoi18n(
343 ui.writenoi18n(
344 b"%sformat: id, p1, p2, cset, delta base, len(delta)\n"
344 b"%sformat: id, p1, p2, cset, delta base, len(delta)\n"
345 % indent_string
345 % indent_string
346 )
346 )
347
347
348 def showchunks(named):
348 def showchunks(named):
349 ui.write(b"\n%s%s\n" % (indent_string, named))
349 ui.write(b"\n%s%s\n" % (indent_string, named))
350 for deltadata in gen.deltaiter():
350 for deltadata in gen.deltaiter():
351 node, p1, p2, cs, deltabase, delta, flags, sidedata = deltadata
351 node, p1, p2, cs, deltabase, delta, flags, sidedata = deltadata
352 ui.write(
352 ui.write(
353 b"%s%s %s %s %s %s %d\n"
353 b"%s%s %s %s %s %s %d\n"
354 % (
354 % (
355 indent_string,
355 indent_string,
356 hex(node),
356 hex(node),
357 hex(p1),
357 hex(p1),
358 hex(p2),
358 hex(p2),
359 hex(cs),
359 hex(cs),
360 hex(deltabase),
360 hex(deltabase),
361 len(delta),
361 len(delta),
362 )
362 )
363 )
363 )
364
364
365 gen.changelogheader()
365 gen.changelogheader()
366 showchunks(b"changelog")
366 showchunks(b"changelog")
367 gen.manifestheader()
367 gen.manifestheader()
368 showchunks(b"manifest")
368 showchunks(b"manifest")
369 for chunkdata in iter(gen.filelogheader, {}):
369 for chunkdata in iter(gen.filelogheader, {}):
370 fname = chunkdata[b'filename']
370 fname = chunkdata[b'filename']
371 showchunks(fname)
371 showchunks(fname)
372 else:
372 else:
373 if isinstance(gen, bundle2.unbundle20):
373 if isinstance(gen, bundle2.unbundle20):
374 raise error.Abort(_(b'use debugbundle2 for this file'))
374 raise error.Abort(_(b'use debugbundle2 for this file'))
375 gen.changelogheader()
375 gen.changelogheader()
376 for deltadata in gen.deltaiter():
376 for deltadata in gen.deltaiter():
377 node, p1, p2, cs, deltabase, delta, flags, sidedata = deltadata
377 node, p1, p2, cs, deltabase, delta, flags, sidedata = deltadata
378 ui.write(b"%s%s\n" % (indent_string, hex(node)))
378 ui.write(b"%s%s\n" % (indent_string, hex(node)))
379
379
380
380
381 def _debugobsmarkers(ui, part, indent=0, **opts):
381 def _debugobsmarkers(ui, part, indent=0, **opts):
382 """display version and markers contained in 'data'"""
382 """display version and markers contained in 'data'"""
383 opts = pycompat.byteskwargs(opts)
383 opts = pycompat.byteskwargs(opts)
384 data = part.read()
384 data = part.read()
385 indent_string = b' ' * indent
385 indent_string = b' ' * indent
386 try:
386 try:
387 version, markers = obsolete._readmarkers(data)
387 version, markers = obsolete._readmarkers(data)
388 except error.UnknownVersion as exc:
388 except error.UnknownVersion as exc:
389 msg = b"%sunsupported version: %s (%d bytes)\n"
389 msg = b"%sunsupported version: %s (%d bytes)\n"
390 msg %= indent_string, exc.version, len(data)
390 msg %= indent_string, exc.version, len(data)
391 ui.write(msg)
391 ui.write(msg)
392 else:
392 else:
393 msg = b"%sversion: %d (%d bytes)\n"
393 msg = b"%sversion: %d (%d bytes)\n"
394 msg %= indent_string, version, len(data)
394 msg %= indent_string, version, len(data)
395 ui.write(msg)
395 ui.write(msg)
396 fm = ui.formatter(b'debugobsolete', opts)
396 fm = ui.formatter(b'debugobsolete', opts)
397 for rawmarker in sorted(markers):
397 for rawmarker in sorted(markers):
398 m = obsutil.marker(None, rawmarker)
398 m = obsutil.marker(None, rawmarker)
399 fm.startitem()
399 fm.startitem()
400 fm.plain(indent_string)
400 fm.plain(indent_string)
401 cmdutil.showmarker(fm, m)
401 cmdutil.showmarker(fm, m)
402 fm.end()
402 fm.end()
403
403
404
404
405 def _debugphaseheads(ui, data, indent=0):
405 def _debugphaseheads(ui, data, indent=0):
406 """display version and markers contained in 'data'"""
406 """display version and markers contained in 'data'"""
407 indent_string = b' ' * indent
407 indent_string = b' ' * indent
408 headsbyphase = phases.binarydecode(data)
408 headsbyphase = phases.binarydecode(data)
409 for phase in phases.allphases:
409 for phase in phases.allphases:
410 for head in headsbyphase[phase]:
410 for head in headsbyphase[phase]:
411 ui.write(indent_string)
411 ui.write(indent_string)
412 ui.write(b'%s %s\n' % (hex(head), phases.phasenames[phase]))
412 ui.write(b'%s %s\n' % (hex(head), phases.phasenames[phase]))
413
413
414
414
415 def _quasirepr(thing):
415 def _quasirepr(thing):
416 if isinstance(thing, (dict, util.sortdict, collections.OrderedDict)):
416 if isinstance(thing, (dict, util.sortdict, collections.OrderedDict)):
417 return b'{%s}' % (
417 return b'{%s}' % (
418 b', '.join(b'%s: %s' % (k, thing[k]) for k in sorted(thing))
418 b', '.join(b'%s: %s' % (k, thing[k]) for k in sorted(thing))
419 )
419 )
420 return pycompat.bytestr(repr(thing))
420 return pycompat.bytestr(repr(thing))
421
421
422
422
423 def _debugbundle2(ui, gen, all=None, **opts):
423 def _debugbundle2(ui, gen, all=None, **opts):
424 """lists the contents of a bundle2"""
424 """lists the contents of a bundle2"""
425 if not isinstance(gen, bundle2.unbundle20):
425 if not isinstance(gen, bundle2.unbundle20):
426 raise error.Abort(_(b'not a bundle2 file'))
426 raise error.Abort(_(b'not a bundle2 file'))
427 ui.write((b'Stream params: %s\n' % _quasirepr(gen.params)))
427 ui.write((b'Stream params: %s\n' % _quasirepr(gen.params)))
428 parttypes = opts.get('part_type', [])
428 parttypes = opts.get('part_type', [])
429 for part in gen.iterparts():
429 for part in gen.iterparts():
430 if parttypes and part.type not in parttypes:
430 if parttypes and part.type not in parttypes:
431 continue
431 continue
432 msg = b'%s -- %s (mandatory: %r)\n'
432 msg = b'%s -- %s (mandatory: %r)\n'
433 ui.write((msg % (part.type, _quasirepr(part.params), part.mandatory)))
433 ui.write((msg % (part.type, _quasirepr(part.params), part.mandatory)))
434 if part.type == b'changegroup':
434 if part.type == b'changegroup':
435 version = part.params.get(b'version', b'01')
435 version = part.params.get(b'version', b'01')
436 cg = changegroup.getunbundler(version, part, b'UN')
436 cg = changegroup.getunbundler(version, part, b'UN')
437 if not ui.quiet:
437 if not ui.quiet:
438 _debugchangegroup(ui, cg, all=all, indent=4, **opts)
438 _debugchangegroup(ui, cg, all=all, indent=4, **opts)
439 if part.type == b'obsmarkers':
439 if part.type == b'obsmarkers':
440 if not ui.quiet:
440 if not ui.quiet:
441 _debugobsmarkers(ui, part, indent=4, **opts)
441 _debugobsmarkers(ui, part, indent=4, **opts)
442 if part.type == b'phase-heads':
442 if part.type == b'phase-heads':
443 if not ui.quiet:
443 if not ui.quiet:
444 _debugphaseheads(ui, part, indent=4)
444 _debugphaseheads(ui, part, indent=4)
445
445
446
446
447 @command(
447 @command(
448 b'debugbundle',
448 b'debugbundle',
449 [
449 [
450 (b'a', b'all', None, _(b'show all details')),
450 (b'a', b'all', None, _(b'show all details')),
451 (b'', b'part-type', [], _(b'show only the named part type')),
451 (b'', b'part-type', [], _(b'show only the named part type')),
452 (b'', b'spec', None, _(b'print the bundlespec of the bundle')),
452 (b'', b'spec', None, _(b'print the bundlespec of the bundle')),
453 ],
453 ],
454 _(b'FILE'),
454 _(b'FILE'),
455 norepo=True,
455 norepo=True,
456 )
456 )
457 def debugbundle(ui, bundlepath, all=None, spec=None, **opts):
457 def debugbundle(ui, bundlepath, all=None, spec=None, **opts):
458 """lists the contents of a bundle"""
458 """lists the contents of a bundle"""
459 with hg.openpath(ui, bundlepath) as f:
459 with hg.openpath(ui, bundlepath) as f:
460 if spec:
460 if spec:
461 spec = exchange.getbundlespec(ui, f)
461 spec = exchange.getbundlespec(ui, f)
462 ui.write(b'%s\n' % spec)
462 ui.write(b'%s\n' % spec)
463 return
463 return
464
464
465 gen = exchange.readbundle(ui, f, bundlepath)
465 gen = exchange.readbundle(ui, f, bundlepath)
466 if isinstance(gen, bundle2.unbundle20):
466 if isinstance(gen, bundle2.unbundle20):
467 return _debugbundle2(ui, gen, all=all, **opts)
467 return _debugbundle2(ui, gen, all=all, **opts)
468 _debugchangegroup(ui, gen, all=all, **opts)
468 _debugchangegroup(ui, gen, all=all, **opts)
469
469
470
470
471 @command(b'debugcapabilities', [], _(b'PATH'), norepo=True)
471 @command(b'debugcapabilities', [], _(b'PATH'), norepo=True)
472 def debugcapabilities(ui, path, **opts):
472 def debugcapabilities(ui, path, **opts):
473 """lists the capabilities of a remote peer"""
473 """lists the capabilities of a remote peer"""
474 opts = pycompat.byteskwargs(opts)
474 opts = pycompat.byteskwargs(opts)
475 peer = hg.peer(ui, opts, path)
475 peer = hg.peer(ui, opts, path)
476 try:
476 try:
477 caps = peer.capabilities()
477 caps = peer.capabilities()
478 ui.writenoi18n(b'Main capabilities:\n')
478 ui.writenoi18n(b'Main capabilities:\n')
479 for c in sorted(caps):
479 for c in sorted(caps):
480 ui.write(b' %s\n' % c)
480 ui.write(b' %s\n' % c)
481 b2caps = bundle2.bundle2caps(peer)
481 b2caps = bundle2.bundle2caps(peer)
482 if b2caps:
482 if b2caps:
483 ui.writenoi18n(b'Bundle2 capabilities:\n')
483 ui.writenoi18n(b'Bundle2 capabilities:\n')
484 for key, values in sorted(pycompat.iteritems(b2caps)):
484 for key, values in sorted(pycompat.iteritems(b2caps)):
485 ui.write(b' %s\n' % key)
485 ui.write(b' %s\n' % key)
486 for v in values:
486 for v in values:
487 ui.write(b' %s\n' % v)
487 ui.write(b' %s\n' % v)
488 finally:
488 finally:
489 peer.close()
489 peer.close()
490
490
491
491
492 @command(
492 @command(
493 b'debugchangedfiles',
493 b'debugchangedfiles',
494 [
494 [
495 (
495 (
496 b'',
496 b'',
497 b'compute',
497 b'compute',
498 False,
498 False,
499 b"compute information instead of reading it from storage",
499 b"compute information instead of reading it from storage",
500 ),
500 ),
501 ],
501 ],
502 b'REV',
502 b'REV',
503 )
503 )
504 def debugchangedfiles(ui, repo, rev, **opts):
504 def debugchangedfiles(ui, repo, rev, **opts):
505 """list the stored files changes for a revision"""
505 """list the stored files changes for a revision"""
506 ctx = scmutil.revsingle(repo, rev, None)
506 ctx = scmutil.revsingle(repo, rev, None)
507 files = None
507 files = None
508
508
509 if opts['compute']:
509 if opts['compute']:
510 files = metadata.compute_all_files_changes(ctx)
510 files = metadata.compute_all_files_changes(ctx)
511 else:
511 else:
512 sd = repo.changelog.sidedata(ctx.rev())
512 sd = repo.changelog.sidedata(ctx.rev())
513 files_block = sd.get(sidedata.SD_FILES)
513 files_block = sd.get(sidedata.SD_FILES)
514 if files_block is not None:
514 if files_block is not None:
515 files = metadata.decode_files_sidedata(sd)
515 files = metadata.decode_files_sidedata(sd)
516 if files is not None:
516 if files is not None:
517 for f in sorted(files.touched):
517 for f in sorted(files.touched):
518 if f in files.added:
518 if f in files.added:
519 action = b"added"
519 action = b"added"
520 elif f in files.removed:
520 elif f in files.removed:
521 action = b"removed"
521 action = b"removed"
522 elif f in files.merged:
522 elif f in files.merged:
523 action = b"merged"
523 action = b"merged"
524 elif f in files.salvaged:
524 elif f in files.salvaged:
525 action = b"salvaged"
525 action = b"salvaged"
526 else:
526 else:
527 action = b"touched"
527 action = b"touched"
528
528
529 copy_parent = b""
529 copy_parent = b""
530 copy_source = b""
530 copy_source = b""
531 if f in files.copied_from_p1:
531 if f in files.copied_from_p1:
532 copy_parent = b"p1"
532 copy_parent = b"p1"
533 copy_source = files.copied_from_p1[f]
533 copy_source = files.copied_from_p1[f]
534 elif f in files.copied_from_p2:
534 elif f in files.copied_from_p2:
535 copy_parent = b"p2"
535 copy_parent = b"p2"
536 copy_source = files.copied_from_p2[f]
536 copy_source = files.copied_from_p2[f]
537
537
538 data = (action, copy_parent, f, copy_source)
538 data = (action, copy_parent, f, copy_source)
539 template = b"%-8s %2s: %s, %s;\n"
539 template = b"%-8s %2s: %s, %s;\n"
540 ui.write(template % data)
540 ui.write(template % data)
541
541
542
542
543 @command(b'debugcheckstate', [], b'')
543 @command(b'debugcheckstate', [], b'')
544 def debugcheckstate(ui, repo):
544 def debugcheckstate(ui, repo):
545 """validate the correctness of the current dirstate"""
545 """validate the correctness of the current dirstate"""
546 parent1, parent2 = repo.dirstate.parents()
546 parent1, parent2 = repo.dirstate.parents()
547 m1 = repo[parent1].manifest()
547 m1 = repo[parent1].manifest()
548 m2 = repo[parent2].manifest()
548 m2 = repo[parent2].manifest()
549 errors = 0
549 errors = 0
550 for f in repo.dirstate:
550 for f in repo.dirstate:
551 state = repo.dirstate[f]
551 state = repo.dirstate[f]
552 if state in b"nr" and f not in m1:
552 if state in b"nr" and f not in m1:
553 ui.warn(_(b"%s in state %s, but not in manifest1\n") % (f, state))
553 ui.warn(_(b"%s in state %s, but not in manifest1\n") % (f, state))
554 errors += 1
554 errors += 1
555 if state in b"a" and f in m1:
555 if state in b"a" and f in m1:
556 ui.warn(_(b"%s in state %s, but also in manifest1\n") % (f, state))
556 ui.warn(_(b"%s in state %s, but also in manifest1\n") % (f, state))
557 errors += 1
557 errors += 1
558 if state in b"m" and f not in m1 and f not in m2:
558 if state in b"m" and f not in m1 and f not in m2:
559 ui.warn(
559 ui.warn(
560 _(b"%s in state %s, but not in either manifest\n") % (f, state)
560 _(b"%s in state %s, but not in either manifest\n") % (f, state)
561 )
561 )
562 errors += 1
562 errors += 1
563 for f in m1:
563 for f in m1:
564 state = repo.dirstate[f]
564 state = repo.dirstate[f]
565 if state not in b"nrm":
565 if state not in b"nrm":
566 ui.warn(_(b"%s in manifest1, but listed as state %s") % (f, state))
566 ui.warn(_(b"%s in manifest1, but listed as state %s") % (f, state))
567 errors += 1
567 errors += 1
568 if errors:
568 if errors:
569 errstr = _(b".hg/dirstate inconsistent with current parent's manifest")
569 errstr = _(b".hg/dirstate inconsistent with current parent's manifest")
570 raise error.Abort(errstr)
570 raise error.Abort(errstr)
571
571
572
572
573 @command(
573 @command(
574 b'debugcolor',
574 b'debugcolor',
575 [(b'', b'style', None, _(b'show all configured styles'))],
575 [(b'', b'style', None, _(b'show all configured styles'))],
576 b'hg debugcolor',
576 b'hg debugcolor',
577 )
577 )
578 def debugcolor(ui, repo, **opts):
578 def debugcolor(ui, repo, **opts):
579 """show available color, effects or style"""
579 """show available color, effects or style"""
580 ui.writenoi18n(b'color mode: %s\n' % stringutil.pprint(ui._colormode))
580 ui.writenoi18n(b'color mode: %s\n' % stringutil.pprint(ui._colormode))
581 if opts.get('style'):
581 if opts.get('style'):
582 return _debugdisplaystyle(ui)
582 return _debugdisplaystyle(ui)
583 else:
583 else:
584 return _debugdisplaycolor(ui)
584 return _debugdisplaycolor(ui)
585
585
586
586
587 def _debugdisplaycolor(ui):
587 def _debugdisplaycolor(ui):
588 ui = ui.copy()
588 ui = ui.copy()
589 ui._styles.clear()
589 ui._styles.clear()
590 for effect in color._activeeffects(ui).keys():
590 for effect in color._activeeffects(ui).keys():
591 ui._styles[effect] = effect
591 ui._styles[effect] = effect
592 if ui._terminfoparams:
592 if ui._terminfoparams:
593 for k, v in ui.configitems(b'color'):
593 for k, v in ui.configitems(b'color'):
594 if k.startswith(b'color.'):
594 if k.startswith(b'color.'):
595 ui._styles[k] = k[6:]
595 ui._styles[k] = k[6:]
596 elif k.startswith(b'terminfo.'):
596 elif k.startswith(b'terminfo.'):
597 ui._styles[k] = k[9:]
597 ui._styles[k] = k[9:]
598 ui.write(_(b'available colors:\n'))
598 ui.write(_(b'available colors:\n'))
599 # sort label with a '_' after the other to group '_background' entry.
599 # sort label with a '_' after the other to group '_background' entry.
600 items = sorted(ui._styles.items(), key=lambda i: (b'_' in i[0], i[0], i[1]))
600 items = sorted(ui._styles.items(), key=lambda i: (b'_' in i[0], i[0], i[1]))
601 for colorname, label in items:
601 for colorname, label in items:
602 ui.write(b'%s\n' % colorname, label=label)
602 ui.write(b'%s\n' % colorname, label=label)
603
603
604
604
605 def _debugdisplaystyle(ui):
605 def _debugdisplaystyle(ui):
606 ui.write(_(b'available style:\n'))
606 ui.write(_(b'available style:\n'))
607 if not ui._styles:
607 if not ui._styles:
608 return
608 return
609 width = max(len(s) for s in ui._styles)
609 width = max(len(s) for s in ui._styles)
610 for label, effects in sorted(ui._styles.items()):
610 for label, effects in sorted(ui._styles.items()):
611 ui.write(b'%s' % label, label=label)
611 ui.write(b'%s' % label, label=label)
612 if effects:
612 if effects:
613 # 50
613 # 50
614 ui.write(b': ')
614 ui.write(b': ')
615 ui.write(b' ' * (max(0, width - len(label))))
615 ui.write(b' ' * (max(0, width - len(label))))
616 ui.write(b', '.join(ui.label(e, e) for e in effects.split()))
616 ui.write(b', '.join(ui.label(e, e) for e in effects.split()))
617 ui.write(b'\n')
617 ui.write(b'\n')
618
618
619
619
620 @command(b'debugcreatestreamclonebundle', [], b'FILE')
620 @command(b'debugcreatestreamclonebundle', [], b'FILE')
621 def debugcreatestreamclonebundle(ui, repo, fname):
621 def debugcreatestreamclonebundle(ui, repo, fname):
622 """create a stream clone bundle file
622 """create a stream clone bundle file
623
623
624 Stream bundles are special bundles that are essentially archives of
624 Stream bundles are special bundles that are essentially archives of
625 revlog files. They are commonly used for cloning very quickly.
625 revlog files. They are commonly used for cloning very quickly.
626 """
626 """
627 # TODO we may want to turn this into an abort when this functionality
627 # TODO we may want to turn this into an abort when this functionality
628 # is moved into `hg bundle`.
628 # is moved into `hg bundle`.
629 if phases.hassecret(repo):
629 if phases.hassecret(repo):
630 ui.warn(
630 ui.warn(
631 _(
631 _(
632 b'(warning: stream clone bundle will contain secret '
632 b'(warning: stream clone bundle will contain secret '
633 b'revisions)\n'
633 b'revisions)\n'
634 )
634 )
635 )
635 )
636
636
637 requirements, gen = streamclone.generatebundlev1(repo)
637 requirements, gen = streamclone.generatebundlev1(repo)
638 changegroup.writechunks(ui, gen, fname)
638 changegroup.writechunks(ui, gen, fname)
639
639
640 ui.write(_(b'bundle requirements: %s\n') % b', '.join(sorted(requirements)))
640 ui.write(_(b'bundle requirements: %s\n') % b', '.join(sorted(requirements)))
641
641
642
642
643 @command(
643 @command(
644 b'debugdag',
644 b'debugdag',
645 [
645 [
646 (b't', b'tags', None, _(b'use tags as labels')),
646 (b't', b'tags', None, _(b'use tags as labels')),
647 (b'b', b'branches', None, _(b'annotate with branch names')),
647 (b'b', b'branches', None, _(b'annotate with branch names')),
648 (b'', b'dots', None, _(b'use dots for runs')),
648 (b'', b'dots', None, _(b'use dots for runs')),
649 (b's', b'spaces', None, _(b'separate elements by spaces')),
649 (b's', b'spaces', None, _(b'separate elements by spaces')),
650 ],
650 ],
651 _(b'[OPTION]... [FILE [REV]...]'),
651 _(b'[OPTION]... [FILE [REV]...]'),
652 optionalrepo=True,
652 optionalrepo=True,
653 )
653 )
654 def debugdag(ui, repo, file_=None, *revs, **opts):
654 def debugdag(ui, repo, file_=None, *revs, **opts):
655 """format the changelog or an index DAG as a concise textual description
655 """format the changelog or an index DAG as a concise textual description
656
656
657 If you pass a revlog index, the revlog's DAG is emitted. If you list
657 If you pass a revlog index, the revlog's DAG is emitted. If you list
658 revision numbers, they get labeled in the output as rN.
658 revision numbers, they get labeled in the output as rN.
659
659
660 Otherwise, the changelog DAG of the current repo is emitted.
660 Otherwise, the changelog DAG of the current repo is emitted.
661 """
661 """
662 spaces = opts.get('spaces')
662 spaces = opts.get('spaces')
663 dots = opts.get('dots')
663 dots = opts.get('dots')
664 if file_:
664 if file_:
665 rlog = revlog.revlog(vfsmod.vfs(encoding.getcwd(), audit=False), file_)
665 rlog = revlog.revlog(vfsmod.vfs(encoding.getcwd(), audit=False), file_)
666 revs = {int(r) for r in revs}
666 revs = {int(r) for r in revs}
667
667
668 def events():
668 def events():
669 for r in rlog:
669 for r in rlog:
670 yield b'n', (r, list(p for p in rlog.parentrevs(r) if p != -1))
670 yield b'n', (r, list(p for p in rlog.parentrevs(r) if p != -1))
671 if r in revs:
671 if r in revs:
672 yield b'l', (r, b"r%i" % r)
672 yield b'l', (r, b"r%i" % r)
673
673
674 elif repo:
674 elif repo:
675 cl = repo.changelog
675 cl = repo.changelog
676 tags = opts.get('tags')
676 tags = opts.get('tags')
677 branches = opts.get('branches')
677 branches = opts.get('branches')
678 if tags:
678 if tags:
679 labels = {}
679 labels = {}
680 for l, n in repo.tags().items():
680 for l, n in repo.tags().items():
681 labels.setdefault(cl.rev(n), []).append(l)
681 labels.setdefault(cl.rev(n), []).append(l)
682
682
683 def events():
683 def events():
684 b = b"default"
684 b = b"default"
685 for r in cl:
685 for r in cl:
686 if branches:
686 if branches:
687 newb = cl.read(cl.node(r))[5][b'branch']
687 newb = cl.read(cl.node(r))[5][b'branch']
688 if newb != b:
688 if newb != b:
689 yield b'a', newb
689 yield b'a', newb
690 b = newb
690 b = newb
691 yield b'n', (r, list(p for p in cl.parentrevs(r) if p != -1))
691 yield b'n', (r, list(p for p in cl.parentrevs(r) if p != -1))
692 if tags:
692 if tags:
693 ls = labels.get(r)
693 ls = labels.get(r)
694 if ls:
694 if ls:
695 for l in ls:
695 for l in ls:
696 yield b'l', (r, l)
696 yield b'l', (r, l)
697
697
698 else:
698 else:
699 raise error.Abort(_(b'need repo for changelog dag'))
699 raise error.Abort(_(b'need repo for changelog dag'))
700
700
701 for line in dagparser.dagtextlines(
701 for line in dagparser.dagtextlines(
702 events(),
702 events(),
703 addspaces=spaces,
703 addspaces=spaces,
704 wraplabels=True,
704 wraplabels=True,
705 wrapannotations=True,
705 wrapannotations=True,
706 wrapnonlinear=dots,
706 wrapnonlinear=dots,
707 usedots=dots,
707 usedots=dots,
708 maxlinewidth=70,
708 maxlinewidth=70,
709 ):
709 ):
710 ui.write(line)
710 ui.write(line)
711 ui.write(b"\n")
711 ui.write(b"\n")
712
712
713
713
714 @command(b'debugdata', cmdutil.debugrevlogopts, _(b'-c|-m|FILE REV'))
714 @command(b'debugdata', cmdutil.debugrevlogopts, _(b'-c|-m|FILE REV'))
715 def debugdata(ui, repo, file_, rev=None, **opts):
715 def debugdata(ui, repo, file_, rev=None, **opts):
716 """dump the contents of a data file revision"""
716 """dump the contents of a data file revision"""
717 opts = pycompat.byteskwargs(opts)
717 opts = pycompat.byteskwargs(opts)
718 if opts.get(b'changelog') or opts.get(b'manifest') or opts.get(b'dir'):
718 if opts.get(b'changelog') or opts.get(b'manifest') or opts.get(b'dir'):
719 if rev is not None:
719 if rev is not None:
720 raise error.CommandError(b'debugdata', _(b'invalid arguments'))
720 raise error.CommandError(b'debugdata', _(b'invalid arguments'))
721 file_, rev = None, file_
721 file_, rev = None, file_
722 elif rev is None:
722 elif rev is None:
723 raise error.CommandError(b'debugdata', _(b'invalid arguments'))
723 raise error.CommandError(b'debugdata', _(b'invalid arguments'))
724 r = cmdutil.openstorage(repo, b'debugdata', file_, opts)
724 r = cmdutil.openstorage(repo, b'debugdata', file_, opts)
725 try:
725 try:
726 ui.write(r.rawdata(r.lookup(rev)))
726 ui.write(r.rawdata(r.lookup(rev)))
727 except KeyError:
727 except KeyError:
728 raise error.Abort(_(b'invalid revision identifier %s') % rev)
728 raise error.Abort(_(b'invalid revision identifier %s') % rev)
729
729
730
730
731 @command(
731 @command(
732 b'debugdate',
732 b'debugdate',
733 [(b'e', b'extended', None, _(b'try extended date formats'))],
733 [(b'e', b'extended', None, _(b'try extended date formats'))],
734 _(b'[-e] DATE [RANGE]'),
734 _(b'[-e] DATE [RANGE]'),
735 norepo=True,
735 norepo=True,
736 optionalrepo=True,
736 optionalrepo=True,
737 )
737 )
738 def debugdate(ui, date, range=None, **opts):
738 def debugdate(ui, date, range=None, **opts):
739 """parse and display a date"""
739 """parse and display a date"""
740 if opts["extended"]:
740 if opts["extended"]:
741 d = dateutil.parsedate(date, dateutil.extendeddateformats)
741 d = dateutil.parsedate(date, dateutil.extendeddateformats)
742 else:
742 else:
743 d = dateutil.parsedate(date)
743 d = dateutil.parsedate(date)
744 ui.writenoi18n(b"internal: %d %d\n" % d)
744 ui.writenoi18n(b"internal: %d %d\n" % d)
745 ui.writenoi18n(b"standard: %s\n" % dateutil.datestr(d))
745 ui.writenoi18n(b"standard: %s\n" % dateutil.datestr(d))
746 if range:
746 if range:
747 m = dateutil.matchdate(range)
747 m = dateutil.matchdate(range)
748 ui.writenoi18n(b"match: %s\n" % m(d[0]))
748 ui.writenoi18n(b"match: %s\n" % m(d[0]))
749
749
750
750
751 @command(
751 @command(
752 b'debugdeltachain',
752 b'debugdeltachain',
753 cmdutil.debugrevlogopts + cmdutil.formatteropts,
753 cmdutil.debugrevlogopts + cmdutil.formatteropts,
754 _(b'-c|-m|FILE'),
754 _(b'-c|-m|FILE'),
755 optionalrepo=True,
755 optionalrepo=True,
756 )
756 )
757 def debugdeltachain(ui, repo, file_=None, **opts):
757 def debugdeltachain(ui, repo, file_=None, **opts):
758 """dump information about delta chains in a revlog
758 """dump information about delta chains in a revlog
759
759
760 Output can be templatized. Available template keywords are:
760 Output can be templatized. Available template keywords are:
761
761
762 :``rev``: revision number
762 :``rev``: revision number
763 :``chainid``: delta chain identifier (numbered by unique base)
763 :``chainid``: delta chain identifier (numbered by unique base)
764 :``chainlen``: delta chain length to this revision
764 :``chainlen``: delta chain length to this revision
765 :``prevrev``: previous revision in delta chain
765 :``prevrev``: previous revision in delta chain
766 :``deltatype``: role of delta / how it was computed
766 :``deltatype``: role of delta / how it was computed
767 :``compsize``: compressed size of revision
767 :``compsize``: compressed size of revision
768 :``uncompsize``: uncompressed size of revision
768 :``uncompsize``: uncompressed size of revision
769 :``chainsize``: total size of compressed revisions in chain
769 :``chainsize``: total size of compressed revisions in chain
770 :``chainratio``: total chain size divided by uncompressed revision size
770 :``chainratio``: total chain size divided by uncompressed revision size
771 (new delta chains typically start at ratio 2.00)
771 (new delta chains typically start at ratio 2.00)
772 :``lindist``: linear distance from base revision in delta chain to end
772 :``lindist``: linear distance from base revision in delta chain to end
773 of this revision
773 of this revision
774 :``extradist``: total size of revisions not part of this delta chain from
774 :``extradist``: total size of revisions not part of this delta chain from
775 base of delta chain to end of this revision; a measurement
775 base of delta chain to end of this revision; a measurement
776 of how much extra data we need to read/seek across to read
776 of how much extra data we need to read/seek across to read
777 the delta chain for this revision
777 the delta chain for this revision
778 :``extraratio``: extradist divided by chainsize; another representation of
778 :``extraratio``: extradist divided by chainsize; another representation of
779 how much unrelated data is needed to load this delta chain
779 how much unrelated data is needed to load this delta chain
780
780
781 If the repository is configured to use the sparse read, additional keywords
781 If the repository is configured to use the sparse read, additional keywords
782 are available:
782 are available:
783
783
784 :``readsize``: total size of data read from the disk for a revision
784 :``readsize``: total size of data read from the disk for a revision
785 (sum of the sizes of all the blocks)
785 (sum of the sizes of all the blocks)
786 :``largestblock``: size of the largest block of data read from the disk
786 :``largestblock``: size of the largest block of data read from the disk
787 :``readdensity``: density of useful bytes in the data read from the disk
787 :``readdensity``: density of useful bytes in the data read from the disk
788 :``srchunks``: in how many data hunks the whole revision would be read
788 :``srchunks``: in how many data hunks the whole revision would be read
789
789
790 The sparse read can be enabled with experimental.sparse-read = True
790 The sparse read can be enabled with experimental.sparse-read = True
791 """
791 """
792 opts = pycompat.byteskwargs(opts)
792 opts = pycompat.byteskwargs(opts)
793 r = cmdutil.openrevlog(repo, b'debugdeltachain', file_, opts)
793 r = cmdutil.openrevlog(repo, b'debugdeltachain', file_, opts)
794 index = r.index
794 index = r.index
795 start = r.start
795 start = r.start
796 length = r.length
796 length = r.length
797 generaldelta = r.version & revlog.FLAG_GENERALDELTA
797 generaldelta = r.version & revlog.FLAG_GENERALDELTA
798 withsparseread = getattr(r, '_withsparseread', False)
798 withsparseread = getattr(r, '_withsparseread', False)
799
799
800 def revinfo(rev):
800 def revinfo(rev):
801 e = index[rev]
801 e = index[rev]
802 compsize = e[1]
802 compsize = e[1]
803 uncompsize = e[2]
803 uncompsize = e[2]
804 chainsize = 0
804 chainsize = 0
805
805
806 if generaldelta:
806 if generaldelta:
807 if e[3] == e[5]:
807 if e[3] == e[5]:
808 deltatype = b'p1'
808 deltatype = b'p1'
809 elif e[3] == e[6]:
809 elif e[3] == e[6]:
810 deltatype = b'p2'
810 deltatype = b'p2'
811 elif e[3] == rev - 1:
811 elif e[3] == rev - 1:
812 deltatype = b'prev'
812 deltatype = b'prev'
813 elif e[3] == rev:
813 elif e[3] == rev:
814 deltatype = b'base'
814 deltatype = b'base'
815 else:
815 else:
816 deltatype = b'other'
816 deltatype = b'other'
817 else:
817 else:
818 if e[3] == rev:
818 if e[3] == rev:
819 deltatype = b'base'
819 deltatype = b'base'
820 else:
820 else:
821 deltatype = b'prev'
821 deltatype = b'prev'
822
822
823 chain = r._deltachain(rev)[0]
823 chain = r._deltachain(rev)[0]
824 for iterrev in chain:
824 for iterrev in chain:
825 e = index[iterrev]
825 e = index[iterrev]
826 chainsize += e[1]
826 chainsize += e[1]
827
827
828 return compsize, uncompsize, deltatype, chain, chainsize
828 return compsize, uncompsize, deltatype, chain, chainsize
829
829
830 fm = ui.formatter(b'debugdeltachain', opts)
830 fm = ui.formatter(b'debugdeltachain', opts)
831
831
832 fm.plain(
832 fm.plain(
833 b' rev chain# chainlen prev delta '
833 b' rev chain# chainlen prev delta '
834 b'size rawsize chainsize ratio lindist extradist '
834 b'size rawsize chainsize ratio lindist extradist '
835 b'extraratio'
835 b'extraratio'
836 )
836 )
837 if withsparseread:
837 if withsparseread:
838 fm.plain(b' readsize largestblk rddensity srchunks')
838 fm.plain(b' readsize largestblk rddensity srchunks')
839 fm.plain(b'\n')
839 fm.plain(b'\n')
840
840
841 chainbases = {}
841 chainbases = {}
842 for rev in r:
842 for rev in r:
843 comp, uncomp, deltatype, chain, chainsize = revinfo(rev)
843 comp, uncomp, deltatype, chain, chainsize = revinfo(rev)
844 chainbase = chain[0]
844 chainbase = chain[0]
845 chainid = chainbases.setdefault(chainbase, len(chainbases) + 1)
845 chainid = chainbases.setdefault(chainbase, len(chainbases) + 1)
846 basestart = start(chainbase)
846 basestart = start(chainbase)
847 revstart = start(rev)
847 revstart = start(rev)
848 lineardist = revstart + comp - basestart
848 lineardist = revstart + comp - basestart
849 extradist = lineardist - chainsize
849 extradist = lineardist - chainsize
850 try:
850 try:
851 prevrev = chain[-2]
851 prevrev = chain[-2]
852 except IndexError:
852 except IndexError:
853 prevrev = -1
853 prevrev = -1
854
854
855 if uncomp != 0:
855 if uncomp != 0:
856 chainratio = float(chainsize) / float(uncomp)
856 chainratio = float(chainsize) / float(uncomp)
857 else:
857 else:
858 chainratio = chainsize
858 chainratio = chainsize
859
859
860 if chainsize != 0:
860 if chainsize != 0:
861 extraratio = float(extradist) / float(chainsize)
861 extraratio = float(extradist) / float(chainsize)
862 else:
862 else:
863 extraratio = extradist
863 extraratio = extradist
864
864
865 fm.startitem()
865 fm.startitem()
866 fm.write(
866 fm.write(
867 b'rev chainid chainlen prevrev deltatype compsize '
867 b'rev chainid chainlen prevrev deltatype compsize '
868 b'uncompsize chainsize chainratio lindist extradist '
868 b'uncompsize chainsize chainratio lindist extradist '
869 b'extraratio',
869 b'extraratio',
870 b'%7d %7d %8d %8d %7s %10d %10d %10d %9.5f %9d %9d %10.5f',
870 b'%7d %7d %8d %8d %7s %10d %10d %10d %9.5f %9d %9d %10.5f',
871 rev,
871 rev,
872 chainid,
872 chainid,
873 len(chain),
873 len(chain),
874 prevrev,
874 prevrev,
875 deltatype,
875 deltatype,
876 comp,
876 comp,
877 uncomp,
877 uncomp,
878 chainsize,
878 chainsize,
879 chainratio,
879 chainratio,
880 lineardist,
880 lineardist,
881 extradist,
881 extradist,
882 extraratio,
882 extraratio,
883 rev=rev,
883 rev=rev,
884 chainid=chainid,
884 chainid=chainid,
885 chainlen=len(chain),
885 chainlen=len(chain),
886 prevrev=prevrev,
886 prevrev=prevrev,
887 deltatype=deltatype,
887 deltatype=deltatype,
888 compsize=comp,
888 compsize=comp,
889 uncompsize=uncomp,
889 uncompsize=uncomp,
890 chainsize=chainsize,
890 chainsize=chainsize,
891 chainratio=chainratio,
891 chainratio=chainratio,
892 lindist=lineardist,
892 lindist=lineardist,
893 extradist=extradist,
893 extradist=extradist,
894 extraratio=extraratio,
894 extraratio=extraratio,
895 )
895 )
896 if withsparseread:
896 if withsparseread:
897 readsize = 0
897 readsize = 0
898 largestblock = 0
898 largestblock = 0
899 srchunks = 0
899 srchunks = 0
900
900
901 for revschunk in deltautil.slicechunk(r, chain):
901 for revschunk in deltautil.slicechunk(r, chain):
902 srchunks += 1
902 srchunks += 1
903 blkend = start(revschunk[-1]) + length(revschunk[-1])
903 blkend = start(revschunk[-1]) + length(revschunk[-1])
904 blksize = blkend - start(revschunk[0])
904 blksize = blkend - start(revschunk[0])
905
905
906 readsize += blksize
906 readsize += blksize
907 if largestblock < blksize:
907 if largestblock < blksize:
908 largestblock = blksize
908 largestblock = blksize
909
909
910 if readsize:
910 if readsize:
911 readdensity = float(chainsize) / float(readsize)
911 readdensity = float(chainsize) / float(readsize)
912 else:
912 else:
913 readdensity = 1
913 readdensity = 1
914
914
915 fm.write(
915 fm.write(
916 b'readsize largestblock readdensity srchunks',
916 b'readsize largestblock readdensity srchunks',
917 b' %10d %10d %9.5f %8d',
917 b' %10d %10d %9.5f %8d',
918 readsize,
918 readsize,
919 largestblock,
919 largestblock,
920 readdensity,
920 readdensity,
921 srchunks,
921 srchunks,
922 readsize=readsize,
922 readsize=readsize,
923 largestblock=largestblock,
923 largestblock=largestblock,
924 readdensity=readdensity,
924 readdensity=readdensity,
925 srchunks=srchunks,
925 srchunks=srchunks,
926 )
926 )
927
927
928 fm.plain(b'\n')
928 fm.plain(b'\n')
929
929
930 fm.end()
930 fm.end()
931
931
932
932
933 @command(
933 @command(
934 b'debugdirstate|debugstate',
934 b'debugdirstate|debugstate',
935 [
935 [
936 (
936 (
937 b'',
937 b'',
938 b'nodates',
938 b'nodates',
939 None,
939 None,
940 _(b'do not display the saved mtime (DEPRECATED)'),
940 _(b'do not display the saved mtime (DEPRECATED)'),
941 ),
941 ),
942 (b'', b'dates', True, _(b'display the saved mtime')),
942 (b'', b'dates', True, _(b'display the saved mtime')),
943 (b'', b'datesort', None, _(b'sort by saved mtime')),
943 (b'', b'datesort', None, _(b'sort by saved mtime')),
944 ],
944 ],
945 _(b'[OPTION]...'),
945 _(b'[OPTION]...'),
946 )
946 )
947 def debugstate(ui, repo, **opts):
947 def debugstate(ui, repo, **opts):
948 """show the contents of the current dirstate"""
948 """show the contents of the current dirstate"""
949
949
950 nodates = not opts['dates']
950 nodates = not opts['dates']
951 if opts.get('nodates') is not None:
951 if opts.get('nodates') is not None:
952 nodates = True
952 nodates = True
953 datesort = opts.get('datesort')
953 datesort = opts.get('datesort')
954
954
955 if datesort:
955 if datesort:
956 keyfunc = lambda x: (x[1][3], x[0]) # sort by mtime, then by filename
956 keyfunc = lambda x: (x[1][3], x[0]) # sort by mtime, then by filename
957 else:
957 else:
958 keyfunc = None # sort by filename
958 keyfunc = None # sort by filename
959 for file_, ent in sorted(pycompat.iteritems(repo.dirstate), key=keyfunc):
959 for file_, ent in sorted(pycompat.iteritems(repo.dirstate), key=keyfunc):
960 if ent[3] == -1:
960 if ent[3] == -1:
961 timestr = b'unset '
961 timestr = b'unset '
962 elif nodates:
962 elif nodates:
963 timestr = b'set '
963 timestr = b'set '
964 else:
964 else:
965 timestr = time.strftime(
965 timestr = time.strftime(
966 "%Y-%m-%d %H:%M:%S ", time.localtime(ent[3])
966 "%Y-%m-%d %H:%M:%S ", time.localtime(ent[3])
967 )
967 )
968 timestr = encoding.strtolocal(timestr)
968 timestr = encoding.strtolocal(timestr)
969 if ent[1] & 0o20000:
969 if ent[1] & 0o20000:
970 mode = b'lnk'
970 mode = b'lnk'
971 else:
971 else:
972 mode = b'%3o' % (ent[1] & 0o777 & ~util.umask)
972 mode = b'%3o' % (ent[1] & 0o777 & ~util.umask)
973 ui.write(b"%c %s %10d %s%s\n" % (ent[0], mode, ent[2], timestr, file_))
973 ui.write(b"%c %s %10d %s%s\n" % (ent[0], mode, ent[2], timestr, file_))
974 for f in repo.dirstate.copies():
974 for f in repo.dirstate.copies():
975 ui.write(_(b"copy: %s -> %s\n") % (repo.dirstate.copied(f), f))
975 ui.write(_(b"copy: %s -> %s\n") % (repo.dirstate.copied(f), f))
976
976
977
977
978 @command(
978 @command(
979 b'debugdiscovery',
979 b'debugdiscovery',
980 [
980 [
981 (b'', b'old', None, _(b'use old-style discovery')),
981 (b'', b'old', None, _(b'use old-style discovery')),
982 (
982 (
983 b'',
983 b'',
984 b'nonheads',
984 b'nonheads',
985 None,
985 None,
986 _(b'use old-style discovery with non-heads included'),
986 _(b'use old-style discovery with non-heads included'),
987 ),
987 ),
988 (b'', b'rev', [], b'restrict discovery to this set of revs'),
988 (b'', b'rev', [], b'restrict discovery to this set of revs'),
989 (b'', b'seed', b'12323', b'specify the random seed use for discovery'),
989 (b'', b'seed', b'12323', b'specify the random seed use for discovery'),
990 (
990 (
991 b'',
991 b'',
992 b'local-as-revs',
992 b'local-as-revs',
993 b"",
993 b"",
994 b'treat local has having these revisions only',
994 b'treat local has having these revisions only',
995 ),
995 ),
996 (
996 (
997 b'',
997 b'',
998 b'remote-as-revs',
998 b'remote-as-revs',
999 b"",
999 b"",
1000 b'use local as remote, with only these these revisions',
1000 b'use local as remote, with only these these revisions',
1001 ),
1001 ),
1002 ]
1002 ]
1003 + cmdutil.remoteopts
1003 + cmdutil.remoteopts
1004 + cmdutil.formatteropts,
1004 + cmdutil.formatteropts,
1005 _(b'[--rev REV] [OTHER]'),
1005 _(b'[--rev REV] [OTHER]'),
1006 )
1006 )
1007 def debugdiscovery(ui, repo, remoteurl=b"default", **opts):
1007 def debugdiscovery(ui, repo, remoteurl=b"default", **opts):
1008 """runs the changeset discovery protocol in isolation
1008 """runs the changeset discovery protocol in isolation
1009
1009
1010 The local peer can be "replaced" by a subset of the local repository by
1010 The local peer can be "replaced" by a subset of the local repository by
1011 using the `--local-as-revs` flag. Int he same way, usual `remote` peer can
1011 using the `--local-as-revs` flag. Int he same way, usual `remote` peer can
1012 be "replaced" by a subset of the local repository using the
1012 be "replaced" by a subset of the local repository using the
1013 `--local-as-revs` flag. This is useful to efficiently debug pathological
1013 `--local-as-revs` flag. This is useful to efficiently debug pathological
1014 discovery situation.
1014 discovery situation.
1015
1015
1016 The following developer oriented config are relevant for people playing with this command:
1016 The following developer oriented config are relevant for people playing with this command:
1017
1017
1018 * devel.discovery.exchange-heads=True
1018 * devel.discovery.exchange-heads=True
1019
1019
1020 If False, the discovery will not start with
1020 If False, the discovery will not start with
1021 remote head fetching and local head querying.
1021 remote head fetching and local head querying.
1022
1022
1023 * devel.discovery.grow-sample=True
1023 * devel.discovery.grow-sample=True
1024
1024
1025 If False, the sample size used in set discovery will not be increased
1025 If False, the sample size used in set discovery will not be increased
1026 through the process
1026 through the process
1027
1027
1028 * devel.discovery.grow-sample.dynamic=True
1028 * devel.discovery.grow-sample.dynamic=True
1029
1029
1030 When discovery.grow-sample.dynamic is True, the default, the sample size is
1030 When discovery.grow-sample.dynamic is True, the default, the sample size is
1031 adapted to the shape of the undecided set (it is set to the max of:
1031 adapted to the shape of the undecided set (it is set to the max of:
1032 <target-size>, len(roots(undecided)), len(heads(undecided)
1032 <target-size>, len(roots(undecided)), len(heads(undecided)
1033
1033
1034 * devel.discovery.grow-sample.rate=1.05
1034 * devel.discovery.grow-sample.rate=1.05
1035
1035
1036 the rate at which the sample grow
1036 the rate at which the sample grow
1037
1037
1038 * devel.discovery.randomize=True
1038 * devel.discovery.randomize=True
1039
1039
1040 If andom sampling during discovery are deterministic. It is meant for
1040 If andom sampling during discovery are deterministic. It is meant for
1041 integration tests.
1041 integration tests.
1042
1042
1043 * devel.discovery.sample-size=200
1043 * devel.discovery.sample-size=200
1044
1044
1045 Control the initial size of the discovery sample
1045 Control the initial size of the discovery sample
1046
1046
1047 * devel.discovery.sample-size.initial=100
1047 * devel.discovery.sample-size.initial=100
1048
1048
1049 Control the initial size of the discovery for initial change
1049 Control the initial size of the discovery for initial change
1050 """
1050 """
1051 opts = pycompat.byteskwargs(opts)
1051 opts = pycompat.byteskwargs(opts)
1052 unfi = repo.unfiltered()
1052 unfi = repo.unfiltered()
1053
1053
1054 # setup potential extra filtering
1054 # setup potential extra filtering
1055 local_revs = opts[b"local_as_revs"]
1055 local_revs = opts[b"local_as_revs"]
1056 remote_revs = opts[b"remote_as_revs"]
1056 remote_revs = opts[b"remote_as_revs"]
1057
1057
1058 # make sure tests are repeatable
1058 # make sure tests are repeatable
1059 random.seed(int(opts[b'seed']))
1059 random.seed(int(opts[b'seed']))
1060
1060
1061 if not remote_revs:
1061 if not remote_revs:
1062
1062
1063 remoteurl, branches = urlutil.parseurl(ui.expandpath(remoteurl))
1063 remoteurl, branches = urlutil.get_unique_pull_path(
1064 b'debugdiscovery', repo, ui, remoteurl
1065 )
1064 remote = hg.peer(repo, opts, remoteurl)
1066 remote = hg.peer(repo, opts, remoteurl)
1065 ui.status(_(b'comparing with %s\n') % urlutil.hidepassword(remoteurl))
1067 ui.status(_(b'comparing with %s\n') % urlutil.hidepassword(remoteurl))
1066 else:
1068 else:
1067 branches = (None, [])
1069 branches = (None, [])
1068 remote_filtered_revs = scmutil.revrange(
1070 remote_filtered_revs = scmutil.revrange(
1069 unfi, [b"not (::(%s))" % remote_revs]
1071 unfi, [b"not (::(%s))" % remote_revs]
1070 )
1072 )
1071 remote_filtered_revs = frozenset(remote_filtered_revs)
1073 remote_filtered_revs = frozenset(remote_filtered_revs)
1072
1074
1073 def remote_func(x):
1075 def remote_func(x):
1074 return remote_filtered_revs
1076 return remote_filtered_revs
1075
1077
1076 repoview.filtertable[b'debug-discovery-remote-filter'] = remote_func
1078 repoview.filtertable[b'debug-discovery-remote-filter'] = remote_func
1077
1079
1078 remote = repo.peer()
1080 remote = repo.peer()
1079 remote._repo = remote._repo.filtered(b'debug-discovery-remote-filter')
1081 remote._repo = remote._repo.filtered(b'debug-discovery-remote-filter')
1080
1082
1081 if local_revs:
1083 if local_revs:
1082 local_filtered_revs = scmutil.revrange(
1084 local_filtered_revs = scmutil.revrange(
1083 unfi, [b"not (::(%s))" % local_revs]
1085 unfi, [b"not (::(%s))" % local_revs]
1084 )
1086 )
1085 local_filtered_revs = frozenset(local_filtered_revs)
1087 local_filtered_revs = frozenset(local_filtered_revs)
1086
1088
1087 def local_func(x):
1089 def local_func(x):
1088 return local_filtered_revs
1090 return local_filtered_revs
1089
1091
1090 repoview.filtertable[b'debug-discovery-local-filter'] = local_func
1092 repoview.filtertable[b'debug-discovery-local-filter'] = local_func
1091 repo = repo.filtered(b'debug-discovery-local-filter')
1093 repo = repo.filtered(b'debug-discovery-local-filter')
1092
1094
1093 data = {}
1095 data = {}
1094 if opts.get(b'old'):
1096 if opts.get(b'old'):
1095
1097
1096 def doit(pushedrevs, remoteheads, remote=remote):
1098 def doit(pushedrevs, remoteheads, remote=remote):
1097 if not util.safehasattr(remote, b'branches'):
1099 if not util.safehasattr(remote, b'branches'):
1098 # enable in-client legacy support
1100 # enable in-client legacy support
1099 remote = localrepo.locallegacypeer(remote.local())
1101 remote = localrepo.locallegacypeer(remote.local())
1100 common, _in, hds = treediscovery.findcommonincoming(
1102 common, _in, hds = treediscovery.findcommonincoming(
1101 repo, remote, force=True, audit=data
1103 repo, remote, force=True, audit=data
1102 )
1104 )
1103 common = set(common)
1105 common = set(common)
1104 if not opts.get(b'nonheads'):
1106 if not opts.get(b'nonheads'):
1105 ui.writenoi18n(
1107 ui.writenoi18n(
1106 b"unpruned common: %s\n"
1108 b"unpruned common: %s\n"
1107 % b" ".join(sorted(short(n) for n in common))
1109 % b" ".join(sorted(short(n) for n in common))
1108 )
1110 )
1109
1111
1110 clnode = repo.changelog.node
1112 clnode = repo.changelog.node
1111 common = repo.revs(b'heads(::%ln)', common)
1113 common = repo.revs(b'heads(::%ln)', common)
1112 common = {clnode(r) for r in common}
1114 common = {clnode(r) for r in common}
1113 return common, hds
1115 return common, hds
1114
1116
1115 else:
1117 else:
1116
1118
1117 def doit(pushedrevs, remoteheads, remote=remote):
1119 def doit(pushedrevs, remoteheads, remote=remote):
1118 nodes = None
1120 nodes = None
1119 if pushedrevs:
1121 if pushedrevs:
1120 revs = scmutil.revrange(repo, pushedrevs)
1122 revs = scmutil.revrange(repo, pushedrevs)
1121 nodes = [repo[r].node() for r in revs]
1123 nodes = [repo[r].node() for r in revs]
1122 common, any, hds = setdiscovery.findcommonheads(
1124 common, any, hds = setdiscovery.findcommonheads(
1123 ui, repo, remote, ancestorsof=nodes, audit=data
1125 ui, repo, remote, ancestorsof=nodes, audit=data
1124 )
1126 )
1125 return common, hds
1127 return common, hds
1126
1128
1127 remoterevs, _checkout = hg.addbranchrevs(repo, remote, branches, revs=None)
1129 remoterevs, _checkout = hg.addbranchrevs(repo, remote, branches, revs=None)
1128 localrevs = opts[b'rev']
1130 localrevs = opts[b'rev']
1129
1131
1130 fm = ui.formatter(b'debugdiscovery', opts)
1132 fm = ui.formatter(b'debugdiscovery', opts)
1131 if fm.strict_format:
1133 if fm.strict_format:
1132
1134
1133 @contextlib.contextmanager
1135 @contextlib.contextmanager
1134 def may_capture_output():
1136 def may_capture_output():
1135 ui.pushbuffer()
1137 ui.pushbuffer()
1136 yield
1138 yield
1137 data[b'output'] = ui.popbuffer()
1139 data[b'output'] = ui.popbuffer()
1138
1140
1139 else:
1141 else:
1140 may_capture_output = util.nullcontextmanager
1142 may_capture_output = util.nullcontextmanager
1141 with may_capture_output():
1143 with may_capture_output():
1142 with util.timedcm('debug-discovery') as t:
1144 with util.timedcm('debug-discovery') as t:
1143 common, hds = doit(localrevs, remoterevs)
1145 common, hds = doit(localrevs, remoterevs)
1144
1146
1145 # compute all statistics
1147 # compute all statistics
1146 heads_common = set(common)
1148 heads_common = set(common)
1147 heads_remote = set(hds)
1149 heads_remote = set(hds)
1148 heads_local = set(repo.heads())
1150 heads_local = set(repo.heads())
1149 # note: they cannot be a local or remote head that is in common and not
1151 # note: they cannot be a local or remote head that is in common and not
1150 # itself a head of common.
1152 # itself a head of common.
1151 heads_common_local = heads_common & heads_local
1153 heads_common_local = heads_common & heads_local
1152 heads_common_remote = heads_common & heads_remote
1154 heads_common_remote = heads_common & heads_remote
1153 heads_common_both = heads_common & heads_remote & heads_local
1155 heads_common_both = heads_common & heads_remote & heads_local
1154
1156
1155 all = repo.revs(b'all()')
1157 all = repo.revs(b'all()')
1156 common = repo.revs(b'::%ln', common)
1158 common = repo.revs(b'::%ln', common)
1157 roots_common = repo.revs(b'roots(::%ld)', common)
1159 roots_common = repo.revs(b'roots(::%ld)', common)
1158 missing = repo.revs(b'not ::%ld', common)
1160 missing = repo.revs(b'not ::%ld', common)
1159 heads_missing = repo.revs(b'heads(%ld)', missing)
1161 heads_missing = repo.revs(b'heads(%ld)', missing)
1160 roots_missing = repo.revs(b'roots(%ld)', missing)
1162 roots_missing = repo.revs(b'roots(%ld)', missing)
1161 assert len(common) + len(missing) == len(all)
1163 assert len(common) + len(missing) == len(all)
1162
1164
1163 initial_undecided = repo.revs(
1165 initial_undecided = repo.revs(
1164 b'not (::%ln or %ln::)', heads_common_remote, heads_common_local
1166 b'not (::%ln or %ln::)', heads_common_remote, heads_common_local
1165 )
1167 )
1166 heads_initial_undecided = repo.revs(b'heads(%ld)', initial_undecided)
1168 heads_initial_undecided = repo.revs(b'heads(%ld)', initial_undecided)
1167 roots_initial_undecided = repo.revs(b'roots(%ld)', initial_undecided)
1169 roots_initial_undecided = repo.revs(b'roots(%ld)', initial_undecided)
1168 common_initial_undecided = initial_undecided & common
1170 common_initial_undecided = initial_undecided & common
1169 missing_initial_undecided = initial_undecided & missing
1171 missing_initial_undecided = initial_undecided & missing
1170
1172
1171 data[b'elapsed'] = t.elapsed
1173 data[b'elapsed'] = t.elapsed
1172 data[b'nb-common-heads'] = len(heads_common)
1174 data[b'nb-common-heads'] = len(heads_common)
1173 data[b'nb-common-heads-local'] = len(heads_common_local)
1175 data[b'nb-common-heads-local'] = len(heads_common_local)
1174 data[b'nb-common-heads-remote'] = len(heads_common_remote)
1176 data[b'nb-common-heads-remote'] = len(heads_common_remote)
1175 data[b'nb-common-heads-both'] = len(heads_common_both)
1177 data[b'nb-common-heads-both'] = len(heads_common_both)
1176 data[b'nb-common-roots'] = len(roots_common)
1178 data[b'nb-common-roots'] = len(roots_common)
1177 data[b'nb-head-local'] = len(heads_local)
1179 data[b'nb-head-local'] = len(heads_local)
1178 data[b'nb-head-local-missing'] = len(heads_local) - len(heads_common_local)
1180 data[b'nb-head-local-missing'] = len(heads_local) - len(heads_common_local)
1179 data[b'nb-head-remote'] = len(heads_remote)
1181 data[b'nb-head-remote'] = len(heads_remote)
1180 data[b'nb-head-remote-unknown'] = len(heads_remote) - len(
1182 data[b'nb-head-remote-unknown'] = len(heads_remote) - len(
1181 heads_common_remote
1183 heads_common_remote
1182 )
1184 )
1183 data[b'nb-revs'] = len(all)
1185 data[b'nb-revs'] = len(all)
1184 data[b'nb-revs-common'] = len(common)
1186 data[b'nb-revs-common'] = len(common)
1185 data[b'nb-revs-missing'] = len(missing)
1187 data[b'nb-revs-missing'] = len(missing)
1186 data[b'nb-missing-heads'] = len(heads_missing)
1188 data[b'nb-missing-heads'] = len(heads_missing)
1187 data[b'nb-missing-roots'] = len(roots_missing)
1189 data[b'nb-missing-roots'] = len(roots_missing)
1188 data[b'nb-ini_und'] = len(initial_undecided)
1190 data[b'nb-ini_und'] = len(initial_undecided)
1189 data[b'nb-ini_und-heads'] = len(heads_initial_undecided)
1191 data[b'nb-ini_und-heads'] = len(heads_initial_undecided)
1190 data[b'nb-ini_und-roots'] = len(roots_initial_undecided)
1192 data[b'nb-ini_und-roots'] = len(roots_initial_undecided)
1191 data[b'nb-ini_und-common'] = len(common_initial_undecided)
1193 data[b'nb-ini_und-common'] = len(common_initial_undecided)
1192 data[b'nb-ini_und-missing'] = len(missing_initial_undecided)
1194 data[b'nb-ini_und-missing'] = len(missing_initial_undecided)
1193
1195
1194 fm.startitem()
1196 fm.startitem()
1195 fm.data(**pycompat.strkwargs(data))
1197 fm.data(**pycompat.strkwargs(data))
1196 # display discovery summary
1198 # display discovery summary
1197 fm.plain(b"elapsed time: %(elapsed)f seconds\n" % data)
1199 fm.plain(b"elapsed time: %(elapsed)f seconds\n" % data)
1198 fm.plain(b"round-trips: %(total-roundtrips)9d\n" % data)
1200 fm.plain(b"round-trips: %(total-roundtrips)9d\n" % data)
1199 fm.plain(b"heads summary:\n")
1201 fm.plain(b"heads summary:\n")
1200 fm.plain(b" total common heads: %(nb-common-heads)9d\n" % data)
1202 fm.plain(b" total common heads: %(nb-common-heads)9d\n" % data)
1201 fm.plain(b" also local heads: %(nb-common-heads-local)9d\n" % data)
1203 fm.plain(b" also local heads: %(nb-common-heads-local)9d\n" % data)
1202 fm.plain(b" also remote heads: %(nb-common-heads-remote)9d\n" % data)
1204 fm.plain(b" also remote heads: %(nb-common-heads-remote)9d\n" % data)
1203 fm.plain(b" both: %(nb-common-heads-both)9d\n" % data)
1205 fm.plain(b" both: %(nb-common-heads-both)9d\n" % data)
1204 fm.plain(b" local heads: %(nb-head-local)9d\n" % data)
1206 fm.plain(b" local heads: %(nb-head-local)9d\n" % data)
1205 fm.plain(b" common: %(nb-common-heads-local)9d\n" % data)
1207 fm.plain(b" common: %(nb-common-heads-local)9d\n" % data)
1206 fm.plain(b" missing: %(nb-head-local-missing)9d\n" % data)
1208 fm.plain(b" missing: %(nb-head-local-missing)9d\n" % data)
1207 fm.plain(b" remote heads: %(nb-head-remote)9d\n" % data)
1209 fm.plain(b" remote heads: %(nb-head-remote)9d\n" % data)
1208 fm.plain(b" common: %(nb-common-heads-remote)9d\n" % data)
1210 fm.plain(b" common: %(nb-common-heads-remote)9d\n" % data)
1209 fm.plain(b" unknown: %(nb-head-remote-unknown)9d\n" % data)
1211 fm.plain(b" unknown: %(nb-head-remote-unknown)9d\n" % data)
1210 fm.plain(b"local changesets: %(nb-revs)9d\n" % data)
1212 fm.plain(b"local changesets: %(nb-revs)9d\n" % data)
1211 fm.plain(b" common: %(nb-revs-common)9d\n" % data)
1213 fm.plain(b" common: %(nb-revs-common)9d\n" % data)
1212 fm.plain(b" heads: %(nb-common-heads)9d\n" % data)
1214 fm.plain(b" heads: %(nb-common-heads)9d\n" % data)
1213 fm.plain(b" roots: %(nb-common-roots)9d\n" % data)
1215 fm.plain(b" roots: %(nb-common-roots)9d\n" % data)
1214 fm.plain(b" missing: %(nb-revs-missing)9d\n" % data)
1216 fm.plain(b" missing: %(nb-revs-missing)9d\n" % data)
1215 fm.plain(b" heads: %(nb-missing-heads)9d\n" % data)
1217 fm.plain(b" heads: %(nb-missing-heads)9d\n" % data)
1216 fm.plain(b" roots: %(nb-missing-roots)9d\n" % data)
1218 fm.plain(b" roots: %(nb-missing-roots)9d\n" % data)
1217 fm.plain(b" first undecided set: %(nb-ini_und)9d\n" % data)
1219 fm.plain(b" first undecided set: %(nb-ini_und)9d\n" % data)
1218 fm.plain(b" heads: %(nb-ini_und-heads)9d\n" % data)
1220 fm.plain(b" heads: %(nb-ini_und-heads)9d\n" % data)
1219 fm.plain(b" roots: %(nb-ini_und-roots)9d\n" % data)
1221 fm.plain(b" roots: %(nb-ini_und-roots)9d\n" % data)
1220 fm.plain(b" common: %(nb-ini_und-common)9d\n" % data)
1222 fm.plain(b" common: %(nb-ini_und-common)9d\n" % data)
1221 fm.plain(b" missing: %(nb-ini_und-missing)9d\n" % data)
1223 fm.plain(b" missing: %(nb-ini_und-missing)9d\n" % data)
1222
1224
1223 if ui.verbose:
1225 if ui.verbose:
1224 fm.plain(
1226 fm.plain(
1225 b"common heads: %s\n"
1227 b"common heads: %s\n"
1226 % b" ".join(sorted(short(n) for n in heads_common))
1228 % b" ".join(sorted(short(n) for n in heads_common))
1227 )
1229 )
1228 fm.end()
1230 fm.end()
1229
1231
1230
1232
1231 _chunksize = 4 << 10
1233 _chunksize = 4 << 10
1232
1234
1233
1235
1234 @command(
1236 @command(
1235 b'debugdownload',
1237 b'debugdownload',
1236 [
1238 [
1237 (b'o', b'output', b'', _(b'path')),
1239 (b'o', b'output', b'', _(b'path')),
1238 ],
1240 ],
1239 optionalrepo=True,
1241 optionalrepo=True,
1240 )
1242 )
1241 def debugdownload(ui, repo, url, output=None, **opts):
1243 def debugdownload(ui, repo, url, output=None, **opts):
1242 """download a resource using Mercurial logic and config"""
1244 """download a resource using Mercurial logic and config"""
1243 fh = urlmod.open(ui, url, output)
1245 fh = urlmod.open(ui, url, output)
1244
1246
1245 dest = ui
1247 dest = ui
1246 if output:
1248 if output:
1247 dest = open(output, b"wb", _chunksize)
1249 dest = open(output, b"wb", _chunksize)
1248 try:
1250 try:
1249 data = fh.read(_chunksize)
1251 data = fh.read(_chunksize)
1250 while data:
1252 while data:
1251 dest.write(data)
1253 dest.write(data)
1252 data = fh.read(_chunksize)
1254 data = fh.read(_chunksize)
1253 finally:
1255 finally:
1254 if output:
1256 if output:
1255 dest.close()
1257 dest.close()
1256
1258
1257
1259
1258 @command(b'debugextensions', cmdutil.formatteropts, [], optionalrepo=True)
1260 @command(b'debugextensions', cmdutil.formatteropts, [], optionalrepo=True)
1259 def debugextensions(ui, repo, **opts):
1261 def debugextensions(ui, repo, **opts):
1260 '''show information about active extensions'''
1262 '''show information about active extensions'''
1261 opts = pycompat.byteskwargs(opts)
1263 opts = pycompat.byteskwargs(opts)
1262 exts = extensions.extensions(ui)
1264 exts = extensions.extensions(ui)
1263 hgver = util.version()
1265 hgver = util.version()
1264 fm = ui.formatter(b'debugextensions', opts)
1266 fm = ui.formatter(b'debugextensions', opts)
1265 for extname, extmod in sorted(exts, key=operator.itemgetter(0)):
1267 for extname, extmod in sorted(exts, key=operator.itemgetter(0)):
1266 isinternal = extensions.ismoduleinternal(extmod)
1268 isinternal = extensions.ismoduleinternal(extmod)
1267 extsource = None
1269 extsource = None
1268
1270
1269 if util.safehasattr(extmod, '__file__'):
1271 if util.safehasattr(extmod, '__file__'):
1270 extsource = pycompat.fsencode(extmod.__file__)
1272 extsource = pycompat.fsencode(extmod.__file__)
1271 elif getattr(sys, 'oxidized', False):
1273 elif getattr(sys, 'oxidized', False):
1272 extsource = pycompat.sysexecutable
1274 extsource = pycompat.sysexecutable
1273 if isinternal:
1275 if isinternal:
1274 exttestedwith = [] # never expose magic string to users
1276 exttestedwith = [] # never expose magic string to users
1275 else:
1277 else:
1276 exttestedwith = getattr(extmod, 'testedwith', b'').split()
1278 exttestedwith = getattr(extmod, 'testedwith', b'').split()
1277 extbuglink = getattr(extmod, 'buglink', None)
1279 extbuglink = getattr(extmod, 'buglink', None)
1278
1280
1279 fm.startitem()
1281 fm.startitem()
1280
1282
1281 if ui.quiet or ui.verbose:
1283 if ui.quiet or ui.verbose:
1282 fm.write(b'name', b'%s\n', extname)
1284 fm.write(b'name', b'%s\n', extname)
1283 else:
1285 else:
1284 fm.write(b'name', b'%s', extname)
1286 fm.write(b'name', b'%s', extname)
1285 if isinternal or hgver in exttestedwith:
1287 if isinternal or hgver in exttestedwith:
1286 fm.plain(b'\n')
1288 fm.plain(b'\n')
1287 elif not exttestedwith:
1289 elif not exttestedwith:
1288 fm.plain(_(b' (untested!)\n'))
1290 fm.plain(_(b' (untested!)\n'))
1289 else:
1291 else:
1290 lasttestedversion = exttestedwith[-1]
1292 lasttestedversion = exttestedwith[-1]
1291 fm.plain(b' (%s!)\n' % lasttestedversion)
1293 fm.plain(b' (%s!)\n' % lasttestedversion)
1292
1294
1293 fm.condwrite(
1295 fm.condwrite(
1294 ui.verbose and extsource,
1296 ui.verbose and extsource,
1295 b'source',
1297 b'source',
1296 _(b' location: %s\n'),
1298 _(b' location: %s\n'),
1297 extsource or b"",
1299 extsource or b"",
1298 )
1300 )
1299
1301
1300 if ui.verbose:
1302 if ui.verbose:
1301 fm.plain(_(b' bundled: %s\n') % [b'no', b'yes'][isinternal])
1303 fm.plain(_(b' bundled: %s\n') % [b'no', b'yes'][isinternal])
1302 fm.data(bundled=isinternal)
1304 fm.data(bundled=isinternal)
1303
1305
1304 fm.condwrite(
1306 fm.condwrite(
1305 ui.verbose and exttestedwith,
1307 ui.verbose and exttestedwith,
1306 b'testedwith',
1308 b'testedwith',
1307 _(b' tested with: %s\n'),
1309 _(b' tested with: %s\n'),
1308 fm.formatlist(exttestedwith, name=b'ver'),
1310 fm.formatlist(exttestedwith, name=b'ver'),
1309 )
1311 )
1310
1312
1311 fm.condwrite(
1313 fm.condwrite(
1312 ui.verbose and extbuglink,
1314 ui.verbose and extbuglink,
1313 b'buglink',
1315 b'buglink',
1314 _(b' bug reporting: %s\n'),
1316 _(b' bug reporting: %s\n'),
1315 extbuglink or b"",
1317 extbuglink or b"",
1316 )
1318 )
1317
1319
1318 fm.end()
1320 fm.end()
1319
1321
1320
1322
1321 @command(
1323 @command(
1322 b'debugfileset',
1324 b'debugfileset',
1323 [
1325 [
1324 (
1326 (
1325 b'r',
1327 b'r',
1326 b'rev',
1328 b'rev',
1327 b'',
1329 b'',
1328 _(b'apply the filespec on this revision'),
1330 _(b'apply the filespec on this revision'),
1329 _(b'REV'),
1331 _(b'REV'),
1330 ),
1332 ),
1331 (
1333 (
1332 b'',
1334 b'',
1333 b'all-files',
1335 b'all-files',
1334 False,
1336 False,
1335 _(b'test files from all revisions and working directory'),
1337 _(b'test files from all revisions and working directory'),
1336 ),
1338 ),
1337 (
1339 (
1338 b's',
1340 b's',
1339 b'show-matcher',
1341 b'show-matcher',
1340 None,
1342 None,
1341 _(b'print internal representation of matcher'),
1343 _(b'print internal representation of matcher'),
1342 ),
1344 ),
1343 (
1345 (
1344 b'p',
1346 b'p',
1345 b'show-stage',
1347 b'show-stage',
1346 [],
1348 [],
1347 _(b'print parsed tree at the given stage'),
1349 _(b'print parsed tree at the given stage'),
1348 _(b'NAME'),
1350 _(b'NAME'),
1349 ),
1351 ),
1350 ],
1352 ],
1351 _(b'[-r REV] [--all-files] [OPTION]... FILESPEC'),
1353 _(b'[-r REV] [--all-files] [OPTION]... FILESPEC'),
1352 )
1354 )
1353 def debugfileset(ui, repo, expr, **opts):
1355 def debugfileset(ui, repo, expr, **opts):
1354 '''parse and apply a fileset specification'''
1356 '''parse and apply a fileset specification'''
1355 from . import fileset
1357 from . import fileset
1356
1358
1357 fileset.symbols # force import of fileset so we have predicates to optimize
1359 fileset.symbols # force import of fileset so we have predicates to optimize
1358 opts = pycompat.byteskwargs(opts)
1360 opts = pycompat.byteskwargs(opts)
1359 ctx = scmutil.revsingle(repo, opts.get(b'rev'), None)
1361 ctx = scmutil.revsingle(repo, opts.get(b'rev'), None)
1360
1362
1361 stages = [
1363 stages = [
1362 (b'parsed', pycompat.identity),
1364 (b'parsed', pycompat.identity),
1363 (b'analyzed', filesetlang.analyze),
1365 (b'analyzed', filesetlang.analyze),
1364 (b'optimized', filesetlang.optimize),
1366 (b'optimized', filesetlang.optimize),
1365 ]
1367 ]
1366 stagenames = {n for n, f in stages}
1368 stagenames = {n for n, f in stages}
1367
1369
1368 showalways = set()
1370 showalways = set()
1369 if ui.verbose and not opts[b'show_stage']:
1371 if ui.verbose and not opts[b'show_stage']:
1370 # show parsed tree by --verbose (deprecated)
1372 # show parsed tree by --verbose (deprecated)
1371 showalways.add(b'parsed')
1373 showalways.add(b'parsed')
1372 if opts[b'show_stage'] == [b'all']:
1374 if opts[b'show_stage'] == [b'all']:
1373 showalways.update(stagenames)
1375 showalways.update(stagenames)
1374 else:
1376 else:
1375 for n in opts[b'show_stage']:
1377 for n in opts[b'show_stage']:
1376 if n not in stagenames:
1378 if n not in stagenames:
1377 raise error.Abort(_(b'invalid stage name: %s') % n)
1379 raise error.Abort(_(b'invalid stage name: %s') % n)
1378 showalways.update(opts[b'show_stage'])
1380 showalways.update(opts[b'show_stage'])
1379
1381
1380 tree = filesetlang.parse(expr)
1382 tree = filesetlang.parse(expr)
1381 for n, f in stages:
1383 for n, f in stages:
1382 tree = f(tree)
1384 tree = f(tree)
1383 if n in showalways:
1385 if n in showalways:
1384 if opts[b'show_stage'] or n != b'parsed':
1386 if opts[b'show_stage'] or n != b'parsed':
1385 ui.write(b"* %s:\n" % n)
1387 ui.write(b"* %s:\n" % n)
1386 ui.write(filesetlang.prettyformat(tree), b"\n")
1388 ui.write(filesetlang.prettyformat(tree), b"\n")
1387
1389
1388 files = set()
1390 files = set()
1389 if opts[b'all_files']:
1391 if opts[b'all_files']:
1390 for r in repo:
1392 for r in repo:
1391 c = repo[r]
1393 c = repo[r]
1392 files.update(c.files())
1394 files.update(c.files())
1393 files.update(c.substate)
1395 files.update(c.substate)
1394 if opts[b'all_files'] or ctx.rev() is None:
1396 if opts[b'all_files'] or ctx.rev() is None:
1395 wctx = repo[None]
1397 wctx = repo[None]
1396 files.update(
1398 files.update(
1397 repo.dirstate.walk(
1399 repo.dirstate.walk(
1398 scmutil.matchall(repo),
1400 scmutil.matchall(repo),
1399 subrepos=list(wctx.substate),
1401 subrepos=list(wctx.substate),
1400 unknown=True,
1402 unknown=True,
1401 ignored=True,
1403 ignored=True,
1402 )
1404 )
1403 )
1405 )
1404 files.update(wctx.substate)
1406 files.update(wctx.substate)
1405 else:
1407 else:
1406 files.update(ctx.files())
1408 files.update(ctx.files())
1407 files.update(ctx.substate)
1409 files.update(ctx.substate)
1408
1410
1409 m = ctx.matchfileset(repo.getcwd(), expr)
1411 m = ctx.matchfileset(repo.getcwd(), expr)
1410 if opts[b'show_matcher'] or (opts[b'show_matcher'] is None and ui.verbose):
1412 if opts[b'show_matcher'] or (opts[b'show_matcher'] is None and ui.verbose):
1411 ui.writenoi18n(b'* matcher:\n', stringutil.prettyrepr(m), b'\n')
1413 ui.writenoi18n(b'* matcher:\n', stringutil.prettyrepr(m), b'\n')
1412 for f in sorted(files):
1414 for f in sorted(files):
1413 if not m(f):
1415 if not m(f):
1414 continue
1416 continue
1415 ui.write(b"%s\n" % f)
1417 ui.write(b"%s\n" % f)
1416
1418
1417
1419
1418 @command(b'debugformat', [] + cmdutil.formatteropts)
1420 @command(b'debugformat', [] + cmdutil.formatteropts)
1419 def debugformat(ui, repo, **opts):
1421 def debugformat(ui, repo, **opts):
1420 """display format information about the current repository
1422 """display format information about the current repository
1421
1423
1422 Use --verbose to get extra information about current config value and
1424 Use --verbose to get extra information about current config value and
1423 Mercurial default."""
1425 Mercurial default."""
1424 opts = pycompat.byteskwargs(opts)
1426 opts = pycompat.byteskwargs(opts)
1425 maxvariantlength = max(len(fv.name) for fv in upgrade.allformatvariant)
1427 maxvariantlength = max(len(fv.name) for fv in upgrade.allformatvariant)
1426 maxvariantlength = max(len(b'format-variant'), maxvariantlength)
1428 maxvariantlength = max(len(b'format-variant'), maxvariantlength)
1427
1429
1428 def makeformatname(name):
1430 def makeformatname(name):
1429 return b'%s:' + (b' ' * (maxvariantlength - len(name)))
1431 return b'%s:' + (b' ' * (maxvariantlength - len(name)))
1430
1432
1431 fm = ui.formatter(b'debugformat', opts)
1433 fm = ui.formatter(b'debugformat', opts)
1432 if fm.isplain():
1434 if fm.isplain():
1433
1435
1434 def formatvalue(value):
1436 def formatvalue(value):
1435 if util.safehasattr(value, b'startswith'):
1437 if util.safehasattr(value, b'startswith'):
1436 return value
1438 return value
1437 if value:
1439 if value:
1438 return b'yes'
1440 return b'yes'
1439 else:
1441 else:
1440 return b'no'
1442 return b'no'
1441
1443
1442 else:
1444 else:
1443 formatvalue = pycompat.identity
1445 formatvalue = pycompat.identity
1444
1446
1445 fm.plain(b'format-variant')
1447 fm.plain(b'format-variant')
1446 fm.plain(b' ' * (maxvariantlength - len(b'format-variant')))
1448 fm.plain(b' ' * (maxvariantlength - len(b'format-variant')))
1447 fm.plain(b' repo')
1449 fm.plain(b' repo')
1448 if ui.verbose:
1450 if ui.verbose:
1449 fm.plain(b' config default')
1451 fm.plain(b' config default')
1450 fm.plain(b'\n')
1452 fm.plain(b'\n')
1451 for fv in upgrade.allformatvariant:
1453 for fv in upgrade.allformatvariant:
1452 fm.startitem()
1454 fm.startitem()
1453 repovalue = fv.fromrepo(repo)
1455 repovalue = fv.fromrepo(repo)
1454 configvalue = fv.fromconfig(repo)
1456 configvalue = fv.fromconfig(repo)
1455
1457
1456 if repovalue != configvalue:
1458 if repovalue != configvalue:
1457 namelabel = b'formatvariant.name.mismatchconfig'
1459 namelabel = b'formatvariant.name.mismatchconfig'
1458 repolabel = b'formatvariant.repo.mismatchconfig'
1460 repolabel = b'formatvariant.repo.mismatchconfig'
1459 elif repovalue != fv.default:
1461 elif repovalue != fv.default:
1460 namelabel = b'formatvariant.name.mismatchdefault'
1462 namelabel = b'formatvariant.name.mismatchdefault'
1461 repolabel = b'formatvariant.repo.mismatchdefault'
1463 repolabel = b'formatvariant.repo.mismatchdefault'
1462 else:
1464 else:
1463 namelabel = b'formatvariant.name.uptodate'
1465 namelabel = b'formatvariant.name.uptodate'
1464 repolabel = b'formatvariant.repo.uptodate'
1466 repolabel = b'formatvariant.repo.uptodate'
1465
1467
1466 fm.write(b'name', makeformatname(fv.name), fv.name, label=namelabel)
1468 fm.write(b'name', makeformatname(fv.name), fv.name, label=namelabel)
1467 fm.write(b'repo', b' %3s', formatvalue(repovalue), label=repolabel)
1469 fm.write(b'repo', b' %3s', formatvalue(repovalue), label=repolabel)
1468 if fv.default != configvalue:
1470 if fv.default != configvalue:
1469 configlabel = b'formatvariant.config.special'
1471 configlabel = b'formatvariant.config.special'
1470 else:
1472 else:
1471 configlabel = b'formatvariant.config.default'
1473 configlabel = b'formatvariant.config.default'
1472 fm.condwrite(
1474 fm.condwrite(
1473 ui.verbose,
1475 ui.verbose,
1474 b'config',
1476 b'config',
1475 b' %6s',
1477 b' %6s',
1476 formatvalue(configvalue),
1478 formatvalue(configvalue),
1477 label=configlabel,
1479 label=configlabel,
1478 )
1480 )
1479 fm.condwrite(
1481 fm.condwrite(
1480 ui.verbose,
1482 ui.verbose,
1481 b'default',
1483 b'default',
1482 b' %7s',
1484 b' %7s',
1483 formatvalue(fv.default),
1485 formatvalue(fv.default),
1484 label=b'formatvariant.default',
1486 label=b'formatvariant.default',
1485 )
1487 )
1486 fm.plain(b'\n')
1488 fm.plain(b'\n')
1487 fm.end()
1489 fm.end()
1488
1490
1489
1491
1490 @command(b'debugfsinfo', [], _(b'[PATH]'), norepo=True)
1492 @command(b'debugfsinfo', [], _(b'[PATH]'), norepo=True)
1491 def debugfsinfo(ui, path=b"."):
1493 def debugfsinfo(ui, path=b"."):
1492 """show information detected about current filesystem"""
1494 """show information detected about current filesystem"""
1493 ui.writenoi18n(b'path: %s\n' % path)
1495 ui.writenoi18n(b'path: %s\n' % path)
1494 ui.writenoi18n(
1496 ui.writenoi18n(
1495 b'mounted on: %s\n' % (util.getfsmountpoint(path) or b'(unknown)')
1497 b'mounted on: %s\n' % (util.getfsmountpoint(path) or b'(unknown)')
1496 )
1498 )
1497 ui.writenoi18n(b'exec: %s\n' % (util.checkexec(path) and b'yes' or b'no'))
1499 ui.writenoi18n(b'exec: %s\n' % (util.checkexec(path) and b'yes' or b'no'))
1498 ui.writenoi18n(b'fstype: %s\n' % (util.getfstype(path) or b'(unknown)'))
1500 ui.writenoi18n(b'fstype: %s\n' % (util.getfstype(path) or b'(unknown)'))
1499 ui.writenoi18n(
1501 ui.writenoi18n(
1500 b'symlink: %s\n' % (util.checklink(path) and b'yes' or b'no')
1502 b'symlink: %s\n' % (util.checklink(path) and b'yes' or b'no')
1501 )
1503 )
1502 ui.writenoi18n(
1504 ui.writenoi18n(
1503 b'hardlink: %s\n' % (util.checknlink(path) and b'yes' or b'no')
1505 b'hardlink: %s\n' % (util.checknlink(path) and b'yes' or b'no')
1504 )
1506 )
1505 casesensitive = b'(unknown)'
1507 casesensitive = b'(unknown)'
1506 try:
1508 try:
1507 with pycompat.namedtempfile(prefix=b'.debugfsinfo', dir=path) as f:
1509 with pycompat.namedtempfile(prefix=b'.debugfsinfo', dir=path) as f:
1508 casesensitive = util.fscasesensitive(f.name) and b'yes' or b'no'
1510 casesensitive = util.fscasesensitive(f.name) and b'yes' or b'no'
1509 except OSError:
1511 except OSError:
1510 pass
1512 pass
1511 ui.writenoi18n(b'case-sensitive: %s\n' % casesensitive)
1513 ui.writenoi18n(b'case-sensitive: %s\n' % casesensitive)
1512
1514
1513
1515
1514 @command(
1516 @command(
1515 b'debuggetbundle',
1517 b'debuggetbundle',
1516 [
1518 [
1517 (b'H', b'head', [], _(b'id of head node'), _(b'ID')),
1519 (b'H', b'head', [], _(b'id of head node'), _(b'ID')),
1518 (b'C', b'common', [], _(b'id of common node'), _(b'ID')),
1520 (b'C', b'common', [], _(b'id of common node'), _(b'ID')),
1519 (
1521 (
1520 b't',
1522 b't',
1521 b'type',
1523 b'type',
1522 b'bzip2',
1524 b'bzip2',
1523 _(b'bundle compression type to use'),
1525 _(b'bundle compression type to use'),
1524 _(b'TYPE'),
1526 _(b'TYPE'),
1525 ),
1527 ),
1526 ],
1528 ],
1527 _(b'REPO FILE [-H|-C ID]...'),
1529 _(b'REPO FILE [-H|-C ID]...'),
1528 norepo=True,
1530 norepo=True,
1529 )
1531 )
1530 def debuggetbundle(ui, repopath, bundlepath, head=None, common=None, **opts):
1532 def debuggetbundle(ui, repopath, bundlepath, head=None, common=None, **opts):
1531 """retrieves a bundle from a repo
1533 """retrieves a bundle from a repo
1532
1534
1533 Every ID must be a full-length hex node id string. Saves the bundle to the
1535 Every ID must be a full-length hex node id string. Saves the bundle to the
1534 given file.
1536 given file.
1535 """
1537 """
1536 opts = pycompat.byteskwargs(opts)
1538 opts = pycompat.byteskwargs(opts)
1537 repo = hg.peer(ui, opts, repopath)
1539 repo = hg.peer(ui, opts, repopath)
1538 if not repo.capable(b'getbundle'):
1540 if not repo.capable(b'getbundle'):
1539 raise error.Abort(b"getbundle() not supported by target repository")
1541 raise error.Abort(b"getbundle() not supported by target repository")
1540 args = {}
1542 args = {}
1541 if common:
1543 if common:
1542 args['common'] = [bin(s) for s in common]
1544 args['common'] = [bin(s) for s in common]
1543 if head:
1545 if head:
1544 args['heads'] = [bin(s) for s in head]
1546 args['heads'] = [bin(s) for s in head]
1545 # TODO: get desired bundlecaps from command line.
1547 # TODO: get desired bundlecaps from command line.
1546 args['bundlecaps'] = None
1548 args['bundlecaps'] = None
1547 bundle = repo.getbundle(b'debug', **args)
1549 bundle = repo.getbundle(b'debug', **args)
1548
1550
1549 bundletype = opts.get(b'type', b'bzip2').lower()
1551 bundletype = opts.get(b'type', b'bzip2').lower()
1550 btypes = {
1552 btypes = {
1551 b'none': b'HG10UN',
1553 b'none': b'HG10UN',
1552 b'bzip2': b'HG10BZ',
1554 b'bzip2': b'HG10BZ',
1553 b'gzip': b'HG10GZ',
1555 b'gzip': b'HG10GZ',
1554 b'bundle2': b'HG20',
1556 b'bundle2': b'HG20',
1555 }
1557 }
1556 bundletype = btypes.get(bundletype)
1558 bundletype = btypes.get(bundletype)
1557 if bundletype not in bundle2.bundletypes:
1559 if bundletype not in bundle2.bundletypes:
1558 raise error.Abort(_(b'unknown bundle type specified with --type'))
1560 raise error.Abort(_(b'unknown bundle type specified with --type'))
1559 bundle2.writebundle(ui, bundle, bundlepath, bundletype)
1561 bundle2.writebundle(ui, bundle, bundlepath, bundletype)
1560
1562
1561
1563
1562 @command(b'debugignore', [], b'[FILE]')
1564 @command(b'debugignore', [], b'[FILE]')
1563 def debugignore(ui, repo, *files, **opts):
1565 def debugignore(ui, repo, *files, **opts):
1564 """display the combined ignore pattern and information about ignored files
1566 """display the combined ignore pattern and information about ignored files
1565
1567
1566 With no argument display the combined ignore pattern.
1568 With no argument display the combined ignore pattern.
1567
1569
1568 Given space separated file names, shows if the given file is ignored and
1570 Given space separated file names, shows if the given file is ignored and
1569 if so, show the ignore rule (file and line number) that matched it.
1571 if so, show the ignore rule (file and line number) that matched it.
1570 """
1572 """
1571 ignore = repo.dirstate._ignore
1573 ignore = repo.dirstate._ignore
1572 if not files:
1574 if not files:
1573 # Show all the patterns
1575 # Show all the patterns
1574 ui.write(b"%s\n" % pycompat.byterepr(ignore))
1576 ui.write(b"%s\n" % pycompat.byterepr(ignore))
1575 else:
1577 else:
1576 m = scmutil.match(repo[None], pats=files)
1578 m = scmutil.match(repo[None], pats=files)
1577 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True)
1579 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True)
1578 for f in m.files():
1580 for f in m.files():
1579 nf = util.normpath(f)
1581 nf = util.normpath(f)
1580 ignored = None
1582 ignored = None
1581 ignoredata = None
1583 ignoredata = None
1582 if nf != b'.':
1584 if nf != b'.':
1583 if ignore(nf):
1585 if ignore(nf):
1584 ignored = nf
1586 ignored = nf
1585 ignoredata = repo.dirstate._ignorefileandline(nf)
1587 ignoredata = repo.dirstate._ignorefileandline(nf)
1586 else:
1588 else:
1587 for p in pathutil.finddirs(nf):
1589 for p in pathutil.finddirs(nf):
1588 if ignore(p):
1590 if ignore(p):
1589 ignored = p
1591 ignored = p
1590 ignoredata = repo.dirstate._ignorefileandline(p)
1592 ignoredata = repo.dirstate._ignorefileandline(p)
1591 break
1593 break
1592 if ignored:
1594 if ignored:
1593 if ignored == nf:
1595 if ignored == nf:
1594 ui.write(_(b"%s is ignored\n") % uipathfn(f))
1596 ui.write(_(b"%s is ignored\n") % uipathfn(f))
1595 else:
1597 else:
1596 ui.write(
1598 ui.write(
1597 _(
1599 _(
1598 b"%s is ignored because of "
1600 b"%s is ignored because of "
1599 b"containing directory %s\n"
1601 b"containing directory %s\n"
1600 )
1602 )
1601 % (uipathfn(f), ignored)
1603 % (uipathfn(f), ignored)
1602 )
1604 )
1603 ignorefile, lineno, line = ignoredata
1605 ignorefile, lineno, line = ignoredata
1604 ui.write(
1606 ui.write(
1605 _(b"(ignore rule in %s, line %d: '%s')\n")
1607 _(b"(ignore rule in %s, line %d: '%s')\n")
1606 % (ignorefile, lineno, line)
1608 % (ignorefile, lineno, line)
1607 )
1609 )
1608 else:
1610 else:
1609 ui.write(_(b"%s is not ignored\n") % uipathfn(f))
1611 ui.write(_(b"%s is not ignored\n") % uipathfn(f))
1610
1612
1611
1613
1612 @command(
1614 @command(
1613 b'debugindex',
1615 b'debugindex',
1614 cmdutil.debugrevlogopts + cmdutil.formatteropts,
1616 cmdutil.debugrevlogopts + cmdutil.formatteropts,
1615 _(b'-c|-m|FILE'),
1617 _(b'-c|-m|FILE'),
1616 )
1618 )
1617 def debugindex(ui, repo, file_=None, **opts):
1619 def debugindex(ui, repo, file_=None, **opts):
1618 """dump index data for a storage primitive"""
1620 """dump index data for a storage primitive"""
1619 opts = pycompat.byteskwargs(opts)
1621 opts = pycompat.byteskwargs(opts)
1620 store = cmdutil.openstorage(repo, b'debugindex', file_, opts)
1622 store = cmdutil.openstorage(repo, b'debugindex', file_, opts)
1621
1623
1622 if ui.debugflag:
1624 if ui.debugflag:
1623 shortfn = hex
1625 shortfn = hex
1624 else:
1626 else:
1625 shortfn = short
1627 shortfn = short
1626
1628
1627 idlen = 12
1629 idlen = 12
1628 for i in store:
1630 for i in store:
1629 idlen = len(shortfn(store.node(i)))
1631 idlen = len(shortfn(store.node(i)))
1630 break
1632 break
1631
1633
1632 fm = ui.formatter(b'debugindex', opts)
1634 fm = ui.formatter(b'debugindex', opts)
1633 fm.plain(
1635 fm.plain(
1634 b' rev linkrev %s %s p2\n'
1636 b' rev linkrev %s %s p2\n'
1635 % (b'nodeid'.ljust(idlen), b'p1'.ljust(idlen))
1637 % (b'nodeid'.ljust(idlen), b'p1'.ljust(idlen))
1636 )
1638 )
1637
1639
1638 for rev in store:
1640 for rev in store:
1639 node = store.node(rev)
1641 node = store.node(rev)
1640 parents = store.parents(node)
1642 parents = store.parents(node)
1641
1643
1642 fm.startitem()
1644 fm.startitem()
1643 fm.write(b'rev', b'%6d ', rev)
1645 fm.write(b'rev', b'%6d ', rev)
1644 fm.write(b'linkrev', b'%7d ', store.linkrev(rev))
1646 fm.write(b'linkrev', b'%7d ', store.linkrev(rev))
1645 fm.write(b'node', b'%s ', shortfn(node))
1647 fm.write(b'node', b'%s ', shortfn(node))
1646 fm.write(b'p1', b'%s ', shortfn(parents[0]))
1648 fm.write(b'p1', b'%s ', shortfn(parents[0]))
1647 fm.write(b'p2', b'%s', shortfn(parents[1]))
1649 fm.write(b'p2', b'%s', shortfn(parents[1]))
1648 fm.plain(b'\n')
1650 fm.plain(b'\n')
1649
1651
1650 fm.end()
1652 fm.end()
1651
1653
1652
1654
1653 @command(
1655 @command(
1654 b'debugindexdot',
1656 b'debugindexdot',
1655 cmdutil.debugrevlogopts,
1657 cmdutil.debugrevlogopts,
1656 _(b'-c|-m|FILE'),
1658 _(b'-c|-m|FILE'),
1657 optionalrepo=True,
1659 optionalrepo=True,
1658 )
1660 )
1659 def debugindexdot(ui, repo, file_=None, **opts):
1661 def debugindexdot(ui, repo, file_=None, **opts):
1660 """dump an index DAG as a graphviz dot file"""
1662 """dump an index DAG as a graphviz dot file"""
1661 opts = pycompat.byteskwargs(opts)
1663 opts = pycompat.byteskwargs(opts)
1662 r = cmdutil.openstorage(repo, b'debugindexdot', file_, opts)
1664 r = cmdutil.openstorage(repo, b'debugindexdot', file_, opts)
1663 ui.writenoi18n(b"digraph G {\n")
1665 ui.writenoi18n(b"digraph G {\n")
1664 for i in r:
1666 for i in r:
1665 node = r.node(i)
1667 node = r.node(i)
1666 pp = r.parents(node)
1668 pp = r.parents(node)
1667 ui.write(b"\t%d -> %d\n" % (r.rev(pp[0]), i))
1669 ui.write(b"\t%d -> %d\n" % (r.rev(pp[0]), i))
1668 if pp[1] != nullid:
1670 if pp[1] != nullid:
1669 ui.write(b"\t%d -> %d\n" % (r.rev(pp[1]), i))
1671 ui.write(b"\t%d -> %d\n" % (r.rev(pp[1]), i))
1670 ui.write(b"}\n")
1672 ui.write(b"}\n")
1671
1673
1672
1674
1673 @command(b'debugindexstats', [])
1675 @command(b'debugindexstats', [])
1674 def debugindexstats(ui, repo):
1676 def debugindexstats(ui, repo):
1675 """show stats related to the changelog index"""
1677 """show stats related to the changelog index"""
1676 repo.changelog.shortest(nullid, 1)
1678 repo.changelog.shortest(nullid, 1)
1677 index = repo.changelog.index
1679 index = repo.changelog.index
1678 if not util.safehasattr(index, b'stats'):
1680 if not util.safehasattr(index, b'stats'):
1679 raise error.Abort(_(b'debugindexstats only works with native code'))
1681 raise error.Abort(_(b'debugindexstats only works with native code'))
1680 for k, v in sorted(index.stats().items()):
1682 for k, v in sorted(index.stats().items()):
1681 ui.write(b'%s: %d\n' % (k, v))
1683 ui.write(b'%s: %d\n' % (k, v))
1682
1684
1683
1685
1684 @command(b'debuginstall', [] + cmdutil.formatteropts, b'', norepo=True)
1686 @command(b'debuginstall', [] + cmdutil.formatteropts, b'', norepo=True)
1685 def debuginstall(ui, **opts):
1687 def debuginstall(ui, **opts):
1686 """test Mercurial installation
1688 """test Mercurial installation
1687
1689
1688 Returns 0 on success.
1690 Returns 0 on success.
1689 """
1691 """
1690 opts = pycompat.byteskwargs(opts)
1692 opts = pycompat.byteskwargs(opts)
1691
1693
1692 problems = 0
1694 problems = 0
1693
1695
1694 fm = ui.formatter(b'debuginstall', opts)
1696 fm = ui.formatter(b'debuginstall', opts)
1695 fm.startitem()
1697 fm.startitem()
1696
1698
1697 # encoding might be unknown or wrong. don't translate these messages.
1699 # encoding might be unknown or wrong. don't translate these messages.
1698 fm.write(b'encoding', b"checking encoding (%s)...\n", encoding.encoding)
1700 fm.write(b'encoding', b"checking encoding (%s)...\n", encoding.encoding)
1699 err = None
1701 err = None
1700 try:
1702 try:
1701 codecs.lookup(pycompat.sysstr(encoding.encoding))
1703 codecs.lookup(pycompat.sysstr(encoding.encoding))
1702 except LookupError as inst:
1704 except LookupError as inst:
1703 err = stringutil.forcebytestr(inst)
1705 err = stringutil.forcebytestr(inst)
1704 problems += 1
1706 problems += 1
1705 fm.condwrite(
1707 fm.condwrite(
1706 err,
1708 err,
1707 b'encodingerror',
1709 b'encodingerror',
1708 b" %s\n (check that your locale is properly set)\n",
1710 b" %s\n (check that your locale is properly set)\n",
1709 err,
1711 err,
1710 )
1712 )
1711
1713
1712 # Python
1714 # Python
1713 pythonlib = None
1715 pythonlib = None
1714 if util.safehasattr(os, '__file__'):
1716 if util.safehasattr(os, '__file__'):
1715 pythonlib = os.path.dirname(pycompat.fsencode(os.__file__))
1717 pythonlib = os.path.dirname(pycompat.fsencode(os.__file__))
1716 elif getattr(sys, 'oxidized', False):
1718 elif getattr(sys, 'oxidized', False):
1717 pythonlib = pycompat.sysexecutable
1719 pythonlib = pycompat.sysexecutable
1718
1720
1719 fm.write(
1721 fm.write(
1720 b'pythonexe',
1722 b'pythonexe',
1721 _(b"checking Python executable (%s)\n"),
1723 _(b"checking Python executable (%s)\n"),
1722 pycompat.sysexecutable or _(b"unknown"),
1724 pycompat.sysexecutable or _(b"unknown"),
1723 )
1725 )
1724 fm.write(
1726 fm.write(
1725 b'pythonimplementation',
1727 b'pythonimplementation',
1726 _(b"checking Python implementation (%s)\n"),
1728 _(b"checking Python implementation (%s)\n"),
1727 pycompat.sysbytes(platform.python_implementation()),
1729 pycompat.sysbytes(platform.python_implementation()),
1728 )
1730 )
1729 fm.write(
1731 fm.write(
1730 b'pythonver',
1732 b'pythonver',
1731 _(b"checking Python version (%s)\n"),
1733 _(b"checking Python version (%s)\n"),
1732 (b"%d.%d.%d" % sys.version_info[:3]),
1734 (b"%d.%d.%d" % sys.version_info[:3]),
1733 )
1735 )
1734 fm.write(
1736 fm.write(
1735 b'pythonlib',
1737 b'pythonlib',
1736 _(b"checking Python lib (%s)...\n"),
1738 _(b"checking Python lib (%s)...\n"),
1737 pythonlib or _(b"unknown"),
1739 pythonlib or _(b"unknown"),
1738 )
1740 )
1739
1741
1740 try:
1742 try:
1741 from . import rustext # pytype: disable=import-error
1743 from . import rustext # pytype: disable=import-error
1742
1744
1743 rustext.__doc__ # trigger lazy import
1745 rustext.__doc__ # trigger lazy import
1744 except ImportError:
1746 except ImportError:
1745 rustext = None
1747 rustext = None
1746
1748
1747 security = set(sslutil.supportedprotocols)
1749 security = set(sslutil.supportedprotocols)
1748 if sslutil.hassni:
1750 if sslutil.hassni:
1749 security.add(b'sni')
1751 security.add(b'sni')
1750
1752
1751 fm.write(
1753 fm.write(
1752 b'pythonsecurity',
1754 b'pythonsecurity',
1753 _(b"checking Python security support (%s)\n"),
1755 _(b"checking Python security support (%s)\n"),
1754 fm.formatlist(sorted(security), name=b'protocol', fmt=b'%s', sep=b','),
1756 fm.formatlist(sorted(security), name=b'protocol', fmt=b'%s', sep=b','),
1755 )
1757 )
1756
1758
1757 # These are warnings, not errors. So don't increment problem count. This
1759 # These are warnings, not errors. So don't increment problem count. This
1758 # may change in the future.
1760 # may change in the future.
1759 if b'tls1.2' not in security:
1761 if b'tls1.2' not in security:
1760 fm.plain(
1762 fm.plain(
1761 _(
1763 _(
1762 b' TLS 1.2 not supported by Python install; '
1764 b' TLS 1.2 not supported by Python install; '
1763 b'network connections lack modern security\n'
1765 b'network connections lack modern security\n'
1764 )
1766 )
1765 )
1767 )
1766 if b'sni' not in security:
1768 if b'sni' not in security:
1767 fm.plain(
1769 fm.plain(
1768 _(
1770 _(
1769 b' SNI not supported by Python install; may have '
1771 b' SNI not supported by Python install; may have '
1770 b'connectivity issues with some servers\n'
1772 b'connectivity issues with some servers\n'
1771 )
1773 )
1772 )
1774 )
1773
1775
1774 fm.plain(
1776 fm.plain(
1775 _(
1777 _(
1776 b"checking Rust extensions (%s)\n"
1778 b"checking Rust extensions (%s)\n"
1777 % (b'missing' if rustext is None else b'installed')
1779 % (b'missing' if rustext is None else b'installed')
1778 ),
1780 ),
1779 )
1781 )
1780
1782
1781 # TODO print CA cert info
1783 # TODO print CA cert info
1782
1784
1783 # hg version
1785 # hg version
1784 hgver = util.version()
1786 hgver = util.version()
1785 fm.write(
1787 fm.write(
1786 b'hgver', _(b"checking Mercurial version (%s)\n"), hgver.split(b'+')[0]
1788 b'hgver', _(b"checking Mercurial version (%s)\n"), hgver.split(b'+')[0]
1787 )
1789 )
1788 fm.write(
1790 fm.write(
1789 b'hgverextra',
1791 b'hgverextra',
1790 _(b"checking Mercurial custom build (%s)\n"),
1792 _(b"checking Mercurial custom build (%s)\n"),
1791 b'+'.join(hgver.split(b'+')[1:]),
1793 b'+'.join(hgver.split(b'+')[1:]),
1792 )
1794 )
1793
1795
1794 # compiled modules
1796 # compiled modules
1795 hgmodules = None
1797 hgmodules = None
1796 if util.safehasattr(sys.modules[__name__], '__file__'):
1798 if util.safehasattr(sys.modules[__name__], '__file__'):
1797 hgmodules = os.path.dirname(pycompat.fsencode(__file__))
1799 hgmodules = os.path.dirname(pycompat.fsencode(__file__))
1798 elif getattr(sys, 'oxidized', False):
1800 elif getattr(sys, 'oxidized', False):
1799 hgmodules = pycompat.sysexecutable
1801 hgmodules = pycompat.sysexecutable
1800
1802
1801 fm.write(
1803 fm.write(
1802 b'hgmodulepolicy', _(b"checking module policy (%s)\n"), policy.policy
1804 b'hgmodulepolicy', _(b"checking module policy (%s)\n"), policy.policy
1803 )
1805 )
1804 fm.write(
1806 fm.write(
1805 b'hgmodules',
1807 b'hgmodules',
1806 _(b"checking installed modules (%s)...\n"),
1808 _(b"checking installed modules (%s)...\n"),
1807 hgmodules or _(b"unknown"),
1809 hgmodules or _(b"unknown"),
1808 )
1810 )
1809
1811
1810 rustandc = policy.policy in (b'rust+c', b'rust+c-allow')
1812 rustandc = policy.policy in (b'rust+c', b'rust+c-allow')
1811 rustext = rustandc # for now, that's the only case
1813 rustext = rustandc # for now, that's the only case
1812 cext = policy.policy in (b'c', b'allow') or rustandc
1814 cext = policy.policy in (b'c', b'allow') or rustandc
1813 nopure = cext or rustext
1815 nopure = cext or rustext
1814 if nopure:
1816 if nopure:
1815 err = None
1817 err = None
1816 try:
1818 try:
1817 if cext:
1819 if cext:
1818 from .cext import ( # pytype: disable=import-error
1820 from .cext import ( # pytype: disable=import-error
1819 base85,
1821 base85,
1820 bdiff,
1822 bdiff,
1821 mpatch,
1823 mpatch,
1822 osutil,
1824 osutil,
1823 )
1825 )
1824
1826
1825 # quiet pyflakes
1827 # quiet pyflakes
1826 dir(bdiff), dir(mpatch), dir(base85), dir(osutil)
1828 dir(bdiff), dir(mpatch), dir(base85), dir(osutil)
1827 if rustext:
1829 if rustext:
1828 from .rustext import ( # pytype: disable=import-error
1830 from .rustext import ( # pytype: disable=import-error
1829 ancestor,
1831 ancestor,
1830 dirstate,
1832 dirstate,
1831 )
1833 )
1832
1834
1833 dir(ancestor), dir(dirstate) # quiet pyflakes
1835 dir(ancestor), dir(dirstate) # quiet pyflakes
1834 except Exception as inst:
1836 except Exception as inst:
1835 err = stringutil.forcebytestr(inst)
1837 err = stringutil.forcebytestr(inst)
1836 problems += 1
1838 problems += 1
1837 fm.condwrite(err, b'extensionserror', b" %s\n", err)
1839 fm.condwrite(err, b'extensionserror', b" %s\n", err)
1838
1840
1839 compengines = util.compengines._engines.values()
1841 compengines = util.compengines._engines.values()
1840 fm.write(
1842 fm.write(
1841 b'compengines',
1843 b'compengines',
1842 _(b'checking registered compression engines (%s)\n'),
1844 _(b'checking registered compression engines (%s)\n'),
1843 fm.formatlist(
1845 fm.formatlist(
1844 sorted(e.name() for e in compengines),
1846 sorted(e.name() for e in compengines),
1845 name=b'compengine',
1847 name=b'compengine',
1846 fmt=b'%s',
1848 fmt=b'%s',
1847 sep=b', ',
1849 sep=b', ',
1848 ),
1850 ),
1849 )
1851 )
1850 fm.write(
1852 fm.write(
1851 b'compenginesavail',
1853 b'compenginesavail',
1852 _(b'checking available compression engines (%s)\n'),
1854 _(b'checking available compression engines (%s)\n'),
1853 fm.formatlist(
1855 fm.formatlist(
1854 sorted(e.name() for e in compengines if e.available()),
1856 sorted(e.name() for e in compengines if e.available()),
1855 name=b'compengine',
1857 name=b'compengine',
1856 fmt=b'%s',
1858 fmt=b'%s',
1857 sep=b', ',
1859 sep=b', ',
1858 ),
1860 ),
1859 )
1861 )
1860 wirecompengines = compression.compengines.supportedwireengines(
1862 wirecompengines = compression.compengines.supportedwireengines(
1861 compression.SERVERROLE
1863 compression.SERVERROLE
1862 )
1864 )
1863 fm.write(
1865 fm.write(
1864 b'compenginesserver',
1866 b'compenginesserver',
1865 _(
1867 _(
1866 b'checking available compression engines '
1868 b'checking available compression engines '
1867 b'for wire protocol (%s)\n'
1869 b'for wire protocol (%s)\n'
1868 ),
1870 ),
1869 fm.formatlist(
1871 fm.formatlist(
1870 [e.name() for e in wirecompengines if e.wireprotosupport()],
1872 [e.name() for e in wirecompengines if e.wireprotosupport()],
1871 name=b'compengine',
1873 name=b'compengine',
1872 fmt=b'%s',
1874 fmt=b'%s',
1873 sep=b', ',
1875 sep=b', ',
1874 ),
1876 ),
1875 )
1877 )
1876 re2 = b'missing'
1878 re2 = b'missing'
1877 if util._re2:
1879 if util._re2:
1878 re2 = b'available'
1880 re2 = b'available'
1879 fm.plain(_(b'checking "re2" regexp engine (%s)\n') % re2)
1881 fm.plain(_(b'checking "re2" regexp engine (%s)\n') % re2)
1880 fm.data(re2=bool(util._re2))
1882 fm.data(re2=bool(util._re2))
1881
1883
1882 # templates
1884 # templates
1883 p = templater.templatedir()
1885 p = templater.templatedir()
1884 fm.write(b'templatedirs', b'checking templates (%s)...\n', p or b'')
1886 fm.write(b'templatedirs', b'checking templates (%s)...\n', p or b'')
1885 fm.condwrite(not p, b'', _(b" no template directories found\n"))
1887 fm.condwrite(not p, b'', _(b" no template directories found\n"))
1886 if p:
1888 if p:
1887 (m, fp) = templater.try_open_template(b"map-cmdline.default")
1889 (m, fp) = templater.try_open_template(b"map-cmdline.default")
1888 if m:
1890 if m:
1889 # template found, check if it is working
1891 # template found, check if it is working
1890 err = None
1892 err = None
1891 try:
1893 try:
1892 templater.templater.frommapfile(m)
1894 templater.templater.frommapfile(m)
1893 except Exception as inst:
1895 except Exception as inst:
1894 err = stringutil.forcebytestr(inst)
1896 err = stringutil.forcebytestr(inst)
1895 p = None
1897 p = None
1896 fm.condwrite(err, b'defaulttemplateerror', b" %s\n", err)
1898 fm.condwrite(err, b'defaulttemplateerror', b" %s\n", err)
1897 else:
1899 else:
1898 p = None
1900 p = None
1899 fm.condwrite(
1901 fm.condwrite(
1900 p, b'defaulttemplate', _(b"checking default template (%s)\n"), m
1902 p, b'defaulttemplate', _(b"checking default template (%s)\n"), m
1901 )
1903 )
1902 fm.condwrite(
1904 fm.condwrite(
1903 not m,
1905 not m,
1904 b'defaulttemplatenotfound',
1906 b'defaulttemplatenotfound',
1905 _(b" template '%s' not found\n"),
1907 _(b" template '%s' not found\n"),
1906 b"default",
1908 b"default",
1907 )
1909 )
1908 if not p:
1910 if not p:
1909 problems += 1
1911 problems += 1
1910 fm.condwrite(
1912 fm.condwrite(
1911 not p, b'', _(b" (templates seem to have been installed incorrectly)\n")
1913 not p, b'', _(b" (templates seem to have been installed incorrectly)\n")
1912 )
1914 )
1913
1915
1914 # editor
1916 # editor
1915 editor = ui.geteditor()
1917 editor = ui.geteditor()
1916 editor = util.expandpath(editor)
1918 editor = util.expandpath(editor)
1917 editorbin = procutil.shellsplit(editor)[0]
1919 editorbin = procutil.shellsplit(editor)[0]
1918 fm.write(b'editor', _(b"checking commit editor... (%s)\n"), editorbin)
1920 fm.write(b'editor', _(b"checking commit editor... (%s)\n"), editorbin)
1919 cmdpath = procutil.findexe(editorbin)
1921 cmdpath = procutil.findexe(editorbin)
1920 fm.condwrite(
1922 fm.condwrite(
1921 not cmdpath and editor == b'vi',
1923 not cmdpath and editor == b'vi',
1922 b'vinotfound',
1924 b'vinotfound',
1923 _(
1925 _(
1924 b" No commit editor set and can't find %s in PATH\n"
1926 b" No commit editor set and can't find %s in PATH\n"
1925 b" (specify a commit editor in your configuration"
1927 b" (specify a commit editor in your configuration"
1926 b" file)\n"
1928 b" file)\n"
1927 ),
1929 ),
1928 not cmdpath and editor == b'vi' and editorbin,
1930 not cmdpath and editor == b'vi' and editorbin,
1929 )
1931 )
1930 fm.condwrite(
1932 fm.condwrite(
1931 not cmdpath and editor != b'vi',
1933 not cmdpath and editor != b'vi',
1932 b'editornotfound',
1934 b'editornotfound',
1933 _(
1935 _(
1934 b" Can't find editor '%s' in PATH\n"
1936 b" Can't find editor '%s' in PATH\n"
1935 b" (specify a commit editor in your configuration"
1937 b" (specify a commit editor in your configuration"
1936 b" file)\n"
1938 b" file)\n"
1937 ),
1939 ),
1938 not cmdpath and editorbin,
1940 not cmdpath and editorbin,
1939 )
1941 )
1940 if not cmdpath and editor != b'vi':
1942 if not cmdpath and editor != b'vi':
1941 problems += 1
1943 problems += 1
1942
1944
1943 # check username
1945 # check username
1944 username = None
1946 username = None
1945 err = None
1947 err = None
1946 try:
1948 try:
1947 username = ui.username()
1949 username = ui.username()
1948 except error.Abort as e:
1950 except error.Abort as e:
1949 err = e.message
1951 err = e.message
1950 problems += 1
1952 problems += 1
1951
1953
1952 fm.condwrite(
1954 fm.condwrite(
1953 username, b'username', _(b"checking username (%s)\n"), username
1955 username, b'username', _(b"checking username (%s)\n"), username
1954 )
1956 )
1955 fm.condwrite(
1957 fm.condwrite(
1956 err,
1958 err,
1957 b'usernameerror',
1959 b'usernameerror',
1958 _(
1960 _(
1959 b"checking username...\n %s\n"
1961 b"checking username...\n %s\n"
1960 b" (specify a username in your configuration file)\n"
1962 b" (specify a username in your configuration file)\n"
1961 ),
1963 ),
1962 err,
1964 err,
1963 )
1965 )
1964
1966
1965 for name, mod in extensions.extensions():
1967 for name, mod in extensions.extensions():
1966 handler = getattr(mod, 'debuginstall', None)
1968 handler = getattr(mod, 'debuginstall', None)
1967 if handler is not None:
1969 if handler is not None:
1968 problems += handler(ui, fm)
1970 problems += handler(ui, fm)
1969
1971
1970 fm.condwrite(not problems, b'', _(b"no problems detected\n"))
1972 fm.condwrite(not problems, b'', _(b"no problems detected\n"))
1971 if not problems:
1973 if not problems:
1972 fm.data(problems=problems)
1974 fm.data(problems=problems)
1973 fm.condwrite(
1975 fm.condwrite(
1974 problems,
1976 problems,
1975 b'problems',
1977 b'problems',
1976 _(b"%d problems detected, please check your install!\n"),
1978 _(b"%d problems detected, please check your install!\n"),
1977 problems,
1979 problems,
1978 )
1980 )
1979 fm.end()
1981 fm.end()
1980
1982
1981 return problems
1983 return problems
1982
1984
1983
1985
1984 @command(b'debugknown', [], _(b'REPO ID...'), norepo=True)
1986 @command(b'debugknown', [], _(b'REPO ID...'), norepo=True)
1985 def debugknown(ui, repopath, *ids, **opts):
1987 def debugknown(ui, repopath, *ids, **opts):
1986 """test whether node ids are known to a repo
1988 """test whether node ids are known to a repo
1987
1989
1988 Every ID must be a full-length hex node id string. Returns a list of 0s
1990 Every ID must be a full-length hex node id string. Returns a list of 0s
1989 and 1s indicating unknown/known.
1991 and 1s indicating unknown/known.
1990 """
1992 """
1991 opts = pycompat.byteskwargs(opts)
1993 opts = pycompat.byteskwargs(opts)
1992 repo = hg.peer(ui, opts, repopath)
1994 repo = hg.peer(ui, opts, repopath)
1993 if not repo.capable(b'known'):
1995 if not repo.capable(b'known'):
1994 raise error.Abort(b"known() not supported by target repository")
1996 raise error.Abort(b"known() not supported by target repository")
1995 flags = repo.known([bin(s) for s in ids])
1997 flags = repo.known([bin(s) for s in ids])
1996 ui.write(b"%s\n" % (b"".join([f and b"1" or b"0" for f in flags])))
1998 ui.write(b"%s\n" % (b"".join([f and b"1" or b"0" for f in flags])))
1997
1999
1998
2000
1999 @command(b'debuglabelcomplete', [], _(b'LABEL...'))
2001 @command(b'debuglabelcomplete', [], _(b'LABEL...'))
2000 def debuglabelcomplete(ui, repo, *args):
2002 def debuglabelcomplete(ui, repo, *args):
2001 '''backwards compatibility with old bash completion scripts (DEPRECATED)'''
2003 '''backwards compatibility with old bash completion scripts (DEPRECATED)'''
2002 debugnamecomplete(ui, repo, *args)
2004 debugnamecomplete(ui, repo, *args)
2003
2005
2004
2006
2005 @command(
2007 @command(
2006 b'debuglocks',
2008 b'debuglocks',
2007 [
2009 [
2008 (b'L', b'force-free-lock', None, _(b'free the store lock (DANGEROUS)')),
2010 (b'L', b'force-free-lock', None, _(b'free the store lock (DANGEROUS)')),
2009 (
2011 (
2010 b'W',
2012 b'W',
2011 b'force-free-wlock',
2013 b'force-free-wlock',
2012 None,
2014 None,
2013 _(b'free the working state lock (DANGEROUS)'),
2015 _(b'free the working state lock (DANGEROUS)'),
2014 ),
2016 ),
2015 (b's', b'set-lock', None, _(b'set the store lock until stopped')),
2017 (b's', b'set-lock', None, _(b'set the store lock until stopped')),
2016 (
2018 (
2017 b'S',
2019 b'S',
2018 b'set-wlock',
2020 b'set-wlock',
2019 None,
2021 None,
2020 _(b'set the working state lock until stopped'),
2022 _(b'set the working state lock until stopped'),
2021 ),
2023 ),
2022 ],
2024 ],
2023 _(b'[OPTION]...'),
2025 _(b'[OPTION]...'),
2024 )
2026 )
2025 def debuglocks(ui, repo, **opts):
2027 def debuglocks(ui, repo, **opts):
2026 """show or modify state of locks
2028 """show or modify state of locks
2027
2029
2028 By default, this command will show which locks are held. This
2030 By default, this command will show which locks are held. This
2029 includes the user and process holding the lock, the amount of time
2031 includes the user and process holding the lock, the amount of time
2030 the lock has been held, and the machine name where the process is
2032 the lock has been held, and the machine name where the process is
2031 running if it's not local.
2033 running if it's not local.
2032
2034
2033 Locks protect the integrity of Mercurial's data, so should be
2035 Locks protect the integrity of Mercurial's data, so should be
2034 treated with care. System crashes or other interruptions may cause
2036 treated with care. System crashes or other interruptions may cause
2035 locks to not be properly released, though Mercurial will usually
2037 locks to not be properly released, though Mercurial will usually
2036 detect and remove such stale locks automatically.
2038 detect and remove such stale locks automatically.
2037
2039
2038 However, detecting stale locks may not always be possible (for
2040 However, detecting stale locks may not always be possible (for
2039 instance, on a shared filesystem). Removing locks may also be
2041 instance, on a shared filesystem). Removing locks may also be
2040 blocked by filesystem permissions.
2042 blocked by filesystem permissions.
2041
2043
2042 Setting a lock will prevent other commands from changing the data.
2044 Setting a lock will prevent other commands from changing the data.
2043 The command will wait until an interruption (SIGINT, SIGTERM, ...) occurs.
2045 The command will wait until an interruption (SIGINT, SIGTERM, ...) occurs.
2044 The set locks are removed when the command exits.
2046 The set locks are removed when the command exits.
2045
2047
2046 Returns 0 if no locks are held.
2048 Returns 0 if no locks are held.
2047
2049
2048 """
2050 """
2049
2051
2050 if opts.get('force_free_lock'):
2052 if opts.get('force_free_lock'):
2051 repo.svfs.unlink(b'lock')
2053 repo.svfs.unlink(b'lock')
2052 if opts.get('force_free_wlock'):
2054 if opts.get('force_free_wlock'):
2053 repo.vfs.unlink(b'wlock')
2055 repo.vfs.unlink(b'wlock')
2054 if opts.get('force_free_lock') or opts.get('force_free_wlock'):
2056 if opts.get('force_free_lock') or opts.get('force_free_wlock'):
2055 return 0
2057 return 0
2056
2058
2057 locks = []
2059 locks = []
2058 try:
2060 try:
2059 if opts.get('set_wlock'):
2061 if opts.get('set_wlock'):
2060 try:
2062 try:
2061 locks.append(repo.wlock(False))
2063 locks.append(repo.wlock(False))
2062 except error.LockHeld:
2064 except error.LockHeld:
2063 raise error.Abort(_(b'wlock is already held'))
2065 raise error.Abort(_(b'wlock is already held'))
2064 if opts.get('set_lock'):
2066 if opts.get('set_lock'):
2065 try:
2067 try:
2066 locks.append(repo.lock(False))
2068 locks.append(repo.lock(False))
2067 except error.LockHeld:
2069 except error.LockHeld:
2068 raise error.Abort(_(b'lock is already held'))
2070 raise error.Abort(_(b'lock is already held'))
2069 if len(locks):
2071 if len(locks):
2070 ui.promptchoice(_(b"ready to release the lock (y)? $$ &Yes"))
2072 ui.promptchoice(_(b"ready to release the lock (y)? $$ &Yes"))
2071 return 0
2073 return 0
2072 finally:
2074 finally:
2073 release(*locks)
2075 release(*locks)
2074
2076
2075 now = time.time()
2077 now = time.time()
2076 held = 0
2078 held = 0
2077
2079
2078 def report(vfs, name, method):
2080 def report(vfs, name, method):
2079 # this causes stale locks to get reaped for more accurate reporting
2081 # this causes stale locks to get reaped for more accurate reporting
2080 try:
2082 try:
2081 l = method(False)
2083 l = method(False)
2082 except error.LockHeld:
2084 except error.LockHeld:
2083 l = None
2085 l = None
2084
2086
2085 if l:
2087 if l:
2086 l.release()
2088 l.release()
2087 else:
2089 else:
2088 try:
2090 try:
2089 st = vfs.lstat(name)
2091 st = vfs.lstat(name)
2090 age = now - st[stat.ST_MTIME]
2092 age = now - st[stat.ST_MTIME]
2091 user = util.username(st.st_uid)
2093 user = util.username(st.st_uid)
2092 locker = vfs.readlock(name)
2094 locker = vfs.readlock(name)
2093 if b":" in locker:
2095 if b":" in locker:
2094 host, pid = locker.split(b':')
2096 host, pid = locker.split(b':')
2095 if host == socket.gethostname():
2097 if host == socket.gethostname():
2096 locker = b'user %s, process %s' % (user or b'None', pid)
2098 locker = b'user %s, process %s' % (user or b'None', pid)
2097 else:
2099 else:
2098 locker = b'user %s, process %s, host %s' % (
2100 locker = b'user %s, process %s, host %s' % (
2099 user or b'None',
2101 user or b'None',
2100 pid,
2102 pid,
2101 host,
2103 host,
2102 )
2104 )
2103 ui.writenoi18n(b"%-6s %s (%ds)\n" % (name + b":", locker, age))
2105 ui.writenoi18n(b"%-6s %s (%ds)\n" % (name + b":", locker, age))
2104 return 1
2106 return 1
2105 except OSError as e:
2107 except OSError as e:
2106 if e.errno != errno.ENOENT:
2108 if e.errno != errno.ENOENT:
2107 raise
2109 raise
2108
2110
2109 ui.writenoi18n(b"%-6s free\n" % (name + b":"))
2111 ui.writenoi18n(b"%-6s free\n" % (name + b":"))
2110 return 0
2112 return 0
2111
2113
2112 held += report(repo.svfs, b"lock", repo.lock)
2114 held += report(repo.svfs, b"lock", repo.lock)
2113 held += report(repo.vfs, b"wlock", repo.wlock)
2115 held += report(repo.vfs, b"wlock", repo.wlock)
2114
2116
2115 return held
2117 return held
2116
2118
2117
2119
2118 @command(
2120 @command(
2119 b'debugmanifestfulltextcache',
2121 b'debugmanifestfulltextcache',
2120 [
2122 [
2121 (b'', b'clear', False, _(b'clear the cache')),
2123 (b'', b'clear', False, _(b'clear the cache')),
2122 (
2124 (
2123 b'a',
2125 b'a',
2124 b'add',
2126 b'add',
2125 [],
2127 [],
2126 _(b'add the given manifest nodes to the cache'),
2128 _(b'add the given manifest nodes to the cache'),
2127 _(b'NODE'),
2129 _(b'NODE'),
2128 ),
2130 ),
2129 ],
2131 ],
2130 b'',
2132 b'',
2131 )
2133 )
2132 def debugmanifestfulltextcache(ui, repo, add=(), **opts):
2134 def debugmanifestfulltextcache(ui, repo, add=(), **opts):
2133 """show, clear or amend the contents of the manifest fulltext cache"""
2135 """show, clear or amend the contents of the manifest fulltext cache"""
2134
2136
2135 def getcache():
2137 def getcache():
2136 r = repo.manifestlog.getstorage(b'')
2138 r = repo.manifestlog.getstorage(b'')
2137 try:
2139 try:
2138 return r._fulltextcache
2140 return r._fulltextcache
2139 except AttributeError:
2141 except AttributeError:
2140 msg = _(
2142 msg = _(
2141 b"Current revlog implementation doesn't appear to have a "
2143 b"Current revlog implementation doesn't appear to have a "
2142 b"manifest fulltext cache\n"
2144 b"manifest fulltext cache\n"
2143 )
2145 )
2144 raise error.Abort(msg)
2146 raise error.Abort(msg)
2145
2147
2146 if opts.get('clear'):
2148 if opts.get('clear'):
2147 with repo.wlock():
2149 with repo.wlock():
2148 cache = getcache()
2150 cache = getcache()
2149 cache.clear(clear_persisted_data=True)
2151 cache.clear(clear_persisted_data=True)
2150 return
2152 return
2151
2153
2152 if add:
2154 if add:
2153 with repo.wlock():
2155 with repo.wlock():
2154 m = repo.manifestlog
2156 m = repo.manifestlog
2155 store = m.getstorage(b'')
2157 store = m.getstorage(b'')
2156 for n in add:
2158 for n in add:
2157 try:
2159 try:
2158 manifest = m[store.lookup(n)]
2160 manifest = m[store.lookup(n)]
2159 except error.LookupError as e:
2161 except error.LookupError as e:
2160 raise error.Abort(
2162 raise error.Abort(
2161 bytes(e), hint=b"Check your manifest node id"
2163 bytes(e), hint=b"Check your manifest node id"
2162 )
2164 )
2163 manifest.read() # stores revisision in cache too
2165 manifest.read() # stores revisision in cache too
2164 return
2166 return
2165
2167
2166 cache = getcache()
2168 cache = getcache()
2167 if not len(cache):
2169 if not len(cache):
2168 ui.write(_(b'cache empty\n'))
2170 ui.write(_(b'cache empty\n'))
2169 else:
2171 else:
2170 ui.write(
2172 ui.write(
2171 _(
2173 _(
2172 b'cache contains %d manifest entries, in order of most to '
2174 b'cache contains %d manifest entries, in order of most to '
2173 b'least recent:\n'
2175 b'least recent:\n'
2174 )
2176 )
2175 % (len(cache),)
2177 % (len(cache),)
2176 )
2178 )
2177 totalsize = 0
2179 totalsize = 0
2178 for nodeid in cache:
2180 for nodeid in cache:
2179 # Use cache.get to not update the LRU order
2181 # Use cache.get to not update the LRU order
2180 data = cache.peek(nodeid)
2182 data = cache.peek(nodeid)
2181 size = len(data)
2183 size = len(data)
2182 totalsize += size + 24 # 20 bytes nodeid, 4 bytes size
2184 totalsize += size + 24 # 20 bytes nodeid, 4 bytes size
2183 ui.write(
2185 ui.write(
2184 _(b'id: %s, size %s\n') % (hex(nodeid), util.bytecount(size))
2186 _(b'id: %s, size %s\n') % (hex(nodeid), util.bytecount(size))
2185 )
2187 )
2186 ondisk = cache._opener.stat(b'manifestfulltextcache').st_size
2188 ondisk = cache._opener.stat(b'manifestfulltextcache').st_size
2187 ui.write(
2189 ui.write(
2188 _(b'total cache data size %s, on-disk %s\n')
2190 _(b'total cache data size %s, on-disk %s\n')
2189 % (util.bytecount(totalsize), util.bytecount(ondisk))
2191 % (util.bytecount(totalsize), util.bytecount(ondisk))
2190 )
2192 )
2191
2193
2192
2194
2193 @command(b'debugmergestate', [] + cmdutil.templateopts, b'')
2195 @command(b'debugmergestate', [] + cmdutil.templateopts, b'')
2194 def debugmergestate(ui, repo, *args, **opts):
2196 def debugmergestate(ui, repo, *args, **opts):
2195 """print merge state
2197 """print merge state
2196
2198
2197 Use --verbose to print out information about whether v1 or v2 merge state
2199 Use --verbose to print out information about whether v1 or v2 merge state
2198 was chosen."""
2200 was chosen."""
2199
2201
2200 if ui.verbose:
2202 if ui.verbose:
2201 ms = mergestatemod.mergestate(repo)
2203 ms = mergestatemod.mergestate(repo)
2202
2204
2203 # sort so that reasonable information is on top
2205 # sort so that reasonable information is on top
2204 v1records = ms._readrecordsv1()
2206 v1records = ms._readrecordsv1()
2205 v2records = ms._readrecordsv2()
2207 v2records = ms._readrecordsv2()
2206
2208
2207 if not v1records and not v2records:
2209 if not v1records and not v2records:
2208 pass
2210 pass
2209 elif not v2records:
2211 elif not v2records:
2210 ui.writenoi18n(b'no version 2 merge state\n')
2212 ui.writenoi18n(b'no version 2 merge state\n')
2211 elif ms._v1v2match(v1records, v2records):
2213 elif ms._v1v2match(v1records, v2records):
2212 ui.writenoi18n(b'v1 and v2 states match: using v2\n')
2214 ui.writenoi18n(b'v1 and v2 states match: using v2\n')
2213 else:
2215 else:
2214 ui.writenoi18n(b'v1 and v2 states mismatch: using v1\n')
2216 ui.writenoi18n(b'v1 and v2 states mismatch: using v1\n')
2215
2217
2216 opts = pycompat.byteskwargs(opts)
2218 opts = pycompat.byteskwargs(opts)
2217 if not opts[b'template']:
2219 if not opts[b'template']:
2218 opts[b'template'] = (
2220 opts[b'template'] = (
2219 b'{if(commits, "", "no merge state found\n")}'
2221 b'{if(commits, "", "no merge state found\n")}'
2220 b'{commits % "{name}{if(label, " ({label})")}: {node}\n"}'
2222 b'{commits % "{name}{if(label, " ({label})")}: {node}\n"}'
2221 b'{files % "file: {path} (state \\"{state}\\")\n'
2223 b'{files % "file: {path} (state \\"{state}\\")\n'
2222 b'{if(local_path, "'
2224 b'{if(local_path, "'
2223 b' local path: {local_path} (hash {local_key}, flags \\"{local_flags}\\")\n'
2225 b' local path: {local_path} (hash {local_key}, flags \\"{local_flags}\\")\n'
2224 b' ancestor path: {ancestor_path} (node {ancestor_node})\n'
2226 b' ancestor path: {ancestor_path} (node {ancestor_node})\n'
2225 b' other path: {other_path} (node {other_node})\n'
2227 b' other path: {other_path} (node {other_node})\n'
2226 b'")}'
2228 b'")}'
2227 b'{if(rename_side, "'
2229 b'{if(rename_side, "'
2228 b' rename side: {rename_side}\n'
2230 b' rename side: {rename_side}\n'
2229 b' renamed path: {renamed_path}\n'
2231 b' renamed path: {renamed_path}\n'
2230 b'")}'
2232 b'")}'
2231 b'{extras % " extra: {key} = {value}\n"}'
2233 b'{extras % " extra: {key} = {value}\n"}'
2232 b'"}'
2234 b'"}'
2233 b'{extras % "extra: {file} ({key} = {value})\n"}'
2235 b'{extras % "extra: {file} ({key} = {value})\n"}'
2234 )
2236 )
2235
2237
2236 ms = mergestatemod.mergestate.read(repo)
2238 ms = mergestatemod.mergestate.read(repo)
2237
2239
2238 fm = ui.formatter(b'debugmergestate', opts)
2240 fm = ui.formatter(b'debugmergestate', opts)
2239 fm.startitem()
2241 fm.startitem()
2240
2242
2241 fm_commits = fm.nested(b'commits')
2243 fm_commits = fm.nested(b'commits')
2242 if ms.active():
2244 if ms.active():
2243 for name, node, label_index in (
2245 for name, node, label_index in (
2244 (b'local', ms.local, 0),
2246 (b'local', ms.local, 0),
2245 (b'other', ms.other, 1),
2247 (b'other', ms.other, 1),
2246 ):
2248 ):
2247 fm_commits.startitem()
2249 fm_commits.startitem()
2248 fm_commits.data(name=name)
2250 fm_commits.data(name=name)
2249 fm_commits.data(node=hex(node))
2251 fm_commits.data(node=hex(node))
2250 if ms._labels and len(ms._labels) > label_index:
2252 if ms._labels and len(ms._labels) > label_index:
2251 fm_commits.data(label=ms._labels[label_index])
2253 fm_commits.data(label=ms._labels[label_index])
2252 fm_commits.end()
2254 fm_commits.end()
2253
2255
2254 fm_files = fm.nested(b'files')
2256 fm_files = fm.nested(b'files')
2255 if ms.active():
2257 if ms.active():
2256 for f in ms:
2258 for f in ms:
2257 fm_files.startitem()
2259 fm_files.startitem()
2258 fm_files.data(path=f)
2260 fm_files.data(path=f)
2259 state = ms._state[f]
2261 state = ms._state[f]
2260 fm_files.data(state=state[0])
2262 fm_files.data(state=state[0])
2261 if state[0] in (
2263 if state[0] in (
2262 mergestatemod.MERGE_RECORD_UNRESOLVED,
2264 mergestatemod.MERGE_RECORD_UNRESOLVED,
2263 mergestatemod.MERGE_RECORD_RESOLVED,
2265 mergestatemod.MERGE_RECORD_RESOLVED,
2264 ):
2266 ):
2265 fm_files.data(local_key=state[1])
2267 fm_files.data(local_key=state[1])
2266 fm_files.data(local_path=state[2])
2268 fm_files.data(local_path=state[2])
2267 fm_files.data(ancestor_path=state[3])
2269 fm_files.data(ancestor_path=state[3])
2268 fm_files.data(ancestor_node=state[4])
2270 fm_files.data(ancestor_node=state[4])
2269 fm_files.data(other_path=state[5])
2271 fm_files.data(other_path=state[5])
2270 fm_files.data(other_node=state[6])
2272 fm_files.data(other_node=state[6])
2271 fm_files.data(local_flags=state[7])
2273 fm_files.data(local_flags=state[7])
2272 elif state[0] in (
2274 elif state[0] in (
2273 mergestatemod.MERGE_RECORD_UNRESOLVED_PATH,
2275 mergestatemod.MERGE_RECORD_UNRESOLVED_PATH,
2274 mergestatemod.MERGE_RECORD_RESOLVED_PATH,
2276 mergestatemod.MERGE_RECORD_RESOLVED_PATH,
2275 ):
2277 ):
2276 fm_files.data(renamed_path=state[1])
2278 fm_files.data(renamed_path=state[1])
2277 fm_files.data(rename_side=state[2])
2279 fm_files.data(rename_side=state[2])
2278 fm_extras = fm_files.nested(b'extras')
2280 fm_extras = fm_files.nested(b'extras')
2279 for k, v in sorted(ms.extras(f).items()):
2281 for k, v in sorted(ms.extras(f).items()):
2280 fm_extras.startitem()
2282 fm_extras.startitem()
2281 fm_extras.data(key=k)
2283 fm_extras.data(key=k)
2282 fm_extras.data(value=v)
2284 fm_extras.data(value=v)
2283 fm_extras.end()
2285 fm_extras.end()
2284
2286
2285 fm_files.end()
2287 fm_files.end()
2286
2288
2287 fm_extras = fm.nested(b'extras')
2289 fm_extras = fm.nested(b'extras')
2288 for f, d in sorted(pycompat.iteritems(ms.allextras())):
2290 for f, d in sorted(pycompat.iteritems(ms.allextras())):
2289 if f in ms:
2291 if f in ms:
2290 # If file is in mergestate, we have already processed it's extras
2292 # If file is in mergestate, we have already processed it's extras
2291 continue
2293 continue
2292 for k, v in pycompat.iteritems(d):
2294 for k, v in pycompat.iteritems(d):
2293 fm_extras.startitem()
2295 fm_extras.startitem()
2294 fm_extras.data(file=f)
2296 fm_extras.data(file=f)
2295 fm_extras.data(key=k)
2297 fm_extras.data(key=k)
2296 fm_extras.data(value=v)
2298 fm_extras.data(value=v)
2297 fm_extras.end()
2299 fm_extras.end()
2298
2300
2299 fm.end()
2301 fm.end()
2300
2302
2301
2303
2302 @command(b'debugnamecomplete', [], _(b'NAME...'))
2304 @command(b'debugnamecomplete', [], _(b'NAME...'))
2303 def debugnamecomplete(ui, repo, *args):
2305 def debugnamecomplete(ui, repo, *args):
2304 '''complete "names" - tags, open branch names, bookmark names'''
2306 '''complete "names" - tags, open branch names, bookmark names'''
2305
2307
2306 names = set()
2308 names = set()
2307 # since we previously only listed open branches, we will handle that
2309 # since we previously only listed open branches, we will handle that
2308 # specially (after this for loop)
2310 # specially (after this for loop)
2309 for name, ns in pycompat.iteritems(repo.names):
2311 for name, ns in pycompat.iteritems(repo.names):
2310 if name != b'branches':
2312 if name != b'branches':
2311 names.update(ns.listnames(repo))
2313 names.update(ns.listnames(repo))
2312 names.update(
2314 names.update(
2313 tag
2315 tag
2314 for (tag, heads, tip, closed) in repo.branchmap().iterbranches()
2316 for (tag, heads, tip, closed) in repo.branchmap().iterbranches()
2315 if not closed
2317 if not closed
2316 )
2318 )
2317 completions = set()
2319 completions = set()
2318 if not args:
2320 if not args:
2319 args = [b'']
2321 args = [b'']
2320 for a in args:
2322 for a in args:
2321 completions.update(n for n in names if n.startswith(a))
2323 completions.update(n for n in names if n.startswith(a))
2322 ui.write(b'\n'.join(sorted(completions)))
2324 ui.write(b'\n'.join(sorted(completions)))
2323 ui.write(b'\n')
2325 ui.write(b'\n')
2324
2326
2325
2327
2326 @command(
2328 @command(
2327 b'debugnodemap',
2329 b'debugnodemap',
2328 [
2330 [
2329 (
2331 (
2330 b'',
2332 b'',
2331 b'dump-new',
2333 b'dump-new',
2332 False,
2334 False,
2333 _(b'write a (new) persistent binary nodemap on stdout'),
2335 _(b'write a (new) persistent binary nodemap on stdout'),
2334 ),
2336 ),
2335 (b'', b'dump-disk', False, _(b'dump on-disk data on stdout')),
2337 (b'', b'dump-disk', False, _(b'dump on-disk data on stdout')),
2336 (
2338 (
2337 b'',
2339 b'',
2338 b'check',
2340 b'check',
2339 False,
2341 False,
2340 _(b'check that the data on disk data are correct.'),
2342 _(b'check that the data on disk data are correct.'),
2341 ),
2343 ),
2342 (
2344 (
2343 b'',
2345 b'',
2344 b'metadata',
2346 b'metadata',
2345 False,
2347 False,
2346 _(b'display the on disk meta data for the nodemap'),
2348 _(b'display the on disk meta data for the nodemap'),
2347 ),
2349 ),
2348 ],
2350 ],
2349 )
2351 )
2350 def debugnodemap(ui, repo, **opts):
2352 def debugnodemap(ui, repo, **opts):
2351 """write and inspect on disk nodemap"""
2353 """write and inspect on disk nodemap"""
2352 if opts['dump_new']:
2354 if opts['dump_new']:
2353 unfi = repo.unfiltered()
2355 unfi = repo.unfiltered()
2354 cl = unfi.changelog
2356 cl = unfi.changelog
2355 if util.safehasattr(cl.index, "nodemap_data_all"):
2357 if util.safehasattr(cl.index, "nodemap_data_all"):
2356 data = cl.index.nodemap_data_all()
2358 data = cl.index.nodemap_data_all()
2357 else:
2359 else:
2358 data = nodemap.persistent_data(cl.index)
2360 data = nodemap.persistent_data(cl.index)
2359 ui.write(data)
2361 ui.write(data)
2360 elif opts['dump_disk']:
2362 elif opts['dump_disk']:
2361 unfi = repo.unfiltered()
2363 unfi = repo.unfiltered()
2362 cl = unfi.changelog
2364 cl = unfi.changelog
2363 nm_data = nodemap.persisted_data(cl)
2365 nm_data = nodemap.persisted_data(cl)
2364 if nm_data is not None:
2366 if nm_data is not None:
2365 docket, data = nm_data
2367 docket, data = nm_data
2366 ui.write(data[:])
2368 ui.write(data[:])
2367 elif opts['check']:
2369 elif opts['check']:
2368 unfi = repo.unfiltered()
2370 unfi = repo.unfiltered()
2369 cl = unfi.changelog
2371 cl = unfi.changelog
2370 nm_data = nodemap.persisted_data(cl)
2372 nm_data = nodemap.persisted_data(cl)
2371 if nm_data is not None:
2373 if nm_data is not None:
2372 docket, data = nm_data
2374 docket, data = nm_data
2373 return nodemap.check_data(ui, cl.index, data)
2375 return nodemap.check_data(ui, cl.index, data)
2374 elif opts['metadata']:
2376 elif opts['metadata']:
2375 unfi = repo.unfiltered()
2377 unfi = repo.unfiltered()
2376 cl = unfi.changelog
2378 cl = unfi.changelog
2377 nm_data = nodemap.persisted_data(cl)
2379 nm_data = nodemap.persisted_data(cl)
2378 if nm_data is not None:
2380 if nm_data is not None:
2379 docket, data = nm_data
2381 docket, data = nm_data
2380 ui.write((b"uid: %s\n") % docket.uid)
2382 ui.write((b"uid: %s\n") % docket.uid)
2381 ui.write((b"tip-rev: %d\n") % docket.tip_rev)
2383 ui.write((b"tip-rev: %d\n") % docket.tip_rev)
2382 ui.write((b"tip-node: %s\n") % hex(docket.tip_node))
2384 ui.write((b"tip-node: %s\n") % hex(docket.tip_node))
2383 ui.write((b"data-length: %d\n") % docket.data_length)
2385 ui.write((b"data-length: %d\n") % docket.data_length)
2384 ui.write((b"data-unused: %d\n") % docket.data_unused)
2386 ui.write((b"data-unused: %d\n") % docket.data_unused)
2385 unused_perc = docket.data_unused * 100.0 / docket.data_length
2387 unused_perc = docket.data_unused * 100.0 / docket.data_length
2386 ui.write((b"data-unused: %2.3f%%\n") % unused_perc)
2388 ui.write((b"data-unused: %2.3f%%\n") % unused_perc)
2387
2389
2388
2390
2389 @command(
2391 @command(
2390 b'debugobsolete',
2392 b'debugobsolete',
2391 [
2393 [
2392 (b'', b'flags', 0, _(b'markers flag')),
2394 (b'', b'flags', 0, _(b'markers flag')),
2393 (
2395 (
2394 b'',
2396 b'',
2395 b'record-parents',
2397 b'record-parents',
2396 False,
2398 False,
2397 _(b'record parent information for the precursor'),
2399 _(b'record parent information for the precursor'),
2398 ),
2400 ),
2399 (b'r', b'rev', [], _(b'display markers relevant to REV')),
2401 (b'r', b'rev', [], _(b'display markers relevant to REV')),
2400 (
2402 (
2401 b'',
2403 b'',
2402 b'exclusive',
2404 b'exclusive',
2403 False,
2405 False,
2404 _(b'restrict display to markers only relevant to REV'),
2406 _(b'restrict display to markers only relevant to REV'),
2405 ),
2407 ),
2406 (b'', b'index', False, _(b'display index of the marker')),
2408 (b'', b'index', False, _(b'display index of the marker')),
2407 (b'', b'delete', [], _(b'delete markers specified by indices')),
2409 (b'', b'delete', [], _(b'delete markers specified by indices')),
2408 ]
2410 ]
2409 + cmdutil.commitopts2
2411 + cmdutil.commitopts2
2410 + cmdutil.formatteropts,
2412 + cmdutil.formatteropts,
2411 _(b'[OBSOLETED [REPLACEMENT ...]]'),
2413 _(b'[OBSOLETED [REPLACEMENT ...]]'),
2412 )
2414 )
2413 def debugobsolete(ui, repo, precursor=None, *successors, **opts):
2415 def debugobsolete(ui, repo, precursor=None, *successors, **opts):
2414 """create arbitrary obsolete marker
2416 """create arbitrary obsolete marker
2415
2417
2416 With no arguments, displays the list of obsolescence markers."""
2418 With no arguments, displays the list of obsolescence markers."""
2417
2419
2418 opts = pycompat.byteskwargs(opts)
2420 opts = pycompat.byteskwargs(opts)
2419
2421
2420 def parsenodeid(s):
2422 def parsenodeid(s):
2421 try:
2423 try:
2422 # We do not use revsingle/revrange functions here to accept
2424 # We do not use revsingle/revrange functions here to accept
2423 # arbitrary node identifiers, possibly not present in the
2425 # arbitrary node identifiers, possibly not present in the
2424 # local repository.
2426 # local repository.
2425 n = bin(s)
2427 n = bin(s)
2426 if len(n) != len(nullid):
2428 if len(n) != len(nullid):
2427 raise TypeError()
2429 raise TypeError()
2428 return n
2430 return n
2429 except TypeError:
2431 except TypeError:
2430 raise error.InputError(
2432 raise error.InputError(
2431 b'changeset references must be full hexadecimal '
2433 b'changeset references must be full hexadecimal '
2432 b'node identifiers'
2434 b'node identifiers'
2433 )
2435 )
2434
2436
2435 if opts.get(b'delete'):
2437 if opts.get(b'delete'):
2436 indices = []
2438 indices = []
2437 for v in opts.get(b'delete'):
2439 for v in opts.get(b'delete'):
2438 try:
2440 try:
2439 indices.append(int(v))
2441 indices.append(int(v))
2440 except ValueError:
2442 except ValueError:
2441 raise error.InputError(
2443 raise error.InputError(
2442 _(b'invalid index value: %r') % v,
2444 _(b'invalid index value: %r') % v,
2443 hint=_(b'use integers for indices'),
2445 hint=_(b'use integers for indices'),
2444 )
2446 )
2445
2447
2446 if repo.currenttransaction():
2448 if repo.currenttransaction():
2447 raise error.Abort(
2449 raise error.Abort(
2448 _(b'cannot delete obsmarkers in the middle of transaction.')
2450 _(b'cannot delete obsmarkers in the middle of transaction.')
2449 )
2451 )
2450
2452
2451 with repo.lock():
2453 with repo.lock():
2452 n = repair.deleteobsmarkers(repo.obsstore, indices)
2454 n = repair.deleteobsmarkers(repo.obsstore, indices)
2453 ui.write(_(b'deleted %i obsolescence markers\n') % n)
2455 ui.write(_(b'deleted %i obsolescence markers\n') % n)
2454
2456
2455 return
2457 return
2456
2458
2457 if precursor is not None:
2459 if precursor is not None:
2458 if opts[b'rev']:
2460 if opts[b'rev']:
2459 raise error.InputError(
2461 raise error.InputError(
2460 b'cannot select revision when creating marker'
2462 b'cannot select revision when creating marker'
2461 )
2463 )
2462 metadata = {}
2464 metadata = {}
2463 metadata[b'user'] = encoding.fromlocal(opts[b'user'] or ui.username())
2465 metadata[b'user'] = encoding.fromlocal(opts[b'user'] or ui.username())
2464 succs = tuple(parsenodeid(succ) for succ in successors)
2466 succs = tuple(parsenodeid(succ) for succ in successors)
2465 l = repo.lock()
2467 l = repo.lock()
2466 try:
2468 try:
2467 tr = repo.transaction(b'debugobsolete')
2469 tr = repo.transaction(b'debugobsolete')
2468 try:
2470 try:
2469 date = opts.get(b'date')
2471 date = opts.get(b'date')
2470 if date:
2472 if date:
2471 date = dateutil.parsedate(date)
2473 date = dateutil.parsedate(date)
2472 else:
2474 else:
2473 date = None
2475 date = None
2474 prec = parsenodeid(precursor)
2476 prec = parsenodeid(precursor)
2475 parents = None
2477 parents = None
2476 if opts[b'record_parents']:
2478 if opts[b'record_parents']:
2477 if prec not in repo.unfiltered():
2479 if prec not in repo.unfiltered():
2478 raise error.Abort(
2480 raise error.Abort(
2479 b'cannot used --record-parents on '
2481 b'cannot used --record-parents on '
2480 b'unknown changesets'
2482 b'unknown changesets'
2481 )
2483 )
2482 parents = repo.unfiltered()[prec].parents()
2484 parents = repo.unfiltered()[prec].parents()
2483 parents = tuple(p.node() for p in parents)
2485 parents = tuple(p.node() for p in parents)
2484 repo.obsstore.create(
2486 repo.obsstore.create(
2485 tr,
2487 tr,
2486 prec,
2488 prec,
2487 succs,
2489 succs,
2488 opts[b'flags'],
2490 opts[b'flags'],
2489 parents=parents,
2491 parents=parents,
2490 date=date,
2492 date=date,
2491 metadata=metadata,
2493 metadata=metadata,
2492 ui=ui,
2494 ui=ui,
2493 )
2495 )
2494 tr.close()
2496 tr.close()
2495 except ValueError as exc:
2497 except ValueError as exc:
2496 raise error.Abort(
2498 raise error.Abort(
2497 _(b'bad obsmarker input: %s') % stringutil.forcebytestr(exc)
2499 _(b'bad obsmarker input: %s') % stringutil.forcebytestr(exc)
2498 )
2500 )
2499 finally:
2501 finally:
2500 tr.release()
2502 tr.release()
2501 finally:
2503 finally:
2502 l.release()
2504 l.release()
2503 else:
2505 else:
2504 if opts[b'rev']:
2506 if opts[b'rev']:
2505 revs = scmutil.revrange(repo, opts[b'rev'])
2507 revs = scmutil.revrange(repo, opts[b'rev'])
2506 nodes = [repo[r].node() for r in revs]
2508 nodes = [repo[r].node() for r in revs]
2507 markers = list(
2509 markers = list(
2508 obsutil.getmarkers(
2510 obsutil.getmarkers(
2509 repo, nodes=nodes, exclusive=opts[b'exclusive']
2511 repo, nodes=nodes, exclusive=opts[b'exclusive']
2510 )
2512 )
2511 )
2513 )
2512 markers.sort(key=lambda x: x._data)
2514 markers.sort(key=lambda x: x._data)
2513 else:
2515 else:
2514 markers = obsutil.getmarkers(repo)
2516 markers = obsutil.getmarkers(repo)
2515
2517
2516 markerstoiter = markers
2518 markerstoiter = markers
2517 isrelevant = lambda m: True
2519 isrelevant = lambda m: True
2518 if opts.get(b'rev') and opts.get(b'index'):
2520 if opts.get(b'rev') and opts.get(b'index'):
2519 markerstoiter = obsutil.getmarkers(repo)
2521 markerstoiter = obsutil.getmarkers(repo)
2520 markerset = set(markers)
2522 markerset = set(markers)
2521 isrelevant = lambda m: m in markerset
2523 isrelevant = lambda m: m in markerset
2522
2524
2523 fm = ui.formatter(b'debugobsolete', opts)
2525 fm = ui.formatter(b'debugobsolete', opts)
2524 for i, m in enumerate(markerstoiter):
2526 for i, m in enumerate(markerstoiter):
2525 if not isrelevant(m):
2527 if not isrelevant(m):
2526 # marker can be irrelevant when we're iterating over a set
2528 # marker can be irrelevant when we're iterating over a set
2527 # of markers (markerstoiter) which is bigger than the set
2529 # of markers (markerstoiter) which is bigger than the set
2528 # of markers we want to display (markers)
2530 # of markers we want to display (markers)
2529 # this can happen if both --index and --rev options are
2531 # this can happen if both --index and --rev options are
2530 # provided and thus we need to iterate over all of the markers
2532 # provided and thus we need to iterate over all of the markers
2531 # to get the correct indices, but only display the ones that
2533 # to get the correct indices, but only display the ones that
2532 # are relevant to --rev value
2534 # are relevant to --rev value
2533 continue
2535 continue
2534 fm.startitem()
2536 fm.startitem()
2535 ind = i if opts.get(b'index') else None
2537 ind = i if opts.get(b'index') else None
2536 cmdutil.showmarker(fm, m, index=ind)
2538 cmdutil.showmarker(fm, m, index=ind)
2537 fm.end()
2539 fm.end()
2538
2540
2539
2541
2540 @command(
2542 @command(
2541 b'debugp1copies',
2543 b'debugp1copies',
2542 [(b'r', b'rev', b'', _(b'revision to debug'), _(b'REV'))],
2544 [(b'r', b'rev', b'', _(b'revision to debug'), _(b'REV'))],
2543 _(b'[-r REV]'),
2545 _(b'[-r REV]'),
2544 )
2546 )
2545 def debugp1copies(ui, repo, **opts):
2547 def debugp1copies(ui, repo, **opts):
2546 """dump copy information compared to p1"""
2548 """dump copy information compared to p1"""
2547
2549
2548 opts = pycompat.byteskwargs(opts)
2550 opts = pycompat.byteskwargs(opts)
2549 ctx = scmutil.revsingle(repo, opts.get(b'rev'), default=None)
2551 ctx = scmutil.revsingle(repo, opts.get(b'rev'), default=None)
2550 for dst, src in ctx.p1copies().items():
2552 for dst, src in ctx.p1copies().items():
2551 ui.write(b'%s -> %s\n' % (src, dst))
2553 ui.write(b'%s -> %s\n' % (src, dst))
2552
2554
2553
2555
2554 @command(
2556 @command(
2555 b'debugp2copies',
2557 b'debugp2copies',
2556 [(b'r', b'rev', b'', _(b'revision to debug'), _(b'REV'))],
2558 [(b'r', b'rev', b'', _(b'revision to debug'), _(b'REV'))],
2557 _(b'[-r REV]'),
2559 _(b'[-r REV]'),
2558 )
2560 )
2559 def debugp1copies(ui, repo, **opts):
2561 def debugp1copies(ui, repo, **opts):
2560 """dump copy information compared to p2"""
2562 """dump copy information compared to p2"""
2561
2563
2562 opts = pycompat.byteskwargs(opts)
2564 opts = pycompat.byteskwargs(opts)
2563 ctx = scmutil.revsingle(repo, opts.get(b'rev'), default=None)
2565 ctx = scmutil.revsingle(repo, opts.get(b'rev'), default=None)
2564 for dst, src in ctx.p2copies().items():
2566 for dst, src in ctx.p2copies().items():
2565 ui.write(b'%s -> %s\n' % (src, dst))
2567 ui.write(b'%s -> %s\n' % (src, dst))
2566
2568
2567
2569
2568 @command(
2570 @command(
2569 b'debugpathcomplete',
2571 b'debugpathcomplete',
2570 [
2572 [
2571 (b'f', b'full', None, _(b'complete an entire path')),
2573 (b'f', b'full', None, _(b'complete an entire path')),
2572 (b'n', b'normal', None, _(b'show only normal files')),
2574 (b'n', b'normal', None, _(b'show only normal files')),
2573 (b'a', b'added', None, _(b'show only added files')),
2575 (b'a', b'added', None, _(b'show only added files')),
2574 (b'r', b'removed', None, _(b'show only removed files')),
2576 (b'r', b'removed', None, _(b'show only removed files')),
2575 ],
2577 ],
2576 _(b'FILESPEC...'),
2578 _(b'FILESPEC...'),
2577 )
2579 )
2578 def debugpathcomplete(ui, repo, *specs, **opts):
2580 def debugpathcomplete(ui, repo, *specs, **opts):
2579 """complete part or all of a tracked path
2581 """complete part or all of a tracked path
2580
2582
2581 This command supports shells that offer path name completion. It
2583 This command supports shells that offer path name completion. It
2582 currently completes only files already known to the dirstate.
2584 currently completes only files already known to the dirstate.
2583
2585
2584 Completion extends only to the next path segment unless
2586 Completion extends only to the next path segment unless
2585 --full is specified, in which case entire paths are used."""
2587 --full is specified, in which case entire paths are used."""
2586
2588
2587 def complete(path, acceptable):
2589 def complete(path, acceptable):
2588 dirstate = repo.dirstate
2590 dirstate = repo.dirstate
2589 spec = os.path.normpath(os.path.join(encoding.getcwd(), path))
2591 spec = os.path.normpath(os.path.join(encoding.getcwd(), path))
2590 rootdir = repo.root + pycompat.ossep
2592 rootdir = repo.root + pycompat.ossep
2591 if spec != repo.root and not spec.startswith(rootdir):
2593 if spec != repo.root and not spec.startswith(rootdir):
2592 return [], []
2594 return [], []
2593 if os.path.isdir(spec):
2595 if os.path.isdir(spec):
2594 spec += b'/'
2596 spec += b'/'
2595 spec = spec[len(rootdir) :]
2597 spec = spec[len(rootdir) :]
2596 fixpaths = pycompat.ossep != b'/'
2598 fixpaths = pycompat.ossep != b'/'
2597 if fixpaths:
2599 if fixpaths:
2598 spec = spec.replace(pycompat.ossep, b'/')
2600 spec = spec.replace(pycompat.ossep, b'/')
2599 speclen = len(spec)
2601 speclen = len(spec)
2600 fullpaths = opts['full']
2602 fullpaths = opts['full']
2601 files, dirs = set(), set()
2603 files, dirs = set(), set()
2602 adddir, addfile = dirs.add, files.add
2604 adddir, addfile = dirs.add, files.add
2603 for f, st in pycompat.iteritems(dirstate):
2605 for f, st in pycompat.iteritems(dirstate):
2604 if f.startswith(spec) and st[0] in acceptable:
2606 if f.startswith(spec) and st[0] in acceptable:
2605 if fixpaths:
2607 if fixpaths:
2606 f = f.replace(b'/', pycompat.ossep)
2608 f = f.replace(b'/', pycompat.ossep)
2607 if fullpaths:
2609 if fullpaths:
2608 addfile(f)
2610 addfile(f)
2609 continue
2611 continue
2610 s = f.find(pycompat.ossep, speclen)
2612 s = f.find(pycompat.ossep, speclen)
2611 if s >= 0:
2613 if s >= 0:
2612 adddir(f[:s])
2614 adddir(f[:s])
2613 else:
2615 else:
2614 addfile(f)
2616 addfile(f)
2615 return files, dirs
2617 return files, dirs
2616
2618
2617 acceptable = b''
2619 acceptable = b''
2618 if opts['normal']:
2620 if opts['normal']:
2619 acceptable += b'nm'
2621 acceptable += b'nm'
2620 if opts['added']:
2622 if opts['added']:
2621 acceptable += b'a'
2623 acceptable += b'a'
2622 if opts['removed']:
2624 if opts['removed']:
2623 acceptable += b'r'
2625 acceptable += b'r'
2624 cwd = repo.getcwd()
2626 cwd = repo.getcwd()
2625 if not specs:
2627 if not specs:
2626 specs = [b'.']
2628 specs = [b'.']
2627
2629
2628 files, dirs = set(), set()
2630 files, dirs = set(), set()
2629 for spec in specs:
2631 for spec in specs:
2630 f, d = complete(spec, acceptable or b'nmar')
2632 f, d = complete(spec, acceptable or b'nmar')
2631 files.update(f)
2633 files.update(f)
2632 dirs.update(d)
2634 dirs.update(d)
2633 files.update(dirs)
2635 files.update(dirs)
2634 ui.write(b'\n'.join(repo.pathto(p, cwd) for p in sorted(files)))
2636 ui.write(b'\n'.join(repo.pathto(p, cwd) for p in sorted(files)))
2635 ui.write(b'\n')
2637 ui.write(b'\n')
2636
2638
2637
2639
2638 @command(
2640 @command(
2639 b'debugpathcopies',
2641 b'debugpathcopies',
2640 cmdutil.walkopts,
2642 cmdutil.walkopts,
2641 b'hg debugpathcopies REV1 REV2 [FILE]',
2643 b'hg debugpathcopies REV1 REV2 [FILE]',
2642 inferrepo=True,
2644 inferrepo=True,
2643 )
2645 )
2644 def debugpathcopies(ui, repo, rev1, rev2, *pats, **opts):
2646 def debugpathcopies(ui, repo, rev1, rev2, *pats, **opts):
2645 """show copies between two revisions"""
2647 """show copies between two revisions"""
2646 ctx1 = scmutil.revsingle(repo, rev1)
2648 ctx1 = scmutil.revsingle(repo, rev1)
2647 ctx2 = scmutil.revsingle(repo, rev2)
2649 ctx2 = scmutil.revsingle(repo, rev2)
2648 m = scmutil.match(ctx1, pats, opts)
2650 m = scmutil.match(ctx1, pats, opts)
2649 for dst, src in sorted(copies.pathcopies(ctx1, ctx2, m).items()):
2651 for dst, src in sorted(copies.pathcopies(ctx1, ctx2, m).items()):
2650 ui.write(b'%s -> %s\n' % (src, dst))
2652 ui.write(b'%s -> %s\n' % (src, dst))
2651
2653
2652
2654
2653 @command(b'debugpeer', [], _(b'PATH'), norepo=True)
2655 @command(b'debugpeer', [], _(b'PATH'), norepo=True)
2654 def debugpeer(ui, path):
2656 def debugpeer(ui, path):
2655 """establish a connection to a peer repository"""
2657 """establish a connection to a peer repository"""
2656 # Always enable peer request logging. Requires --debug to display
2658 # Always enable peer request logging. Requires --debug to display
2657 # though.
2659 # though.
2658 overrides = {
2660 overrides = {
2659 (b'devel', b'debug.peer-request'): True,
2661 (b'devel', b'debug.peer-request'): True,
2660 }
2662 }
2661
2663
2662 with ui.configoverride(overrides):
2664 with ui.configoverride(overrides):
2663 peer = hg.peer(ui, {}, path)
2665 peer = hg.peer(ui, {}, path)
2664
2666
2665 try:
2667 try:
2666 local = peer.local() is not None
2668 local = peer.local() is not None
2667 canpush = peer.canpush()
2669 canpush = peer.canpush()
2668
2670
2669 ui.write(_(b'url: %s\n') % peer.url())
2671 ui.write(_(b'url: %s\n') % peer.url())
2670 ui.write(_(b'local: %s\n') % (_(b'yes') if local else _(b'no')))
2672 ui.write(_(b'local: %s\n') % (_(b'yes') if local else _(b'no')))
2671 ui.write(
2673 ui.write(
2672 _(b'pushable: %s\n') % (_(b'yes') if canpush else _(b'no'))
2674 _(b'pushable: %s\n') % (_(b'yes') if canpush else _(b'no'))
2673 )
2675 )
2674 finally:
2676 finally:
2675 peer.close()
2677 peer.close()
2676
2678
2677
2679
2678 @command(
2680 @command(
2679 b'debugpickmergetool',
2681 b'debugpickmergetool',
2680 [
2682 [
2681 (b'r', b'rev', b'', _(b'check for files in this revision'), _(b'REV')),
2683 (b'r', b'rev', b'', _(b'check for files in this revision'), _(b'REV')),
2682 (b'', b'changedelete', None, _(b'emulate merging change and delete')),
2684 (b'', b'changedelete', None, _(b'emulate merging change and delete')),
2683 ]
2685 ]
2684 + cmdutil.walkopts
2686 + cmdutil.walkopts
2685 + cmdutil.mergetoolopts,
2687 + cmdutil.mergetoolopts,
2686 _(b'[PATTERN]...'),
2688 _(b'[PATTERN]...'),
2687 inferrepo=True,
2689 inferrepo=True,
2688 )
2690 )
2689 def debugpickmergetool(ui, repo, *pats, **opts):
2691 def debugpickmergetool(ui, repo, *pats, **opts):
2690 """examine which merge tool is chosen for specified file
2692 """examine which merge tool is chosen for specified file
2691
2693
2692 As described in :hg:`help merge-tools`, Mercurial examines
2694 As described in :hg:`help merge-tools`, Mercurial examines
2693 configurations below in this order to decide which merge tool is
2695 configurations below in this order to decide which merge tool is
2694 chosen for specified file.
2696 chosen for specified file.
2695
2697
2696 1. ``--tool`` option
2698 1. ``--tool`` option
2697 2. ``HGMERGE`` environment variable
2699 2. ``HGMERGE`` environment variable
2698 3. configurations in ``merge-patterns`` section
2700 3. configurations in ``merge-patterns`` section
2699 4. configuration of ``ui.merge``
2701 4. configuration of ``ui.merge``
2700 5. configurations in ``merge-tools`` section
2702 5. configurations in ``merge-tools`` section
2701 6. ``hgmerge`` tool (for historical reason only)
2703 6. ``hgmerge`` tool (for historical reason only)
2702 7. default tool for fallback (``:merge`` or ``:prompt``)
2704 7. default tool for fallback (``:merge`` or ``:prompt``)
2703
2705
2704 This command writes out examination result in the style below::
2706 This command writes out examination result in the style below::
2705
2707
2706 FILE = MERGETOOL
2708 FILE = MERGETOOL
2707
2709
2708 By default, all files known in the first parent context of the
2710 By default, all files known in the first parent context of the
2709 working directory are examined. Use file patterns and/or -I/-X
2711 working directory are examined. Use file patterns and/or -I/-X
2710 options to limit target files. -r/--rev is also useful to examine
2712 options to limit target files. -r/--rev is also useful to examine
2711 files in another context without actual updating to it.
2713 files in another context without actual updating to it.
2712
2714
2713 With --debug, this command shows warning messages while matching
2715 With --debug, this command shows warning messages while matching
2714 against ``merge-patterns`` and so on, too. It is recommended to
2716 against ``merge-patterns`` and so on, too. It is recommended to
2715 use this option with explicit file patterns and/or -I/-X options,
2717 use this option with explicit file patterns and/or -I/-X options,
2716 because this option increases amount of output per file according
2718 because this option increases amount of output per file according
2717 to configurations in hgrc.
2719 to configurations in hgrc.
2718
2720
2719 With -v/--verbose, this command shows configurations below at
2721 With -v/--verbose, this command shows configurations below at
2720 first (only if specified).
2722 first (only if specified).
2721
2723
2722 - ``--tool`` option
2724 - ``--tool`` option
2723 - ``HGMERGE`` environment variable
2725 - ``HGMERGE`` environment variable
2724 - configuration of ``ui.merge``
2726 - configuration of ``ui.merge``
2725
2727
2726 If merge tool is chosen before matching against
2728 If merge tool is chosen before matching against
2727 ``merge-patterns``, this command can't show any helpful
2729 ``merge-patterns``, this command can't show any helpful
2728 information, even with --debug. In such case, information above is
2730 information, even with --debug. In such case, information above is
2729 useful to know why a merge tool is chosen.
2731 useful to know why a merge tool is chosen.
2730 """
2732 """
2731 opts = pycompat.byteskwargs(opts)
2733 opts = pycompat.byteskwargs(opts)
2732 overrides = {}
2734 overrides = {}
2733 if opts[b'tool']:
2735 if opts[b'tool']:
2734 overrides[(b'ui', b'forcemerge')] = opts[b'tool']
2736 overrides[(b'ui', b'forcemerge')] = opts[b'tool']
2735 ui.notenoi18n(b'with --tool %r\n' % (pycompat.bytestr(opts[b'tool'])))
2737 ui.notenoi18n(b'with --tool %r\n' % (pycompat.bytestr(opts[b'tool'])))
2736
2738
2737 with ui.configoverride(overrides, b'debugmergepatterns'):
2739 with ui.configoverride(overrides, b'debugmergepatterns'):
2738 hgmerge = encoding.environ.get(b"HGMERGE")
2740 hgmerge = encoding.environ.get(b"HGMERGE")
2739 if hgmerge is not None:
2741 if hgmerge is not None:
2740 ui.notenoi18n(b'with HGMERGE=%r\n' % (pycompat.bytestr(hgmerge)))
2742 ui.notenoi18n(b'with HGMERGE=%r\n' % (pycompat.bytestr(hgmerge)))
2741 uimerge = ui.config(b"ui", b"merge")
2743 uimerge = ui.config(b"ui", b"merge")
2742 if uimerge:
2744 if uimerge:
2743 ui.notenoi18n(b'with ui.merge=%r\n' % (pycompat.bytestr(uimerge)))
2745 ui.notenoi18n(b'with ui.merge=%r\n' % (pycompat.bytestr(uimerge)))
2744
2746
2745 ctx = scmutil.revsingle(repo, opts.get(b'rev'))
2747 ctx = scmutil.revsingle(repo, opts.get(b'rev'))
2746 m = scmutil.match(ctx, pats, opts)
2748 m = scmutil.match(ctx, pats, opts)
2747 changedelete = opts[b'changedelete']
2749 changedelete = opts[b'changedelete']
2748 for path in ctx.walk(m):
2750 for path in ctx.walk(m):
2749 fctx = ctx[path]
2751 fctx = ctx[path]
2750 try:
2752 try:
2751 if not ui.debugflag:
2753 if not ui.debugflag:
2752 ui.pushbuffer(error=True)
2754 ui.pushbuffer(error=True)
2753 tool, toolpath = filemerge._picktool(
2755 tool, toolpath = filemerge._picktool(
2754 repo,
2756 repo,
2755 ui,
2757 ui,
2756 path,
2758 path,
2757 fctx.isbinary(),
2759 fctx.isbinary(),
2758 b'l' in fctx.flags(),
2760 b'l' in fctx.flags(),
2759 changedelete,
2761 changedelete,
2760 )
2762 )
2761 finally:
2763 finally:
2762 if not ui.debugflag:
2764 if not ui.debugflag:
2763 ui.popbuffer()
2765 ui.popbuffer()
2764 ui.write(b'%s = %s\n' % (path, tool))
2766 ui.write(b'%s = %s\n' % (path, tool))
2765
2767
2766
2768
2767 @command(b'debugpushkey', [], _(b'REPO NAMESPACE [KEY OLD NEW]'), norepo=True)
2769 @command(b'debugpushkey', [], _(b'REPO NAMESPACE [KEY OLD NEW]'), norepo=True)
2768 def debugpushkey(ui, repopath, namespace, *keyinfo, **opts):
2770 def debugpushkey(ui, repopath, namespace, *keyinfo, **opts):
2769 """access the pushkey key/value protocol
2771 """access the pushkey key/value protocol
2770
2772
2771 With two args, list the keys in the given namespace.
2773 With two args, list the keys in the given namespace.
2772
2774
2773 With five args, set a key to new if it currently is set to old.
2775 With five args, set a key to new if it currently is set to old.
2774 Reports success or failure.
2776 Reports success or failure.
2775 """
2777 """
2776
2778
2777 target = hg.peer(ui, {}, repopath)
2779 target = hg.peer(ui, {}, repopath)
2778 try:
2780 try:
2779 if keyinfo:
2781 if keyinfo:
2780 key, old, new = keyinfo
2782 key, old, new = keyinfo
2781 with target.commandexecutor() as e:
2783 with target.commandexecutor() as e:
2782 r = e.callcommand(
2784 r = e.callcommand(
2783 b'pushkey',
2785 b'pushkey',
2784 {
2786 {
2785 b'namespace': namespace,
2787 b'namespace': namespace,
2786 b'key': key,
2788 b'key': key,
2787 b'old': old,
2789 b'old': old,
2788 b'new': new,
2790 b'new': new,
2789 },
2791 },
2790 ).result()
2792 ).result()
2791
2793
2792 ui.status(pycompat.bytestr(r) + b'\n')
2794 ui.status(pycompat.bytestr(r) + b'\n')
2793 return not r
2795 return not r
2794 else:
2796 else:
2795 for k, v in sorted(pycompat.iteritems(target.listkeys(namespace))):
2797 for k, v in sorted(pycompat.iteritems(target.listkeys(namespace))):
2796 ui.write(
2798 ui.write(
2797 b"%s\t%s\n"
2799 b"%s\t%s\n"
2798 % (stringutil.escapestr(k), stringutil.escapestr(v))
2800 % (stringutil.escapestr(k), stringutil.escapestr(v))
2799 )
2801 )
2800 finally:
2802 finally:
2801 target.close()
2803 target.close()
2802
2804
2803
2805
2804 @command(b'debugpvec', [], _(b'A B'))
2806 @command(b'debugpvec', [], _(b'A B'))
2805 def debugpvec(ui, repo, a, b=None):
2807 def debugpvec(ui, repo, a, b=None):
2806 ca = scmutil.revsingle(repo, a)
2808 ca = scmutil.revsingle(repo, a)
2807 cb = scmutil.revsingle(repo, b)
2809 cb = scmutil.revsingle(repo, b)
2808 pa = pvec.ctxpvec(ca)
2810 pa = pvec.ctxpvec(ca)
2809 pb = pvec.ctxpvec(cb)
2811 pb = pvec.ctxpvec(cb)
2810 if pa == pb:
2812 if pa == pb:
2811 rel = b"="
2813 rel = b"="
2812 elif pa > pb:
2814 elif pa > pb:
2813 rel = b">"
2815 rel = b">"
2814 elif pa < pb:
2816 elif pa < pb:
2815 rel = b"<"
2817 rel = b"<"
2816 elif pa | pb:
2818 elif pa | pb:
2817 rel = b"|"
2819 rel = b"|"
2818 ui.write(_(b"a: %s\n") % pa)
2820 ui.write(_(b"a: %s\n") % pa)
2819 ui.write(_(b"b: %s\n") % pb)
2821 ui.write(_(b"b: %s\n") % pb)
2820 ui.write(_(b"depth(a): %d depth(b): %d\n") % (pa._depth, pb._depth))
2822 ui.write(_(b"depth(a): %d depth(b): %d\n") % (pa._depth, pb._depth))
2821 ui.write(
2823 ui.write(
2822 _(b"delta: %d hdist: %d distance: %d relation: %s\n")
2824 _(b"delta: %d hdist: %d distance: %d relation: %s\n")
2823 % (
2825 % (
2824 abs(pa._depth - pb._depth),
2826 abs(pa._depth - pb._depth),
2825 pvec._hamming(pa._vec, pb._vec),
2827 pvec._hamming(pa._vec, pb._vec),
2826 pa.distance(pb),
2828 pa.distance(pb),
2827 rel,
2829 rel,
2828 )
2830 )
2829 )
2831 )
2830
2832
2831
2833
2832 @command(
2834 @command(
2833 b'debugrebuilddirstate|debugrebuildstate',
2835 b'debugrebuilddirstate|debugrebuildstate',
2834 [
2836 [
2835 (b'r', b'rev', b'', _(b'revision to rebuild to'), _(b'REV')),
2837 (b'r', b'rev', b'', _(b'revision to rebuild to'), _(b'REV')),
2836 (
2838 (
2837 b'',
2839 b'',
2838 b'minimal',
2840 b'minimal',
2839 None,
2841 None,
2840 _(
2842 _(
2841 b'only rebuild files that are inconsistent with '
2843 b'only rebuild files that are inconsistent with '
2842 b'the working copy parent'
2844 b'the working copy parent'
2843 ),
2845 ),
2844 ),
2846 ),
2845 ],
2847 ],
2846 _(b'[-r REV]'),
2848 _(b'[-r REV]'),
2847 )
2849 )
2848 def debugrebuilddirstate(ui, repo, rev, **opts):
2850 def debugrebuilddirstate(ui, repo, rev, **opts):
2849 """rebuild the dirstate as it would look like for the given revision
2851 """rebuild the dirstate as it would look like for the given revision
2850
2852
2851 If no revision is specified the first current parent will be used.
2853 If no revision is specified the first current parent will be used.
2852
2854
2853 The dirstate will be set to the files of the given revision.
2855 The dirstate will be set to the files of the given revision.
2854 The actual working directory content or existing dirstate
2856 The actual working directory content or existing dirstate
2855 information such as adds or removes is not considered.
2857 information such as adds or removes is not considered.
2856
2858
2857 ``minimal`` will only rebuild the dirstate status for files that claim to be
2859 ``minimal`` will only rebuild the dirstate status for files that claim to be
2858 tracked but are not in the parent manifest, or that exist in the parent
2860 tracked but are not in the parent manifest, or that exist in the parent
2859 manifest but are not in the dirstate. It will not change adds, removes, or
2861 manifest but are not in the dirstate. It will not change adds, removes, or
2860 modified files that are in the working copy parent.
2862 modified files that are in the working copy parent.
2861
2863
2862 One use of this command is to make the next :hg:`status` invocation
2864 One use of this command is to make the next :hg:`status` invocation
2863 check the actual file content.
2865 check the actual file content.
2864 """
2866 """
2865 ctx = scmutil.revsingle(repo, rev)
2867 ctx = scmutil.revsingle(repo, rev)
2866 with repo.wlock():
2868 with repo.wlock():
2867 dirstate = repo.dirstate
2869 dirstate = repo.dirstate
2868 changedfiles = None
2870 changedfiles = None
2869 # See command doc for what minimal does.
2871 # See command doc for what minimal does.
2870 if opts.get('minimal'):
2872 if opts.get('minimal'):
2871 manifestfiles = set(ctx.manifest().keys())
2873 manifestfiles = set(ctx.manifest().keys())
2872 dirstatefiles = set(dirstate)
2874 dirstatefiles = set(dirstate)
2873 manifestonly = manifestfiles - dirstatefiles
2875 manifestonly = manifestfiles - dirstatefiles
2874 dsonly = dirstatefiles - manifestfiles
2876 dsonly = dirstatefiles - manifestfiles
2875 dsnotadded = {f for f in dsonly if dirstate[f] != b'a'}
2877 dsnotadded = {f for f in dsonly if dirstate[f] != b'a'}
2876 changedfiles = manifestonly | dsnotadded
2878 changedfiles = manifestonly | dsnotadded
2877
2879
2878 dirstate.rebuild(ctx.node(), ctx.manifest(), changedfiles)
2880 dirstate.rebuild(ctx.node(), ctx.manifest(), changedfiles)
2879
2881
2880
2882
2881 @command(b'debugrebuildfncache', [], b'')
2883 @command(b'debugrebuildfncache', [], b'')
2882 def debugrebuildfncache(ui, repo):
2884 def debugrebuildfncache(ui, repo):
2883 """rebuild the fncache file"""
2885 """rebuild the fncache file"""
2884 repair.rebuildfncache(ui, repo)
2886 repair.rebuildfncache(ui, repo)
2885
2887
2886
2888
2887 @command(
2889 @command(
2888 b'debugrename',
2890 b'debugrename',
2889 [(b'r', b'rev', b'', _(b'revision to debug'), _(b'REV'))],
2891 [(b'r', b'rev', b'', _(b'revision to debug'), _(b'REV'))],
2890 _(b'[-r REV] [FILE]...'),
2892 _(b'[-r REV] [FILE]...'),
2891 )
2893 )
2892 def debugrename(ui, repo, *pats, **opts):
2894 def debugrename(ui, repo, *pats, **opts):
2893 """dump rename information"""
2895 """dump rename information"""
2894
2896
2895 opts = pycompat.byteskwargs(opts)
2897 opts = pycompat.byteskwargs(opts)
2896 ctx = scmutil.revsingle(repo, opts.get(b'rev'))
2898 ctx = scmutil.revsingle(repo, opts.get(b'rev'))
2897 m = scmutil.match(ctx, pats, opts)
2899 m = scmutil.match(ctx, pats, opts)
2898 for abs in ctx.walk(m):
2900 for abs in ctx.walk(m):
2899 fctx = ctx[abs]
2901 fctx = ctx[abs]
2900 o = fctx.filelog().renamed(fctx.filenode())
2902 o = fctx.filelog().renamed(fctx.filenode())
2901 rel = repo.pathto(abs)
2903 rel = repo.pathto(abs)
2902 if o:
2904 if o:
2903 ui.write(_(b"%s renamed from %s:%s\n") % (rel, o[0], hex(o[1])))
2905 ui.write(_(b"%s renamed from %s:%s\n") % (rel, o[0], hex(o[1])))
2904 else:
2906 else:
2905 ui.write(_(b"%s not renamed\n") % rel)
2907 ui.write(_(b"%s not renamed\n") % rel)
2906
2908
2907
2909
2908 @command(b'debugrequires|debugrequirements', [], b'')
2910 @command(b'debugrequires|debugrequirements', [], b'')
2909 def debugrequirements(ui, repo):
2911 def debugrequirements(ui, repo):
2910 """ print the current repo requirements """
2912 """ print the current repo requirements """
2911 for r in sorted(repo.requirements):
2913 for r in sorted(repo.requirements):
2912 ui.write(b"%s\n" % r)
2914 ui.write(b"%s\n" % r)
2913
2915
2914
2916
2915 @command(
2917 @command(
2916 b'debugrevlog',
2918 b'debugrevlog',
2917 cmdutil.debugrevlogopts + [(b'd', b'dump', False, _(b'dump index data'))],
2919 cmdutil.debugrevlogopts + [(b'd', b'dump', False, _(b'dump index data'))],
2918 _(b'-c|-m|FILE'),
2920 _(b'-c|-m|FILE'),
2919 optionalrepo=True,
2921 optionalrepo=True,
2920 )
2922 )
2921 def debugrevlog(ui, repo, file_=None, **opts):
2923 def debugrevlog(ui, repo, file_=None, **opts):
2922 """show data and statistics about a revlog"""
2924 """show data and statistics about a revlog"""
2923 opts = pycompat.byteskwargs(opts)
2925 opts = pycompat.byteskwargs(opts)
2924 r = cmdutil.openrevlog(repo, b'debugrevlog', file_, opts)
2926 r = cmdutil.openrevlog(repo, b'debugrevlog', file_, opts)
2925
2927
2926 if opts.get(b"dump"):
2928 if opts.get(b"dump"):
2927 numrevs = len(r)
2929 numrevs = len(r)
2928 ui.write(
2930 ui.write(
2929 (
2931 (
2930 b"# rev p1rev p2rev start end deltastart base p1 p2"
2932 b"# rev p1rev p2rev start end deltastart base p1 p2"
2931 b" rawsize totalsize compression heads chainlen\n"
2933 b" rawsize totalsize compression heads chainlen\n"
2932 )
2934 )
2933 )
2935 )
2934 ts = 0
2936 ts = 0
2935 heads = set()
2937 heads = set()
2936
2938
2937 for rev in pycompat.xrange(numrevs):
2939 for rev in pycompat.xrange(numrevs):
2938 dbase = r.deltaparent(rev)
2940 dbase = r.deltaparent(rev)
2939 if dbase == -1:
2941 if dbase == -1:
2940 dbase = rev
2942 dbase = rev
2941 cbase = r.chainbase(rev)
2943 cbase = r.chainbase(rev)
2942 clen = r.chainlen(rev)
2944 clen = r.chainlen(rev)
2943 p1, p2 = r.parentrevs(rev)
2945 p1, p2 = r.parentrevs(rev)
2944 rs = r.rawsize(rev)
2946 rs = r.rawsize(rev)
2945 ts = ts + rs
2947 ts = ts + rs
2946 heads -= set(r.parentrevs(rev))
2948 heads -= set(r.parentrevs(rev))
2947 heads.add(rev)
2949 heads.add(rev)
2948 try:
2950 try:
2949 compression = ts / r.end(rev)
2951 compression = ts / r.end(rev)
2950 except ZeroDivisionError:
2952 except ZeroDivisionError:
2951 compression = 0
2953 compression = 0
2952 ui.write(
2954 ui.write(
2953 b"%5d %5d %5d %5d %5d %10d %4d %4d %4d %7d %9d "
2955 b"%5d %5d %5d %5d %5d %10d %4d %4d %4d %7d %9d "
2954 b"%11d %5d %8d\n"
2956 b"%11d %5d %8d\n"
2955 % (
2957 % (
2956 rev,
2958 rev,
2957 p1,
2959 p1,
2958 p2,
2960 p2,
2959 r.start(rev),
2961 r.start(rev),
2960 r.end(rev),
2962 r.end(rev),
2961 r.start(dbase),
2963 r.start(dbase),
2962 r.start(cbase),
2964 r.start(cbase),
2963 r.start(p1),
2965 r.start(p1),
2964 r.start(p2),
2966 r.start(p2),
2965 rs,
2967 rs,
2966 ts,
2968 ts,
2967 compression,
2969 compression,
2968 len(heads),
2970 len(heads),
2969 clen,
2971 clen,
2970 )
2972 )
2971 )
2973 )
2972 return 0
2974 return 0
2973
2975
2974 v = r.version
2976 v = r.version
2975 format = v & 0xFFFF
2977 format = v & 0xFFFF
2976 flags = []
2978 flags = []
2977 gdelta = False
2979 gdelta = False
2978 if v & revlog.FLAG_INLINE_DATA:
2980 if v & revlog.FLAG_INLINE_DATA:
2979 flags.append(b'inline')
2981 flags.append(b'inline')
2980 if v & revlog.FLAG_GENERALDELTA:
2982 if v & revlog.FLAG_GENERALDELTA:
2981 gdelta = True
2983 gdelta = True
2982 flags.append(b'generaldelta')
2984 flags.append(b'generaldelta')
2983 if not flags:
2985 if not flags:
2984 flags = [b'(none)']
2986 flags = [b'(none)']
2985
2987
2986 ### tracks merge vs single parent
2988 ### tracks merge vs single parent
2987 nummerges = 0
2989 nummerges = 0
2988
2990
2989 ### tracks ways the "delta" are build
2991 ### tracks ways the "delta" are build
2990 # nodelta
2992 # nodelta
2991 numempty = 0
2993 numempty = 0
2992 numemptytext = 0
2994 numemptytext = 0
2993 numemptydelta = 0
2995 numemptydelta = 0
2994 # full file content
2996 # full file content
2995 numfull = 0
2997 numfull = 0
2996 # intermediate snapshot against a prior snapshot
2998 # intermediate snapshot against a prior snapshot
2997 numsemi = 0
2999 numsemi = 0
2998 # snapshot count per depth
3000 # snapshot count per depth
2999 numsnapdepth = collections.defaultdict(lambda: 0)
3001 numsnapdepth = collections.defaultdict(lambda: 0)
3000 # delta against previous revision
3002 # delta against previous revision
3001 numprev = 0
3003 numprev = 0
3002 # delta against first or second parent (not prev)
3004 # delta against first or second parent (not prev)
3003 nump1 = 0
3005 nump1 = 0
3004 nump2 = 0
3006 nump2 = 0
3005 # delta against neither prev nor parents
3007 # delta against neither prev nor parents
3006 numother = 0
3008 numother = 0
3007 # delta against prev that are also first or second parent
3009 # delta against prev that are also first or second parent
3008 # (details of `numprev`)
3010 # (details of `numprev`)
3009 nump1prev = 0
3011 nump1prev = 0
3010 nump2prev = 0
3012 nump2prev = 0
3011
3013
3012 # data about delta chain of each revs
3014 # data about delta chain of each revs
3013 chainlengths = []
3015 chainlengths = []
3014 chainbases = []
3016 chainbases = []
3015 chainspans = []
3017 chainspans = []
3016
3018
3017 # data about each revision
3019 # data about each revision
3018 datasize = [None, 0, 0]
3020 datasize = [None, 0, 0]
3019 fullsize = [None, 0, 0]
3021 fullsize = [None, 0, 0]
3020 semisize = [None, 0, 0]
3022 semisize = [None, 0, 0]
3021 # snapshot count per depth
3023 # snapshot count per depth
3022 snapsizedepth = collections.defaultdict(lambda: [None, 0, 0])
3024 snapsizedepth = collections.defaultdict(lambda: [None, 0, 0])
3023 deltasize = [None, 0, 0]
3025 deltasize = [None, 0, 0]
3024 chunktypecounts = {}
3026 chunktypecounts = {}
3025 chunktypesizes = {}
3027 chunktypesizes = {}
3026
3028
3027 def addsize(size, l):
3029 def addsize(size, l):
3028 if l[0] is None or size < l[0]:
3030 if l[0] is None or size < l[0]:
3029 l[0] = size
3031 l[0] = size
3030 if size > l[1]:
3032 if size > l[1]:
3031 l[1] = size
3033 l[1] = size
3032 l[2] += size
3034 l[2] += size
3033
3035
3034 numrevs = len(r)
3036 numrevs = len(r)
3035 for rev in pycompat.xrange(numrevs):
3037 for rev in pycompat.xrange(numrevs):
3036 p1, p2 = r.parentrevs(rev)
3038 p1, p2 = r.parentrevs(rev)
3037 delta = r.deltaparent(rev)
3039 delta = r.deltaparent(rev)
3038 if format > 0:
3040 if format > 0:
3039 addsize(r.rawsize(rev), datasize)
3041 addsize(r.rawsize(rev), datasize)
3040 if p2 != nullrev:
3042 if p2 != nullrev:
3041 nummerges += 1
3043 nummerges += 1
3042 size = r.length(rev)
3044 size = r.length(rev)
3043 if delta == nullrev:
3045 if delta == nullrev:
3044 chainlengths.append(0)
3046 chainlengths.append(0)
3045 chainbases.append(r.start(rev))
3047 chainbases.append(r.start(rev))
3046 chainspans.append(size)
3048 chainspans.append(size)
3047 if size == 0:
3049 if size == 0:
3048 numempty += 1
3050 numempty += 1
3049 numemptytext += 1
3051 numemptytext += 1
3050 else:
3052 else:
3051 numfull += 1
3053 numfull += 1
3052 numsnapdepth[0] += 1
3054 numsnapdepth[0] += 1
3053 addsize(size, fullsize)
3055 addsize(size, fullsize)
3054 addsize(size, snapsizedepth[0])
3056 addsize(size, snapsizedepth[0])
3055 else:
3057 else:
3056 chainlengths.append(chainlengths[delta] + 1)
3058 chainlengths.append(chainlengths[delta] + 1)
3057 baseaddr = chainbases[delta]
3059 baseaddr = chainbases[delta]
3058 revaddr = r.start(rev)
3060 revaddr = r.start(rev)
3059 chainbases.append(baseaddr)
3061 chainbases.append(baseaddr)
3060 chainspans.append((revaddr - baseaddr) + size)
3062 chainspans.append((revaddr - baseaddr) + size)
3061 if size == 0:
3063 if size == 0:
3062 numempty += 1
3064 numempty += 1
3063 numemptydelta += 1
3065 numemptydelta += 1
3064 elif r.issnapshot(rev):
3066 elif r.issnapshot(rev):
3065 addsize(size, semisize)
3067 addsize(size, semisize)
3066 numsemi += 1
3068 numsemi += 1
3067 depth = r.snapshotdepth(rev)
3069 depth = r.snapshotdepth(rev)
3068 numsnapdepth[depth] += 1
3070 numsnapdepth[depth] += 1
3069 addsize(size, snapsizedepth[depth])
3071 addsize(size, snapsizedepth[depth])
3070 else:
3072 else:
3071 addsize(size, deltasize)
3073 addsize(size, deltasize)
3072 if delta == rev - 1:
3074 if delta == rev - 1:
3073 numprev += 1
3075 numprev += 1
3074 if delta == p1:
3076 if delta == p1:
3075 nump1prev += 1
3077 nump1prev += 1
3076 elif delta == p2:
3078 elif delta == p2:
3077 nump2prev += 1
3079 nump2prev += 1
3078 elif delta == p1:
3080 elif delta == p1:
3079 nump1 += 1
3081 nump1 += 1
3080 elif delta == p2:
3082 elif delta == p2:
3081 nump2 += 1
3083 nump2 += 1
3082 elif delta != nullrev:
3084 elif delta != nullrev:
3083 numother += 1
3085 numother += 1
3084
3086
3085 # Obtain data on the raw chunks in the revlog.
3087 # Obtain data on the raw chunks in the revlog.
3086 if util.safehasattr(r, b'_getsegmentforrevs'):
3088 if util.safehasattr(r, b'_getsegmentforrevs'):
3087 segment = r._getsegmentforrevs(rev, rev)[1]
3089 segment = r._getsegmentforrevs(rev, rev)[1]
3088 else:
3090 else:
3089 segment = r._revlog._getsegmentforrevs(rev, rev)[1]
3091 segment = r._revlog._getsegmentforrevs(rev, rev)[1]
3090 if segment:
3092 if segment:
3091 chunktype = bytes(segment[0:1])
3093 chunktype = bytes(segment[0:1])
3092 else:
3094 else:
3093 chunktype = b'empty'
3095 chunktype = b'empty'
3094
3096
3095 if chunktype not in chunktypecounts:
3097 if chunktype not in chunktypecounts:
3096 chunktypecounts[chunktype] = 0
3098 chunktypecounts[chunktype] = 0
3097 chunktypesizes[chunktype] = 0
3099 chunktypesizes[chunktype] = 0
3098
3100
3099 chunktypecounts[chunktype] += 1
3101 chunktypecounts[chunktype] += 1
3100 chunktypesizes[chunktype] += size
3102 chunktypesizes[chunktype] += size
3101
3103
3102 # Adjust size min value for empty cases
3104 # Adjust size min value for empty cases
3103 for size in (datasize, fullsize, semisize, deltasize):
3105 for size in (datasize, fullsize, semisize, deltasize):
3104 if size[0] is None:
3106 if size[0] is None:
3105 size[0] = 0
3107 size[0] = 0
3106
3108
3107 numdeltas = numrevs - numfull - numempty - numsemi
3109 numdeltas = numrevs - numfull - numempty - numsemi
3108 numoprev = numprev - nump1prev - nump2prev
3110 numoprev = numprev - nump1prev - nump2prev
3109 totalrawsize = datasize[2]
3111 totalrawsize = datasize[2]
3110 datasize[2] /= numrevs
3112 datasize[2] /= numrevs
3111 fulltotal = fullsize[2]
3113 fulltotal = fullsize[2]
3112 if numfull == 0:
3114 if numfull == 0:
3113 fullsize[2] = 0
3115 fullsize[2] = 0
3114 else:
3116 else:
3115 fullsize[2] /= numfull
3117 fullsize[2] /= numfull
3116 semitotal = semisize[2]
3118 semitotal = semisize[2]
3117 snaptotal = {}
3119 snaptotal = {}
3118 if numsemi > 0:
3120 if numsemi > 0:
3119 semisize[2] /= numsemi
3121 semisize[2] /= numsemi
3120 for depth in snapsizedepth:
3122 for depth in snapsizedepth:
3121 snaptotal[depth] = snapsizedepth[depth][2]
3123 snaptotal[depth] = snapsizedepth[depth][2]
3122 snapsizedepth[depth][2] /= numsnapdepth[depth]
3124 snapsizedepth[depth][2] /= numsnapdepth[depth]
3123
3125
3124 deltatotal = deltasize[2]
3126 deltatotal = deltasize[2]
3125 if numdeltas > 0:
3127 if numdeltas > 0:
3126 deltasize[2] /= numdeltas
3128 deltasize[2] /= numdeltas
3127 totalsize = fulltotal + semitotal + deltatotal
3129 totalsize = fulltotal + semitotal + deltatotal
3128 avgchainlen = sum(chainlengths) / numrevs
3130 avgchainlen = sum(chainlengths) / numrevs
3129 maxchainlen = max(chainlengths)
3131 maxchainlen = max(chainlengths)
3130 maxchainspan = max(chainspans)
3132 maxchainspan = max(chainspans)
3131 compratio = 1
3133 compratio = 1
3132 if totalsize:
3134 if totalsize:
3133 compratio = totalrawsize / totalsize
3135 compratio = totalrawsize / totalsize
3134
3136
3135 basedfmtstr = b'%%%dd\n'
3137 basedfmtstr = b'%%%dd\n'
3136 basepcfmtstr = b'%%%dd %s(%%5.2f%%%%)\n'
3138 basepcfmtstr = b'%%%dd %s(%%5.2f%%%%)\n'
3137
3139
3138 def dfmtstr(max):
3140 def dfmtstr(max):
3139 return basedfmtstr % len(str(max))
3141 return basedfmtstr % len(str(max))
3140
3142
3141 def pcfmtstr(max, padding=0):
3143 def pcfmtstr(max, padding=0):
3142 return basepcfmtstr % (len(str(max)), b' ' * padding)
3144 return basepcfmtstr % (len(str(max)), b' ' * padding)
3143
3145
3144 def pcfmt(value, total):
3146 def pcfmt(value, total):
3145 if total:
3147 if total:
3146 return (value, 100 * float(value) / total)
3148 return (value, 100 * float(value) / total)
3147 else:
3149 else:
3148 return value, 100.0
3150 return value, 100.0
3149
3151
3150 ui.writenoi18n(b'format : %d\n' % format)
3152 ui.writenoi18n(b'format : %d\n' % format)
3151 ui.writenoi18n(b'flags : %s\n' % b', '.join(flags))
3153 ui.writenoi18n(b'flags : %s\n' % b', '.join(flags))
3152
3154
3153 ui.write(b'\n')
3155 ui.write(b'\n')
3154 fmt = pcfmtstr(totalsize)
3156 fmt = pcfmtstr(totalsize)
3155 fmt2 = dfmtstr(totalsize)
3157 fmt2 = dfmtstr(totalsize)
3156 ui.writenoi18n(b'revisions : ' + fmt2 % numrevs)
3158 ui.writenoi18n(b'revisions : ' + fmt2 % numrevs)
3157 ui.writenoi18n(b' merges : ' + fmt % pcfmt(nummerges, numrevs))
3159 ui.writenoi18n(b' merges : ' + fmt % pcfmt(nummerges, numrevs))
3158 ui.writenoi18n(
3160 ui.writenoi18n(
3159 b' normal : ' + fmt % pcfmt(numrevs - nummerges, numrevs)
3161 b' normal : ' + fmt % pcfmt(numrevs - nummerges, numrevs)
3160 )
3162 )
3161 ui.writenoi18n(b'revisions : ' + fmt2 % numrevs)
3163 ui.writenoi18n(b'revisions : ' + fmt2 % numrevs)
3162 ui.writenoi18n(b' empty : ' + fmt % pcfmt(numempty, numrevs))
3164 ui.writenoi18n(b' empty : ' + fmt % pcfmt(numempty, numrevs))
3163 ui.writenoi18n(
3165 ui.writenoi18n(
3164 b' text : '
3166 b' text : '
3165 + fmt % pcfmt(numemptytext, numemptytext + numemptydelta)
3167 + fmt % pcfmt(numemptytext, numemptytext + numemptydelta)
3166 )
3168 )
3167 ui.writenoi18n(
3169 ui.writenoi18n(
3168 b' delta : '
3170 b' delta : '
3169 + fmt % pcfmt(numemptydelta, numemptytext + numemptydelta)
3171 + fmt % pcfmt(numemptydelta, numemptytext + numemptydelta)
3170 )
3172 )
3171 ui.writenoi18n(
3173 ui.writenoi18n(
3172 b' snapshot : ' + fmt % pcfmt(numfull + numsemi, numrevs)
3174 b' snapshot : ' + fmt % pcfmt(numfull + numsemi, numrevs)
3173 )
3175 )
3174 for depth in sorted(numsnapdepth):
3176 for depth in sorted(numsnapdepth):
3175 ui.write(
3177 ui.write(
3176 (b' lvl-%-3d : ' % depth)
3178 (b' lvl-%-3d : ' % depth)
3177 + fmt % pcfmt(numsnapdepth[depth], numrevs)
3179 + fmt % pcfmt(numsnapdepth[depth], numrevs)
3178 )
3180 )
3179 ui.writenoi18n(b' deltas : ' + fmt % pcfmt(numdeltas, numrevs))
3181 ui.writenoi18n(b' deltas : ' + fmt % pcfmt(numdeltas, numrevs))
3180 ui.writenoi18n(b'revision size : ' + fmt2 % totalsize)
3182 ui.writenoi18n(b'revision size : ' + fmt2 % totalsize)
3181 ui.writenoi18n(
3183 ui.writenoi18n(
3182 b' snapshot : ' + fmt % pcfmt(fulltotal + semitotal, totalsize)
3184 b' snapshot : ' + fmt % pcfmt(fulltotal + semitotal, totalsize)
3183 )
3185 )
3184 for depth in sorted(numsnapdepth):
3186 for depth in sorted(numsnapdepth):
3185 ui.write(
3187 ui.write(
3186 (b' lvl-%-3d : ' % depth)
3188 (b' lvl-%-3d : ' % depth)
3187 + fmt % pcfmt(snaptotal[depth], totalsize)
3189 + fmt % pcfmt(snaptotal[depth], totalsize)
3188 )
3190 )
3189 ui.writenoi18n(b' deltas : ' + fmt % pcfmt(deltatotal, totalsize))
3191 ui.writenoi18n(b' deltas : ' + fmt % pcfmt(deltatotal, totalsize))
3190
3192
3191 def fmtchunktype(chunktype):
3193 def fmtchunktype(chunktype):
3192 if chunktype == b'empty':
3194 if chunktype == b'empty':
3193 return b' %s : ' % chunktype
3195 return b' %s : ' % chunktype
3194 elif chunktype in pycompat.bytestr(string.ascii_letters):
3196 elif chunktype in pycompat.bytestr(string.ascii_letters):
3195 return b' 0x%s (%s) : ' % (hex(chunktype), chunktype)
3197 return b' 0x%s (%s) : ' % (hex(chunktype), chunktype)
3196 else:
3198 else:
3197 return b' 0x%s : ' % hex(chunktype)
3199 return b' 0x%s : ' % hex(chunktype)
3198
3200
3199 ui.write(b'\n')
3201 ui.write(b'\n')
3200 ui.writenoi18n(b'chunks : ' + fmt2 % numrevs)
3202 ui.writenoi18n(b'chunks : ' + fmt2 % numrevs)
3201 for chunktype in sorted(chunktypecounts):
3203 for chunktype in sorted(chunktypecounts):
3202 ui.write(fmtchunktype(chunktype))
3204 ui.write(fmtchunktype(chunktype))
3203 ui.write(fmt % pcfmt(chunktypecounts[chunktype], numrevs))
3205 ui.write(fmt % pcfmt(chunktypecounts[chunktype], numrevs))
3204 ui.writenoi18n(b'chunks size : ' + fmt2 % totalsize)
3206 ui.writenoi18n(b'chunks size : ' + fmt2 % totalsize)
3205 for chunktype in sorted(chunktypecounts):
3207 for chunktype in sorted(chunktypecounts):
3206 ui.write(fmtchunktype(chunktype))
3208 ui.write(fmtchunktype(chunktype))
3207 ui.write(fmt % pcfmt(chunktypesizes[chunktype], totalsize))
3209 ui.write(fmt % pcfmt(chunktypesizes[chunktype], totalsize))
3208
3210
3209 ui.write(b'\n')
3211 ui.write(b'\n')
3210 fmt = dfmtstr(max(avgchainlen, maxchainlen, maxchainspan, compratio))
3212 fmt = dfmtstr(max(avgchainlen, maxchainlen, maxchainspan, compratio))
3211 ui.writenoi18n(b'avg chain length : ' + fmt % avgchainlen)
3213 ui.writenoi18n(b'avg chain length : ' + fmt % avgchainlen)
3212 ui.writenoi18n(b'max chain length : ' + fmt % maxchainlen)
3214 ui.writenoi18n(b'max chain length : ' + fmt % maxchainlen)
3213 ui.writenoi18n(b'max chain reach : ' + fmt % maxchainspan)
3215 ui.writenoi18n(b'max chain reach : ' + fmt % maxchainspan)
3214 ui.writenoi18n(b'compression ratio : ' + fmt % compratio)
3216 ui.writenoi18n(b'compression ratio : ' + fmt % compratio)
3215
3217
3216 if format > 0:
3218 if format > 0:
3217 ui.write(b'\n')
3219 ui.write(b'\n')
3218 ui.writenoi18n(
3220 ui.writenoi18n(
3219 b'uncompressed data size (min/max/avg) : %d / %d / %d\n'
3221 b'uncompressed data size (min/max/avg) : %d / %d / %d\n'
3220 % tuple(datasize)
3222 % tuple(datasize)
3221 )
3223 )
3222 ui.writenoi18n(
3224 ui.writenoi18n(
3223 b'full revision size (min/max/avg) : %d / %d / %d\n'
3225 b'full revision size (min/max/avg) : %d / %d / %d\n'
3224 % tuple(fullsize)
3226 % tuple(fullsize)
3225 )
3227 )
3226 ui.writenoi18n(
3228 ui.writenoi18n(
3227 b'inter-snapshot size (min/max/avg) : %d / %d / %d\n'
3229 b'inter-snapshot size (min/max/avg) : %d / %d / %d\n'
3228 % tuple(semisize)
3230 % tuple(semisize)
3229 )
3231 )
3230 for depth in sorted(snapsizedepth):
3232 for depth in sorted(snapsizedepth):
3231 if depth == 0:
3233 if depth == 0:
3232 continue
3234 continue
3233 ui.writenoi18n(
3235 ui.writenoi18n(
3234 b' level-%-3d (min/max/avg) : %d / %d / %d\n'
3236 b' level-%-3d (min/max/avg) : %d / %d / %d\n'
3235 % ((depth,) + tuple(snapsizedepth[depth]))
3237 % ((depth,) + tuple(snapsizedepth[depth]))
3236 )
3238 )
3237 ui.writenoi18n(
3239 ui.writenoi18n(
3238 b'delta size (min/max/avg) : %d / %d / %d\n'
3240 b'delta size (min/max/avg) : %d / %d / %d\n'
3239 % tuple(deltasize)
3241 % tuple(deltasize)
3240 )
3242 )
3241
3243
3242 if numdeltas > 0:
3244 if numdeltas > 0:
3243 ui.write(b'\n')
3245 ui.write(b'\n')
3244 fmt = pcfmtstr(numdeltas)
3246 fmt = pcfmtstr(numdeltas)
3245 fmt2 = pcfmtstr(numdeltas, 4)
3247 fmt2 = pcfmtstr(numdeltas, 4)
3246 ui.writenoi18n(
3248 ui.writenoi18n(
3247 b'deltas against prev : ' + fmt % pcfmt(numprev, numdeltas)
3249 b'deltas against prev : ' + fmt % pcfmt(numprev, numdeltas)
3248 )
3250 )
3249 if numprev > 0:
3251 if numprev > 0:
3250 ui.writenoi18n(
3252 ui.writenoi18n(
3251 b' where prev = p1 : ' + fmt2 % pcfmt(nump1prev, numprev)
3253 b' where prev = p1 : ' + fmt2 % pcfmt(nump1prev, numprev)
3252 )
3254 )
3253 ui.writenoi18n(
3255 ui.writenoi18n(
3254 b' where prev = p2 : ' + fmt2 % pcfmt(nump2prev, numprev)
3256 b' where prev = p2 : ' + fmt2 % pcfmt(nump2prev, numprev)
3255 )
3257 )
3256 ui.writenoi18n(
3258 ui.writenoi18n(
3257 b' other : ' + fmt2 % pcfmt(numoprev, numprev)
3259 b' other : ' + fmt2 % pcfmt(numoprev, numprev)
3258 )
3260 )
3259 if gdelta:
3261 if gdelta:
3260 ui.writenoi18n(
3262 ui.writenoi18n(
3261 b'deltas against p1 : ' + fmt % pcfmt(nump1, numdeltas)
3263 b'deltas against p1 : ' + fmt % pcfmt(nump1, numdeltas)
3262 )
3264 )
3263 ui.writenoi18n(
3265 ui.writenoi18n(
3264 b'deltas against p2 : ' + fmt % pcfmt(nump2, numdeltas)
3266 b'deltas against p2 : ' + fmt % pcfmt(nump2, numdeltas)
3265 )
3267 )
3266 ui.writenoi18n(
3268 ui.writenoi18n(
3267 b'deltas against other : ' + fmt % pcfmt(numother, numdeltas)
3269 b'deltas against other : ' + fmt % pcfmt(numother, numdeltas)
3268 )
3270 )
3269
3271
3270
3272
3271 @command(
3273 @command(
3272 b'debugrevlogindex',
3274 b'debugrevlogindex',
3273 cmdutil.debugrevlogopts
3275 cmdutil.debugrevlogopts
3274 + [(b'f', b'format', 0, _(b'revlog format'), _(b'FORMAT'))],
3276 + [(b'f', b'format', 0, _(b'revlog format'), _(b'FORMAT'))],
3275 _(b'[-f FORMAT] -c|-m|FILE'),
3277 _(b'[-f FORMAT] -c|-m|FILE'),
3276 optionalrepo=True,
3278 optionalrepo=True,
3277 )
3279 )
3278 def debugrevlogindex(ui, repo, file_=None, **opts):
3280 def debugrevlogindex(ui, repo, file_=None, **opts):
3279 """dump the contents of a revlog index"""
3281 """dump the contents of a revlog index"""
3280 opts = pycompat.byteskwargs(opts)
3282 opts = pycompat.byteskwargs(opts)
3281 r = cmdutil.openrevlog(repo, b'debugrevlogindex', file_, opts)
3283 r = cmdutil.openrevlog(repo, b'debugrevlogindex', file_, opts)
3282 format = opts.get(b'format', 0)
3284 format = opts.get(b'format', 0)
3283 if format not in (0, 1):
3285 if format not in (0, 1):
3284 raise error.Abort(_(b"unknown format %d") % format)
3286 raise error.Abort(_(b"unknown format %d") % format)
3285
3287
3286 if ui.debugflag:
3288 if ui.debugflag:
3287 shortfn = hex
3289 shortfn = hex
3288 else:
3290 else:
3289 shortfn = short
3291 shortfn = short
3290
3292
3291 # There might not be anything in r, so have a sane default
3293 # There might not be anything in r, so have a sane default
3292 idlen = 12
3294 idlen = 12
3293 for i in r:
3295 for i in r:
3294 idlen = len(shortfn(r.node(i)))
3296 idlen = len(shortfn(r.node(i)))
3295 break
3297 break
3296
3298
3297 if format == 0:
3299 if format == 0:
3298 if ui.verbose:
3300 if ui.verbose:
3299 ui.writenoi18n(
3301 ui.writenoi18n(
3300 b" rev offset length linkrev %s %s p2\n"
3302 b" rev offset length linkrev %s %s p2\n"
3301 % (b"nodeid".ljust(idlen), b"p1".ljust(idlen))
3303 % (b"nodeid".ljust(idlen), b"p1".ljust(idlen))
3302 )
3304 )
3303 else:
3305 else:
3304 ui.writenoi18n(
3306 ui.writenoi18n(
3305 b" rev linkrev %s %s p2\n"
3307 b" rev linkrev %s %s p2\n"
3306 % (b"nodeid".ljust(idlen), b"p1".ljust(idlen))
3308 % (b"nodeid".ljust(idlen), b"p1".ljust(idlen))
3307 )
3309 )
3308 elif format == 1:
3310 elif format == 1:
3309 if ui.verbose:
3311 if ui.verbose:
3310 ui.writenoi18n(
3312 ui.writenoi18n(
3311 (
3313 (
3312 b" rev flag offset length size link p1"
3314 b" rev flag offset length size link p1"
3313 b" p2 %s\n"
3315 b" p2 %s\n"
3314 )
3316 )
3315 % b"nodeid".rjust(idlen)
3317 % b"nodeid".rjust(idlen)
3316 )
3318 )
3317 else:
3319 else:
3318 ui.writenoi18n(
3320 ui.writenoi18n(
3319 b" rev flag size link p1 p2 %s\n"
3321 b" rev flag size link p1 p2 %s\n"
3320 % b"nodeid".rjust(idlen)
3322 % b"nodeid".rjust(idlen)
3321 )
3323 )
3322
3324
3323 for i in r:
3325 for i in r:
3324 node = r.node(i)
3326 node = r.node(i)
3325 if format == 0:
3327 if format == 0:
3326 try:
3328 try:
3327 pp = r.parents(node)
3329 pp = r.parents(node)
3328 except Exception:
3330 except Exception:
3329 pp = [nullid, nullid]
3331 pp = [nullid, nullid]
3330 if ui.verbose:
3332 if ui.verbose:
3331 ui.write(
3333 ui.write(
3332 b"% 6d % 9d % 7d % 7d %s %s %s\n"
3334 b"% 6d % 9d % 7d % 7d %s %s %s\n"
3333 % (
3335 % (
3334 i,
3336 i,
3335 r.start(i),
3337 r.start(i),
3336 r.length(i),
3338 r.length(i),
3337 r.linkrev(i),
3339 r.linkrev(i),
3338 shortfn(node),
3340 shortfn(node),
3339 shortfn(pp[0]),
3341 shortfn(pp[0]),
3340 shortfn(pp[1]),
3342 shortfn(pp[1]),
3341 )
3343 )
3342 )
3344 )
3343 else:
3345 else:
3344 ui.write(
3346 ui.write(
3345 b"% 6d % 7d %s %s %s\n"
3347 b"% 6d % 7d %s %s %s\n"
3346 % (
3348 % (
3347 i,
3349 i,
3348 r.linkrev(i),
3350 r.linkrev(i),
3349 shortfn(node),
3351 shortfn(node),
3350 shortfn(pp[0]),
3352 shortfn(pp[0]),
3351 shortfn(pp[1]),
3353 shortfn(pp[1]),
3352 )
3354 )
3353 )
3355 )
3354 elif format == 1:
3356 elif format == 1:
3355 pr = r.parentrevs(i)
3357 pr = r.parentrevs(i)
3356 if ui.verbose:
3358 if ui.verbose:
3357 ui.write(
3359 ui.write(
3358 b"% 6d %04x % 8d % 8d % 8d % 6d % 6d % 6d %s\n"
3360 b"% 6d %04x % 8d % 8d % 8d % 6d % 6d % 6d %s\n"
3359 % (
3361 % (
3360 i,
3362 i,
3361 r.flags(i),
3363 r.flags(i),
3362 r.start(i),
3364 r.start(i),
3363 r.length(i),
3365 r.length(i),
3364 r.rawsize(i),
3366 r.rawsize(i),
3365 r.linkrev(i),
3367 r.linkrev(i),
3366 pr[0],
3368 pr[0],
3367 pr[1],
3369 pr[1],
3368 shortfn(node),
3370 shortfn(node),
3369 )
3371 )
3370 )
3372 )
3371 else:
3373 else:
3372 ui.write(
3374 ui.write(
3373 b"% 6d %04x % 8d % 6d % 6d % 6d %s\n"
3375 b"% 6d %04x % 8d % 6d % 6d % 6d %s\n"
3374 % (
3376 % (
3375 i,
3377 i,
3376 r.flags(i),
3378 r.flags(i),
3377 r.rawsize(i),
3379 r.rawsize(i),
3378 r.linkrev(i),
3380 r.linkrev(i),
3379 pr[0],
3381 pr[0],
3380 pr[1],
3382 pr[1],
3381 shortfn(node),
3383 shortfn(node),
3382 )
3384 )
3383 )
3385 )
3384
3386
3385
3387
3386 @command(
3388 @command(
3387 b'debugrevspec',
3389 b'debugrevspec',
3388 [
3390 [
3389 (
3391 (
3390 b'',
3392 b'',
3391 b'optimize',
3393 b'optimize',
3392 None,
3394 None,
3393 _(b'print parsed tree after optimizing (DEPRECATED)'),
3395 _(b'print parsed tree after optimizing (DEPRECATED)'),
3394 ),
3396 ),
3395 (
3397 (
3396 b'',
3398 b'',
3397 b'show-revs',
3399 b'show-revs',
3398 True,
3400 True,
3399 _(b'print list of result revisions (default)'),
3401 _(b'print list of result revisions (default)'),
3400 ),
3402 ),
3401 (
3403 (
3402 b's',
3404 b's',
3403 b'show-set',
3405 b'show-set',
3404 None,
3406 None,
3405 _(b'print internal representation of result set'),
3407 _(b'print internal representation of result set'),
3406 ),
3408 ),
3407 (
3409 (
3408 b'p',
3410 b'p',
3409 b'show-stage',
3411 b'show-stage',
3410 [],
3412 [],
3411 _(b'print parsed tree at the given stage'),
3413 _(b'print parsed tree at the given stage'),
3412 _(b'NAME'),
3414 _(b'NAME'),
3413 ),
3415 ),
3414 (b'', b'no-optimized', False, _(b'evaluate tree without optimization')),
3416 (b'', b'no-optimized', False, _(b'evaluate tree without optimization')),
3415 (b'', b'verify-optimized', False, _(b'verify optimized result')),
3417 (b'', b'verify-optimized', False, _(b'verify optimized result')),
3416 ],
3418 ],
3417 b'REVSPEC',
3419 b'REVSPEC',
3418 )
3420 )
3419 def debugrevspec(ui, repo, expr, **opts):
3421 def debugrevspec(ui, repo, expr, **opts):
3420 """parse and apply a revision specification
3422 """parse and apply a revision specification
3421
3423
3422 Use -p/--show-stage option to print the parsed tree at the given stages.
3424 Use -p/--show-stage option to print the parsed tree at the given stages.
3423 Use -p all to print tree at every stage.
3425 Use -p all to print tree at every stage.
3424
3426
3425 Use --no-show-revs option with -s or -p to print only the set
3427 Use --no-show-revs option with -s or -p to print only the set
3426 representation or the parsed tree respectively.
3428 representation or the parsed tree respectively.
3427
3429
3428 Use --verify-optimized to compare the optimized result with the unoptimized
3430 Use --verify-optimized to compare the optimized result with the unoptimized
3429 one. Returns 1 if the optimized result differs.
3431 one. Returns 1 if the optimized result differs.
3430 """
3432 """
3431 opts = pycompat.byteskwargs(opts)
3433 opts = pycompat.byteskwargs(opts)
3432 aliases = ui.configitems(b'revsetalias')
3434 aliases = ui.configitems(b'revsetalias')
3433 stages = [
3435 stages = [
3434 (b'parsed', lambda tree: tree),
3436 (b'parsed', lambda tree: tree),
3435 (
3437 (
3436 b'expanded',
3438 b'expanded',
3437 lambda tree: revsetlang.expandaliases(tree, aliases, ui.warn),
3439 lambda tree: revsetlang.expandaliases(tree, aliases, ui.warn),
3438 ),
3440 ),
3439 (b'concatenated', revsetlang.foldconcat),
3441 (b'concatenated', revsetlang.foldconcat),
3440 (b'analyzed', revsetlang.analyze),
3442 (b'analyzed', revsetlang.analyze),
3441 (b'optimized', revsetlang.optimize),
3443 (b'optimized', revsetlang.optimize),
3442 ]
3444 ]
3443 if opts[b'no_optimized']:
3445 if opts[b'no_optimized']:
3444 stages = stages[:-1]
3446 stages = stages[:-1]
3445 if opts[b'verify_optimized'] and opts[b'no_optimized']:
3447 if opts[b'verify_optimized'] and opts[b'no_optimized']:
3446 raise error.Abort(
3448 raise error.Abort(
3447 _(b'cannot use --verify-optimized with --no-optimized')
3449 _(b'cannot use --verify-optimized with --no-optimized')
3448 )
3450 )
3449 stagenames = {n for n, f in stages}
3451 stagenames = {n for n, f in stages}
3450
3452
3451 showalways = set()
3453 showalways = set()
3452 showchanged = set()
3454 showchanged = set()
3453 if ui.verbose and not opts[b'show_stage']:
3455 if ui.verbose and not opts[b'show_stage']:
3454 # show parsed tree by --verbose (deprecated)
3456 # show parsed tree by --verbose (deprecated)
3455 showalways.add(b'parsed')
3457 showalways.add(b'parsed')
3456 showchanged.update([b'expanded', b'concatenated'])
3458 showchanged.update([b'expanded', b'concatenated'])
3457 if opts[b'optimize']:
3459 if opts[b'optimize']:
3458 showalways.add(b'optimized')
3460 showalways.add(b'optimized')
3459 if opts[b'show_stage'] and opts[b'optimize']:
3461 if opts[b'show_stage'] and opts[b'optimize']:
3460 raise error.Abort(_(b'cannot use --optimize with --show-stage'))
3462 raise error.Abort(_(b'cannot use --optimize with --show-stage'))
3461 if opts[b'show_stage'] == [b'all']:
3463 if opts[b'show_stage'] == [b'all']:
3462 showalways.update(stagenames)
3464 showalways.update(stagenames)
3463 else:
3465 else:
3464 for n in opts[b'show_stage']:
3466 for n in opts[b'show_stage']:
3465 if n not in stagenames:
3467 if n not in stagenames:
3466 raise error.Abort(_(b'invalid stage name: %s') % n)
3468 raise error.Abort(_(b'invalid stage name: %s') % n)
3467 showalways.update(opts[b'show_stage'])
3469 showalways.update(opts[b'show_stage'])
3468
3470
3469 treebystage = {}
3471 treebystage = {}
3470 printedtree = None
3472 printedtree = None
3471 tree = revsetlang.parse(expr, lookup=revset.lookupfn(repo))
3473 tree = revsetlang.parse(expr, lookup=revset.lookupfn(repo))
3472 for n, f in stages:
3474 for n, f in stages:
3473 treebystage[n] = tree = f(tree)
3475 treebystage[n] = tree = f(tree)
3474 if n in showalways or (n in showchanged and tree != printedtree):
3476 if n in showalways or (n in showchanged and tree != printedtree):
3475 if opts[b'show_stage'] or n != b'parsed':
3477 if opts[b'show_stage'] or n != b'parsed':
3476 ui.write(b"* %s:\n" % n)
3478 ui.write(b"* %s:\n" % n)
3477 ui.write(revsetlang.prettyformat(tree), b"\n")
3479 ui.write(revsetlang.prettyformat(tree), b"\n")
3478 printedtree = tree
3480 printedtree = tree
3479
3481
3480 if opts[b'verify_optimized']:
3482 if opts[b'verify_optimized']:
3481 arevs = revset.makematcher(treebystage[b'analyzed'])(repo)
3483 arevs = revset.makematcher(treebystage[b'analyzed'])(repo)
3482 brevs = revset.makematcher(treebystage[b'optimized'])(repo)
3484 brevs = revset.makematcher(treebystage[b'optimized'])(repo)
3483 if opts[b'show_set'] or (opts[b'show_set'] is None and ui.verbose):
3485 if opts[b'show_set'] or (opts[b'show_set'] is None and ui.verbose):
3484 ui.writenoi18n(
3486 ui.writenoi18n(
3485 b"* analyzed set:\n", stringutil.prettyrepr(arevs), b"\n"
3487 b"* analyzed set:\n", stringutil.prettyrepr(arevs), b"\n"
3486 )
3488 )
3487 ui.writenoi18n(
3489 ui.writenoi18n(
3488 b"* optimized set:\n", stringutil.prettyrepr(brevs), b"\n"
3490 b"* optimized set:\n", stringutil.prettyrepr(brevs), b"\n"
3489 )
3491 )
3490 arevs = list(arevs)
3492 arevs = list(arevs)
3491 brevs = list(brevs)
3493 brevs = list(brevs)
3492 if arevs == brevs:
3494 if arevs == brevs:
3493 return 0
3495 return 0
3494 ui.writenoi18n(b'--- analyzed\n', label=b'diff.file_a')
3496 ui.writenoi18n(b'--- analyzed\n', label=b'diff.file_a')
3495 ui.writenoi18n(b'+++ optimized\n', label=b'diff.file_b')
3497 ui.writenoi18n(b'+++ optimized\n', label=b'diff.file_b')
3496 sm = difflib.SequenceMatcher(None, arevs, brevs)
3498 sm = difflib.SequenceMatcher(None, arevs, brevs)
3497 for tag, alo, ahi, blo, bhi in sm.get_opcodes():
3499 for tag, alo, ahi, blo, bhi in sm.get_opcodes():
3498 if tag in ('delete', 'replace'):
3500 if tag in ('delete', 'replace'):
3499 for c in arevs[alo:ahi]:
3501 for c in arevs[alo:ahi]:
3500 ui.write(b'-%d\n' % c, label=b'diff.deleted')
3502 ui.write(b'-%d\n' % c, label=b'diff.deleted')
3501 if tag in ('insert', 'replace'):
3503 if tag in ('insert', 'replace'):
3502 for c in brevs[blo:bhi]:
3504 for c in brevs[blo:bhi]:
3503 ui.write(b'+%d\n' % c, label=b'diff.inserted')
3505 ui.write(b'+%d\n' % c, label=b'diff.inserted')
3504 if tag == 'equal':
3506 if tag == 'equal':
3505 for c in arevs[alo:ahi]:
3507 for c in arevs[alo:ahi]:
3506 ui.write(b' %d\n' % c)
3508 ui.write(b' %d\n' % c)
3507 return 1
3509 return 1
3508
3510
3509 func = revset.makematcher(tree)
3511 func = revset.makematcher(tree)
3510 revs = func(repo)
3512 revs = func(repo)
3511 if opts[b'show_set'] or (opts[b'show_set'] is None and ui.verbose):
3513 if opts[b'show_set'] or (opts[b'show_set'] is None and ui.verbose):
3512 ui.writenoi18n(b"* set:\n", stringutil.prettyrepr(revs), b"\n")
3514 ui.writenoi18n(b"* set:\n", stringutil.prettyrepr(revs), b"\n")
3513 if not opts[b'show_revs']:
3515 if not opts[b'show_revs']:
3514 return
3516 return
3515 for c in revs:
3517 for c in revs:
3516 ui.write(b"%d\n" % c)
3518 ui.write(b"%d\n" % c)
3517
3519
3518
3520
3519 @command(
3521 @command(
3520 b'debugserve',
3522 b'debugserve',
3521 [
3523 [
3522 (
3524 (
3523 b'',
3525 b'',
3524 b'sshstdio',
3526 b'sshstdio',
3525 False,
3527 False,
3526 _(b'run an SSH server bound to process handles'),
3528 _(b'run an SSH server bound to process handles'),
3527 ),
3529 ),
3528 (b'', b'logiofd', b'', _(b'file descriptor to log server I/O to')),
3530 (b'', b'logiofd', b'', _(b'file descriptor to log server I/O to')),
3529 (b'', b'logiofile', b'', _(b'file to log server I/O to')),
3531 (b'', b'logiofile', b'', _(b'file to log server I/O to')),
3530 ],
3532 ],
3531 b'',
3533 b'',
3532 )
3534 )
3533 def debugserve(ui, repo, **opts):
3535 def debugserve(ui, repo, **opts):
3534 """run a server with advanced settings
3536 """run a server with advanced settings
3535
3537
3536 This command is similar to :hg:`serve`. It exists partially as a
3538 This command is similar to :hg:`serve`. It exists partially as a
3537 workaround to the fact that ``hg serve --stdio`` must have specific
3539 workaround to the fact that ``hg serve --stdio`` must have specific
3538 arguments for security reasons.
3540 arguments for security reasons.
3539 """
3541 """
3540 opts = pycompat.byteskwargs(opts)
3542 opts = pycompat.byteskwargs(opts)
3541
3543
3542 if not opts[b'sshstdio']:
3544 if not opts[b'sshstdio']:
3543 raise error.Abort(_(b'only --sshstdio is currently supported'))
3545 raise error.Abort(_(b'only --sshstdio is currently supported'))
3544
3546
3545 logfh = None
3547 logfh = None
3546
3548
3547 if opts[b'logiofd'] and opts[b'logiofile']:
3549 if opts[b'logiofd'] and opts[b'logiofile']:
3548 raise error.Abort(_(b'cannot use both --logiofd and --logiofile'))
3550 raise error.Abort(_(b'cannot use both --logiofd and --logiofile'))
3549
3551
3550 if opts[b'logiofd']:
3552 if opts[b'logiofd']:
3551 # Ideally we would be line buffered. But line buffering in binary
3553 # Ideally we would be line buffered. But line buffering in binary
3552 # mode isn't supported and emits a warning in Python 3.8+. Disabling
3554 # mode isn't supported and emits a warning in Python 3.8+. Disabling
3553 # buffering could have performance impacts. But since this isn't
3555 # buffering could have performance impacts. But since this isn't
3554 # performance critical code, it should be fine.
3556 # performance critical code, it should be fine.
3555 try:
3557 try:
3556 logfh = os.fdopen(int(opts[b'logiofd']), 'ab', 0)
3558 logfh = os.fdopen(int(opts[b'logiofd']), 'ab', 0)
3557 except OSError as e:
3559 except OSError as e:
3558 if e.errno != errno.ESPIPE:
3560 if e.errno != errno.ESPIPE:
3559 raise
3561 raise
3560 # can't seek a pipe, so `ab` mode fails on py3
3562 # can't seek a pipe, so `ab` mode fails on py3
3561 logfh = os.fdopen(int(opts[b'logiofd']), 'wb', 0)
3563 logfh = os.fdopen(int(opts[b'logiofd']), 'wb', 0)
3562 elif opts[b'logiofile']:
3564 elif opts[b'logiofile']:
3563 logfh = open(opts[b'logiofile'], b'ab', 0)
3565 logfh = open(opts[b'logiofile'], b'ab', 0)
3564
3566
3565 s = wireprotoserver.sshserver(ui, repo, logfh=logfh)
3567 s = wireprotoserver.sshserver(ui, repo, logfh=logfh)
3566 s.serve_forever()
3568 s.serve_forever()
3567
3569
3568
3570
3569 @command(b'debugsetparents', [], _(b'REV1 [REV2]'))
3571 @command(b'debugsetparents', [], _(b'REV1 [REV2]'))
3570 def debugsetparents(ui, repo, rev1, rev2=None):
3572 def debugsetparents(ui, repo, rev1, rev2=None):
3571 """manually set the parents of the current working directory (DANGEROUS)
3573 """manually set the parents of the current working directory (DANGEROUS)
3572
3574
3573 This command is not what you are looking for and should not be used. Using
3575 This command is not what you are looking for and should not be used. Using
3574 this command will most certainly results in slight corruption of the file
3576 this command will most certainly results in slight corruption of the file
3575 level histories withing your repository. DO NOT USE THIS COMMAND.
3577 level histories withing your repository. DO NOT USE THIS COMMAND.
3576
3578
3577 The command update the p1 and p2 field in the dirstate, and not touching
3579 The command update the p1 and p2 field in the dirstate, and not touching
3578 anything else. This useful for writing repository conversion tools, but
3580 anything else. This useful for writing repository conversion tools, but
3579 should be used with extreme care. For example, neither the working
3581 should be used with extreme care. For example, neither the working
3580 directory nor the dirstate is updated, so file status may be incorrect
3582 directory nor the dirstate is updated, so file status may be incorrect
3581 after running this command. Only used if you are one of the few people that
3583 after running this command. Only used if you are one of the few people that
3582 deeply unstand both conversion tools and file level histories. If you are
3584 deeply unstand both conversion tools and file level histories. If you are
3583 reading this help, you are not one of this people (most of them sailed west
3585 reading this help, you are not one of this people (most of them sailed west
3584 from Mithlond anyway.
3586 from Mithlond anyway.
3585
3587
3586 So one last time DO NOT USE THIS COMMAND.
3588 So one last time DO NOT USE THIS COMMAND.
3587
3589
3588 Returns 0 on success.
3590 Returns 0 on success.
3589 """
3591 """
3590
3592
3591 node1 = scmutil.revsingle(repo, rev1).node()
3593 node1 = scmutil.revsingle(repo, rev1).node()
3592 node2 = scmutil.revsingle(repo, rev2, b'null').node()
3594 node2 = scmutil.revsingle(repo, rev2, b'null').node()
3593
3595
3594 with repo.wlock():
3596 with repo.wlock():
3595 repo.setparents(node1, node2)
3597 repo.setparents(node1, node2)
3596
3598
3597
3599
3598 @command(b'debugsidedata', cmdutil.debugrevlogopts, _(b'-c|-m|FILE REV'))
3600 @command(b'debugsidedata', cmdutil.debugrevlogopts, _(b'-c|-m|FILE REV'))
3599 def debugsidedata(ui, repo, file_, rev=None, **opts):
3601 def debugsidedata(ui, repo, file_, rev=None, **opts):
3600 """dump the side data for a cl/manifest/file revision
3602 """dump the side data for a cl/manifest/file revision
3601
3603
3602 Use --verbose to dump the sidedata content."""
3604 Use --verbose to dump the sidedata content."""
3603 opts = pycompat.byteskwargs(opts)
3605 opts = pycompat.byteskwargs(opts)
3604 if opts.get(b'changelog') or opts.get(b'manifest') or opts.get(b'dir'):
3606 if opts.get(b'changelog') or opts.get(b'manifest') or opts.get(b'dir'):
3605 if rev is not None:
3607 if rev is not None:
3606 raise error.CommandError(b'debugdata', _(b'invalid arguments'))
3608 raise error.CommandError(b'debugdata', _(b'invalid arguments'))
3607 file_, rev = None, file_
3609 file_, rev = None, file_
3608 elif rev is None:
3610 elif rev is None:
3609 raise error.CommandError(b'debugdata', _(b'invalid arguments'))
3611 raise error.CommandError(b'debugdata', _(b'invalid arguments'))
3610 r = cmdutil.openstorage(repo, b'debugdata', file_, opts)
3612 r = cmdutil.openstorage(repo, b'debugdata', file_, opts)
3611 r = getattr(r, '_revlog', r)
3613 r = getattr(r, '_revlog', r)
3612 try:
3614 try:
3613 sidedata = r.sidedata(r.lookup(rev))
3615 sidedata = r.sidedata(r.lookup(rev))
3614 except KeyError:
3616 except KeyError:
3615 raise error.Abort(_(b'invalid revision identifier %s') % rev)
3617 raise error.Abort(_(b'invalid revision identifier %s') % rev)
3616 if sidedata:
3618 if sidedata:
3617 sidedata = list(sidedata.items())
3619 sidedata = list(sidedata.items())
3618 sidedata.sort()
3620 sidedata.sort()
3619 ui.writenoi18n(b'%d sidedata entries\n' % len(sidedata))
3621 ui.writenoi18n(b'%d sidedata entries\n' % len(sidedata))
3620 for key, value in sidedata:
3622 for key, value in sidedata:
3621 ui.writenoi18n(b' entry-%04o size %d\n' % (key, len(value)))
3623 ui.writenoi18n(b' entry-%04o size %d\n' % (key, len(value)))
3622 if ui.verbose:
3624 if ui.verbose:
3623 ui.writenoi18n(b' %s\n' % stringutil.pprint(value))
3625 ui.writenoi18n(b' %s\n' % stringutil.pprint(value))
3624
3626
3625
3627
3626 @command(b'debugssl', [], b'[SOURCE]', optionalrepo=True)
3628 @command(b'debugssl', [], b'[SOURCE]', optionalrepo=True)
3627 def debugssl(ui, repo, source=None, **opts):
3629 def debugssl(ui, repo, source=None, **opts):
3628 """test a secure connection to a server
3630 """test a secure connection to a server
3629
3631
3630 This builds the certificate chain for the server on Windows, installing the
3632 This builds the certificate chain for the server on Windows, installing the
3631 missing intermediates and trusted root via Windows Update if necessary. It
3633 missing intermediates and trusted root via Windows Update if necessary. It
3632 does nothing on other platforms.
3634 does nothing on other platforms.
3633
3635
3634 If SOURCE is omitted, the 'default' path will be used. If a URL is given,
3636 If SOURCE is omitted, the 'default' path will be used. If a URL is given,
3635 that server is used. See :hg:`help urls` for more information.
3637 that server is used. See :hg:`help urls` for more information.
3636
3638
3637 If the update succeeds, retry the original operation. Otherwise, the cause
3639 If the update succeeds, retry the original operation. Otherwise, the cause
3638 of the SSL error is likely another issue.
3640 of the SSL error is likely another issue.
3639 """
3641 """
3640 if not pycompat.iswindows:
3642 if not pycompat.iswindows:
3641 raise error.Abort(
3643 raise error.Abort(
3642 _(b'certificate chain building is only possible on Windows')
3644 _(b'certificate chain building is only possible on Windows')
3643 )
3645 )
3644
3646
3645 if not source:
3647 if not source:
3646 if not repo:
3648 if not repo:
3647 raise error.Abort(
3649 raise error.Abort(
3648 _(
3650 _(
3649 b"there is no Mercurial repository here, and no "
3651 b"there is no Mercurial repository here, and no "
3650 b"server specified"
3652 b"server specified"
3651 )
3653 )
3652 )
3654 )
3653 source = b"default"
3655 source = b"default"
3654
3656
3655 source, branches = urlutil.parseurl(ui.expandpath(source))
3657 source, branches = urlutil.parseurl(ui.expandpath(source))
3656 url = urlutil.url(source)
3658 url = urlutil.url(source)
3657
3659
3658 defaultport = {b'https': 443, b'ssh': 22}
3660 defaultport = {b'https': 443, b'ssh': 22}
3659 if url.scheme in defaultport:
3661 if url.scheme in defaultport:
3660 try:
3662 try:
3661 addr = (url.host, int(url.port or defaultport[url.scheme]))
3663 addr = (url.host, int(url.port or defaultport[url.scheme]))
3662 except ValueError:
3664 except ValueError:
3663 raise error.Abort(_(b"malformed port number in URL"))
3665 raise error.Abort(_(b"malformed port number in URL"))
3664 else:
3666 else:
3665 raise error.Abort(_(b"only https and ssh connections are supported"))
3667 raise error.Abort(_(b"only https and ssh connections are supported"))
3666
3668
3667 from . import win32
3669 from . import win32
3668
3670
3669 s = ssl.wrap_socket(
3671 s = ssl.wrap_socket(
3670 socket.socket(),
3672 socket.socket(),
3671 ssl_version=ssl.PROTOCOL_TLS,
3673 ssl_version=ssl.PROTOCOL_TLS,
3672 cert_reqs=ssl.CERT_NONE,
3674 cert_reqs=ssl.CERT_NONE,
3673 ca_certs=None,
3675 ca_certs=None,
3674 )
3676 )
3675
3677
3676 try:
3678 try:
3677 s.connect(addr)
3679 s.connect(addr)
3678 cert = s.getpeercert(True)
3680 cert = s.getpeercert(True)
3679
3681
3680 ui.status(_(b'checking the certificate chain for %s\n') % url.host)
3682 ui.status(_(b'checking the certificate chain for %s\n') % url.host)
3681
3683
3682 complete = win32.checkcertificatechain(cert, build=False)
3684 complete = win32.checkcertificatechain(cert, build=False)
3683
3685
3684 if not complete:
3686 if not complete:
3685 ui.status(_(b'certificate chain is incomplete, updating... '))
3687 ui.status(_(b'certificate chain is incomplete, updating... '))
3686
3688
3687 if not win32.checkcertificatechain(cert):
3689 if not win32.checkcertificatechain(cert):
3688 ui.status(_(b'failed.\n'))
3690 ui.status(_(b'failed.\n'))
3689 else:
3691 else:
3690 ui.status(_(b'done.\n'))
3692 ui.status(_(b'done.\n'))
3691 else:
3693 else:
3692 ui.status(_(b'full certificate chain is available\n'))
3694 ui.status(_(b'full certificate chain is available\n'))
3693 finally:
3695 finally:
3694 s.close()
3696 s.close()
3695
3697
3696
3698
3697 @command(
3699 @command(
3698 b"debugbackupbundle",
3700 b"debugbackupbundle",
3699 [
3701 [
3700 (
3702 (
3701 b"",
3703 b"",
3702 b"recover",
3704 b"recover",
3703 b"",
3705 b"",
3704 b"brings the specified changeset back into the repository",
3706 b"brings the specified changeset back into the repository",
3705 )
3707 )
3706 ]
3708 ]
3707 + cmdutil.logopts,
3709 + cmdutil.logopts,
3708 _(b"hg debugbackupbundle [--recover HASH]"),
3710 _(b"hg debugbackupbundle [--recover HASH]"),
3709 )
3711 )
3710 def debugbackupbundle(ui, repo, *pats, **opts):
3712 def debugbackupbundle(ui, repo, *pats, **opts):
3711 """lists the changesets available in backup bundles
3713 """lists the changesets available in backup bundles
3712
3714
3713 Without any arguments, this command prints a list of the changesets in each
3715 Without any arguments, this command prints a list of the changesets in each
3714 backup bundle.
3716 backup bundle.
3715
3717
3716 --recover takes a changeset hash and unbundles the first bundle that
3718 --recover takes a changeset hash and unbundles the first bundle that
3717 contains that hash, which puts that changeset back in your repository.
3719 contains that hash, which puts that changeset back in your repository.
3718
3720
3719 --verbose will print the entire commit message and the bundle path for that
3721 --verbose will print the entire commit message and the bundle path for that
3720 backup.
3722 backup.
3721 """
3723 """
3722 backups = list(
3724 backups = list(
3723 filter(
3725 filter(
3724 os.path.isfile, glob.glob(repo.vfs.join(b"strip-backup") + b"/*.hg")
3726 os.path.isfile, glob.glob(repo.vfs.join(b"strip-backup") + b"/*.hg")
3725 )
3727 )
3726 )
3728 )
3727 backups.sort(key=lambda x: os.path.getmtime(x), reverse=True)
3729 backups.sort(key=lambda x: os.path.getmtime(x), reverse=True)
3728
3730
3729 opts = pycompat.byteskwargs(opts)
3731 opts = pycompat.byteskwargs(opts)
3730 opts[b"bundle"] = b""
3732 opts[b"bundle"] = b""
3731 opts[b"force"] = None
3733 opts[b"force"] = None
3732 limit = logcmdutil.getlimit(opts)
3734 limit = logcmdutil.getlimit(opts)
3733
3735
3734 def display(other, chlist, displayer):
3736 def display(other, chlist, displayer):
3735 if opts.get(b"newest_first"):
3737 if opts.get(b"newest_first"):
3736 chlist.reverse()
3738 chlist.reverse()
3737 count = 0
3739 count = 0
3738 for n in chlist:
3740 for n in chlist:
3739 if limit is not None and count >= limit:
3741 if limit is not None and count >= limit:
3740 break
3742 break
3741 parents = [True for p in other.changelog.parents(n) if p != nullid]
3743 parents = [True for p in other.changelog.parents(n) if p != nullid]
3742 if opts.get(b"no_merges") and len(parents) == 2:
3744 if opts.get(b"no_merges") and len(parents) == 2:
3743 continue
3745 continue
3744 count += 1
3746 count += 1
3745 displayer.show(other[n])
3747 displayer.show(other[n])
3746
3748
3747 recovernode = opts.get(b"recover")
3749 recovernode = opts.get(b"recover")
3748 if recovernode:
3750 if recovernode:
3749 if scmutil.isrevsymbol(repo, recovernode):
3751 if scmutil.isrevsymbol(repo, recovernode):
3750 ui.warn(_(b"%s already exists in the repo\n") % recovernode)
3752 ui.warn(_(b"%s already exists in the repo\n") % recovernode)
3751 return
3753 return
3752 elif backups:
3754 elif backups:
3753 msg = _(
3755 msg = _(
3754 b"Recover changesets using: hg debugbackupbundle --recover "
3756 b"Recover changesets using: hg debugbackupbundle --recover "
3755 b"<changeset hash>\n\nAvailable backup changesets:"
3757 b"<changeset hash>\n\nAvailable backup changesets:"
3756 )
3758 )
3757 ui.status(msg, label=b"status.removed")
3759 ui.status(msg, label=b"status.removed")
3758 else:
3760 else:
3759 ui.status(_(b"no backup changesets found\n"))
3761 ui.status(_(b"no backup changesets found\n"))
3760 return
3762 return
3761
3763
3762 for backup in backups:
3764 for backup in backups:
3763 # Much of this is copied from the hg incoming logic
3765 # Much of this is copied from the hg incoming logic
3764 source = ui.expandpath(os.path.relpath(backup, encoding.getcwd()))
3766 source = ui.expandpath(os.path.relpath(backup, encoding.getcwd()))
3765 source, branches = urlutil.parseurl(source, opts.get(b"branch"))
3767 source, branches = urlutil.parseurl(source, opts.get(b"branch"))
3766 try:
3768 try:
3767 other = hg.peer(repo, opts, source)
3769 other = hg.peer(repo, opts, source)
3768 except error.LookupError as ex:
3770 except error.LookupError as ex:
3769 msg = _(b"\nwarning: unable to open bundle %s") % source
3771 msg = _(b"\nwarning: unable to open bundle %s") % source
3770 hint = _(b"\n(missing parent rev %s)\n") % short(ex.name)
3772 hint = _(b"\n(missing parent rev %s)\n") % short(ex.name)
3771 ui.warn(msg, hint=hint)
3773 ui.warn(msg, hint=hint)
3772 continue
3774 continue
3773 revs, checkout = hg.addbranchrevs(
3775 revs, checkout = hg.addbranchrevs(
3774 repo, other, branches, opts.get(b"rev")
3776 repo, other, branches, opts.get(b"rev")
3775 )
3777 )
3776
3778
3777 if revs:
3779 if revs:
3778 revs = [other.lookup(rev) for rev in revs]
3780 revs = [other.lookup(rev) for rev in revs]
3779
3781
3780 quiet = ui.quiet
3782 quiet = ui.quiet
3781 try:
3783 try:
3782 ui.quiet = True
3784 ui.quiet = True
3783 other, chlist, cleanupfn = bundlerepo.getremotechanges(
3785 other, chlist, cleanupfn = bundlerepo.getremotechanges(
3784 ui, repo, other, revs, opts[b"bundle"], opts[b"force"]
3786 ui, repo, other, revs, opts[b"bundle"], opts[b"force"]
3785 )
3787 )
3786 except error.LookupError:
3788 except error.LookupError:
3787 continue
3789 continue
3788 finally:
3790 finally:
3789 ui.quiet = quiet
3791 ui.quiet = quiet
3790
3792
3791 try:
3793 try:
3792 if not chlist:
3794 if not chlist:
3793 continue
3795 continue
3794 if recovernode:
3796 if recovernode:
3795 with repo.lock(), repo.transaction(b"unbundle") as tr:
3797 with repo.lock(), repo.transaction(b"unbundle") as tr:
3796 if scmutil.isrevsymbol(other, recovernode):
3798 if scmutil.isrevsymbol(other, recovernode):
3797 ui.status(_(b"Unbundling %s\n") % (recovernode))
3799 ui.status(_(b"Unbundling %s\n") % (recovernode))
3798 f = hg.openpath(ui, source)
3800 f = hg.openpath(ui, source)
3799 gen = exchange.readbundle(ui, f, source)
3801 gen = exchange.readbundle(ui, f, source)
3800 if isinstance(gen, bundle2.unbundle20):
3802 if isinstance(gen, bundle2.unbundle20):
3801 bundle2.applybundle(
3803 bundle2.applybundle(
3802 repo,
3804 repo,
3803 gen,
3805 gen,
3804 tr,
3806 tr,
3805 source=b"unbundle",
3807 source=b"unbundle",
3806 url=b"bundle:" + source,
3808 url=b"bundle:" + source,
3807 )
3809 )
3808 else:
3810 else:
3809 gen.apply(repo, b"unbundle", b"bundle:" + source)
3811 gen.apply(repo, b"unbundle", b"bundle:" + source)
3810 break
3812 break
3811 else:
3813 else:
3812 backupdate = encoding.strtolocal(
3814 backupdate = encoding.strtolocal(
3813 time.strftime(
3815 time.strftime(
3814 "%a %H:%M, %Y-%m-%d",
3816 "%a %H:%M, %Y-%m-%d",
3815 time.localtime(os.path.getmtime(source)),
3817 time.localtime(os.path.getmtime(source)),
3816 )
3818 )
3817 )
3819 )
3818 ui.status(b"\n%s\n" % (backupdate.ljust(50)))
3820 ui.status(b"\n%s\n" % (backupdate.ljust(50)))
3819 if ui.verbose:
3821 if ui.verbose:
3820 ui.status(b"%s%s\n" % (b"bundle:".ljust(13), source))
3822 ui.status(b"%s%s\n" % (b"bundle:".ljust(13), source))
3821 else:
3823 else:
3822 opts[
3824 opts[
3823 b"template"
3825 b"template"
3824 ] = b"{label('status.modified', node|short)} {desc|firstline}\n"
3826 ] = b"{label('status.modified', node|short)} {desc|firstline}\n"
3825 displayer = logcmdutil.changesetdisplayer(
3827 displayer = logcmdutil.changesetdisplayer(
3826 ui, other, opts, False
3828 ui, other, opts, False
3827 )
3829 )
3828 display(other, chlist, displayer)
3830 display(other, chlist, displayer)
3829 displayer.close()
3831 displayer.close()
3830 finally:
3832 finally:
3831 cleanupfn()
3833 cleanupfn()
3832
3834
3833
3835
3834 @command(
3836 @command(
3835 b'debugsub',
3837 b'debugsub',
3836 [(b'r', b'rev', b'', _(b'revision to check'), _(b'REV'))],
3838 [(b'r', b'rev', b'', _(b'revision to check'), _(b'REV'))],
3837 _(b'[-r REV] [REV]'),
3839 _(b'[-r REV] [REV]'),
3838 )
3840 )
3839 def debugsub(ui, repo, rev=None):
3841 def debugsub(ui, repo, rev=None):
3840 ctx = scmutil.revsingle(repo, rev, None)
3842 ctx = scmutil.revsingle(repo, rev, None)
3841 for k, v in sorted(ctx.substate.items()):
3843 for k, v in sorted(ctx.substate.items()):
3842 ui.writenoi18n(b'path %s\n' % k)
3844 ui.writenoi18n(b'path %s\n' % k)
3843 ui.writenoi18n(b' source %s\n' % v[0])
3845 ui.writenoi18n(b' source %s\n' % v[0])
3844 ui.writenoi18n(b' revision %s\n' % v[1])
3846 ui.writenoi18n(b' revision %s\n' % v[1])
3845
3847
3846
3848
3847 @command(b'debugshell', optionalrepo=True)
3849 @command(b'debugshell', optionalrepo=True)
3848 def debugshell(ui, repo):
3850 def debugshell(ui, repo):
3849 """run an interactive Python interpreter
3851 """run an interactive Python interpreter
3850
3852
3851 The local namespace is provided with a reference to the ui and
3853 The local namespace is provided with a reference to the ui and
3852 the repo instance (if available).
3854 the repo instance (if available).
3853 """
3855 """
3854 import code
3856 import code
3855
3857
3856 imported_objects = {
3858 imported_objects = {
3857 'ui': ui,
3859 'ui': ui,
3858 'repo': repo,
3860 'repo': repo,
3859 }
3861 }
3860
3862
3861 code.interact(local=imported_objects)
3863 code.interact(local=imported_objects)
3862
3864
3863
3865
3864 @command(
3866 @command(
3865 b'debugsuccessorssets',
3867 b'debugsuccessorssets',
3866 [(b'', b'closest', False, _(b'return closest successors sets only'))],
3868 [(b'', b'closest', False, _(b'return closest successors sets only'))],
3867 _(b'[REV]'),
3869 _(b'[REV]'),
3868 )
3870 )
3869 def debugsuccessorssets(ui, repo, *revs, **opts):
3871 def debugsuccessorssets(ui, repo, *revs, **opts):
3870 """show set of successors for revision
3872 """show set of successors for revision
3871
3873
3872 A successors set of changeset A is a consistent group of revisions that
3874 A successors set of changeset A is a consistent group of revisions that
3873 succeed A. It contains non-obsolete changesets only unless closests
3875 succeed A. It contains non-obsolete changesets only unless closests
3874 successors set is set.
3876 successors set is set.
3875
3877
3876 In most cases a changeset A has a single successors set containing a single
3878 In most cases a changeset A has a single successors set containing a single
3877 successor (changeset A replaced by A').
3879 successor (changeset A replaced by A').
3878
3880
3879 A changeset that is made obsolete with no successors are called "pruned".
3881 A changeset that is made obsolete with no successors are called "pruned".
3880 Such changesets have no successors sets at all.
3882 Such changesets have no successors sets at all.
3881
3883
3882 A changeset that has been "split" will have a successors set containing
3884 A changeset that has been "split" will have a successors set containing
3883 more than one successor.
3885 more than one successor.
3884
3886
3885 A changeset that has been rewritten in multiple different ways is called
3887 A changeset that has been rewritten in multiple different ways is called
3886 "divergent". Such changesets have multiple successor sets (each of which
3888 "divergent". Such changesets have multiple successor sets (each of which
3887 may also be split, i.e. have multiple successors).
3889 may also be split, i.e. have multiple successors).
3888
3890
3889 Results are displayed as follows::
3891 Results are displayed as follows::
3890
3892
3891 <rev1>
3893 <rev1>
3892 <successors-1A>
3894 <successors-1A>
3893 <rev2>
3895 <rev2>
3894 <successors-2A>
3896 <successors-2A>
3895 <successors-2B1> <successors-2B2> <successors-2B3>
3897 <successors-2B1> <successors-2B2> <successors-2B3>
3896
3898
3897 Here rev2 has two possible (i.e. divergent) successors sets. The first
3899 Here rev2 has two possible (i.e. divergent) successors sets. The first
3898 holds one element, whereas the second holds three (i.e. the changeset has
3900 holds one element, whereas the second holds three (i.e. the changeset has
3899 been split).
3901 been split).
3900 """
3902 """
3901 # passed to successorssets caching computation from one call to another
3903 # passed to successorssets caching computation from one call to another
3902 cache = {}
3904 cache = {}
3903 ctx2str = bytes
3905 ctx2str = bytes
3904 node2str = short
3906 node2str = short
3905 for rev in scmutil.revrange(repo, revs):
3907 for rev in scmutil.revrange(repo, revs):
3906 ctx = repo[rev]
3908 ctx = repo[rev]
3907 ui.write(b'%s\n' % ctx2str(ctx))
3909 ui.write(b'%s\n' % ctx2str(ctx))
3908 for succsset in obsutil.successorssets(
3910 for succsset in obsutil.successorssets(
3909 repo, ctx.node(), closest=opts['closest'], cache=cache
3911 repo, ctx.node(), closest=opts['closest'], cache=cache
3910 ):
3912 ):
3911 if succsset:
3913 if succsset:
3912 ui.write(b' ')
3914 ui.write(b' ')
3913 ui.write(node2str(succsset[0]))
3915 ui.write(node2str(succsset[0]))
3914 for node in succsset[1:]:
3916 for node in succsset[1:]:
3915 ui.write(b' ')
3917 ui.write(b' ')
3916 ui.write(node2str(node))
3918 ui.write(node2str(node))
3917 ui.write(b'\n')
3919 ui.write(b'\n')
3918
3920
3919
3921
3920 @command(b'debugtagscache', [])
3922 @command(b'debugtagscache', [])
3921 def debugtagscache(ui, repo):
3923 def debugtagscache(ui, repo):
3922 """display the contents of .hg/cache/hgtagsfnodes1"""
3924 """display the contents of .hg/cache/hgtagsfnodes1"""
3923 cache = tagsmod.hgtagsfnodescache(repo.unfiltered())
3925 cache = tagsmod.hgtagsfnodescache(repo.unfiltered())
3924 flog = repo.file(b'.hgtags')
3926 flog = repo.file(b'.hgtags')
3925 for r in repo:
3927 for r in repo:
3926 node = repo[r].node()
3928 node = repo[r].node()
3927 tagsnode = cache.getfnode(node, computemissing=False)
3929 tagsnode = cache.getfnode(node, computemissing=False)
3928 if tagsnode:
3930 if tagsnode:
3929 tagsnodedisplay = hex(tagsnode)
3931 tagsnodedisplay = hex(tagsnode)
3930 if not flog.hasnode(tagsnode):
3932 if not flog.hasnode(tagsnode):
3931 tagsnodedisplay += b' (unknown node)'
3933 tagsnodedisplay += b' (unknown node)'
3932 elif tagsnode is None:
3934 elif tagsnode is None:
3933 tagsnodedisplay = b'missing'
3935 tagsnodedisplay = b'missing'
3934 else:
3936 else:
3935 tagsnodedisplay = b'invalid'
3937 tagsnodedisplay = b'invalid'
3936
3938
3937 ui.write(b'%d %s %s\n' % (r, hex(node), tagsnodedisplay))
3939 ui.write(b'%d %s %s\n' % (r, hex(node), tagsnodedisplay))
3938
3940
3939
3941
3940 @command(
3942 @command(
3941 b'debugtemplate',
3943 b'debugtemplate',
3942 [
3944 [
3943 (b'r', b'rev', [], _(b'apply template on changesets'), _(b'REV')),
3945 (b'r', b'rev', [], _(b'apply template on changesets'), _(b'REV')),
3944 (b'D', b'define', [], _(b'define template keyword'), _(b'KEY=VALUE')),
3946 (b'D', b'define', [], _(b'define template keyword'), _(b'KEY=VALUE')),
3945 ],
3947 ],
3946 _(b'[-r REV]... [-D KEY=VALUE]... TEMPLATE'),
3948 _(b'[-r REV]... [-D KEY=VALUE]... TEMPLATE'),
3947 optionalrepo=True,
3949 optionalrepo=True,
3948 )
3950 )
3949 def debugtemplate(ui, repo, tmpl, **opts):
3951 def debugtemplate(ui, repo, tmpl, **opts):
3950 """parse and apply a template
3952 """parse and apply a template
3951
3953
3952 If -r/--rev is given, the template is processed as a log template and
3954 If -r/--rev is given, the template is processed as a log template and
3953 applied to the given changesets. Otherwise, it is processed as a generic
3955 applied to the given changesets. Otherwise, it is processed as a generic
3954 template.
3956 template.
3955
3957
3956 Use --verbose to print the parsed tree.
3958 Use --verbose to print the parsed tree.
3957 """
3959 """
3958 revs = None
3960 revs = None
3959 if opts['rev']:
3961 if opts['rev']:
3960 if repo is None:
3962 if repo is None:
3961 raise error.RepoError(
3963 raise error.RepoError(
3962 _(b'there is no Mercurial repository here (.hg not found)')
3964 _(b'there is no Mercurial repository here (.hg not found)')
3963 )
3965 )
3964 revs = scmutil.revrange(repo, opts['rev'])
3966 revs = scmutil.revrange(repo, opts['rev'])
3965
3967
3966 props = {}
3968 props = {}
3967 for d in opts['define']:
3969 for d in opts['define']:
3968 try:
3970 try:
3969 k, v = (e.strip() for e in d.split(b'=', 1))
3971 k, v = (e.strip() for e in d.split(b'=', 1))
3970 if not k or k == b'ui':
3972 if not k or k == b'ui':
3971 raise ValueError
3973 raise ValueError
3972 props[k] = v
3974 props[k] = v
3973 except ValueError:
3975 except ValueError:
3974 raise error.Abort(_(b'malformed keyword definition: %s') % d)
3976 raise error.Abort(_(b'malformed keyword definition: %s') % d)
3975
3977
3976 if ui.verbose:
3978 if ui.verbose:
3977 aliases = ui.configitems(b'templatealias')
3979 aliases = ui.configitems(b'templatealias')
3978 tree = templater.parse(tmpl)
3980 tree = templater.parse(tmpl)
3979 ui.note(templater.prettyformat(tree), b'\n')
3981 ui.note(templater.prettyformat(tree), b'\n')
3980 newtree = templater.expandaliases(tree, aliases)
3982 newtree = templater.expandaliases(tree, aliases)
3981 if newtree != tree:
3983 if newtree != tree:
3982 ui.notenoi18n(
3984 ui.notenoi18n(
3983 b"* expanded:\n", templater.prettyformat(newtree), b'\n'
3985 b"* expanded:\n", templater.prettyformat(newtree), b'\n'
3984 )
3986 )
3985
3987
3986 if revs is None:
3988 if revs is None:
3987 tres = formatter.templateresources(ui, repo)
3989 tres = formatter.templateresources(ui, repo)
3988 t = formatter.maketemplater(ui, tmpl, resources=tres)
3990 t = formatter.maketemplater(ui, tmpl, resources=tres)
3989 if ui.verbose:
3991 if ui.verbose:
3990 kwds, funcs = t.symbolsuseddefault()
3992 kwds, funcs = t.symbolsuseddefault()
3991 ui.writenoi18n(b"* keywords: %s\n" % b', '.join(sorted(kwds)))
3993 ui.writenoi18n(b"* keywords: %s\n" % b', '.join(sorted(kwds)))
3992 ui.writenoi18n(b"* functions: %s\n" % b', '.join(sorted(funcs)))
3994 ui.writenoi18n(b"* functions: %s\n" % b', '.join(sorted(funcs)))
3993 ui.write(t.renderdefault(props))
3995 ui.write(t.renderdefault(props))
3994 else:
3996 else:
3995 displayer = logcmdutil.maketemplater(ui, repo, tmpl)
3997 displayer = logcmdutil.maketemplater(ui, repo, tmpl)
3996 if ui.verbose:
3998 if ui.verbose:
3997 kwds, funcs = displayer.t.symbolsuseddefault()
3999 kwds, funcs = displayer.t.symbolsuseddefault()
3998 ui.writenoi18n(b"* keywords: %s\n" % b', '.join(sorted(kwds)))
4000 ui.writenoi18n(b"* keywords: %s\n" % b', '.join(sorted(kwds)))
3999 ui.writenoi18n(b"* functions: %s\n" % b', '.join(sorted(funcs)))
4001 ui.writenoi18n(b"* functions: %s\n" % b', '.join(sorted(funcs)))
4000 for r in revs:
4002 for r in revs:
4001 displayer.show(repo[r], **pycompat.strkwargs(props))
4003 displayer.show(repo[r], **pycompat.strkwargs(props))
4002 displayer.close()
4004 displayer.close()
4003
4005
4004
4006
4005 @command(
4007 @command(
4006 b'debuguigetpass',
4008 b'debuguigetpass',
4007 [
4009 [
4008 (b'p', b'prompt', b'', _(b'prompt text'), _(b'TEXT')),
4010 (b'p', b'prompt', b'', _(b'prompt text'), _(b'TEXT')),
4009 ],
4011 ],
4010 _(b'[-p TEXT]'),
4012 _(b'[-p TEXT]'),
4011 norepo=True,
4013 norepo=True,
4012 )
4014 )
4013 def debuguigetpass(ui, prompt=b''):
4015 def debuguigetpass(ui, prompt=b''):
4014 """show prompt to type password"""
4016 """show prompt to type password"""
4015 r = ui.getpass(prompt)
4017 r = ui.getpass(prompt)
4016 if r is None:
4018 if r is None:
4017 r = b"<default response>"
4019 r = b"<default response>"
4018 ui.writenoi18n(b'response: %s\n' % r)
4020 ui.writenoi18n(b'response: %s\n' % r)
4019
4021
4020
4022
4021 @command(
4023 @command(
4022 b'debuguiprompt',
4024 b'debuguiprompt',
4023 [
4025 [
4024 (b'p', b'prompt', b'', _(b'prompt text'), _(b'TEXT')),
4026 (b'p', b'prompt', b'', _(b'prompt text'), _(b'TEXT')),
4025 ],
4027 ],
4026 _(b'[-p TEXT]'),
4028 _(b'[-p TEXT]'),
4027 norepo=True,
4029 norepo=True,
4028 )
4030 )
4029 def debuguiprompt(ui, prompt=b''):
4031 def debuguiprompt(ui, prompt=b''):
4030 """show plain prompt"""
4032 """show plain prompt"""
4031 r = ui.prompt(prompt)
4033 r = ui.prompt(prompt)
4032 ui.writenoi18n(b'response: %s\n' % r)
4034 ui.writenoi18n(b'response: %s\n' % r)
4033
4035
4034
4036
4035 @command(b'debugupdatecaches', [])
4037 @command(b'debugupdatecaches', [])
4036 def debugupdatecaches(ui, repo, *pats, **opts):
4038 def debugupdatecaches(ui, repo, *pats, **opts):
4037 """warm all known caches in the repository"""
4039 """warm all known caches in the repository"""
4038 with repo.wlock(), repo.lock():
4040 with repo.wlock(), repo.lock():
4039 repo.updatecaches(full=True)
4041 repo.updatecaches(full=True)
4040
4042
4041
4043
4042 @command(
4044 @command(
4043 b'debugupgraderepo',
4045 b'debugupgraderepo',
4044 [
4046 [
4045 (
4047 (
4046 b'o',
4048 b'o',
4047 b'optimize',
4049 b'optimize',
4048 [],
4050 [],
4049 _(b'extra optimization to perform'),
4051 _(b'extra optimization to perform'),
4050 _(b'NAME'),
4052 _(b'NAME'),
4051 ),
4053 ),
4052 (b'', b'run', False, _(b'performs an upgrade')),
4054 (b'', b'run', False, _(b'performs an upgrade')),
4053 (b'', b'backup', True, _(b'keep the old repository content around')),
4055 (b'', b'backup', True, _(b'keep the old repository content around')),
4054 (b'', b'changelog', None, _(b'select the changelog for upgrade')),
4056 (b'', b'changelog', None, _(b'select the changelog for upgrade')),
4055 (b'', b'manifest', None, _(b'select the manifest for upgrade')),
4057 (b'', b'manifest', None, _(b'select the manifest for upgrade')),
4056 (b'', b'filelogs', None, _(b'select all filelogs for upgrade')),
4058 (b'', b'filelogs', None, _(b'select all filelogs for upgrade')),
4057 ],
4059 ],
4058 )
4060 )
4059 def debugupgraderepo(ui, repo, run=False, optimize=None, backup=True, **opts):
4061 def debugupgraderepo(ui, repo, run=False, optimize=None, backup=True, **opts):
4060 """upgrade a repository to use different features
4062 """upgrade a repository to use different features
4061
4063
4062 If no arguments are specified, the repository is evaluated for upgrade
4064 If no arguments are specified, the repository is evaluated for upgrade
4063 and a list of problems and potential optimizations is printed.
4065 and a list of problems and potential optimizations is printed.
4064
4066
4065 With ``--run``, a repository upgrade is performed. Behavior of the upgrade
4067 With ``--run``, a repository upgrade is performed. Behavior of the upgrade
4066 can be influenced via additional arguments. More details will be provided
4068 can be influenced via additional arguments. More details will be provided
4067 by the command output when run without ``--run``.
4069 by the command output when run without ``--run``.
4068
4070
4069 During the upgrade, the repository will be locked and no writes will be
4071 During the upgrade, the repository will be locked and no writes will be
4070 allowed.
4072 allowed.
4071
4073
4072 At the end of the upgrade, the repository may not be readable while new
4074 At the end of the upgrade, the repository may not be readable while new
4073 repository data is swapped in. This window will be as long as it takes to
4075 repository data is swapped in. This window will be as long as it takes to
4074 rename some directories inside the ``.hg`` directory. On most machines, this
4076 rename some directories inside the ``.hg`` directory. On most machines, this
4075 should complete almost instantaneously and the chances of a consumer being
4077 should complete almost instantaneously and the chances of a consumer being
4076 unable to access the repository should be low.
4078 unable to access the repository should be low.
4077
4079
4078 By default, all revlog will be upgraded. You can restrict this using flag
4080 By default, all revlog will be upgraded. You can restrict this using flag
4079 such as `--manifest`:
4081 such as `--manifest`:
4080
4082
4081 * `--manifest`: only optimize the manifest
4083 * `--manifest`: only optimize the manifest
4082 * `--no-manifest`: optimize all revlog but the manifest
4084 * `--no-manifest`: optimize all revlog but the manifest
4083 * `--changelog`: optimize the changelog only
4085 * `--changelog`: optimize the changelog only
4084 * `--no-changelog --no-manifest`: optimize filelogs only
4086 * `--no-changelog --no-manifest`: optimize filelogs only
4085 * `--filelogs`: optimize the filelogs only
4087 * `--filelogs`: optimize the filelogs only
4086 * `--no-changelog --no-manifest --no-filelogs`: skip all revlog optimizations
4088 * `--no-changelog --no-manifest --no-filelogs`: skip all revlog optimizations
4087 """
4089 """
4088 return upgrade.upgraderepo(
4090 return upgrade.upgraderepo(
4089 ui, repo, run=run, optimize=set(optimize), backup=backup, **opts
4091 ui, repo, run=run, optimize=set(optimize), backup=backup, **opts
4090 )
4092 )
4091
4093
4092
4094
4093 @command(
4095 @command(
4094 b'debugwalk', cmdutil.walkopts, _(b'[OPTION]... [FILE]...'), inferrepo=True
4096 b'debugwalk', cmdutil.walkopts, _(b'[OPTION]... [FILE]...'), inferrepo=True
4095 )
4097 )
4096 def debugwalk(ui, repo, *pats, **opts):
4098 def debugwalk(ui, repo, *pats, **opts):
4097 """show how files match on given patterns"""
4099 """show how files match on given patterns"""
4098 opts = pycompat.byteskwargs(opts)
4100 opts = pycompat.byteskwargs(opts)
4099 m = scmutil.match(repo[None], pats, opts)
4101 m = scmutil.match(repo[None], pats, opts)
4100 if ui.verbose:
4102 if ui.verbose:
4101 ui.writenoi18n(b'* matcher:\n', stringutil.prettyrepr(m), b'\n')
4103 ui.writenoi18n(b'* matcher:\n', stringutil.prettyrepr(m), b'\n')
4102 items = list(repo[None].walk(m))
4104 items = list(repo[None].walk(m))
4103 if not items:
4105 if not items:
4104 return
4106 return
4105 f = lambda fn: fn
4107 f = lambda fn: fn
4106 if ui.configbool(b'ui', b'slash') and pycompat.ossep != b'/':
4108 if ui.configbool(b'ui', b'slash') and pycompat.ossep != b'/':
4107 f = lambda fn: util.normpath(fn)
4109 f = lambda fn: util.normpath(fn)
4108 fmt = b'f %%-%ds %%-%ds %%s' % (
4110 fmt = b'f %%-%ds %%-%ds %%s' % (
4109 max([len(abs) for abs in items]),
4111 max([len(abs) for abs in items]),
4110 max([len(repo.pathto(abs)) for abs in items]),
4112 max([len(repo.pathto(abs)) for abs in items]),
4111 )
4113 )
4112 for abs in items:
4114 for abs in items:
4113 line = fmt % (
4115 line = fmt % (
4114 abs,
4116 abs,
4115 f(repo.pathto(abs)),
4117 f(repo.pathto(abs)),
4116 m.exact(abs) and b'exact' or b'',
4118 m.exact(abs) and b'exact' or b'',
4117 )
4119 )
4118 ui.write(b"%s\n" % line.rstrip())
4120 ui.write(b"%s\n" % line.rstrip())
4119
4121
4120
4122
4121 @command(b'debugwhyunstable', [], _(b'REV'))
4123 @command(b'debugwhyunstable', [], _(b'REV'))
4122 def debugwhyunstable(ui, repo, rev):
4124 def debugwhyunstable(ui, repo, rev):
4123 """explain instabilities of a changeset"""
4125 """explain instabilities of a changeset"""
4124 for entry in obsutil.whyunstable(repo, scmutil.revsingle(repo, rev)):
4126 for entry in obsutil.whyunstable(repo, scmutil.revsingle(repo, rev)):
4125 dnodes = b''
4127 dnodes = b''
4126 if entry.get(b'divergentnodes'):
4128 if entry.get(b'divergentnodes'):
4127 dnodes = (
4129 dnodes = (
4128 b' '.join(
4130 b' '.join(
4129 b'%s (%s)' % (ctx.hex(), ctx.phasestr())
4131 b'%s (%s)' % (ctx.hex(), ctx.phasestr())
4130 for ctx in entry[b'divergentnodes']
4132 for ctx in entry[b'divergentnodes']
4131 )
4133 )
4132 + b' '
4134 + b' '
4133 )
4135 )
4134 ui.write(
4136 ui.write(
4135 b'%s: %s%s %s\n'
4137 b'%s: %s%s %s\n'
4136 % (entry[b'instability'], dnodes, entry[b'reason'], entry[b'node'])
4138 % (entry[b'instability'], dnodes, entry[b'reason'], entry[b'node'])
4137 )
4139 )
4138
4140
4139
4141
4140 @command(
4142 @command(
4141 b'debugwireargs',
4143 b'debugwireargs',
4142 [
4144 [
4143 (b'', b'three', b'', b'three'),
4145 (b'', b'three', b'', b'three'),
4144 (b'', b'four', b'', b'four'),
4146 (b'', b'four', b'', b'four'),
4145 (b'', b'five', b'', b'five'),
4147 (b'', b'five', b'', b'five'),
4146 ]
4148 ]
4147 + cmdutil.remoteopts,
4149 + cmdutil.remoteopts,
4148 _(b'REPO [OPTIONS]... [ONE [TWO]]'),
4150 _(b'REPO [OPTIONS]... [ONE [TWO]]'),
4149 norepo=True,
4151 norepo=True,
4150 )
4152 )
4151 def debugwireargs(ui, repopath, *vals, **opts):
4153 def debugwireargs(ui, repopath, *vals, **opts):
4152 opts = pycompat.byteskwargs(opts)
4154 opts = pycompat.byteskwargs(opts)
4153 repo = hg.peer(ui, opts, repopath)
4155 repo = hg.peer(ui, opts, repopath)
4154 try:
4156 try:
4155 for opt in cmdutil.remoteopts:
4157 for opt in cmdutil.remoteopts:
4156 del opts[opt[1]]
4158 del opts[opt[1]]
4157 args = {}
4159 args = {}
4158 for k, v in pycompat.iteritems(opts):
4160 for k, v in pycompat.iteritems(opts):
4159 if v:
4161 if v:
4160 args[k] = v
4162 args[k] = v
4161 args = pycompat.strkwargs(args)
4163 args = pycompat.strkwargs(args)
4162 # run twice to check that we don't mess up the stream for the next command
4164 # run twice to check that we don't mess up the stream for the next command
4163 res1 = repo.debugwireargs(*vals, **args)
4165 res1 = repo.debugwireargs(*vals, **args)
4164 res2 = repo.debugwireargs(*vals, **args)
4166 res2 = repo.debugwireargs(*vals, **args)
4165 ui.write(b"%s\n" % res1)
4167 ui.write(b"%s\n" % res1)
4166 if res1 != res2:
4168 if res1 != res2:
4167 ui.warn(b"%s\n" % res2)
4169 ui.warn(b"%s\n" % res2)
4168 finally:
4170 finally:
4169 repo.close()
4171 repo.close()
4170
4172
4171
4173
4172 def _parsewirelangblocks(fh):
4174 def _parsewirelangblocks(fh):
4173 activeaction = None
4175 activeaction = None
4174 blocklines = []
4176 blocklines = []
4175 lastindent = 0
4177 lastindent = 0
4176
4178
4177 for line in fh:
4179 for line in fh:
4178 line = line.rstrip()
4180 line = line.rstrip()
4179 if not line:
4181 if not line:
4180 continue
4182 continue
4181
4183
4182 if line.startswith(b'#'):
4184 if line.startswith(b'#'):
4183 continue
4185 continue
4184
4186
4185 if not line.startswith(b' '):
4187 if not line.startswith(b' '):
4186 # New block. Flush previous one.
4188 # New block. Flush previous one.
4187 if activeaction:
4189 if activeaction:
4188 yield activeaction, blocklines
4190 yield activeaction, blocklines
4189
4191
4190 activeaction = line
4192 activeaction = line
4191 blocklines = []
4193 blocklines = []
4192 lastindent = 0
4194 lastindent = 0
4193 continue
4195 continue
4194
4196
4195 # Else we start with an indent.
4197 # Else we start with an indent.
4196
4198
4197 if not activeaction:
4199 if not activeaction:
4198 raise error.Abort(_(b'indented line outside of block'))
4200 raise error.Abort(_(b'indented line outside of block'))
4199
4201
4200 indent = len(line) - len(line.lstrip())
4202 indent = len(line) - len(line.lstrip())
4201
4203
4202 # If this line is indented more than the last line, concatenate it.
4204 # If this line is indented more than the last line, concatenate it.
4203 if indent > lastindent and blocklines:
4205 if indent > lastindent and blocklines:
4204 blocklines[-1] += line.lstrip()
4206 blocklines[-1] += line.lstrip()
4205 else:
4207 else:
4206 blocklines.append(line)
4208 blocklines.append(line)
4207 lastindent = indent
4209 lastindent = indent
4208
4210
4209 # Flush last block.
4211 # Flush last block.
4210 if activeaction:
4212 if activeaction:
4211 yield activeaction, blocklines
4213 yield activeaction, blocklines
4212
4214
4213
4215
4214 @command(
4216 @command(
4215 b'debugwireproto',
4217 b'debugwireproto',
4216 [
4218 [
4217 (b'', b'localssh', False, _(b'start an SSH server for this repo')),
4219 (b'', b'localssh', False, _(b'start an SSH server for this repo')),
4218 (b'', b'peer', b'', _(b'construct a specific version of the peer')),
4220 (b'', b'peer', b'', _(b'construct a specific version of the peer')),
4219 (
4221 (
4220 b'',
4222 b'',
4221 b'noreadstderr',
4223 b'noreadstderr',
4222 False,
4224 False,
4223 _(b'do not read from stderr of the remote'),
4225 _(b'do not read from stderr of the remote'),
4224 ),
4226 ),
4225 (
4227 (
4226 b'',
4228 b'',
4227 b'nologhandshake',
4229 b'nologhandshake',
4228 False,
4230 False,
4229 _(b'do not log I/O related to the peer handshake'),
4231 _(b'do not log I/O related to the peer handshake'),
4230 ),
4232 ),
4231 ]
4233 ]
4232 + cmdutil.remoteopts,
4234 + cmdutil.remoteopts,
4233 _(b'[PATH]'),
4235 _(b'[PATH]'),
4234 optionalrepo=True,
4236 optionalrepo=True,
4235 )
4237 )
4236 def debugwireproto(ui, repo, path=None, **opts):
4238 def debugwireproto(ui, repo, path=None, **opts):
4237 """send wire protocol commands to a server
4239 """send wire protocol commands to a server
4238
4240
4239 This command can be used to issue wire protocol commands to remote
4241 This command can be used to issue wire protocol commands to remote
4240 peers and to debug the raw data being exchanged.
4242 peers and to debug the raw data being exchanged.
4241
4243
4242 ``--localssh`` will start an SSH server against the current repository
4244 ``--localssh`` will start an SSH server against the current repository
4243 and connect to that. By default, the connection will perform a handshake
4245 and connect to that. By default, the connection will perform a handshake
4244 and establish an appropriate peer instance.
4246 and establish an appropriate peer instance.
4245
4247
4246 ``--peer`` can be used to bypass the handshake protocol and construct a
4248 ``--peer`` can be used to bypass the handshake protocol and construct a
4247 peer instance using the specified class type. Valid values are ``raw``,
4249 peer instance using the specified class type. Valid values are ``raw``,
4248 ``http2``, ``ssh1``, and ``ssh2``. ``raw`` instances only allow sending
4250 ``http2``, ``ssh1``, and ``ssh2``. ``raw`` instances only allow sending
4249 raw data payloads and don't support higher-level command actions.
4251 raw data payloads and don't support higher-level command actions.
4250
4252
4251 ``--noreadstderr`` can be used to disable automatic reading from stderr
4253 ``--noreadstderr`` can be used to disable automatic reading from stderr
4252 of the peer (for SSH connections only). Disabling automatic reading of
4254 of the peer (for SSH connections only). Disabling automatic reading of
4253 stderr is useful for making output more deterministic.
4255 stderr is useful for making output more deterministic.
4254
4256
4255 Commands are issued via a mini language which is specified via stdin.
4257 Commands are issued via a mini language which is specified via stdin.
4256 The language consists of individual actions to perform. An action is
4258 The language consists of individual actions to perform. An action is
4257 defined by a block. A block is defined as a line with no leading
4259 defined by a block. A block is defined as a line with no leading
4258 space followed by 0 or more lines with leading space. Blocks are
4260 space followed by 0 or more lines with leading space. Blocks are
4259 effectively a high-level command with additional metadata.
4261 effectively a high-level command with additional metadata.
4260
4262
4261 Lines beginning with ``#`` are ignored.
4263 Lines beginning with ``#`` are ignored.
4262
4264
4263 The following sections denote available actions.
4265 The following sections denote available actions.
4264
4266
4265 raw
4267 raw
4266 ---
4268 ---
4267
4269
4268 Send raw data to the server.
4270 Send raw data to the server.
4269
4271
4270 The block payload contains the raw data to send as one atomic send
4272 The block payload contains the raw data to send as one atomic send
4271 operation. The data may not actually be delivered in a single system
4273 operation. The data may not actually be delivered in a single system
4272 call: it depends on the abilities of the transport being used.
4274 call: it depends on the abilities of the transport being used.
4273
4275
4274 Each line in the block is de-indented and concatenated. Then, that
4276 Each line in the block is de-indented and concatenated. Then, that
4275 value is evaluated as a Python b'' literal. This allows the use of
4277 value is evaluated as a Python b'' literal. This allows the use of
4276 backslash escaping, etc.
4278 backslash escaping, etc.
4277
4279
4278 raw+
4280 raw+
4279 ----
4281 ----
4280
4282
4281 Behaves like ``raw`` except flushes output afterwards.
4283 Behaves like ``raw`` except flushes output afterwards.
4282
4284
4283 command <X>
4285 command <X>
4284 -----------
4286 -----------
4285
4287
4286 Send a request to run a named command, whose name follows the ``command``
4288 Send a request to run a named command, whose name follows the ``command``
4287 string.
4289 string.
4288
4290
4289 Arguments to the command are defined as lines in this block. The format of
4291 Arguments to the command are defined as lines in this block. The format of
4290 each line is ``<key> <value>``. e.g.::
4292 each line is ``<key> <value>``. e.g.::
4291
4293
4292 command listkeys
4294 command listkeys
4293 namespace bookmarks
4295 namespace bookmarks
4294
4296
4295 If the value begins with ``eval:``, it will be interpreted as a Python
4297 If the value begins with ``eval:``, it will be interpreted as a Python
4296 literal expression. Otherwise values are interpreted as Python b'' literals.
4298 literal expression. Otherwise values are interpreted as Python b'' literals.
4297 This allows sending complex types and encoding special byte sequences via
4299 This allows sending complex types and encoding special byte sequences via
4298 backslash escaping.
4300 backslash escaping.
4299
4301
4300 The following arguments have special meaning:
4302 The following arguments have special meaning:
4301
4303
4302 ``PUSHFILE``
4304 ``PUSHFILE``
4303 When defined, the *push* mechanism of the peer will be used instead
4305 When defined, the *push* mechanism of the peer will be used instead
4304 of the static request-response mechanism and the content of the
4306 of the static request-response mechanism and the content of the
4305 file specified in the value of this argument will be sent as the
4307 file specified in the value of this argument will be sent as the
4306 command payload.
4308 command payload.
4307
4309
4308 This can be used to submit a local bundle file to the remote.
4310 This can be used to submit a local bundle file to the remote.
4309
4311
4310 batchbegin
4312 batchbegin
4311 ----------
4313 ----------
4312
4314
4313 Instruct the peer to begin a batched send.
4315 Instruct the peer to begin a batched send.
4314
4316
4315 All ``command`` blocks are queued for execution until the next
4317 All ``command`` blocks are queued for execution until the next
4316 ``batchsubmit`` block.
4318 ``batchsubmit`` block.
4317
4319
4318 batchsubmit
4320 batchsubmit
4319 -----------
4321 -----------
4320
4322
4321 Submit previously queued ``command`` blocks as a batch request.
4323 Submit previously queued ``command`` blocks as a batch request.
4322
4324
4323 This action MUST be paired with a ``batchbegin`` action.
4325 This action MUST be paired with a ``batchbegin`` action.
4324
4326
4325 httprequest <method> <path>
4327 httprequest <method> <path>
4326 ---------------------------
4328 ---------------------------
4327
4329
4328 (HTTP peer only)
4330 (HTTP peer only)
4329
4331
4330 Send an HTTP request to the peer.
4332 Send an HTTP request to the peer.
4331
4333
4332 The HTTP request line follows the ``httprequest`` action. e.g. ``GET /foo``.
4334 The HTTP request line follows the ``httprequest`` action. e.g. ``GET /foo``.
4333
4335
4334 Arguments of the form ``<key>: <value>`` are interpreted as HTTP request
4336 Arguments of the form ``<key>: <value>`` are interpreted as HTTP request
4335 headers to add to the request. e.g. ``Accept: foo``.
4337 headers to add to the request. e.g. ``Accept: foo``.
4336
4338
4337 The following arguments are special:
4339 The following arguments are special:
4338
4340
4339 ``BODYFILE``
4341 ``BODYFILE``
4340 The content of the file defined as the value to this argument will be
4342 The content of the file defined as the value to this argument will be
4341 transferred verbatim as the HTTP request body.
4343 transferred verbatim as the HTTP request body.
4342
4344
4343 ``frame <type> <flags> <payload>``
4345 ``frame <type> <flags> <payload>``
4344 Send a unified protocol frame as part of the request body.
4346 Send a unified protocol frame as part of the request body.
4345
4347
4346 All frames will be collected and sent as the body to the HTTP
4348 All frames will be collected and sent as the body to the HTTP
4347 request.
4349 request.
4348
4350
4349 close
4351 close
4350 -----
4352 -----
4351
4353
4352 Close the connection to the server.
4354 Close the connection to the server.
4353
4355
4354 flush
4356 flush
4355 -----
4357 -----
4356
4358
4357 Flush data written to the server.
4359 Flush data written to the server.
4358
4360
4359 readavailable
4361 readavailable
4360 -------------
4362 -------------
4361
4363
4362 Close the write end of the connection and read all available data from
4364 Close the write end of the connection and read all available data from
4363 the server.
4365 the server.
4364
4366
4365 If the connection to the server encompasses multiple pipes, we poll both
4367 If the connection to the server encompasses multiple pipes, we poll both
4366 pipes and read available data.
4368 pipes and read available data.
4367
4369
4368 readline
4370 readline
4369 --------
4371 --------
4370
4372
4371 Read a line of output from the server. If there are multiple output
4373 Read a line of output from the server. If there are multiple output
4372 pipes, reads only the main pipe.
4374 pipes, reads only the main pipe.
4373
4375
4374 ereadline
4376 ereadline
4375 ---------
4377 ---------
4376
4378
4377 Like ``readline``, but read from the stderr pipe, if available.
4379 Like ``readline``, but read from the stderr pipe, if available.
4378
4380
4379 read <X>
4381 read <X>
4380 --------
4382 --------
4381
4383
4382 ``read()`` N bytes from the server's main output pipe.
4384 ``read()`` N bytes from the server's main output pipe.
4383
4385
4384 eread <X>
4386 eread <X>
4385 ---------
4387 ---------
4386
4388
4387 ``read()`` N bytes from the server's stderr pipe, if available.
4389 ``read()`` N bytes from the server's stderr pipe, if available.
4388
4390
4389 Specifying Unified Frame-Based Protocol Frames
4391 Specifying Unified Frame-Based Protocol Frames
4390 ----------------------------------------------
4392 ----------------------------------------------
4391
4393
4392 It is possible to emit a *Unified Frame-Based Protocol* by using special
4394 It is possible to emit a *Unified Frame-Based Protocol* by using special
4393 syntax.
4395 syntax.
4394
4396
4395 A frame is composed as a type, flags, and payload. These can be parsed
4397 A frame is composed as a type, flags, and payload. These can be parsed
4396 from a string of the form:
4398 from a string of the form:
4397
4399
4398 <request-id> <stream-id> <stream-flags> <type> <flags> <payload>
4400 <request-id> <stream-id> <stream-flags> <type> <flags> <payload>
4399
4401
4400 ``request-id`` and ``stream-id`` are integers defining the request and
4402 ``request-id`` and ``stream-id`` are integers defining the request and
4401 stream identifiers.
4403 stream identifiers.
4402
4404
4403 ``type`` can be an integer value for the frame type or the string name
4405 ``type`` can be an integer value for the frame type or the string name
4404 of the type. The strings are defined in ``wireprotoframing.py``. e.g.
4406 of the type. The strings are defined in ``wireprotoframing.py``. e.g.
4405 ``command-name``.
4407 ``command-name``.
4406
4408
4407 ``stream-flags`` and ``flags`` are a ``|`` delimited list of flag
4409 ``stream-flags`` and ``flags`` are a ``|`` delimited list of flag
4408 components. Each component (and there can be just one) can be an integer
4410 components. Each component (and there can be just one) can be an integer
4409 or a flag name for stream flags or frame flags, respectively. Values are
4411 or a flag name for stream flags or frame flags, respectively. Values are
4410 resolved to integers and then bitwise OR'd together.
4412 resolved to integers and then bitwise OR'd together.
4411
4413
4412 ``payload`` represents the raw frame payload. If it begins with
4414 ``payload`` represents the raw frame payload. If it begins with
4413 ``cbor:``, the following string is evaluated as Python code and the
4415 ``cbor:``, the following string is evaluated as Python code and the
4414 resulting object is fed into a CBOR encoder. Otherwise it is interpreted
4416 resulting object is fed into a CBOR encoder. Otherwise it is interpreted
4415 as a Python byte string literal.
4417 as a Python byte string literal.
4416 """
4418 """
4417 opts = pycompat.byteskwargs(opts)
4419 opts = pycompat.byteskwargs(opts)
4418
4420
4419 if opts[b'localssh'] and not repo:
4421 if opts[b'localssh'] and not repo:
4420 raise error.Abort(_(b'--localssh requires a repository'))
4422 raise error.Abort(_(b'--localssh requires a repository'))
4421
4423
4422 if opts[b'peer'] and opts[b'peer'] not in (
4424 if opts[b'peer'] and opts[b'peer'] not in (
4423 b'raw',
4425 b'raw',
4424 b'http2',
4426 b'http2',
4425 b'ssh1',
4427 b'ssh1',
4426 b'ssh2',
4428 b'ssh2',
4427 ):
4429 ):
4428 raise error.Abort(
4430 raise error.Abort(
4429 _(b'invalid value for --peer'),
4431 _(b'invalid value for --peer'),
4430 hint=_(b'valid values are "raw", "ssh1", and "ssh2"'),
4432 hint=_(b'valid values are "raw", "ssh1", and "ssh2"'),
4431 )
4433 )
4432
4434
4433 if path and opts[b'localssh']:
4435 if path and opts[b'localssh']:
4434 raise error.Abort(_(b'cannot specify --localssh with an explicit path'))
4436 raise error.Abort(_(b'cannot specify --localssh with an explicit path'))
4435
4437
4436 if ui.interactive():
4438 if ui.interactive():
4437 ui.write(_(b'(waiting for commands on stdin)\n'))
4439 ui.write(_(b'(waiting for commands on stdin)\n'))
4438
4440
4439 blocks = list(_parsewirelangblocks(ui.fin))
4441 blocks = list(_parsewirelangblocks(ui.fin))
4440
4442
4441 proc = None
4443 proc = None
4442 stdin = None
4444 stdin = None
4443 stdout = None
4445 stdout = None
4444 stderr = None
4446 stderr = None
4445 opener = None
4447 opener = None
4446
4448
4447 if opts[b'localssh']:
4449 if opts[b'localssh']:
4448 # We start the SSH server in its own process so there is process
4450 # We start the SSH server in its own process so there is process
4449 # separation. This prevents a whole class of potential bugs around
4451 # separation. This prevents a whole class of potential bugs around
4450 # shared state from interfering with server operation.
4452 # shared state from interfering with server operation.
4451 args = procutil.hgcmd() + [
4453 args = procutil.hgcmd() + [
4452 b'-R',
4454 b'-R',
4453 repo.root,
4455 repo.root,
4454 b'debugserve',
4456 b'debugserve',
4455 b'--sshstdio',
4457 b'--sshstdio',
4456 ]
4458 ]
4457 proc = subprocess.Popen(
4459 proc = subprocess.Popen(
4458 pycompat.rapply(procutil.tonativestr, args),
4460 pycompat.rapply(procutil.tonativestr, args),
4459 stdin=subprocess.PIPE,
4461 stdin=subprocess.PIPE,
4460 stdout=subprocess.PIPE,
4462 stdout=subprocess.PIPE,
4461 stderr=subprocess.PIPE,
4463 stderr=subprocess.PIPE,
4462 bufsize=0,
4464 bufsize=0,
4463 )
4465 )
4464
4466
4465 stdin = proc.stdin
4467 stdin = proc.stdin
4466 stdout = proc.stdout
4468 stdout = proc.stdout
4467 stderr = proc.stderr
4469 stderr = proc.stderr
4468
4470
4469 # We turn the pipes into observers so we can log I/O.
4471 # We turn the pipes into observers so we can log I/O.
4470 if ui.verbose or opts[b'peer'] == b'raw':
4472 if ui.verbose or opts[b'peer'] == b'raw':
4471 stdin = util.makeloggingfileobject(
4473 stdin = util.makeloggingfileobject(
4472 ui, proc.stdin, b'i', logdata=True
4474 ui, proc.stdin, b'i', logdata=True
4473 )
4475 )
4474 stdout = util.makeloggingfileobject(
4476 stdout = util.makeloggingfileobject(
4475 ui, proc.stdout, b'o', logdata=True
4477 ui, proc.stdout, b'o', logdata=True
4476 )
4478 )
4477 stderr = util.makeloggingfileobject(
4479 stderr = util.makeloggingfileobject(
4478 ui, proc.stderr, b'e', logdata=True
4480 ui, proc.stderr, b'e', logdata=True
4479 )
4481 )
4480
4482
4481 # --localssh also implies the peer connection settings.
4483 # --localssh also implies the peer connection settings.
4482
4484
4483 url = b'ssh://localserver'
4485 url = b'ssh://localserver'
4484 autoreadstderr = not opts[b'noreadstderr']
4486 autoreadstderr = not opts[b'noreadstderr']
4485
4487
4486 if opts[b'peer'] == b'ssh1':
4488 if opts[b'peer'] == b'ssh1':
4487 ui.write(_(b'creating ssh peer for wire protocol version 1\n'))
4489 ui.write(_(b'creating ssh peer for wire protocol version 1\n'))
4488 peer = sshpeer.sshv1peer(
4490 peer = sshpeer.sshv1peer(
4489 ui,
4491 ui,
4490 url,
4492 url,
4491 proc,
4493 proc,
4492 stdin,
4494 stdin,
4493 stdout,
4495 stdout,
4494 stderr,
4496 stderr,
4495 None,
4497 None,
4496 autoreadstderr=autoreadstderr,
4498 autoreadstderr=autoreadstderr,
4497 )
4499 )
4498 elif opts[b'peer'] == b'ssh2':
4500 elif opts[b'peer'] == b'ssh2':
4499 ui.write(_(b'creating ssh peer for wire protocol version 2\n'))
4501 ui.write(_(b'creating ssh peer for wire protocol version 2\n'))
4500 peer = sshpeer.sshv2peer(
4502 peer = sshpeer.sshv2peer(
4501 ui,
4503 ui,
4502 url,
4504 url,
4503 proc,
4505 proc,
4504 stdin,
4506 stdin,
4505 stdout,
4507 stdout,
4506 stderr,
4508 stderr,
4507 None,
4509 None,
4508 autoreadstderr=autoreadstderr,
4510 autoreadstderr=autoreadstderr,
4509 )
4511 )
4510 elif opts[b'peer'] == b'raw':
4512 elif opts[b'peer'] == b'raw':
4511 ui.write(_(b'using raw connection to peer\n'))
4513 ui.write(_(b'using raw connection to peer\n'))
4512 peer = None
4514 peer = None
4513 else:
4515 else:
4514 ui.write(_(b'creating ssh peer from handshake results\n'))
4516 ui.write(_(b'creating ssh peer from handshake results\n'))
4515 peer = sshpeer.makepeer(
4517 peer = sshpeer.makepeer(
4516 ui,
4518 ui,
4517 url,
4519 url,
4518 proc,
4520 proc,
4519 stdin,
4521 stdin,
4520 stdout,
4522 stdout,
4521 stderr,
4523 stderr,
4522 autoreadstderr=autoreadstderr,
4524 autoreadstderr=autoreadstderr,
4523 )
4525 )
4524
4526
4525 elif path:
4527 elif path:
4526 # We bypass hg.peer() so we can proxy the sockets.
4528 # We bypass hg.peer() so we can proxy the sockets.
4527 # TODO consider not doing this because we skip
4529 # TODO consider not doing this because we skip
4528 # ``hg.wirepeersetupfuncs`` and potentially other useful functionality.
4530 # ``hg.wirepeersetupfuncs`` and potentially other useful functionality.
4529 u = urlutil.url(path)
4531 u = urlutil.url(path)
4530 if u.scheme != b'http':
4532 if u.scheme != b'http':
4531 raise error.Abort(_(b'only http:// paths are currently supported'))
4533 raise error.Abort(_(b'only http:// paths are currently supported'))
4532
4534
4533 url, authinfo = u.authinfo()
4535 url, authinfo = u.authinfo()
4534 openerargs = {
4536 openerargs = {
4535 'useragent': b'Mercurial debugwireproto',
4537 'useragent': b'Mercurial debugwireproto',
4536 }
4538 }
4537
4539
4538 # Turn pipes/sockets into observers so we can log I/O.
4540 # Turn pipes/sockets into observers so we can log I/O.
4539 if ui.verbose:
4541 if ui.verbose:
4540 openerargs.update(
4542 openerargs.update(
4541 {
4543 {
4542 'loggingfh': ui,
4544 'loggingfh': ui,
4543 'loggingname': b's',
4545 'loggingname': b's',
4544 'loggingopts': {
4546 'loggingopts': {
4545 'logdata': True,
4547 'logdata': True,
4546 'logdataapis': False,
4548 'logdataapis': False,
4547 },
4549 },
4548 }
4550 }
4549 )
4551 )
4550
4552
4551 if ui.debugflag:
4553 if ui.debugflag:
4552 openerargs['loggingopts']['logdataapis'] = True
4554 openerargs['loggingopts']['logdataapis'] = True
4553
4555
4554 # Don't send default headers when in raw mode. This allows us to
4556 # Don't send default headers when in raw mode. This allows us to
4555 # bypass most of the behavior of our URL handling code so we can
4557 # bypass most of the behavior of our URL handling code so we can
4556 # have near complete control over what's sent on the wire.
4558 # have near complete control over what's sent on the wire.
4557 if opts[b'peer'] == b'raw':
4559 if opts[b'peer'] == b'raw':
4558 openerargs['sendaccept'] = False
4560 openerargs['sendaccept'] = False
4559
4561
4560 opener = urlmod.opener(ui, authinfo, **openerargs)
4562 opener = urlmod.opener(ui, authinfo, **openerargs)
4561
4563
4562 if opts[b'peer'] == b'http2':
4564 if opts[b'peer'] == b'http2':
4563 ui.write(_(b'creating http peer for wire protocol version 2\n'))
4565 ui.write(_(b'creating http peer for wire protocol version 2\n'))
4564 # We go through makepeer() because we need an API descriptor for
4566 # We go through makepeer() because we need an API descriptor for
4565 # the peer instance to be useful.
4567 # the peer instance to be useful.
4566 with ui.configoverride(
4568 with ui.configoverride(
4567 {(b'experimental', b'httppeer.advertise-v2'): True}
4569 {(b'experimental', b'httppeer.advertise-v2'): True}
4568 ):
4570 ):
4569 if opts[b'nologhandshake']:
4571 if opts[b'nologhandshake']:
4570 ui.pushbuffer()
4572 ui.pushbuffer()
4571
4573
4572 peer = httppeer.makepeer(ui, path, opener=opener)
4574 peer = httppeer.makepeer(ui, path, opener=opener)
4573
4575
4574 if opts[b'nologhandshake']:
4576 if opts[b'nologhandshake']:
4575 ui.popbuffer()
4577 ui.popbuffer()
4576
4578
4577 if not isinstance(peer, httppeer.httpv2peer):
4579 if not isinstance(peer, httppeer.httpv2peer):
4578 raise error.Abort(
4580 raise error.Abort(
4579 _(
4581 _(
4580 b'could not instantiate HTTP peer for '
4582 b'could not instantiate HTTP peer for '
4581 b'wire protocol version 2'
4583 b'wire protocol version 2'
4582 ),
4584 ),
4583 hint=_(
4585 hint=_(
4584 b'the server may not have the feature '
4586 b'the server may not have the feature '
4585 b'enabled or is not allowing this '
4587 b'enabled or is not allowing this '
4586 b'client version'
4588 b'client version'
4587 ),
4589 ),
4588 )
4590 )
4589
4591
4590 elif opts[b'peer'] == b'raw':
4592 elif opts[b'peer'] == b'raw':
4591 ui.write(_(b'using raw connection to peer\n'))
4593 ui.write(_(b'using raw connection to peer\n'))
4592 peer = None
4594 peer = None
4593 elif opts[b'peer']:
4595 elif opts[b'peer']:
4594 raise error.Abort(
4596 raise error.Abort(
4595 _(b'--peer %s not supported with HTTP peers') % opts[b'peer']
4597 _(b'--peer %s not supported with HTTP peers') % opts[b'peer']
4596 )
4598 )
4597 else:
4599 else:
4598 peer = httppeer.makepeer(ui, path, opener=opener)
4600 peer = httppeer.makepeer(ui, path, opener=opener)
4599
4601
4600 # We /could/ populate stdin/stdout with sock.makefile()...
4602 # We /could/ populate stdin/stdout with sock.makefile()...
4601 else:
4603 else:
4602 raise error.Abort(_(b'unsupported connection configuration'))
4604 raise error.Abort(_(b'unsupported connection configuration'))
4603
4605
4604 batchedcommands = None
4606 batchedcommands = None
4605
4607
4606 # Now perform actions based on the parsed wire language instructions.
4608 # Now perform actions based on the parsed wire language instructions.
4607 for action, lines in blocks:
4609 for action, lines in blocks:
4608 if action in (b'raw', b'raw+'):
4610 if action in (b'raw', b'raw+'):
4609 if not stdin:
4611 if not stdin:
4610 raise error.Abort(_(b'cannot call raw/raw+ on this peer'))
4612 raise error.Abort(_(b'cannot call raw/raw+ on this peer'))
4611
4613
4612 # Concatenate the data together.
4614 # Concatenate the data together.
4613 data = b''.join(l.lstrip() for l in lines)
4615 data = b''.join(l.lstrip() for l in lines)
4614 data = stringutil.unescapestr(data)
4616 data = stringutil.unescapestr(data)
4615 stdin.write(data)
4617 stdin.write(data)
4616
4618
4617 if action == b'raw+':
4619 if action == b'raw+':
4618 stdin.flush()
4620 stdin.flush()
4619 elif action == b'flush':
4621 elif action == b'flush':
4620 if not stdin:
4622 if not stdin:
4621 raise error.Abort(_(b'cannot call flush on this peer'))
4623 raise error.Abort(_(b'cannot call flush on this peer'))
4622 stdin.flush()
4624 stdin.flush()
4623 elif action.startswith(b'command'):
4625 elif action.startswith(b'command'):
4624 if not peer:
4626 if not peer:
4625 raise error.Abort(
4627 raise error.Abort(
4626 _(
4628 _(
4627 b'cannot send commands unless peer instance '
4629 b'cannot send commands unless peer instance '
4628 b'is available'
4630 b'is available'
4629 )
4631 )
4630 )
4632 )
4631
4633
4632 command = action.split(b' ', 1)[1]
4634 command = action.split(b' ', 1)[1]
4633
4635
4634 args = {}
4636 args = {}
4635 for line in lines:
4637 for line in lines:
4636 # We need to allow empty values.
4638 # We need to allow empty values.
4637 fields = line.lstrip().split(b' ', 1)
4639 fields = line.lstrip().split(b' ', 1)
4638 if len(fields) == 1:
4640 if len(fields) == 1:
4639 key = fields[0]
4641 key = fields[0]
4640 value = b''
4642 value = b''
4641 else:
4643 else:
4642 key, value = fields
4644 key, value = fields
4643
4645
4644 if value.startswith(b'eval:'):
4646 if value.startswith(b'eval:'):
4645 value = stringutil.evalpythonliteral(value[5:])
4647 value = stringutil.evalpythonliteral(value[5:])
4646 else:
4648 else:
4647 value = stringutil.unescapestr(value)
4649 value = stringutil.unescapestr(value)
4648
4650
4649 args[key] = value
4651 args[key] = value
4650
4652
4651 if batchedcommands is not None:
4653 if batchedcommands is not None:
4652 batchedcommands.append((command, args))
4654 batchedcommands.append((command, args))
4653 continue
4655 continue
4654
4656
4655 ui.status(_(b'sending %s command\n') % command)
4657 ui.status(_(b'sending %s command\n') % command)
4656
4658
4657 if b'PUSHFILE' in args:
4659 if b'PUSHFILE' in args:
4658 with open(args[b'PUSHFILE'], 'rb') as fh:
4660 with open(args[b'PUSHFILE'], 'rb') as fh:
4659 del args[b'PUSHFILE']
4661 del args[b'PUSHFILE']
4660 res, output = peer._callpush(
4662 res, output = peer._callpush(
4661 command, fh, **pycompat.strkwargs(args)
4663 command, fh, **pycompat.strkwargs(args)
4662 )
4664 )
4663 ui.status(_(b'result: %s\n') % stringutil.escapestr(res))
4665 ui.status(_(b'result: %s\n') % stringutil.escapestr(res))
4664 ui.status(
4666 ui.status(
4665 _(b'remote output: %s\n') % stringutil.escapestr(output)
4667 _(b'remote output: %s\n') % stringutil.escapestr(output)
4666 )
4668 )
4667 else:
4669 else:
4668 with peer.commandexecutor() as e:
4670 with peer.commandexecutor() as e:
4669 res = e.callcommand(command, args).result()
4671 res = e.callcommand(command, args).result()
4670
4672
4671 if isinstance(res, wireprotov2peer.commandresponse):
4673 if isinstance(res, wireprotov2peer.commandresponse):
4672 val = res.objects()
4674 val = res.objects()
4673 ui.status(
4675 ui.status(
4674 _(b'response: %s\n')
4676 _(b'response: %s\n')
4675 % stringutil.pprint(val, bprefix=True, indent=2)
4677 % stringutil.pprint(val, bprefix=True, indent=2)
4676 )
4678 )
4677 else:
4679 else:
4678 ui.status(
4680 ui.status(
4679 _(b'response: %s\n')
4681 _(b'response: %s\n')
4680 % stringutil.pprint(res, bprefix=True, indent=2)
4682 % stringutil.pprint(res, bprefix=True, indent=2)
4681 )
4683 )
4682
4684
4683 elif action == b'batchbegin':
4685 elif action == b'batchbegin':
4684 if batchedcommands is not None:
4686 if batchedcommands is not None:
4685 raise error.Abort(_(b'nested batchbegin not allowed'))
4687 raise error.Abort(_(b'nested batchbegin not allowed'))
4686
4688
4687 batchedcommands = []
4689 batchedcommands = []
4688 elif action == b'batchsubmit':
4690 elif action == b'batchsubmit':
4689 # There is a batching API we could go through. But it would be
4691 # There is a batching API we could go through. But it would be
4690 # difficult to normalize requests into function calls. It is easier
4692 # difficult to normalize requests into function calls. It is easier
4691 # to bypass this layer and normalize to commands + args.
4693 # to bypass this layer and normalize to commands + args.
4692 ui.status(
4694 ui.status(
4693 _(b'sending batch with %d sub-commands\n')
4695 _(b'sending batch with %d sub-commands\n')
4694 % len(batchedcommands)
4696 % len(batchedcommands)
4695 )
4697 )
4696 assert peer is not None
4698 assert peer is not None
4697 for i, chunk in enumerate(peer._submitbatch(batchedcommands)):
4699 for i, chunk in enumerate(peer._submitbatch(batchedcommands)):
4698 ui.status(
4700 ui.status(
4699 _(b'response #%d: %s\n') % (i, stringutil.escapestr(chunk))
4701 _(b'response #%d: %s\n') % (i, stringutil.escapestr(chunk))
4700 )
4702 )
4701
4703
4702 batchedcommands = None
4704 batchedcommands = None
4703
4705
4704 elif action.startswith(b'httprequest '):
4706 elif action.startswith(b'httprequest '):
4705 if not opener:
4707 if not opener:
4706 raise error.Abort(
4708 raise error.Abort(
4707 _(b'cannot use httprequest without an HTTP peer')
4709 _(b'cannot use httprequest without an HTTP peer')
4708 )
4710 )
4709
4711
4710 request = action.split(b' ', 2)
4712 request = action.split(b' ', 2)
4711 if len(request) != 3:
4713 if len(request) != 3:
4712 raise error.Abort(
4714 raise error.Abort(
4713 _(
4715 _(
4714 b'invalid httprequest: expected format is '
4716 b'invalid httprequest: expected format is '
4715 b'"httprequest <method> <path>'
4717 b'"httprequest <method> <path>'
4716 )
4718 )
4717 )
4719 )
4718
4720
4719 method, httppath = request[1:]
4721 method, httppath = request[1:]
4720 headers = {}
4722 headers = {}
4721 body = None
4723 body = None
4722 frames = []
4724 frames = []
4723 for line in lines:
4725 for line in lines:
4724 line = line.lstrip()
4726 line = line.lstrip()
4725 m = re.match(b'^([a-zA-Z0-9_-]+): (.*)$', line)
4727 m = re.match(b'^([a-zA-Z0-9_-]+): (.*)$', line)
4726 if m:
4728 if m:
4727 # Headers need to use native strings.
4729 # Headers need to use native strings.
4728 key = pycompat.strurl(m.group(1))
4730 key = pycompat.strurl(m.group(1))
4729 value = pycompat.strurl(m.group(2))
4731 value = pycompat.strurl(m.group(2))
4730 headers[key] = value
4732 headers[key] = value
4731 continue
4733 continue
4732
4734
4733 if line.startswith(b'BODYFILE '):
4735 if line.startswith(b'BODYFILE '):
4734 with open(line.split(b' ', 1), b'rb') as fh:
4736 with open(line.split(b' ', 1), b'rb') as fh:
4735 body = fh.read()
4737 body = fh.read()
4736 elif line.startswith(b'frame '):
4738 elif line.startswith(b'frame '):
4737 frame = wireprotoframing.makeframefromhumanstring(
4739 frame = wireprotoframing.makeframefromhumanstring(
4738 line[len(b'frame ') :]
4740 line[len(b'frame ') :]
4739 )
4741 )
4740
4742
4741 frames.append(frame)
4743 frames.append(frame)
4742 else:
4744 else:
4743 raise error.Abort(
4745 raise error.Abort(
4744 _(b'unknown argument to httprequest: %s') % line
4746 _(b'unknown argument to httprequest: %s') % line
4745 )
4747 )
4746
4748
4747 url = path + httppath
4749 url = path + httppath
4748
4750
4749 if frames:
4751 if frames:
4750 body = b''.join(bytes(f) for f in frames)
4752 body = b''.join(bytes(f) for f in frames)
4751
4753
4752 req = urlmod.urlreq.request(pycompat.strurl(url), body, headers)
4754 req = urlmod.urlreq.request(pycompat.strurl(url), body, headers)
4753
4755
4754 # urllib.Request insists on using has_data() as a proxy for
4756 # urllib.Request insists on using has_data() as a proxy for
4755 # determining the request method. Override that to use our
4757 # determining the request method. Override that to use our
4756 # explicitly requested method.
4758 # explicitly requested method.
4757 req.get_method = lambda: pycompat.sysstr(method)
4759 req.get_method = lambda: pycompat.sysstr(method)
4758
4760
4759 try:
4761 try:
4760 res = opener.open(req)
4762 res = opener.open(req)
4761 body = res.read()
4763 body = res.read()
4762 except util.urlerr.urlerror as e:
4764 except util.urlerr.urlerror as e:
4763 # read() method must be called, but only exists in Python 2
4765 # read() method must be called, but only exists in Python 2
4764 getattr(e, 'read', lambda: None)()
4766 getattr(e, 'read', lambda: None)()
4765 continue
4767 continue
4766
4768
4767 ct = res.headers.get('Content-Type')
4769 ct = res.headers.get('Content-Type')
4768 if ct == 'application/mercurial-cbor':
4770 if ct == 'application/mercurial-cbor':
4769 ui.write(
4771 ui.write(
4770 _(b'cbor> %s\n')
4772 _(b'cbor> %s\n')
4771 % stringutil.pprint(
4773 % stringutil.pprint(
4772 cborutil.decodeall(body), bprefix=True, indent=2
4774 cborutil.decodeall(body), bprefix=True, indent=2
4773 )
4775 )
4774 )
4776 )
4775
4777
4776 elif action == b'close':
4778 elif action == b'close':
4777 assert peer is not None
4779 assert peer is not None
4778 peer.close()
4780 peer.close()
4779 elif action == b'readavailable':
4781 elif action == b'readavailable':
4780 if not stdout or not stderr:
4782 if not stdout or not stderr:
4781 raise error.Abort(
4783 raise error.Abort(
4782 _(b'readavailable not available on this peer')
4784 _(b'readavailable not available on this peer')
4783 )
4785 )
4784
4786
4785 stdin.close()
4787 stdin.close()
4786 stdout.read()
4788 stdout.read()
4787 stderr.read()
4789 stderr.read()
4788
4790
4789 elif action == b'readline':
4791 elif action == b'readline':
4790 if not stdout:
4792 if not stdout:
4791 raise error.Abort(_(b'readline not available on this peer'))
4793 raise error.Abort(_(b'readline not available on this peer'))
4792 stdout.readline()
4794 stdout.readline()
4793 elif action == b'ereadline':
4795 elif action == b'ereadline':
4794 if not stderr:
4796 if not stderr:
4795 raise error.Abort(_(b'ereadline not available on this peer'))
4797 raise error.Abort(_(b'ereadline not available on this peer'))
4796 stderr.readline()
4798 stderr.readline()
4797 elif action.startswith(b'read '):
4799 elif action.startswith(b'read '):
4798 count = int(action.split(b' ', 1)[1])
4800 count = int(action.split(b' ', 1)[1])
4799 if not stdout:
4801 if not stdout:
4800 raise error.Abort(_(b'read not available on this peer'))
4802 raise error.Abort(_(b'read not available on this peer'))
4801 stdout.read(count)
4803 stdout.read(count)
4802 elif action.startswith(b'eread '):
4804 elif action.startswith(b'eread '):
4803 count = int(action.split(b' ', 1)[1])
4805 count = int(action.split(b' ', 1)[1])
4804 if not stderr:
4806 if not stderr:
4805 raise error.Abort(_(b'eread not available on this peer'))
4807 raise error.Abort(_(b'eread not available on this peer'))
4806 stderr.read(count)
4808 stderr.read(count)
4807 else:
4809 else:
4808 raise error.Abort(_(b'unknown action: %s') % action)
4810 raise error.Abort(_(b'unknown action: %s') % action)
4809
4811
4810 if batchedcommands is not None:
4812 if batchedcommands is not None:
4811 raise error.Abort(_(b'unclosed "batchbegin" request'))
4813 raise error.Abort(_(b'unclosed "batchbegin" request'))
4812
4814
4813 if peer:
4815 if peer:
4814 peer.close()
4816 peer.close()
4815
4817
4816 if proc:
4818 if proc:
4817 proc.kill()
4819 proc.kill()
General Comments 0
You need to be logged in to leave comments. Login now