##// END OF EJS Templates
py3: format revision number as '%d' in debugrevspec...
Yuya Nishihara -
r35920:2da4144e default
parent child Browse files
Show More
@@ -1,2478 +1,2478 b''
1 # debugcommands.py - command processing for debug* commands
1 # debugcommands.py - command processing for debug* commands
2 #
2 #
3 # Copyright 2005-2016 Matt Mackall <mpm@selenic.com>
3 # Copyright 2005-2016 Matt Mackall <mpm@selenic.com>
4 #
4 #
5 # This software may be used and distributed according to the terms of the
5 # This software may be used and distributed according to the terms of the
6 # GNU General Public License version 2 or any later version.
6 # GNU General Public License version 2 or any later version.
7
7
8 from __future__ import absolute_import
8 from __future__ import absolute_import
9
9
10 import codecs
10 import codecs
11 import collections
11 import collections
12 import difflib
12 import difflib
13 import errno
13 import errno
14 import operator
14 import operator
15 import os
15 import os
16 import random
16 import random
17 import socket
17 import socket
18 import ssl
18 import ssl
19 import string
19 import string
20 import sys
20 import sys
21 import tempfile
21 import tempfile
22 import time
22 import time
23
23
24 from .i18n import _
24 from .i18n import _
25 from .node import (
25 from .node import (
26 bin,
26 bin,
27 hex,
27 hex,
28 nullhex,
28 nullhex,
29 nullid,
29 nullid,
30 nullrev,
30 nullrev,
31 short,
31 short,
32 )
32 )
33 from . import (
33 from . import (
34 bundle2,
34 bundle2,
35 changegroup,
35 changegroup,
36 cmdutil,
36 cmdutil,
37 color,
37 color,
38 context,
38 context,
39 dagparser,
39 dagparser,
40 dagutil,
40 dagutil,
41 encoding,
41 encoding,
42 error,
42 error,
43 exchange,
43 exchange,
44 extensions,
44 extensions,
45 filemerge,
45 filemerge,
46 fileset,
46 fileset,
47 formatter,
47 formatter,
48 hg,
48 hg,
49 localrepo,
49 localrepo,
50 lock as lockmod,
50 lock as lockmod,
51 logcmdutil,
51 logcmdutil,
52 merge as mergemod,
52 merge as mergemod,
53 obsolete,
53 obsolete,
54 obsutil,
54 obsutil,
55 phases,
55 phases,
56 policy,
56 policy,
57 pvec,
57 pvec,
58 pycompat,
58 pycompat,
59 registrar,
59 registrar,
60 repair,
60 repair,
61 revlog,
61 revlog,
62 revset,
62 revset,
63 revsetlang,
63 revsetlang,
64 scmutil,
64 scmutil,
65 setdiscovery,
65 setdiscovery,
66 simplemerge,
66 simplemerge,
67 smartset,
67 smartset,
68 sslutil,
68 sslutil,
69 streamclone,
69 streamclone,
70 templater,
70 templater,
71 treediscovery,
71 treediscovery,
72 upgrade,
72 upgrade,
73 url as urlmod,
73 url as urlmod,
74 util,
74 util,
75 vfs as vfsmod,
75 vfs as vfsmod,
76 )
76 )
77
77
78 release = lockmod.release
78 release = lockmod.release
79
79
80 command = registrar.command()
80 command = registrar.command()
81
81
82 @command('debugancestor', [], _('[INDEX] REV1 REV2'), optionalrepo=True)
82 @command('debugancestor', [], _('[INDEX] REV1 REV2'), optionalrepo=True)
83 def debugancestor(ui, repo, *args):
83 def debugancestor(ui, repo, *args):
84 """find the ancestor revision of two revisions in a given index"""
84 """find the ancestor revision of two revisions in a given index"""
85 if len(args) == 3:
85 if len(args) == 3:
86 index, rev1, rev2 = args
86 index, rev1, rev2 = args
87 r = revlog.revlog(vfsmod.vfs(pycompat.getcwd(), audit=False), index)
87 r = revlog.revlog(vfsmod.vfs(pycompat.getcwd(), audit=False), index)
88 lookup = r.lookup
88 lookup = r.lookup
89 elif len(args) == 2:
89 elif len(args) == 2:
90 if not repo:
90 if not repo:
91 raise error.Abort(_('there is no Mercurial repository here '
91 raise error.Abort(_('there is no Mercurial repository here '
92 '(.hg not found)'))
92 '(.hg not found)'))
93 rev1, rev2 = args
93 rev1, rev2 = args
94 r = repo.changelog
94 r = repo.changelog
95 lookup = repo.lookup
95 lookup = repo.lookup
96 else:
96 else:
97 raise error.Abort(_('either two or three arguments required'))
97 raise error.Abort(_('either two or three arguments required'))
98 a = r.ancestor(lookup(rev1), lookup(rev2))
98 a = r.ancestor(lookup(rev1), lookup(rev2))
99 ui.write('%d:%s\n' % (r.rev(a), hex(a)))
99 ui.write('%d:%s\n' % (r.rev(a), hex(a)))
100
100
101 @command('debugapplystreamclonebundle', [], 'FILE')
101 @command('debugapplystreamclonebundle', [], 'FILE')
102 def debugapplystreamclonebundle(ui, repo, fname):
102 def debugapplystreamclonebundle(ui, repo, fname):
103 """apply a stream clone bundle file"""
103 """apply a stream clone bundle file"""
104 f = hg.openpath(ui, fname)
104 f = hg.openpath(ui, fname)
105 gen = exchange.readbundle(ui, f, fname)
105 gen = exchange.readbundle(ui, f, fname)
106 gen.apply(repo)
106 gen.apply(repo)
107
107
108 @command('debugbuilddag',
108 @command('debugbuilddag',
109 [('m', 'mergeable-file', None, _('add single file mergeable changes')),
109 [('m', 'mergeable-file', None, _('add single file mergeable changes')),
110 ('o', 'overwritten-file', None, _('add single file all revs overwrite')),
110 ('o', 'overwritten-file', None, _('add single file all revs overwrite')),
111 ('n', 'new-file', None, _('add new file at each rev'))],
111 ('n', 'new-file', None, _('add new file at each rev'))],
112 _('[OPTION]... [TEXT]'))
112 _('[OPTION]... [TEXT]'))
113 def debugbuilddag(ui, repo, text=None,
113 def debugbuilddag(ui, repo, text=None,
114 mergeable_file=False,
114 mergeable_file=False,
115 overwritten_file=False,
115 overwritten_file=False,
116 new_file=False):
116 new_file=False):
117 """builds a repo with a given DAG from scratch in the current empty repo
117 """builds a repo with a given DAG from scratch in the current empty repo
118
118
119 The description of the DAG is read from stdin if not given on the
119 The description of the DAG is read from stdin if not given on the
120 command line.
120 command line.
121
121
122 Elements:
122 Elements:
123
123
124 - "+n" is a linear run of n nodes based on the current default parent
124 - "+n" is a linear run of n nodes based on the current default parent
125 - "." is a single node based on the current default parent
125 - "." is a single node based on the current default parent
126 - "$" resets the default parent to null (implied at the start);
126 - "$" resets the default parent to null (implied at the start);
127 otherwise the default parent is always the last node created
127 otherwise the default parent is always the last node created
128 - "<p" sets the default parent to the backref p
128 - "<p" sets the default parent to the backref p
129 - "*p" is a fork at parent p, which is a backref
129 - "*p" is a fork at parent p, which is a backref
130 - "*p1/p2" is a merge of parents p1 and p2, which are backrefs
130 - "*p1/p2" is a merge of parents p1 and p2, which are backrefs
131 - "/p2" is a merge of the preceding node and p2
131 - "/p2" is a merge of the preceding node and p2
132 - ":tag" defines a local tag for the preceding node
132 - ":tag" defines a local tag for the preceding node
133 - "@branch" sets the named branch for subsequent nodes
133 - "@branch" sets the named branch for subsequent nodes
134 - "#...\\n" is a comment up to the end of the line
134 - "#...\\n" is a comment up to the end of the line
135
135
136 Whitespace between the above elements is ignored.
136 Whitespace between the above elements is ignored.
137
137
138 A backref is either
138 A backref is either
139
139
140 - a number n, which references the node curr-n, where curr is the current
140 - a number n, which references the node curr-n, where curr is the current
141 node, or
141 node, or
142 - the name of a local tag you placed earlier using ":tag", or
142 - the name of a local tag you placed earlier using ":tag", or
143 - empty to denote the default parent.
143 - empty to denote the default parent.
144
144
145 All string valued-elements are either strictly alphanumeric, or must
145 All string valued-elements are either strictly alphanumeric, or must
146 be enclosed in double quotes ("..."), with "\\" as escape character.
146 be enclosed in double quotes ("..."), with "\\" as escape character.
147 """
147 """
148
148
149 if text is None:
149 if text is None:
150 ui.status(_("reading DAG from stdin\n"))
150 ui.status(_("reading DAG from stdin\n"))
151 text = ui.fin.read()
151 text = ui.fin.read()
152
152
153 cl = repo.changelog
153 cl = repo.changelog
154 if len(cl) > 0:
154 if len(cl) > 0:
155 raise error.Abort(_('repository is not empty'))
155 raise error.Abort(_('repository is not empty'))
156
156
157 # determine number of revs in DAG
157 # determine number of revs in DAG
158 total = 0
158 total = 0
159 for type, data in dagparser.parsedag(text):
159 for type, data in dagparser.parsedag(text):
160 if type == 'n':
160 if type == 'n':
161 total += 1
161 total += 1
162
162
163 if mergeable_file:
163 if mergeable_file:
164 linesperrev = 2
164 linesperrev = 2
165 # make a file with k lines per rev
165 # make a file with k lines per rev
166 initialmergedlines = [str(i) for i in xrange(0, total * linesperrev)]
166 initialmergedlines = [str(i) for i in xrange(0, total * linesperrev)]
167 initialmergedlines.append("")
167 initialmergedlines.append("")
168
168
169 tags = []
169 tags = []
170
170
171 wlock = lock = tr = None
171 wlock = lock = tr = None
172 try:
172 try:
173 wlock = repo.wlock()
173 wlock = repo.wlock()
174 lock = repo.lock()
174 lock = repo.lock()
175 tr = repo.transaction("builddag")
175 tr = repo.transaction("builddag")
176
176
177 at = -1
177 at = -1
178 atbranch = 'default'
178 atbranch = 'default'
179 nodeids = []
179 nodeids = []
180 id = 0
180 id = 0
181 ui.progress(_('building'), id, unit=_('revisions'), total=total)
181 ui.progress(_('building'), id, unit=_('revisions'), total=total)
182 for type, data in dagparser.parsedag(text):
182 for type, data in dagparser.parsedag(text):
183 if type == 'n':
183 if type == 'n':
184 ui.note(('node %s\n' % pycompat.bytestr(data)))
184 ui.note(('node %s\n' % pycompat.bytestr(data)))
185 id, ps = data
185 id, ps = data
186
186
187 files = []
187 files = []
188 filecontent = {}
188 filecontent = {}
189
189
190 p2 = None
190 p2 = None
191 if mergeable_file:
191 if mergeable_file:
192 fn = "mf"
192 fn = "mf"
193 p1 = repo[ps[0]]
193 p1 = repo[ps[0]]
194 if len(ps) > 1:
194 if len(ps) > 1:
195 p2 = repo[ps[1]]
195 p2 = repo[ps[1]]
196 pa = p1.ancestor(p2)
196 pa = p1.ancestor(p2)
197 base, local, other = [x[fn].data() for x in (pa, p1,
197 base, local, other = [x[fn].data() for x in (pa, p1,
198 p2)]
198 p2)]
199 m3 = simplemerge.Merge3Text(base, local, other)
199 m3 = simplemerge.Merge3Text(base, local, other)
200 ml = [l.strip() for l in m3.merge_lines()]
200 ml = [l.strip() for l in m3.merge_lines()]
201 ml.append("")
201 ml.append("")
202 elif at > 0:
202 elif at > 0:
203 ml = p1[fn].data().split("\n")
203 ml = p1[fn].data().split("\n")
204 else:
204 else:
205 ml = initialmergedlines
205 ml = initialmergedlines
206 ml[id * linesperrev] += " r%i" % id
206 ml[id * linesperrev] += " r%i" % id
207 mergedtext = "\n".join(ml)
207 mergedtext = "\n".join(ml)
208 files.append(fn)
208 files.append(fn)
209 filecontent[fn] = mergedtext
209 filecontent[fn] = mergedtext
210
210
211 if overwritten_file:
211 if overwritten_file:
212 fn = "of"
212 fn = "of"
213 files.append(fn)
213 files.append(fn)
214 filecontent[fn] = "r%i\n" % id
214 filecontent[fn] = "r%i\n" % id
215
215
216 if new_file:
216 if new_file:
217 fn = "nf%i" % id
217 fn = "nf%i" % id
218 files.append(fn)
218 files.append(fn)
219 filecontent[fn] = "r%i\n" % id
219 filecontent[fn] = "r%i\n" % id
220 if len(ps) > 1:
220 if len(ps) > 1:
221 if not p2:
221 if not p2:
222 p2 = repo[ps[1]]
222 p2 = repo[ps[1]]
223 for fn in p2:
223 for fn in p2:
224 if fn.startswith("nf"):
224 if fn.startswith("nf"):
225 files.append(fn)
225 files.append(fn)
226 filecontent[fn] = p2[fn].data()
226 filecontent[fn] = p2[fn].data()
227
227
228 def fctxfn(repo, cx, path):
228 def fctxfn(repo, cx, path):
229 if path in filecontent:
229 if path in filecontent:
230 return context.memfilectx(repo, cx, path,
230 return context.memfilectx(repo, cx, path,
231 filecontent[path])
231 filecontent[path])
232 return None
232 return None
233
233
234 if len(ps) == 0 or ps[0] < 0:
234 if len(ps) == 0 or ps[0] < 0:
235 pars = [None, None]
235 pars = [None, None]
236 elif len(ps) == 1:
236 elif len(ps) == 1:
237 pars = [nodeids[ps[0]], None]
237 pars = [nodeids[ps[0]], None]
238 else:
238 else:
239 pars = [nodeids[p] for p in ps]
239 pars = [nodeids[p] for p in ps]
240 cx = context.memctx(repo, pars, "r%i" % id, files, fctxfn,
240 cx = context.memctx(repo, pars, "r%i" % id, files, fctxfn,
241 date=(id, 0),
241 date=(id, 0),
242 user="debugbuilddag",
242 user="debugbuilddag",
243 extra={'branch': atbranch})
243 extra={'branch': atbranch})
244 nodeid = repo.commitctx(cx)
244 nodeid = repo.commitctx(cx)
245 nodeids.append(nodeid)
245 nodeids.append(nodeid)
246 at = id
246 at = id
247 elif type == 'l':
247 elif type == 'l':
248 id, name = data
248 id, name = data
249 ui.note(('tag %s\n' % name))
249 ui.note(('tag %s\n' % name))
250 tags.append("%s %s\n" % (hex(repo.changelog.node(id)), name))
250 tags.append("%s %s\n" % (hex(repo.changelog.node(id)), name))
251 elif type == 'a':
251 elif type == 'a':
252 ui.note(('branch %s\n' % data))
252 ui.note(('branch %s\n' % data))
253 atbranch = data
253 atbranch = data
254 ui.progress(_('building'), id, unit=_('revisions'), total=total)
254 ui.progress(_('building'), id, unit=_('revisions'), total=total)
255 tr.close()
255 tr.close()
256
256
257 if tags:
257 if tags:
258 repo.vfs.write("localtags", "".join(tags))
258 repo.vfs.write("localtags", "".join(tags))
259 finally:
259 finally:
260 ui.progress(_('building'), None)
260 ui.progress(_('building'), None)
261 release(tr, lock, wlock)
261 release(tr, lock, wlock)
262
262
263 def _debugchangegroup(ui, gen, all=None, indent=0, **opts):
263 def _debugchangegroup(ui, gen, all=None, indent=0, **opts):
264 indent_string = ' ' * indent
264 indent_string = ' ' * indent
265 if all:
265 if all:
266 ui.write(("%sformat: id, p1, p2, cset, delta base, len(delta)\n")
266 ui.write(("%sformat: id, p1, p2, cset, delta base, len(delta)\n")
267 % indent_string)
267 % indent_string)
268
268
269 def showchunks(named):
269 def showchunks(named):
270 ui.write("\n%s%s\n" % (indent_string, named))
270 ui.write("\n%s%s\n" % (indent_string, named))
271 for deltadata in gen.deltaiter():
271 for deltadata in gen.deltaiter():
272 node, p1, p2, cs, deltabase, delta, flags = deltadata
272 node, p1, p2, cs, deltabase, delta, flags = deltadata
273 ui.write("%s%s %s %s %s %s %s\n" %
273 ui.write("%s%s %s %s %s %s %s\n" %
274 (indent_string, hex(node), hex(p1), hex(p2),
274 (indent_string, hex(node), hex(p1), hex(p2),
275 hex(cs), hex(deltabase), len(delta)))
275 hex(cs), hex(deltabase), len(delta)))
276
276
277 chunkdata = gen.changelogheader()
277 chunkdata = gen.changelogheader()
278 showchunks("changelog")
278 showchunks("changelog")
279 chunkdata = gen.manifestheader()
279 chunkdata = gen.manifestheader()
280 showchunks("manifest")
280 showchunks("manifest")
281 for chunkdata in iter(gen.filelogheader, {}):
281 for chunkdata in iter(gen.filelogheader, {}):
282 fname = chunkdata['filename']
282 fname = chunkdata['filename']
283 showchunks(fname)
283 showchunks(fname)
284 else:
284 else:
285 if isinstance(gen, bundle2.unbundle20):
285 if isinstance(gen, bundle2.unbundle20):
286 raise error.Abort(_('use debugbundle2 for this file'))
286 raise error.Abort(_('use debugbundle2 for this file'))
287 chunkdata = gen.changelogheader()
287 chunkdata = gen.changelogheader()
288 for deltadata in gen.deltaiter():
288 for deltadata in gen.deltaiter():
289 node, p1, p2, cs, deltabase, delta, flags = deltadata
289 node, p1, p2, cs, deltabase, delta, flags = deltadata
290 ui.write("%s%s\n" % (indent_string, hex(node)))
290 ui.write("%s%s\n" % (indent_string, hex(node)))
291
291
292 def _debugobsmarkers(ui, part, indent=0, **opts):
292 def _debugobsmarkers(ui, part, indent=0, **opts):
293 """display version and markers contained in 'data'"""
293 """display version and markers contained in 'data'"""
294 opts = pycompat.byteskwargs(opts)
294 opts = pycompat.byteskwargs(opts)
295 data = part.read()
295 data = part.read()
296 indent_string = ' ' * indent
296 indent_string = ' ' * indent
297 try:
297 try:
298 version, markers = obsolete._readmarkers(data)
298 version, markers = obsolete._readmarkers(data)
299 except error.UnknownVersion as exc:
299 except error.UnknownVersion as exc:
300 msg = "%sunsupported version: %s (%d bytes)\n"
300 msg = "%sunsupported version: %s (%d bytes)\n"
301 msg %= indent_string, exc.version, len(data)
301 msg %= indent_string, exc.version, len(data)
302 ui.write(msg)
302 ui.write(msg)
303 else:
303 else:
304 msg = "%sversion: %d (%d bytes)\n"
304 msg = "%sversion: %d (%d bytes)\n"
305 msg %= indent_string, version, len(data)
305 msg %= indent_string, version, len(data)
306 ui.write(msg)
306 ui.write(msg)
307 fm = ui.formatter('debugobsolete', opts)
307 fm = ui.formatter('debugobsolete', opts)
308 for rawmarker in sorted(markers):
308 for rawmarker in sorted(markers):
309 m = obsutil.marker(None, rawmarker)
309 m = obsutil.marker(None, rawmarker)
310 fm.startitem()
310 fm.startitem()
311 fm.plain(indent_string)
311 fm.plain(indent_string)
312 cmdutil.showmarker(fm, m)
312 cmdutil.showmarker(fm, m)
313 fm.end()
313 fm.end()
314
314
315 def _debugphaseheads(ui, data, indent=0):
315 def _debugphaseheads(ui, data, indent=0):
316 """display version and markers contained in 'data'"""
316 """display version and markers contained in 'data'"""
317 indent_string = ' ' * indent
317 indent_string = ' ' * indent
318 headsbyphase = phases.binarydecode(data)
318 headsbyphase = phases.binarydecode(data)
319 for phase in phases.allphases:
319 for phase in phases.allphases:
320 for head in headsbyphase[phase]:
320 for head in headsbyphase[phase]:
321 ui.write(indent_string)
321 ui.write(indent_string)
322 ui.write('%s %s\n' % (hex(head), phases.phasenames[phase]))
322 ui.write('%s %s\n' % (hex(head), phases.phasenames[phase]))
323
323
324 def _quasirepr(thing):
324 def _quasirepr(thing):
325 if isinstance(thing, (dict, util.sortdict, collections.OrderedDict)):
325 if isinstance(thing, (dict, util.sortdict, collections.OrderedDict)):
326 return '{%s}' % (
326 return '{%s}' % (
327 b', '.join(b'%s: %s' % (k, thing[k]) for k in sorted(thing)))
327 b', '.join(b'%s: %s' % (k, thing[k]) for k in sorted(thing)))
328 return pycompat.bytestr(repr(thing))
328 return pycompat.bytestr(repr(thing))
329
329
330 def _debugbundle2(ui, gen, all=None, **opts):
330 def _debugbundle2(ui, gen, all=None, **opts):
331 """lists the contents of a bundle2"""
331 """lists the contents of a bundle2"""
332 if not isinstance(gen, bundle2.unbundle20):
332 if not isinstance(gen, bundle2.unbundle20):
333 raise error.Abort(_('not a bundle2 file'))
333 raise error.Abort(_('not a bundle2 file'))
334 ui.write(('Stream params: %s\n' % _quasirepr(gen.params)))
334 ui.write(('Stream params: %s\n' % _quasirepr(gen.params)))
335 parttypes = opts.get(r'part_type', [])
335 parttypes = opts.get(r'part_type', [])
336 for part in gen.iterparts():
336 for part in gen.iterparts():
337 if parttypes and part.type not in parttypes:
337 if parttypes and part.type not in parttypes:
338 continue
338 continue
339 ui.write('%s -- %s\n' % (part.type, _quasirepr(part.params)))
339 ui.write('%s -- %s\n' % (part.type, _quasirepr(part.params)))
340 if part.type == 'changegroup':
340 if part.type == 'changegroup':
341 version = part.params.get('version', '01')
341 version = part.params.get('version', '01')
342 cg = changegroup.getunbundler(version, part, 'UN')
342 cg = changegroup.getunbundler(version, part, 'UN')
343 _debugchangegroup(ui, cg, all=all, indent=4, **opts)
343 _debugchangegroup(ui, cg, all=all, indent=4, **opts)
344 if part.type == 'obsmarkers':
344 if part.type == 'obsmarkers':
345 _debugobsmarkers(ui, part, indent=4, **opts)
345 _debugobsmarkers(ui, part, indent=4, **opts)
346 if part.type == 'phase-heads':
346 if part.type == 'phase-heads':
347 _debugphaseheads(ui, part, indent=4)
347 _debugphaseheads(ui, part, indent=4)
348
348
349 @command('debugbundle',
349 @command('debugbundle',
350 [('a', 'all', None, _('show all details')),
350 [('a', 'all', None, _('show all details')),
351 ('', 'part-type', [], _('show only the named part type')),
351 ('', 'part-type', [], _('show only the named part type')),
352 ('', 'spec', None, _('print the bundlespec of the bundle'))],
352 ('', 'spec', None, _('print the bundlespec of the bundle'))],
353 _('FILE'),
353 _('FILE'),
354 norepo=True)
354 norepo=True)
355 def debugbundle(ui, bundlepath, all=None, spec=None, **opts):
355 def debugbundle(ui, bundlepath, all=None, spec=None, **opts):
356 """lists the contents of a bundle"""
356 """lists the contents of a bundle"""
357 with hg.openpath(ui, bundlepath) as f:
357 with hg.openpath(ui, bundlepath) as f:
358 if spec:
358 if spec:
359 spec = exchange.getbundlespec(ui, f)
359 spec = exchange.getbundlespec(ui, f)
360 ui.write('%s\n' % spec)
360 ui.write('%s\n' % spec)
361 return
361 return
362
362
363 gen = exchange.readbundle(ui, f, bundlepath)
363 gen = exchange.readbundle(ui, f, bundlepath)
364 if isinstance(gen, bundle2.unbundle20):
364 if isinstance(gen, bundle2.unbundle20):
365 return _debugbundle2(ui, gen, all=all, **opts)
365 return _debugbundle2(ui, gen, all=all, **opts)
366 _debugchangegroup(ui, gen, all=all, **opts)
366 _debugchangegroup(ui, gen, all=all, **opts)
367
367
368 @command('debugcapabilities',
368 @command('debugcapabilities',
369 [], _('PATH'),
369 [], _('PATH'),
370 norepo=True)
370 norepo=True)
371 def debugcapabilities(ui, path, **opts):
371 def debugcapabilities(ui, path, **opts):
372 """lists the capabilities of a remote peer"""
372 """lists the capabilities of a remote peer"""
373 opts = pycompat.byteskwargs(opts)
373 opts = pycompat.byteskwargs(opts)
374 peer = hg.peer(ui, opts, path)
374 peer = hg.peer(ui, opts, path)
375 caps = peer.capabilities()
375 caps = peer.capabilities()
376 ui.write(('Main capabilities:\n'))
376 ui.write(('Main capabilities:\n'))
377 for c in sorted(caps):
377 for c in sorted(caps):
378 ui.write((' %s\n') % c)
378 ui.write((' %s\n') % c)
379 b2caps = bundle2.bundle2caps(peer)
379 b2caps = bundle2.bundle2caps(peer)
380 if b2caps:
380 if b2caps:
381 ui.write(('Bundle2 capabilities:\n'))
381 ui.write(('Bundle2 capabilities:\n'))
382 for key, values in sorted(b2caps.iteritems()):
382 for key, values in sorted(b2caps.iteritems()):
383 ui.write((' %s\n') % key)
383 ui.write((' %s\n') % key)
384 for v in values:
384 for v in values:
385 ui.write((' %s\n') % v)
385 ui.write((' %s\n') % v)
386
386
387 @command('debugcheckstate', [], '')
387 @command('debugcheckstate', [], '')
388 def debugcheckstate(ui, repo):
388 def debugcheckstate(ui, repo):
389 """validate the correctness of the current dirstate"""
389 """validate the correctness of the current dirstate"""
390 parent1, parent2 = repo.dirstate.parents()
390 parent1, parent2 = repo.dirstate.parents()
391 m1 = repo[parent1].manifest()
391 m1 = repo[parent1].manifest()
392 m2 = repo[parent2].manifest()
392 m2 = repo[parent2].manifest()
393 errors = 0
393 errors = 0
394 for f in repo.dirstate:
394 for f in repo.dirstate:
395 state = repo.dirstate[f]
395 state = repo.dirstate[f]
396 if state in "nr" and f not in m1:
396 if state in "nr" and f not in m1:
397 ui.warn(_("%s in state %s, but not in manifest1\n") % (f, state))
397 ui.warn(_("%s in state %s, but not in manifest1\n") % (f, state))
398 errors += 1
398 errors += 1
399 if state in "a" and f in m1:
399 if state in "a" and f in m1:
400 ui.warn(_("%s in state %s, but also in manifest1\n") % (f, state))
400 ui.warn(_("%s in state %s, but also in manifest1\n") % (f, state))
401 errors += 1
401 errors += 1
402 if state in "m" and f not in m1 and f not in m2:
402 if state in "m" and f not in m1 and f not in m2:
403 ui.warn(_("%s in state %s, but not in either manifest\n") %
403 ui.warn(_("%s in state %s, but not in either manifest\n") %
404 (f, state))
404 (f, state))
405 errors += 1
405 errors += 1
406 for f in m1:
406 for f in m1:
407 state = repo.dirstate[f]
407 state = repo.dirstate[f]
408 if state not in "nrm":
408 if state not in "nrm":
409 ui.warn(_("%s in manifest1, but listed as state %s") % (f, state))
409 ui.warn(_("%s in manifest1, but listed as state %s") % (f, state))
410 errors += 1
410 errors += 1
411 if errors:
411 if errors:
412 error = _(".hg/dirstate inconsistent with current parent's manifest")
412 error = _(".hg/dirstate inconsistent with current parent's manifest")
413 raise error.Abort(error)
413 raise error.Abort(error)
414
414
415 @command('debugcolor',
415 @command('debugcolor',
416 [('', 'style', None, _('show all configured styles'))],
416 [('', 'style', None, _('show all configured styles'))],
417 'hg debugcolor')
417 'hg debugcolor')
418 def debugcolor(ui, repo, **opts):
418 def debugcolor(ui, repo, **opts):
419 """show available color, effects or style"""
419 """show available color, effects or style"""
420 ui.write(('color mode: %s\n') % ui._colormode)
420 ui.write(('color mode: %s\n') % ui._colormode)
421 if opts.get(r'style'):
421 if opts.get(r'style'):
422 return _debugdisplaystyle(ui)
422 return _debugdisplaystyle(ui)
423 else:
423 else:
424 return _debugdisplaycolor(ui)
424 return _debugdisplaycolor(ui)
425
425
426 def _debugdisplaycolor(ui):
426 def _debugdisplaycolor(ui):
427 ui = ui.copy()
427 ui = ui.copy()
428 ui._styles.clear()
428 ui._styles.clear()
429 for effect in color._activeeffects(ui).keys():
429 for effect in color._activeeffects(ui).keys():
430 ui._styles[effect] = effect
430 ui._styles[effect] = effect
431 if ui._terminfoparams:
431 if ui._terminfoparams:
432 for k, v in ui.configitems('color'):
432 for k, v in ui.configitems('color'):
433 if k.startswith('color.'):
433 if k.startswith('color.'):
434 ui._styles[k] = k[6:]
434 ui._styles[k] = k[6:]
435 elif k.startswith('terminfo.'):
435 elif k.startswith('terminfo.'):
436 ui._styles[k] = k[9:]
436 ui._styles[k] = k[9:]
437 ui.write(_('available colors:\n'))
437 ui.write(_('available colors:\n'))
438 # sort label with a '_' after the other to group '_background' entry.
438 # sort label with a '_' after the other to group '_background' entry.
439 items = sorted(ui._styles.items(),
439 items = sorted(ui._styles.items(),
440 key=lambda i: ('_' in i[0], i[0], i[1]))
440 key=lambda i: ('_' in i[0], i[0], i[1]))
441 for colorname, label in items:
441 for colorname, label in items:
442 ui.write(('%s\n') % colorname, label=label)
442 ui.write(('%s\n') % colorname, label=label)
443
443
444 def _debugdisplaystyle(ui):
444 def _debugdisplaystyle(ui):
445 ui.write(_('available style:\n'))
445 ui.write(_('available style:\n'))
446 width = max(len(s) for s in ui._styles)
446 width = max(len(s) for s in ui._styles)
447 for label, effects in sorted(ui._styles.items()):
447 for label, effects in sorted(ui._styles.items()):
448 ui.write('%s' % label, label=label)
448 ui.write('%s' % label, label=label)
449 if effects:
449 if effects:
450 # 50
450 # 50
451 ui.write(': ')
451 ui.write(': ')
452 ui.write(' ' * (max(0, width - len(label))))
452 ui.write(' ' * (max(0, width - len(label))))
453 ui.write(', '.join(ui.label(e, e) for e in effects.split()))
453 ui.write(', '.join(ui.label(e, e) for e in effects.split()))
454 ui.write('\n')
454 ui.write('\n')
455
455
456 @command('debugcreatestreamclonebundle', [], 'FILE')
456 @command('debugcreatestreamclonebundle', [], 'FILE')
457 def debugcreatestreamclonebundle(ui, repo, fname):
457 def debugcreatestreamclonebundle(ui, repo, fname):
458 """create a stream clone bundle file
458 """create a stream clone bundle file
459
459
460 Stream bundles are special bundles that are essentially archives of
460 Stream bundles are special bundles that are essentially archives of
461 revlog files. They are commonly used for cloning very quickly.
461 revlog files. They are commonly used for cloning very quickly.
462 """
462 """
463 # TODO we may want to turn this into an abort when this functionality
463 # TODO we may want to turn this into an abort when this functionality
464 # is moved into `hg bundle`.
464 # is moved into `hg bundle`.
465 if phases.hassecret(repo):
465 if phases.hassecret(repo):
466 ui.warn(_('(warning: stream clone bundle will contain secret '
466 ui.warn(_('(warning: stream clone bundle will contain secret '
467 'revisions)\n'))
467 'revisions)\n'))
468
468
469 requirements, gen = streamclone.generatebundlev1(repo)
469 requirements, gen = streamclone.generatebundlev1(repo)
470 changegroup.writechunks(ui, gen, fname)
470 changegroup.writechunks(ui, gen, fname)
471
471
472 ui.write(_('bundle requirements: %s\n') % ', '.join(sorted(requirements)))
472 ui.write(_('bundle requirements: %s\n') % ', '.join(sorted(requirements)))
473
473
474 @command('debugdag',
474 @command('debugdag',
475 [('t', 'tags', None, _('use tags as labels')),
475 [('t', 'tags', None, _('use tags as labels')),
476 ('b', 'branches', None, _('annotate with branch names')),
476 ('b', 'branches', None, _('annotate with branch names')),
477 ('', 'dots', None, _('use dots for runs')),
477 ('', 'dots', None, _('use dots for runs')),
478 ('s', 'spaces', None, _('separate elements by spaces'))],
478 ('s', 'spaces', None, _('separate elements by spaces'))],
479 _('[OPTION]... [FILE [REV]...]'),
479 _('[OPTION]... [FILE [REV]...]'),
480 optionalrepo=True)
480 optionalrepo=True)
481 def debugdag(ui, repo, file_=None, *revs, **opts):
481 def debugdag(ui, repo, file_=None, *revs, **opts):
482 """format the changelog or an index DAG as a concise textual description
482 """format the changelog or an index DAG as a concise textual description
483
483
484 If you pass a revlog index, the revlog's DAG is emitted. If you list
484 If you pass a revlog index, the revlog's DAG is emitted. If you list
485 revision numbers, they get labeled in the output as rN.
485 revision numbers, they get labeled in the output as rN.
486
486
487 Otherwise, the changelog DAG of the current repo is emitted.
487 Otherwise, the changelog DAG of the current repo is emitted.
488 """
488 """
489 spaces = opts.get(r'spaces')
489 spaces = opts.get(r'spaces')
490 dots = opts.get(r'dots')
490 dots = opts.get(r'dots')
491 if file_:
491 if file_:
492 rlog = revlog.revlog(vfsmod.vfs(pycompat.getcwd(), audit=False),
492 rlog = revlog.revlog(vfsmod.vfs(pycompat.getcwd(), audit=False),
493 file_)
493 file_)
494 revs = set((int(r) for r in revs))
494 revs = set((int(r) for r in revs))
495 def events():
495 def events():
496 for r in rlog:
496 for r in rlog:
497 yield 'n', (r, list(p for p in rlog.parentrevs(r)
497 yield 'n', (r, list(p for p in rlog.parentrevs(r)
498 if p != -1))
498 if p != -1))
499 if r in revs:
499 if r in revs:
500 yield 'l', (r, "r%i" % r)
500 yield 'l', (r, "r%i" % r)
501 elif repo:
501 elif repo:
502 cl = repo.changelog
502 cl = repo.changelog
503 tags = opts.get(r'tags')
503 tags = opts.get(r'tags')
504 branches = opts.get(r'branches')
504 branches = opts.get(r'branches')
505 if tags:
505 if tags:
506 labels = {}
506 labels = {}
507 for l, n in repo.tags().items():
507 for l, n in repo.tags().items():
508 labels.setdefault(cl.rev(n), []).append(l)
508 labels.setdefault(cl.rev(n), []).append(l)
509 def events():
509 def events():
510 b = "default"
510 b = "default"
511 for r in cl:
511 for r in cl:
512 if branches:
512 if branches:
513 newb = cl.read(cl.node(r))[5]['branch']
513 newb = cl.read(cl.node(r))[5]['branch']
514 if newb != b:
514 if newb != b:
515 yield 'a', newb
515 yield 'a', newb
516 b = newb
516 b = newb
517 yield 'n', (r, list(p for p in cl.parentrevs(r)
517 yield 'n', (r, list(p for p in cl.parentrevs(r)
518 if p != -1))
518 if p != -1))
519 if tags:
519 if tags:
520 ls = labels.get(r)
520 ls = labels.get(r)
521 if ls:
521 if ls:
522 for l in ls:
522 for l in ls:
523 yield 'l', (r, l)
523 yield 'l', (r, l)
524 else:
524 else:
525 raise error.Abort(_('need repo for changelog dag'))
525 raise error.Abort(_('need repo for changelog dag'))
526
526
527 for line in dagparser.dagtextlines(events(),
527 for line in dagparser.dagtextlines(events(),
528 addspaces=spaces,
528 addspaces=spaces,
529 wraplabels=True,
529 wraplabels=True,
530 wrapannotations=True,
530 wrapannotations=True,
531 wrapnonlinear=dots,
531 wrapnonlinear=dots,
532 usedots=dots,
532 usedots=dots,
533 maxlinewidth=70):
533 maxlinewidth=70):
534 ui.write(line)
534 ui.write(line)
535 ui.write("\n")
535 ui.write("\n")
536
536
537 @command('debugdata', cmdutil.debugrevlogopts, _('-c|-m|FILE REV'))
537 @command('debugdata', cmdutil.debugrevlogopts, _('-c|-m|FILE REV'))
538 def debugdata(ui, repo, file_, rev=None, **opts):
538 def debugdata(ui, repo, file_, rev=None, **opts):
539 """dump the contents of a data file revision"""
539 """dump the contents of a data file revision"""
540 opts = pycompat.byteskwargs(opts)
540 opts = pycompat.byteskwargs(opts)
541 if opts.get('changelog') or opts.get('manifest') or opts.get('dir'):
541 if opts.get('changelog') or opts.get('manifest') or opts.get('dir'):
542 if rev is not None:
542 if rev is not None:
543 raise error.CommandError('debugdata', _('invalid arguments'))
543 raise error.CommandError('debugdata', _('invalid arguments'))
544 file_, rev = None, file_
544 file_, rev = None, file_
545 elif rev is None:
545 elif rev is None:
546 raise error.CommandError('debugdata', _('invalid arguments'))
546 raise error.CommandError('debugdata', _('invalid arguments'))
547 r = cmdutil.openrevlog(repo, 'debugdata', file_, opts)
547 r = cmdutil.openrevlog(repo, 'debugdata', file_, opts)
548 try:
548 try:
549 ui.write(r.revision(r.lookup(rev), raw=True))
549 ui.write(r.revision(r.lookup(rev), raw=True))
550 except KeyError:
550 except KeyError:
551 raise error.Abort(_('invalid revision identifier %s') % rev)
551 raise error.Abort(_('invalid revision identifier %s') % rev)
552
552
553 @command('debugdate',
553 @command('debugdate',
554 [('e', 'extended', None, _('try extended date formats'))],
554 [('e', 'extended', None, _('try extended date formats'))],
555 _('[-e] DATE [RANGE]'),
555 _('[-e] DATE [RANGE]'),
556 norepo=True, optionalrepo=True)
556 norepo=True, optionalrepo=True)
557 def debugdate(ui, date, range=None, **opts):
557 def debugdate(ui, date, range=None, **opts):
558 """parse and display a date"""
558 """parse and display a date"""
559 if opts[r"extended"]:
559 if opts[r"extended"]:
560 d = util.parsedate(date, util.extendeddateformats)
560 d = util.parsedate(date, util.extendeddateformats)
561 else:
561 else:
562 d = util.parsedate(date)
562 d = util.parsedate(date)
563 ui.write(("internal: %s %s\n") % d)
563 ui.write(("internal: %s %s\n") % d)
564 ui.write(("standard: %s\n") % util.datestr(d))
564 ui.write(("standard: %s\n") % util.datestr(d))
565 if range:
565 if range:
566 m = util.matchdate(range)
566 m = util.matchdate(range)
567 ui.write(("match: %s\n") % m(d[0]))
567 ui.write(("match: %s\n") % m(d[0]))
568
568
569 @command('debugdeltachain',
569 @command('debugdeltachain',
570 cmdutil.debugrevlogopts + cmdutil.formatteropts,
570 cmdutil.debugrevlogopts + cmdutil.formatteropts,
571 _('-c|-m|FILE'),
571 _('-c|-m|FILE'),
572 optionalrepo=True)
572 optionalrepo=True)
573 def debugdeltachain(ui, repo, file_=None, **opts):
573 def debugdeltachain(ui, repo, file_=None, **opts):
574 """dump information about delta chains in a revlog
574 """dump information about delta chains in a revlog
575
575
576 Output can be templatized. Available template keywords are:
576 Output can be templatized. Available template keywords are:
577
577
578 :``rev``: revision number
578 :``rev``: revision number
579 :``chainid``: delta chain identifier (numbered by unique base)
579 :``chainid``: delta chain identifier (numbered by unique base)
580 :``chainlen``: delta chain length to this revision
580 :``chainlen``: delta chain length to this revision
581 :``prevrev``: previous revision in delta chain
581 :``prevrev``: previous revision in delta chain
582 :``deltatype``: role of delta / how it was computed
582 :``deltatype``: role of delta / how it was computed
583 :``compsize``: compressed size of revision
583 :``compsize``: compressed size of revision
584 :``uncompsize``: uncompressed size of revision
584 :``uncompsize``: uncompressed size of revision
585 :``chainsize``: total size of compressed revisions in chain
585 :``chainsize``: total size of compressed revisions in chain
586 :``chainratio``: total chain size divided by uncompressed revision size
586 :``chainratio``: total chain size divided by uncompressed revision size
587 (new delta chains typically start at ratio 2.00)
587 (new delta chains typically start at ratio 2.00)
588 :``lindist``: linear distance from base revision in delta chain to end
588 :``lindist``: linear distance from base revision in delta chain to end
589 of this revision
589 of this revision
590 :``extradist``: total size of revisions not part of this delta chain from
590 :``extradist``: total size of revisions not part of this delta chain from
591 base of delta chain to end of this revision; a measurement
591 base of delta chain to end of this revision; a measurement
592 of how much extra data we need to read/seek across to read
592 of how much extra data we need to read/seek across to read
593 the delta chain for this revision
593 the delta chain for this revision
594 :``extraratio``: extradist divided by chainsize; another representation of
594 :``extraratio``: extradist divided by chainsize; another representation of
595 how much unrelated data is needed to load this delta chain
595 how much unrelated data is needed to load this delta chain
596
596
597 If the repository is configured to use the sparse read, additional keywords
597 If the repository is configured to use the sparse read, additional keywords
598 are available:
598 are available:
599
599
600 :``readsize``: total size of data read from the disk for a revision
600 :``readsize``: total size of data read from the disk for a revision
601 (sum of the sizes of all the blocks)
601 (sum of the sizes of all the blocks)
602 :``largestblock``: size of the largest block of data read from the disk
602 :``largestblock``: size of the largest block of data read from the disk
603 :``readdensity``: density of useful bytes in the data read from the disk
603 :``readdensity``: density of useful bytes in the data read from the disk
604 :``srchunks``: in how many data hunks the whole revision would be read
604 :``srchunks``: in how many data hunks the whole revision would be read
605
605
606 The sparse read can be enabled with experimental.sparse-read = True
606 The sparse read can be enabled with experimental.sparse-read = True
607 """
607 """
608 opts = pycompat.byteskwargs(opts)
608 opts = pycompat.byteskwargs(opts)
609 r = cmdutil.openrevlog(repo, 'debugdeltachain', file_, opts)
609 r = cmdutil.openrevlog(repo, 'debugdeltachain', file_, opts)
610 index = r.index
610 index = r.index
611 generaldelta = r.version & revlog.FLAG_GENERALDELTA
611 generaldelta = r.version & revlog.FLAG_GENERALDELTA
612 withsparseread = getattr(r, '_withsparseread', False)
612 withsparseread = getattr(r, '_withsparseread', False)
613
613
614 def revinfo(rev):
614 def revinfo(rev):
615 e = index[rev]
615 e = index[rev]
616 compsize = e[1]
616 compsize = e[1]
617 uncompsize = e[2]
617 uncompsize = e[2]
618 chainsize = 0
618 chainsize = 0
619
619
620 if generaldelta:
620 if generaldelta:
621 if e[3] == e[5]:
621 if e[3] == e[5]:
622 deltatype = 'p1'
622 deltatype = 'p1'
623 elif e[3] == e[6]:
623 elif e[3] == e[6]:
624 deltatype = 'p2'
624 deltatype = 'p2'
625 elif e[3] == rev - 1:
625 elif e[3] == rev - 1:
626 deltatype = 'prev'
626 deltatype = 'prev'
627 elif e[3] == rev:
627 elif e[3] == rev:
628 deltatype = 'base'
628 deltatype = 'base'
629 else:
629 else:
630 deltatype = 'other'
630 deltatype = 'other'
631 else:
631 else:
632 if e[3] == rev:
632 if e[3] == rev:
633 deltatype = 'base'
633 deltatype = 'base'
634 else:
634 else:
635 deltatype = 'prev'
635 deltatype = 'prev'
636
636
637 chain = r._deltachain(rev)[0]
637 chain = r._deltachain(rev)[0]
638 for iterrev in chain:
638 for iterrev in chain:
639 e = index[iterrev]
639 e = index[iterrev]
640 chainsize += e[1]
640 chainsize += e[1]
641
641
642 return compsize, uncompsize, deltatype, chain, chainsize
642 return compsize, uncompsize, deltatype, chain, chainsize
643
643
644 fm = ui.formatter('debugdeltachain', opts)
644 fm = ui.formatter('debugdeltachain', opts)
645
645
646 fm.plain(' rev chain# chainlen prev delta '
646 fm.plain(' rev chain# chainlen prev delta '
647 'size rawsize chainsize ratio lindist extradist '
647 'size rawsize chainsize ratio lindist extradist '
648 'extraratio')
648 'extraratio')
649 if withsparseread:
649 if withsparseread:
650 fm.plain(' readsize largestblk rddensity srchunks')
650 fm.plain(' readsize largestblk rddensity srchunks')
651 fm.plain('\n')
651 fm.plain('\n')
652
652
653 chainbases = {}
653 chainbases = {}
654 for rev in r:
654 for rev in r:
655 comp, uncomp, deltatype, chain, chainsize = revinfo(rev)
655 comp, uncomp, deltatype, chain, chainsize = revinfo(rev)
656 chainbase = chain[0]
656 chainbase = chain[0]
657 chainid = chainbases.setdefault(chainbase, len(chainbases) + 1)
657 chainid = chainbases.setdefault(chainbase, len(chainbases) + 1)
658 start = r.start
658 start = r.start
659 length = r.length
659 length = r.length
660 basestart = start(chainbase)
660 basestart = start(chainbase)
661 revstart = start(rev)
661 revstart = start(rev)
662 lineardist = revstart + comp - basestart
662 lineardist = revstart + comp - basestart
663 extradist = lineardist - chainsize
663 extradist = lineardist - chainsize
664 try:
664 try:
665 prevrev = chain[-2]
665 prevrev = chain[-2]
666 except IndexError:
666 except IndexError:
667 prevrev = -1
667 prevrev = -1
668
668
669 chainratio = float(chainsize) / float(uncomp)
669 chainratio = float(chainsize) / float(uncomp)
670 extraratio = float(extradist) / float(chainsize)
670 extraratio = float(extradist) / float(chainsize)
671
671
672 fm.startitem()
672 fm.startitem()
673 fm.write('rev chainid chainlen prevrev deltatype compsize '
673 fm.write('rev chainid chainlen prevrev deltatype compsize '
674 'uncompsize chainsize chainratio lindist extradist '
674 'uncompsize chainsize chainratio lindist extradist '
675 'extraratio',
675 'extraratio',
676 '%7d %7d %8d %8d %7s %10d %10d %10d %9.5f %9d %9d %10.5f',
676 '%7d %7d %8d %8d %7s %10d %10d %10d %9.5f %9d %9d %10.5f',
677 rev, chainid, len(chain), prevrev, deltatype, comp,
677 rev, chainid, len(chain), prevrev, deltatype, comp,
678 uncomp, chainsize, chainratio, lineardist, extradist,
678 uncomp, chainsize, chainratio, lineardist, extradist,
679 extraratio,
679 extraratio,
680 rev=rev, chainid=chainid, chainlen=len(chain),
680 rev=rev, chainid=chainid, chainlen=len(chain),
681 prevrev=prevrev, deltatype=deltatype, compsize=comp,
681 prevrev=prevrev, deltatype=deltatype, compsize=comp,
682 uncompsize=uncomp, chainsize=chainsize,
682 uncompsize=uncomp, chainsize=chainsize,
683 chainratio=chainratio, lindist=lineardist,
683 chainratio=chainratio, lindist=lineardist,
684 extradist=extradist, extraratio=extraratio)
684 extradist=extradist, extraratio=extraratio)
685 if withsparseread:
685 if withsparseread:
686 readsize = 0
686 readsize = 0
687 largestblock = 0
687 largestblock = 0
688 srchunks = 0
688 srchunks = 0
689
689
690 for revschunk in revlog._slicechunk(r, chain):
690 for revschunk in revlog._slicechunk(r, chain):
691 srchunks += 1
691 srchunks += 1
692 blkend = start(revschunk[-1]) + length(revschunk[-1])
692 blkend = start(revschunk[-1]) + length(revschunk[-1])
693 blksize = blkend - start(revschunk[0])
693 blksize = blkend - start(revschunk[0])
694
694
695 readsize += blksize
695 readsize += blksize
696 if largestblock < blksize:
696 if largestblock < blksize:
697 largestblock = blksize
697 largestblock = blksize
698
698
699 readdensity = float(chainsize) / float(readsize)
699 readdensity = float(chainsize) / float(readsize)
700
700
701 fm.write('readsize largestblock readdensity srchunks',
701 fm.write('readsize largestblock readdensity srchunks',
702 ' %10d %10d %9.5f %8d',
702 ' %10d %10d %9.5f %8d',
703 readsize, largestblock, readdensity, srchunks,
703 readsize, largestblock, readdensity, srchunks,
704 readsize=readsize, largestblock=largestblock,
704 readsize=readsize, largestblock=largestblock,
705 readdensity=readdensity, srchunks=srchunks)
705 readdensity=readdensity, srchunks=srchunks)
706
706
707 fm.plain('\n')
707 fm.plain('\n')
708
708
709 fm.end()
709 fm.end()
710
710
711 @command('debugdirstate|debugstate',
711 @command('debugdirstate|debugstate',
712 [('', 'nodates', None, _('do not display the saved mtime')),
712 [('', 'nodates', None, _('do not display the saved mtime')),
713 ('', 'datesort', None, _('sort by saved mtime'))],
713 ('', 'datesort', None, _('sort by saved mtime'))],
714 _('[OPTION]...'))
714 _('[OPTION]...'))
715 def debugstate(ui, repo, **opts):
715 def debugstate(ui, repo, **opts):
716 """show the contents of the current dirstate"""
716 """show the contents of the current dirstate"""
717
717
718 nodates = opts.get(r'nodates')
718 nodates = opts.get(r'nodates')
719 datesort = opts.get(r'datesort')
719 datesort = opts.get(r'datesort')
720
720
721 timestr = ""
721 timestr = ""
722 if datesort:
722 if datesort:
723 keyfunc = lambda x: (x[1][3], x[0]) # sort by mtime, then by filename
723 keyfunc = lambda x: (x[1][3], x[0]) # sort by mtime, then by filename
724 else:
724 else:
725 keyfunc = None # sort by filename
725 keyfunc = None # sort by filename
726 for file_, ent in sorted(repo.dirstate._map.iteritems(), key=keyfunc):
726 for file_, ent in sorted(repo.dirstate._map.iteritems(), key=keyfunc):
727 if ent[3] == -1:
727 if ent[3] == -1:
728 timestr = 'unset '
728 timestr = 'unset '
729 elif nodates:
729 elif nodates:
730 timestr = 'set '
730 timestr = 'set '
731 else:
731 else:
732 timestr = time.strftime(r"%Y-%m-%d %H:%M:%S ",
732 timestr = time.strftime(r"%Y-%m-%d %H:%M:%S ",
733 time.localtime(ent[3]))
733 time.localtime(ent[3]))
734 timestr = encoding.strtolocal(timestr)
734 timestr = encoding.strtolocal(timestr)
735 if ent[1] & 0o20000:
735 if ent[1] & 0o20000:
736 mode = 'lnk'
736 mode = 'lnk'
737 else:
737 else:
738 mode = '%3o' % (ent[1] & 0o777 & ~util.umask)
738 mode = '%3o' % (ent[1] & 0o777 & ~util.umask)
739 ui.write("%c %s %10d %s%s\n" % (ent[0], mode, ent[2], timestr, file_))
739 ui.write("%c %s %10d %s%s\n" % (ent[0], mode, ent[2], timestr, file_))
740 for f in repo.dirstate.copies():
740 for f in repo.dirstate.copies():
741 ui.write(_("copy: %s -> %s\n") % (repo.dirstate.copied(f), f))
741 ui.write(_("copy: %s -> %s\n") % (repo.dirstate.copied(f), f))
742
742
743 @command('debugdiscovery',
743 @command('debugdiscovery',
744 [('', 'old', None, _('use old-style discovery')),
744 [('', 'old', None, _('use old-style discovery')),
745 ('', 'nonheads', None,
745 ('', 'nonheads', None,
746 _('use old-style discovery with non-heads included')),
746 _('use old-style discovery with non-heads included')),
747 ('', 'rev', [], 'restrict discovery to this set of revs'),
747 ('', 'rev', [], 'restrict discovery to this set of revs'),
748 ] + cmdutil.remoteopts,
748 ] + cmdutil.remoteopts,
749 _('[--rev REV] [OTHER]'))
749 _('[--rev REV] [OTHER]'))
750 def debugdiscovery(ui, repo, remoteurl="default", **opts):
750 def debugdiscovery(ui, repo, remoteurl="default", **opts):
751 """runs the changeset discovery protocol in isolation"""
751 """runs the changeset discovery protocol in isolation"""
752 opts = pycompat.byteskwargs(opts)
752 opts = pycompat.byteskwargs(opts)
753 remoteurl, branches = hg.parseurl(ui.expandpath(remoteurl))
753 remoteurl, branches = hg.parseurl(ui.expandpath(remoteurl))
754 remote = hg.peer(repo, opts, remoteurl)
754 remote = hg.peer(repo, opts, remoteurl)
755 ui.status(_('comparing with %s\n') % util.hidepassword(remoteurl))
755 ui.status(_('comparing with %s\n') % util.hidepassword(remoteurl))
756
756
757 # make sure tests are repeatable
757 # make sure tests are repeatable
758 random.seed(12323)
758 random.seed(12323)
759
759
760 def doit(pushedrevs, remoteheads, remote=remote):
760 def doit(pushedrevs, remoteheads, remote=remote):
761 if opts.get('old'):
761 if opts.get('old'):
762 if not util.safehasattr(remote, 'branches'):
762 if not util.safehasattr(remote, 'branches'):
763 # enable in-client legacy support
763 # enable in-client legacy support
764 remote = localrepo.locallegacypeer(remote.local())
764 remote = localrepo.locallegacypeer(remote.local())
765 common, _in, hds = treediscovery.findcommonincoming(repo, remote,
765 common, _in, hds = treediscovery.findcommonincoming(repo, remote,
766 force=True)
766 force=True)
767 common = set(common)
767 common = set(common)
768 if not opts.get('nonheads'):
768 if not opts.get('nonheads'):
769 ui.write(("unpruned common: %s\n") %
769 ui.write(("unpruned common: %s\n") %
770 " ".join(sorted(short(n) for n in common)))
770 " ".join(sorted(short(n) for n in common)))
771 dag = dagutil.revlogdag(repo.changelog)
771 dag = dagutil.revlogdag(repo.changelog)
772 all = dag.ancestorset(dag.internalizeall(common))
772 all = dag.ancestorset(dag.internalizeall(common))
773 common = dag.externalizeall(dag.headsetofconnecteds(all))
773 common = dag.externalizeall(dag.headsetofconnecteds(all))
774 else:
774 else:
775 nodes = None
775 nodes = None
776 if pushedrevs:
776 if pushedrevs:
777 revs = scmutil.revrange(repo, pushedrevs)
777 revs = scmutil.revrange(repo, pushedrevs)
778 nodes = [repo[r].node() for r in revs]
778 nodes = [repo[r].node() for r in revs]
779 common, any, hds = setdiscovery.findcommonheads(ui, repo, remote,
779 common, any, hds = setdiscovery.findcommonheads(ui, repo, remote,
780 ancestorsof=nodes)
780 ancestorsof=nodes)
781 common = set(common)
781 common = set(common)
782 rheads = set(hds)
782 rheads = set(hds)
783 lheads = set(repo.heads())
783 lheads = set(repo.heads())
784 ui.write(("common heads: %s\n") %
784 ui.write(("common heads: %s\n") %
785 " ".join(sorted(short(n) for n in common)))
785 " ".join(sorted(short(n) for n in common)))
786 if lheads <= common:
786 if lheads <= common:
787 ui.write(("local is subset\n"))
787 ui.write(("local is subset\n"))
788 elif rheads <= common:
788 elif rheads <= common:
789 ui.write(("remote is subset\n"))
789 ui.write(("remote is subset\n"))
790
790
791 remoterevs, _checkout = hg.addbranchrevs(repo, remote, branches, revs=None)
791 remoterevs, _checkout = hg.addbranchrevs(repo, remote, branches, revs=None)
792 localrevs = opts['rev']
792 localrevs = opts['rev']
793 doit(localrevs, remoterevs)
793 doit(localrevs, remoterevs)
794
794
795 _chunksize = 4 << 10
795 _chunksize = 4 << 10
796
796
797 @command('debugdownload',
797 @command('debugdownload',
798 [
798 [
799 ('o', 'output', '', _('path')),
799 ('o', 'output', '', _('path')),
800 ],
800 ],
801 optionalrepo=True)
801 optionalrepo=True)
802 def debugdownload(ui, repo, url, output=None, **opts):
802 def debugdownload(ui, repo, url, output=None, **opts):
803 """download a resource using Mercurial logic and config
803 """download a resource using Mercurial logic and config
804 """
804 """
805 fh = urlmod.open(ui, url, output)
805 fh = urlmod.open(ui, url, output)
806
806
807 dest = ui
807 dest = ui
808 if output:
808 if output:
809 dest = open(output, "wb", _chunksize)
809 dest = open(output, "wb", _chunksize)
810 try:
810 try:
811 data = fh.read(_chunksize)
811 data = fh.read(_chunksize)
812 while data:
812 while data:
813 dest.write(data)
813 dest.write(data)
814 data = fh.read(_chunksize)
814 data = fh.read(_chunksize)
815 finally:
815 finally:
816 if output:
816 if output:
817 dest.close()
817 dest.close()
818
818
819 @command('debugextensions', cmdutil.formatteropts, [], norepo=True)
819 @command('debugextensions', cmdutil.formatteropts, [], norepo=True)
820 def debugextensions(ui, **opts):
820 def debugextensions(ui, **opts):
821 '''show information about active extensions'''
821 '''show information about active extensions'''
822 opts = pycompat.byteskwargs(opts)
822 opts = pycompat.byteskwargs(opts)
823 exts = extensions.extensions(ui)
823 exts = extensions.extensions(ui)
824 hgver = util.version()
824 hgver = util.version()
825 fm = ui.formatter('debugextensions', opts)
825 fm = ui.formatter('debugextensions', opts)
826 for extname, extmod in sorted(exts, key=operator.itemgetter(0)):
826 for extname, extmod in sorted(exts, key=operator.itemgetter(0)):
827 isinternal = extensions.ismoduleinternal(extmod)
827 isinternal = extensions.ismoduleinternal(extmod)
828 extsource = pycompat.fsencode(extmod.__file__)
828 extsource = pycompat.fsencode(extmod.__file__)
829 if isinternal:
829 if isinternal:
830 exttestedwith = [] # never expose magic string to users
830 exttestedwith = [] # never expose magic string to users
831 else:
831 else:
832 exttestedwith = getattr(extmod, 'testedwith', '').split()
832 exttestedwith = getattr(extmod, 'testedwith', '').split()
833 extbuglink = getattr(extmod, 'buglink', None)
833 extbuglink = getattr(extmod, 'buglink', None)
834
834
835 fm.startitem()
835 fm.startitem()
836
836
837 if ui.quiet or ui.verbose:
837 if ui.quiet or ui.verbose:
838 fm.write('name', '%s\n', extname)
838 fm.write('name', '%s\n', extname)
839 else:
839 else:
840 fm.write('name', '%s', extname)
840 fm.write('name', '%s', extname)
841 if isinternal or hgver in exttestedwith:
841 if isinternal or hgver in exttestedwith:
842 fm.plain('\n')
842 fm.plain('\n')
843 elif not exttestedwith:
843 elif not exttestedwith:
844 fm.plain(_(' (untested!)\n'))
844 fm.plain(_(' (untested!)\n'))
845 else:
845 else:
846 lasttestedversion = exttestedwith[-1]
846 lasttestedversion = exttestedwith[-1]
847 fm.plain(' (%s!)\n' % lasttestedversion)
847 fm.plain(' (%s!)\n' % lasttestedversion)
848
848
849 fm.condwrite(ui.verbose and extsource, 'source',
849 fm.condwrite(ui.verbose and extsource, 'source',
850 _(' location: %s\n'), extsource or "")
850 _(' location: %s\n'), extsource or "")
851
851
852 if ui.verbose:
852 if ui.verbose:
853 fm.plain(_(' bundled: %s\n') % ['no', 'yes'][isinternal])
853 fm.plain(_(' bundled: %s\n') % ['no', 'yes'][isinternal])
854 fm.data(bundled=isinternal)
854 fm.data(bundled=isinternal)
855
855
856 fm.condwrite(ui.verbose and exttestedwith, 'testedwith',
856 fm.condwrite(ui.verbose and exttestedwith, 'testedwith',
857 _(' tested with: %s\n'),
857 _(' tested with: %s\n'),
858 fm.formatlist(exttestedwith, name='ver'))
858 fm.formatlist(exttestedwith, name='ver'))
859
859
860 fm.condwrite(ui.verbose and extbuglink, 'buglink',
860 fm.condwrite(ui.verbose and extbuglink, 'buglink',
861 _(' bug reporting: %s\n'), extbuglink or "")
861 _(' bug reporting: %s\n'), extbuglink or "")
862
862
863 fm.end()
863 fm.end()
864
864
865 @command('debugfileset',
865 @command('debugfileset',
866 [('r', 'rev', '', _('apply the filespec on this revision'), _('REV'))],
866 [('r', 'rev', '', _('apply the filespec on this revision'), _('REV'))],
867 _('[-r REV] FILESPEC'))
867 _('[-r REV] FILESPEC'))
868 def debugfileset(ui, repo, expr, **opts):
868 def debugfileset(ui, repo, expr, **opts):
869 '''parse and apply a fileset specification'''
869 '''parse and apply a fileset specification'''
870 ctx = scmutil.revsingle(repo, opts.get(r'rev'), None)
870 ctx = scmutil.revsingle(repo, opts.get(r'rev'), None)
871 if ui.verbose:
871 if ui.verbose:
872 tree = fileset.parse(expr)
872 tree = fileset.parse(expr)
873 ui.note(fileset.prettyformat(tree), "\n")
873 ui.note(fileset.prettyformat(tree), "\n")
874
874
875 for f in ctx.getfileset(expr):
875 for f in ctx.getfileset(expr):
876 ui.write("%s\n" % f)
876 ui.write("%s\n" % f)
877
877
878 @command('debugformat',
878 @command('debugformat',
879 [] + cmdutil.formatteropts,
879 [] + cmdutil.formatteropts,
880 _(''))
880 _(''))
881 def debugformat(ui, repo, **opts):
881 def debugformat(ui, repo, **opts):
882 """display format information about the current repository
882 """display format information about the current repository
883
883
884 Use --verbose to get extra information about current config value and
884 Use --verbose to get extra information about current config value and
885 Mercurial default."""
885 Mercurial default."""
886 opts = pycompat.byteskwargs(opts)
886 opts = pycompat.byteskwargs(opts)
887 maxvariantlength = max(len(fv.name) for fv in upgrade.allformatvariant)
887 maxvariantlength = max(len(fv.name) for fv in upgrade.allformatvariant)
888 maxvariantlength = max(len('format-variant'), maxvariantlength)
888 maxvariantlength = max(len('format-variant'), maxvariantlength)
889
889
890 def makeformatname(name):
890 def makeformatname(name):
891 return '%s:' + (' ' * (maxvariantlength - len(name)))
891 return '%s:' + (' ' * (maxvariantlength - len(name)))
892
892
893 fm = ui.formatter('debugformat', opts)
893 fm = ui.formatter('debugformat', opts)
894 if fm.isplain():
894 if fm.isplain():
895 def formatvalue(value):
895 def formatvalue(value):
896 if util.safehasattr(value, 'startswith'):
896 if util.safehasattr(value, 'startswith'):
897 return value
897 return value
898 if value:
898 if value:
899 return 'yes'
899 return 'yes'
900 else:
900 else:
901 return 'no'
901 return 'no'
902 else:
902 else:
903 formatvalue = pycompat.identity
903 formatvalue = pycompat.identity
904
904
905 fm.plain('format-variant')
905 fm.plain('format-variant')
906 fm.plain(' ' * (maxvariantlength - len('format-variant')))
906 fm.plain(' ' * (maxvariantlength - len('format-variant')))
907 fm.plain(' repo')
907 fm.plain(' repo')
908 if ui.verbose:
908 if ui.verbose:
909 fm.plain(' config default')
909 fm.plain(' config default')
910 fm.plain('\n')
910 fm.plain('\n')
911 for fv in upgrade.allformatvariant:
911 for fv in upgrade.allformatvariant:
912 fm.startitem()
912 fm.startitem()
913 repovalue = fv.fromrepo(repo)
913 repovalue = fv.fromrepo(repo)
914 configvalue = fv.fromconfig(repo)
914 configvalue = fv.fromconfig(repo)
915
915
916 if repovalue != configvalue:
916 if repovalue != configvalue:
917 namelabel = 'formatvariant.name.mismatchconfig'
917 namelabel = 'formatvariant.name.mismatchconfig'
918 repolabel = 'formatvariant.repo.mismatchconfig'
918 repolabel = 'formatvariant.repo.mismatchconfig'
919 elif repovalue != fv.default:
919 elif repovalue != fv.default:
920 namelabel = 'formatvariant.name.mismatchdefault'
920 namelabel = 'formatvariant.name.mismatchdefault'
921 repolabel = 'formatvariant.repo.mismatchdefault'
921 repolabel = 'formatvariant.repo.mismatchdefault'
922 else:
922 else:
923 namelabel = 'formatvariant.name.uptodate'
923 namelabel = 'formatvariant.name.uptodate'
924 repolabel = 'formatvariant.repo.uptodate'
924 repolabel = 'formatvariant.repo.uptodate'
925
925
926 fm.write('name', makeformatname(fv.name), fv.name,
926 fm.write('name', makeformatname(fv.name), fv.name,
927 label=namelabel)
927 label=namelabel)
928 fm.write('repo', ' %3s', formatvalue(repovalue),
928 fm.write('repo', ' %3s', formatvalue(repovalue),
929 label=repolabel)
929 label=repolabel)
930 if fv.default != configvalue:
930 if fv.default != configvalue:
931 configlabel = 'formatvariant.config.special'
931 configlabel = 'formatvariant.config.special'
932 else:
932 else:
933 configlabel = 'formatvariant.config.default'
933 configlabel = 'formatvariant.config.default'
934 fm.condwrite(ui.verbose, 'config', ' %6s', formatvalue(configvalue),
934 fm.condwrite(ui.verbose, 'config', ' %6s', formatvalue(configvalue),
935 label=configlabel)
935 label=configlabel)
936 fm.condwrite(ui.verbose, 'default', ' %7s', formatvalue(fv.default),
936 fm.condwrite(ui.verbose, 'default', ' %7s', formatvalue(fv.default),
937 label='formatvariant.default')
937 label='formatvariant.default')
938 fm.plain('\n')
938 fm.plain('\n')
939 fm.end()
939 fm.end()
940
940
941 @command('debugfsinfo', [], _('[PATH]'), norepo=True)
941 @command('debugfsinfo', [], _('[PATH]'), norepo=True)
942 def debugfsinfo(ui, path="."):
942 def debugfsinfo(ui, path="."):
943 """show information detected about current filesystem"""
943 """show information detected about current filesystem"""
944 ui.write(('path: %s\n') % path)
944 ui.write(('path: %s\n') % path)
945 ui.write(('mounted on: %s\n') % (util.getfsmountpoint(path) or '(unknown)'))
945 ui.write(('mounted on: %s\n') % (util.getfsmountpoint(path) or '(unknown)'))
946 ui.write(('exec: %s\n') % (util.checkexec(path) and 'yes' or 'no'))
946 ui.write(('exec: %s\n') % (util.checkexec(path) and 'yes' or 'no'))
947 ui.write(('fstype: %s\n') % (util.getfstype(path) or '(unknown)'))
947 ui.write(('fstype: %s\n') % (util.getfstype(path) or '(unknown)'))
948 ui.write(('symlink: %s\n') % (util.checklink(path) and 'yes' or 'no'))
948 ui.write(('symlink: %s\n') % (util.checklink(path) and 'yes' or 'no'))
949 ui.write(('hardlink: %s\n') % (util.checknlink(path) and 'yes' or 'no'))
949 ui.write(('hardlink: %s\n') % (util.checknlink(path) and 'yes' or 'no'))
950 casesensitive = '(unknown)'
950 casesensitive = '(unknown)'
951 try:
951 try:
952 with tempfile.NamedTemporaryFile(prefix='.debugfsinfo', dir=path) as f:
952 with tempfile.NamedTemporaryFile(prefix='.debugfsinfo', dir=path) as f:
953 casesensitive = util.fscasesensitive(f.name) and 'yes' or 'no'
953 casesensitive = util.fscasesensitive(f.name) and 'yes' or 'no'
954 except OSError:
954 except OSError:
955 pass
955 pass
956 ui.write(('case-sensitive: %s\n') % casesensitive)
956 ui.write(('case-sensitive: %s\n') % casesensitive)
957
957
958 @command('debuggetbundle',
958 @command('debuggetbundle',
959 [('H', 'head', [], _('id of head node'), _('ID')),
959 [('H', 'head', [], _('id of head node'), _('ID')),
960 ('C', 'common', [], _('id of common node'), _('ID')),
960 ('C', 'common', [], _('id of common node'), _('ID')),
961 ('t', 'type', 'bzip2', _('bundle compression type to use'), _('TYPE'))],
961 ('t', 'type', 'bzip2', _('bundle compression type to use'), _('TYPE'))],
962 _('REPO FILE [-H|-C ID]...'),
962 _('REPO FILE [-H|-C ID]...'),
963 norepo=True)
963 norepo=True)
964 def debuggetbundle(ui, repopath, bundlepath, head=None, common=None, **opts):
964 def debuggetbundle(ui, repopath, bundlepath, head=None, common=None, **opts):
965 """retrieves a bundle from a repo
965 """retrieves a bundle from a repo
966
966
967 Every ID must be a full-length hex node id string. Saves the bundle to the
967 Every ID must be a full-length hex node id string. Saves the bundle to the
968 given file.
968 given file.
969 """
969 """
970 opts = pycompat.byteskwargs(opts)
970 opts = pycompat.byteskwargs(opts)
971 repo = hg.peer(ui, opts, repopath)
971 repo = hg.peer(ui, opts, repopath)
972 if not repo.capable('getbundle'):
972 if not repo.capable('getbundle'):
973 raise error.Abort("getbundle() not supported by target repository")
973 raise error.Abort("getbundle() not supported by target repository")
974 args = {}
974 args = {}
975 if common:
975 if common:
976 args[r'common'] = [bin(s) for s in common]
976 args[r'common'] = [bin(s) for s in common]
977 if head:
977 if head:
978 args[r'heads'] = [bin(s) for s in head]
978 args[r'heads'] = [bin(s) for s in head]
979 # TODO: get desired bundlecaps from command line.
979 # TODO: get desired bundlecaps from command line.
980 args[r'bundlecaps'] = None
980 args[r'bundlecaps'] = None
981 bundle = repo.getbundle('debug', **args)
981 bundle = repo.getbundle('debug', **args)
982
982
983 bundletype = opts.get('type', 'bzip2').lower()
983 bundletype = opts.get('type', 'bzip2').lower()
984 btypes = {'none': 'HG10UN',
984 btypes = {'none': 'HG10UN',
985 'bzip2': 'HG10BZ',
985 'bzip2': 'HG10BZ',
986 'gzip': 'HG10GZ',
986 'gzip': 'HG10GZ',
987 'bundle2': 'HG20'}
987 'bundle2': 'HG20'}
988 bundletype = btypes.get(bundletype)
988 bundletype = btypes.get(bundletype)
989 if bundletype not in bundle2.bundletypes:
989 if bundletype not in bundle2.bundletypes:
990 raise error.Abort(_('unknown bundle type specified with --type'))
990 raise error.Abort(_('unknown bundle type specified with --type'))
991 bundle2.writebundle(ui, bundle, bundlepath, bundletype)
991 bundle2.writebundle(ui, bundle, bundlepath, bundletype)
992
992
993 @command('debugignore', [], '[FILE]')
993 @command('debugignore', [], '[FILE]')
994 def debugignore(ui, repo, *files, **opts):
994 def debugignore(ui, repo, *files, **opts):
995 """display the combined ignore pattern and information about ignored files
995 """display the combined ignore pattern and information about ignored files
996
996
997 With no argument display the combined ignore pattern.
997 With no argument display the combined ignore pattern.
998
998
999 Given space separated file names, shows if the given file is ignored and
999 Given space separated file names, shows if the given file is ignored and
1000 if so, show the ignore rule (file and line number) that matched it.
1000 if so, show the ignore rule (file and line number) that matched it.
1001 """
1001 """
1002 ignore = repo.dirstate._ignore
1002 ignore = repo.dirstate._ignore
1003 if not files:
1003 if not files:
1004 # Show all the patterns
1004 # Show all the patterns
1005 ui.write("%s\n" % repr(ignore))
1005 ui.write("%s\n" % repr(ignore))
1006 else:
1006 else:
1007 m = scmutil.match(repo[None], pats=files)
1007 m = scmutil.match(repo[None], pats=files)
1008 for f in m.files():
1008 for f in m.files():
1009 nf = util.normpath(f)
1009 nf = util.normpath(f)
1010 ignored = None
1010 ignored = None
1011 ignoredata = None
1011 ignoredata = None
1012 if nf != '.':
1012 if nf != '.':
1013 if ignore(nf):
1013 if ignore(nf):
1014 ignored = nf
1014 ignored = nf
1015 ignoredata = repo.dirstate._ignorefileandline(nf)
1015 ignoredata = repo.dirstate._ignorefileandline(nf)
1016 else:
1016 else:
1017 for p in util.finddirs(nf):
1017 for p in util.finddirs(nf):
1018 if ignore(p):
1018 if ignore(p):
1019 ignored = p
1019 ignored = p
1020 ignoredata = repo.dirstate._ignorefileandline(p)
1020 ignoredata = repo.dirstate._ignorefileandline(p)
1021 break
1021 break
1022 if ignored:
1022 if ignored:
1023 if ignored == nf:
1023 if ignored == nf:
1024 ui.write(_("%s is ignored\n") % m.uipath(f))
1024 ui.write(_("%s is ignored\n") % m.uipath(f))
1025 else:
1025 else:
1026 ui.write(_("%s is ignored because of "
1026 ui.write(_("%s is ignored because of "
1027 "containing folder %s\n")
1027 "containing folder %s\n")
1028 % (m.uipath(f), ignored))
1028 % (m.uipath(f), ignored))
1029 ignorefile, lineno, line = ignoredata
1029 ignorefile, lineno, line = ignoredata
1030 ui.write(_("(ignore rule in %s, line %d: '%s')\n")
1030 ui.write(_("(ignore rule in %s, line %d: '%s')\n")
1031 % (ignorefile, lineno, line))
1031 % (ignorefile, lineno, line))
1032 else:
1032 else:
1033 ui.write(_("%s is not ignored\n") % m.uipath(f))
1033 ui.write(_("%s is not ignored\n") % m.uipath(f))
1034
1034
1035 @command('debugindex', cmdutil.debugrevlogopts +
1035 @command('debugindex', cmdutil.debugrevlogopts +
1036 [('f', 'format', 0, _('revlog format'), _('FORMAT'))],
1036 [('f', 'format', 0, _('revlog format'), _('FORMAT'))],
1037 _('[-f FORMAT] -c|-m|FILE'),
1037 _('[-f FORMAT] -c|-m|FILE'),
1038 optionalrepo=True)
1038 optionalrepo=True)
1039 def debugindex(ui, repo, file_=None, **opts):
1039 def debugindex(ui, repo, file_=None, **opts):
1040 """dump the contents of an index file"""
1040 """dump the contents of an index file"""
1041 opts = pycompat.byteskwargs(opts)
1041 opts = pycompat.byteskwargs(opts)
1042 r = cmdutil.openrevlog(repo, 'debugindex', file_, opts)
1042 r = cmdutil.openrevlog(repo, 'debugindex', file_, opts)
1043 format = opts.get('format', 0)
1043 format = opts.get('format', 0)
1044 if format not in (0, 1):
1044 if format not in (0, 1):
1045 raise error.Abort(_("unknown format %d") % format)
1045 raise error.Abort(_("unknown format %d") % format)
1046
1046
1047 generaldelta = r.version & revlog.FLAG_GENERALDELTA
1047 generaldelta = r.version & revlog.FLAG_GENERALDELTA
1048 if generaldelta:
1048 if generaldelta:
1049 basehdr = ' delta'
1049 basehdr = ' delta'
1050 else:
1050 else:
1051 basehdr = ' base'
1051 basehdr = ' base'
1052
1052
1053 if ui.debugflag:
1053 if ui.debugflag:
1054 shortfn = hex
1054 shortfn = hex
1055 else:
1055 else:
1056 shortfn = short
1056 shortfn = short
1057
1057
1058 # There might not be anything in r, so have a sane default
1058 # There might not be anything in r, so have a sane default
1059 idlen = 12
1059 idlen = 12
1060 for i in r:
1060 for i in r:
1061 idlen = len(shortfn(r.node(i)))
1061 idlen = len(shortfn(r.node(i)))
1062 break
1062 break
1063
1063
1064 if format == 0:
1064 if format == 0:
1065 ui.write((" rev offset length " + basehdr + " linkrev"
1065 ui.write((" rev offset length " + basehdr + " linkrev"
1066 " %s %s p2\n") % ("nodeid".ljust(idlen), "p1".ljust(idlen)))
1066 " %s %s p2\n") % ("nodeid".ljust(idlen), "p1".ljust(idlen)))
1067 elif format == 1:
1067 elif format == 1:
1068 ui.write((" rev flag offset length"
1068 ui.write((" rev flag offset length"
1069 " size " + basehdr + " link p1 p2"
1069 " size " + basehdr + " link p1 p2"
1070 " %s\n") % "nodeid".rjust(idlen))
1070 " %s\n") % "nodeid".rjust(idlen))
1071
1071
1072 for i in r:
1072 for i in r:
1073 node = r.node(i)
1073 node = r.node(i)
1074 if generaldelta:
1074 if generaldelta:
1075 base = r.deltaparent(i)
1075 base = r.deltaparent(i)
1076 else:
1076 else:
1077 base = r.chainbase(i)
1077 base = r.chainbase(i)
1078 if format == 0:
1078 if format == 0:
1079 try:
1079 try:
1080 pp = r.parents(node)
1080 pp = r.parents(node)
1081 except Exception:
1081 except Exception:
1082 pp = [nullid, nullid]
1082 pp = [nullid, nullid]
1083 ui.write("% 6d % 9d % 7d % 6d % 7d %s %s %s\n" % (
1083 ui.write("% 6d % 9d % 7d % 6d % 7d %s %s %s\n" % (
1084 i, r.start(i), r.length(i), base, r.linkrev(i),
1084 i, r.start(i), r.length(i), base, r.linkrev(i),
1085 shortfn(node), shortfn(pp[0]), shortfn(pp[1])))
1085 shortfn(node), shortfn(pp[0]), shortfn(pp[1])))
1086 elif format == 1:
1086 elif format == 1:
1087 pr = r.parentrevs(i)
1087 pr = r.parentrevs(i)
1088 ui.write("% 6d %04x % 8d % 8d % 8d % 6d % 6d % 6d % 6d %s\n" % (
1088 ui.write("% 6d %04x % 8d % 8d % 8d % 6d % 6d % 6d % 6d %s\n" % (
1089 i, r.flags(i), r.start(i), r.length(i), r.rawsize(i),
1089 i, r.flags(i), r.start(i), r.length(i), r.rawsize(i),
1090 base, r.linkrev(i), pr[0], pr[1], shortfn(node)))
1090 base, r.linkrev(i), pr[0], pr[1], shortfn(node)))
1091
1091
1092 @command('debugindexdot', cmdutil.debugrevlogopts,
1092 @command('debugindexdot', cmdutil.debugrevlogopts,
1093 _('-c|-m|FILE'), optionalrepo=True)
1093 _('-c|-m|FILE'), optionalrepo=True)
1094 def debugindexdot(ui, repo, file_=None, **opts):
1094 def debugindexdot(ui, repo, file_=None, **opts):
1095 """dump an index DAG as a graphviz dot file"""
1095 """dump an index DAG as a graphviz dot file"""
1096 opts = pycompat.byteskwargs(opts)
1096 opts = pycompat.byteskwargs(opts)
1097 r = cmdutil.openrevlog(repo, 'debugindexdot', file_, opts)
1097 r = cmdutil.openrevlog(repo, 'debugindexdot', file_, opts)
1098 ui.write(("digraph G {\n"))
1098 ui.write(("digraph G {\n"))
1099 for i in r:
1099 for i in r:
1100 node = r.node(i)
1100 node = r.node(i)
1101 pp = r.parents(node)
1101 pp = r.parents(node)
1102 ui.write("\t%d -> %d\n" % (r.rev(pp[0]), i))
1102 ui.write("\t%d -> %d\n" % (r.rev(pp[0]), i))
1103 if pp[1] != nullid:
1103 if pp[1] != nullid:
1104 ui.write("\t%d -> %d\n" % (r.rev(pp[1]), i))
1104 ui.write("\t%d -> %d\n" % (r.rev(pp[1]), i))
1105 ui.write("}\n")
1105 ui.write("}\n")
1106
1106
1107 @command('debuginstall', [] + cmdutil.formatteropts, '', norepo=True)
1107 @command('debuginstall', [] + cmdutil.formatteropts, '', norepo=True)
1108 def debuginstall(ui, **opts):
1108 def debuginstall(ui, **opts):
1109 '''test Mercurial installation
1109 '''test Mercurial installation
1110
1110
1111 Returns 0 on success.
1111 Returns 0 on success.
1112 '''
1112 '''
1113 opts = pycompat.byteskwargs(opts)
1113 opts = pycompat.byteskwargs(opts)
1114
1114
1115 def writetemp(contents):
1115 def writetemp(contents):
1116 (fd, name) = tempfile.mkstemp(prefix="hg-debuginstall-")
1116 (fd, name) = tempfile.mkstemp(prefix="hg-debuginstall-")
1117 f = os.fdopen(fd, pycompat.sysstr("wb"))
1117 f = os.fdopen(fd, pycompat.sysstr("wb"))
1118 f.write(contents)
1118 f.write(contents)
1119 f.close()
1119 f.close()
1120 return name
1120 return name
1121
1121
1122 problems = 0
1122 problems = 0
1123
1123
1124 fm = ui.formatter('debuginstall', opts)
1124 fm = ui.formatter('debuginstall', opts)
1125 fm.startitem()
1125 fm.startitem()
1126
1126
1127 # encoding
1127 # encoding
1128 fm.write('encoding', _("checking encoding (%s)...\n"), encoding.encoding)
1128 fm.write('encoding', _("checking encoding (%s)...\n"), encoding.encoding)
1129 err = None
1129 err = None
1130 try:
1130 try:
1131 codecs.lookup(pycompat.sysstr(encoding.encoding))
1131 codecs.lookup(pycompat.sysstr(encoding.encoding))
1132 except LookupError as inst:
1132 except LookupError as inst:
1133 err = util.forcebytestr(inst)
1133 err = util.forcebytestr(inst)
1134 problems += 1
1134 problems += 1
1135 fm.condwrite(err, 'encodingerror', _(" %s\n"
1135 fm.condwrite(err, 'encodingerror', _(" %s\n"
1136 " (check that your locale is properly set)\n"), err)
1136 " (check that your locale is properly set)\n"), err)
1137
1137
1138 # Python
1138 # Python
1139 fm.write('pythonexe', _("checking Python executable (%s)\n"),
1139 fm.write('pythonexe', _("checking Python executable (%s)\n"),
1140 pycompat.sysexecutable)
1140 pycompat.sysexecutable)
1141 fm.write('pythonver', _("checking Python version (%s)\n"),
1141 fm.write('pythonver', _("checking Python version (%s)\n"),
1142 ("%d.%d.%d" % sys.version_info[:3]))
1142 ("%d.%d.%d" % sys.version_info[:3]))
1143 fm.write('pythonlib', _("checking Python lib (%s)...\n"),
1143 fm.write('pythonlib', _("checking Python lib (%s)...\n"),
1144 os.path.dirname(pycompat.fsencode(os.__file__)))
1144 os.path.dirname(pycompat.fsencode(os.__file__)))
1145
1145
1146 security = set(sslutil.supportedprotocols)
1146 security = set(sslutil.supportedprotocols)
1147 if sslutil.hassni:
1147 if sslutil.hassni:
1148 security.add('sni')
1148 security.add('sni')
1149
1149
1150 fm.write('pythonsecurity', _("checking Python security support (%s)\n"),
1150 fm.write('pythonsecurity', _("checking Python security support (%s)\n"),
1151 fm.formatlist(sorted(security), name='protocol',
1151 fm.formatlist(sorted(security), name='protocol',
1152 fmt='%s', sep=','))
1152 fmt='%s', sep=','))
1153
1153
1154 # These are warnings, not errors. So don't increment problem count. This
1154 # These are warnings, not errors. So don't increment problem count. This
1155 # may change in the future.
1155 # may change in the future.
1156 if 'tls1.2' not in security:
1156 if 'tls1.2' not in security:
1157 fm.plain(_(' TLS 1.2 not supported by Python install; '
1157 fm.plain(_(' TLS 1.2 not supported by Python install; '
1158 'network connections lack modern security\n'))
1158 'network connections lack modern security\n'))
1159 if 'sni' not in security:
1159 if 'sni' not in security:
1160 fm.plain(_(' SNI not supported by Python install; may have '
1160 fm.plain(_(' SNI not supported by Python install; may have '
1161 'connectivity issues with some servers\n'))
1161 'connectivity issues with some servers\n'))
1162
1162
1163 # TODO print CA cert info
1163 # TODO print CA cert info
1164
1164
1165 # hg version
1165 # hg version
1166 hgver = util.version()
1166 hgver = util.version()
1167 fm.write('hgver', _("checking Mercurial version (%s)\n"),
1167 fm.write('hgver', _("checking Mercurial version (%s)\n"),
1168 hgver.split('+')[0])
1168 hgver.split('+')[0])
1169 fm.write('hgverextra', _("checking Mercurial custom build (%s)\n"),
1169 fm.write('hgverextra', _("checking Mercurial custom build (%s)\n"),
1170 '+'.join(hgver.split('+')[1:]))
1170 '+'.join(hgver.split('+')[1:]))
1171
1171
1172 # compiled modules
1172 # compiled modules
1173 fm.write('hgmodulepolicy', _("checking module policy (%s)\n"),
1173 fm.write('hgmodulepolicy', _("checking module policy (%s)\n"),
1174 policy.policy)
1174 policy.policy)
1175 fm.write('hgmodules', _("checking installed modules (%s)...\n"),
1175 fm.write('hgmodules', _("checking installed modules (%s)...\n"),
1176 os.path.dirname(pycompat.fsencode(__file__)))
1176 os.path.dirname(pycompat.fsencode(__file__)))
1177
1177
1178 if policy.policy in ('c', 'allow'):
1178 if policy.policy in ('c', 'allow'):
1179 err = None
1179 err = None
1180 try:
1180 try:
1181 from .cext import (
1181 from .cext import (
1182 base85,
1182 base85,
1183 bdiff,
1183 bdiff,
1184 mpatch,
1184 mpatch,
1185 osutil,
1185 osutil,
1186 )
1186 )
1187 dir(bdiff), dir(mpatch), dir(base85), dir(osutil) # quiet pyflakes
1187 dir(bdiff), dir(mpatch), dir(base85), dir(osutil) # quiet pyflakes
1188 except Exception as inst:
1188 except Exception as inst:
1189 err = util.forcebytestr(inst)
1189 err = util.forcebytestr(inst)
1190 problems += 1
1190 problems += 1
1191 fm.condwrite(err, 'extensionserror', " %s\n", err)
1191 fm.condwrite(err, 'extensionserror', " %s\n", err)
1192
1192
1193 compengines = util.compengines._engines.values()
1193 compengines = util.compengines._engines.values()
1194 fm.write('compengines', _('checking registered compression engines (%s)\n'),
1194 fm.write('compengines', _('checking registered compression engines (%s)\n'),
1195 fm.formatlist(sorted(e.name() for e in compengines),
1195 fm.formatlist(sorted(e.name() for e in compengines),
1196 name='compengine', fmt='%s', sep=', '))
1196 name='compengine', fmt='%s', sep=', '))
1197 fm.write('compenginesavail', _('checking available compression engines '
1197 fm.write('compenginesavail', _('checking available compression engines '
1198 '(%s)\n'),
1198 '(%s)\n'),
1199 fm.formatlist(sorted(e.name() for e in compengines
1199 fm.formatlist(sorted(e.name() for e in compengines
1200 if e.available()),
1200 if e.available()),
1201 name='compengine', fmt='%s', sep=', '))
1201 name='compengine', fmt='%s', sep=', '))
1202 wirecompengines = util.compengines.supportedwireengines(util.SERVERROLE)
1202 wirecompengines = util.compengines.supportedwireengines(util.SERVERROLE)
1203 fm.write('compenginesserver', _('checking available compression engines '
1203 fm.write('compenginesserver', _('checking available compression engines '
1204 'for wire protocol (%s)\n'),
1204 'for wire protocol (%s)\n'),
1205 fm.formatlist([e.name() for e in wirecompengines
1205 fm.formatlist([e.name() for e in wirecompengines
1206 if e.wireprotosupport()],
1206 if e.wireprotosupport()],
1207 name='compengine', fmt='%s', sep=', '))
1207 name='compengine', fmt='%s', sep=', '))
1208 re2 = 'missing'
1208 re2 = 'missing'
1209 if util._re2:
1209 if util._re2:
1210 re2 = 'available'
1210 re2 = 'available'
1211 fm.plain(_('checking "re2" regexp engine (%s)\n') % re2)
1211 fm.plain(_('checking "re2" regexp engine (%s)\n') % re2)
1212 fm.data(re2=bool(util._re2))
1212 fm.data(re2=bool(util._re2))
1213
1213
1214 # templates
1214 # templates
1215 p = templater.templatepaths()
1215 p = templater.templatepaths()
1216 fm.write('templatedirs', 'checking templates (%s)...\n', ' '.join(p))
1216 fm.write('templatedirs', 'checking templates (%s)...\n', ' '.join(p))
1217 fm.condwrite(not p, '', _(" no template directories found\n"))
1217 fm.condwrite(not p, '', _(" no template directories found\n"))
1218 if p:
1218 if p:
1219 m = templater.templatepath("map-cmdline.default")
1219 m = templater.templatepath("map-cmdline.default")
1220 if m:
1220 if m:
1221 # template found, check if it is working
1221 # template found, check if it is working
1222 err = None
1222 err = None
1223 try:
1223 try:
1224 templater.templater.frommapfile(m)
1224 templater.templater.frommapfile(m)
1225 except Exception as inst:
1225 except Exception as inst:
1226 err = util.forcebytestr(inst)
1226 err = util.forcebytestr(inst)
1227 p = None
1227 p = None
1228 fm.condwrite(err, 'defaulttemplateerror', " %s\n", err)
1228 fm.condwrite(err, 'defaulttemplateerror', " %s\n", err)
1229 else:
1229 else:
1230 p = None
1230 p = None
1231 fm.condwrite(p, 'defaulttemplate',
1231 fm.condwrite(p, 'defaulttemplate',
1232 _("checking default template (%s)\n"), m)
1232 _("checking default template (%s)\n"), m)
1233 fm.condwrite(not m, 'defaulttemplatenotfound',
1233 fm.condwrite(not m, 'defaulttemplatenotfound',
1234 _(" template '%s' not found\n"), "default")
1234 _(" template '%s' not found\n"), "default")
1235 if not p:
1235 if not p:
1236 problems += 1
1236 problems += 1
1237 fm.condwrite(not p, '',
1237 fm.condwrite(not p, '',
1238 _(" (templates seem to have been installed incorrectly)\n"))
1238 _(" (templates seem to have been installed incorrectly)\n"))
1239
1239
1240 # editor
1240 # editor
1241 editor = ui.geteditor()
1241 editor = ui.geteditor()
1242 editor = util.expandpath(editor)
1242 editor = util.expandpath(editor)
1243 fm.write('editor', _("checking commit editor... (%s)\n"), editor)
1243 fm.write('editor', _("checking commit editor... (%s)\n"), editor)
1244 cmdpath = util.findexe(pycompat.shlexsplit(editor)[0])
1244 cmdpath = util.findexe(pycompat.shlexsplit(editor)[0])
1245 fm.condwrite(not cmdpath and editor == 'vi', 'vinotfound',
1245 fm.condwrite(not cmdpath and editor == 'vi', 'vinotfound',
1246 _(" No commit editor set and can't find %s in PATH\n"
1246 _(" No commit editor set and can't find %s in PATH\n"
1247 " (specify a commit editor in your configuration"
1247 " (specify a commit editor in your configuration"
1248 " file)\n"), not cmdpath and editor == 'vi' and editor)
1248 " file)\n"), not cmdpath and editor == 'vi' and editor)
1249 fm.condwrite(not cmdpath and editor != 'vi', 'editornotfound',
1249 fm.condwrite(not cmdpath and editor != 'vi', 'editornotfound',
1250 _(" Can't find editor '%s' in PATH\n"
1250 _(" Can't find editor '%s' in PATH\n"
1251 " (specify a commit editor in your configuration"
1251 " (specify a commit editor in your configuration"
1252 " file)\n"), not cmdpath and editor)
1252 " file)\n"), not cmdpath and editor)
1253 if not cmdpath and editor != 'vi':
1253 if not cmdpath and editor != 'vi':
1254 problems += 1
1254 problems += 1
1255
1255
1256 # check username
1256 # check username
1257 username = None
1257 username = None
1258 err = None
1258 err = None
1259 try:
1259 try:
1260 username = ui.username()
1260 username = ui.username()
1261 except error.Abort as e:
1261 except error.Abort as e:
1262 err = util.forcebytestr(e)
1262 err = util.forcebytestr(e)
1263 problems += 1
1263 problems += 1
1264
1264
1265 fm.condwrite(username, 'username', _("checking username (%s)\n"), username)
1265 fm.condwrite(username, 'username', _("checking username (%s)\n"), username)
1266 fm.condwrite(err, 'usernameerror', _("checking username...\n %s\n"
1266 fm.condwrite(err, 'usernameerror', _("checking username...\n %s\n"
1267 " (specify a username in your configuration file)\n"), err)
1267 " (specify a username in your configuration file)\n"), err)
1268
1268
1269 fm.condwrite(not problems, '',
1269 fm.condwrite(not problems, '',
1270 _("no problems detected\n"))
1270 _("no problems detected\n"))
1271 if not problems:
1271 if not problems:
1272 fm.data(problems=problems)
1272 fm.data(problems=problems)
1273 fm.condwrite(problems, 'problems',
1273 fm.condwrite(problems, 'problems',
1274 _("%d problems detected,"
1274 _("%d problems detected,"
1275 " please check your install!\n"), problems)
1275 " please check your install!\n"), problems)
1276 fm.end()
1276 fm.end()
1277
1277
1278 return problems
1278 return problems
1279
1279
1280 @command('debugknown', [], _('REPO ID...'), norepo=True)
1280 @command('debugknown', [], _('REPO ID...'), norepo=True)
1281 def debugknown(ui, repopath, *ids, **opts):
1281 def debugknown(ui, repopath, *ids, **opts):
1282 """test whether node ids are known to a repo
1282 """test whether node ids are known to a repo
1283
1283
1284 Every ID must be a full-length hex node id string. Returns a list of 0s
1284 Every ID must be a full-length hex node id string. Returns a list of 0s
1285 and 1s indicating unknown/known.
1285 and 1s indicating unknown/known.
1286 """
1286 """
1287 opts = pycompat.byteskwargs(opts)
1287 opts = pycompat.byteskwargs(opts)
1288 repo = hg.peer(ui, opts, repopath)
1288 repo = hg.peer(ui, opts, repopath)
1289 if not repo.capable('known'):
1289 if not repo.capable('known'):
1290 raise error.Abort("known() not supported by target repository")
1290 raise error.Abort("known() not supported by target repository")
1291 flags = repo.known([bin(s) for s in ids])
1291 flags = repo.known([bin(s) for s in ids])
1292 ui.write("%s\n" % ("".join([f and "1" or "0" for f in flags])))
1292 ui.write("%s\n" % ("".join([f and "1" or "0" for f in flags])))
1293
1293
1294 @command('debuglabelcomplete', [], _('LABEL...'))
1294 @command('debuglabelcomplete', [], _('LABEL...'))
1295 def debuglabelcomplete(ui, repo, *args):
1295 def debuglabelcomplete(ui, repo, *args):
1296 '''backwards compatibility with old bash completion scripts (DEPRECATED)'''
1296 '''backwards compatibility with old bash completion scripts (DEPRECATED)'''
1297 debugnamecomplete(ui, repo, *args)
1297 debugnamecomplete(ui, repo, *args)
1298
1298
1299 @command('debuglocks',
1299 @command('debuglocks',
1300 [('L', 'force-lock', None, _('free the store lock (DANGEROUS)')),
1300 [('L', 'force-lock', None, _('free the store lock (DANGEROUS)')),
1301 ('W', 'force-wlock', None,
1301 ('W', 'force-wlock', None,
1302 _('free the working state lock (DANGEROUS)')),
1302 _('free the working state lock (DANGEROUS)')),
1303 ('s', 'set-lock', None, _('set the store lock until stopped')),
1303 ('s', 'set-lock', None, _('set the store lock until stopped')),
1304 ('S', 'set-wlock', None,
1304 ('S', 'set-wlock', None,
1305 _('set the working state lock until stopped'))],
1305 _('set the working state lock until stopped'))],
1306 _('[OPTION]...'))
1306 _('[OPTION]...'))
1307 def debuglocks(ui, repo, **opts):
1307 def debuglocks(ui, repo, **opts):
1308 """show or modify state of locks
1308 """show or modify state of locks
1309
1309
1310 By default, this command will show which locks are held. This
1310 By default, this command will show which locks are held. This
1311 includes the user and process holding the lock, the amount of time
1311 includes the user and process holding the lock, the amount of time
1312 the lock has been held, and the machine name where the process is
1312 the lock has been held, and the machine name where the process is
1313 running if it's not local.
1313 running if it's not local.
1314
1314
1315 Locks protect the integrity of Mercurial's data, so should be
1315 Locks protect the integrity of Mercurial's data, so should be
1316 treated with care. System crashes or other interruptions may cause
1316 treated with care. System crashes or other interruptions may cause
1317 locks to not be properly released, though Mercurial will usually
1317 locks to not be properly released, though Mercurial will usually
1318 detect and remove such stale locks automatically.
1318 detect and remove such stale locks automatically.
1319
1319
1320 However, detecting stale locks may not always be possible (for
1320 However, detecting stale locks may not always be possible (for
1321 instance, on a shared filesystem). Removing locks may also be
1321 instance, on a shared filesystem). Removing locks may also be
1322 blocked by filesystem permissions.
1322 blocked by filesystem permissions.
1323
1323
1324 Setting a lock will prevent other commands from changing the data.
1324 Setting a lock will prevent other commands from changing the data.
1325 The command will wait until an interruption (SIGINT, SIGTERM, ...) occurs.
1325 The command will wait until an interruption (SIGINT, SIGTERM, ...) occurs.
1326 The set locks are removed when the command exits.
1326 The set locks are removed when the command exits.
1327
1327
1328 Returns 0 if no locks are held.
1328 Returns 0 if no locks are held.
1329
1329
1330 """
1330 """
1331
1331
1332 if opts.get(r'force_lock'):
1332 if opts.get(r'force_lock'):
1333 repo.svfs.unlink('lock')
1333 repo.svfs.unlink('lock')
1334 if opts.get(r'force_wlock'):
1334 if opts.get(r'force_wlock'):
1335 repo.vfs.unlink('wlock')
1335 repo.vfs.unlink('wlock')
1336 if opts.get(r'force_lock') or opts.get(r'force_wlock'):
1336 if opts.get(r'force_lock') or opts.get(r'force_wlock'):
1337 return 0
1337 return 0
1338
1338
1339 locks = []
1339 locks = []
1340 try:
1340 try:
1341 if opts.get(r'set_wlock'):
1341 if opts.get(r'set_wlock'):
1342 try:
1342 try:
1343 locks.append(repo.wlock(False))
1343 locks.append(repo.wlock(False))
1344 except error.LockHeld:
1344 except error.LockHeld:
1345 raise error.Abort(_('wlock is already held'))
1345 raise error.Abort(_('wlock is already held'))
1346 if opts.get(r'set_lock'):
1346 if opts.get(r'set_lock'):
1347 try:
1347 try:
1348 locks.append(repo.lock(False))
1348 locks.append(repo.lock(False))
1349 except error.LockHeld:
1349 except error.LockHeld:
1350 raise error.Abort(_('lock is already held'))
1350 raise error.Abort(_('lock is already held'))
1351 if len(locks):
1351 if len(locks):
1352 ui.promptchoice(_("ready to release the lock (y)? $$ &Yes"))
1352 ui.promptchoice(_("ready to release the lock (y)? $$ &Yes"))
1353 return 0
1353 return 0
1354 finally:
1354 finally:
1355 release(*locks)
1355 release(*locks)
1356
1356
1357 now = time.time()
1357 now = time.time()
1358 held = 0
1358 held = 0
1359
1359
1360 def report(vfs, name, method):
1360 def report(vfs, name, method):
1361 # this causes stale locks to get reaped for more accurate reporting
1361 # this causes stale locks to get reaped for more accurate reporting
1362 try:
1362 try:
1363 l = method(False)
1363 l = method(False)
1364 except error.LockHeld:
1364 except error.LockHeld:
1365 l = None
1365 l = None
1366
1366
1367 if l:
1367 if l:
1368 l.release()
1368 l.release()
1369 else:
1369 else:
1370 try:
1370 try:
1371 stat = vfs.lstat(name)
1371 stat = vfs.lstat(name)
1372 age = now - stat.st_mtime
1372 age = now - stat.st_mtime
1373 user = util.username(stat.st_uid)
1373 user = util.username(stat.st_uid)
1374 locker = vfs.readlock(name)
1374 locker = vfs.readlock(name)
1375 if ":" in locker:
1375 if ":" in locker:
1376 host, pid = locker.split(':')
1376 host, pid = locker.split(':')
1377 if host == socket.gethostname():
1377 if host == socket.gethostname():
1378 locker = 'user %s, process %s' % (user, pid)
1378 locker = 'user %s, process %s' % (user, pid)
1379 else:
1379 else:
1380 locker = 'user %s, process %s, host %s' \
1380 locker = 'user %s, process %s, host %s' \
1381 % (user, pid, host)
1381 % (user, pid, host)
1382 ui.write(("%-6s %s (%ds)\n") % (name + ":", locker, age))
1382 ui.write(("%-6s %s (%ds)\n") % (name + ":", locker, age))
1383 return 1
1383 return 1
1384 except OSError as e:
1384 except OSError as e:
1385 if e.errno != errno.ENOENT:
1385 if e.errno != errno.ENOENT:
1386 raise
1386 raise
1387
1387
1388 ui.write(("%-6s free\n") % (name + ":"))
1388 ui.write(("%-6s free\n") % (name + ":"))
1389 return 0
1389 return 0
1390
1390
1391 held += report(repo.svfs, "lock", repo.lock)
1391 held += report(repo.svfs, "lock", repo.lock)
1392 held += report(repo.vfs, "wlock", repo.wlock)
1392 held += report(repo.vfs, "wlock", repo.wlock)
1393
1393
1394 return held
1394 return held
1395
1395
1396 @command('debugmergestate', [], '')
1396 @command('debugmergestate', [], '')
1397 def debugmergestate(ui, repo, *args):
1397 def debugmergestate(ui, repo, *args):
1398 """print merge state
1398 """print merge state
1399
1399
1400 Use --verbose to print out information about whether v1 or v2 merge state
1400 Use --verbose to print out information about whether v1 or v2 merge state
1401 was chosen."""
1401 was chosen."""
1402 def _hashornull(h):
1402 def _hashornull(h):
1403 if h == nullhex:
1403 if h == nullhex:
1404 return 'null'
1404 return 'null'
1405 else:
1405 else:
1406 return h
1406 return h
1407
1407
1408 def printrecords(version):
1408 def printrecords(version):
1409 ui.write(('* version %s records\n') % version)
1409 ui.write(('* version %s records\n') % version)
1410 if version == 1:
1410 if version == 1:
1411 records = v1records
1411 records = v1records
1412 else:
1412 else:
1413 records = v2records
1413 records = v2records
1414
1414
1415 for rtype, record in records:
1415 for rtype, record in records:
1416 # pretty print some record types
1416 # pretty print some record types
1417 if rtype == 'L':
1417 if rtype == 'L':
1418 ui.write(('local: %s\n') % record)
1418 ui.write(('local: %s\n') % record)
1419 elif rtype == 'O':
1419 elif rtype == 'O':
1420 ui.write(('other: %s\n') % record)
1420 ui.write(('other: %s\n') % record)
1421 elif rtype == 'm':
1421 elif rtype == 'm':
1422 driver, mdstate = record.split('\0', 1)
1422 driver, mdstate = record.split('\0', 1)
1423 ui.write(('merge driver: %s (state "%s")\n')
1423 ui.write(('merge driver: %s (state "%s")\n')
1424 % (driver, mdstate))
1424 % (driver, mdstate))
1425 elif rtype in 'FDC':
1425 elif rtype in 'FDC':
1426 r = record.split('\0')
1426 r = record.split('\0')
1427 f, state, hash, lfile, afile, anode, ofile = r[0:7]
1427 f, state, hash, lfile, afile, anode, ofile = r[0:7]
1428 if version == 1:
1428 if version == 1:
1429 onode = 'not stored in v1 format'
1429 onode = 'not stored in v1 format'
1430 flags = r[7]
1430 flags = r[7]
1431 else:
1431 else:
1432 onode, flags = r[7:9]
1432 onode, flags = r[7:9]
1433 ui.write(('file: %s (record type "%s", state "%s", hash %s)\n')
1433 ui.write(('file: %s (record type "%s", state "%s", hash %s)\n')
1434 % (f, rtype, state, _hashornull(hash)))
1434 % (f, rtype, state, _hashornull(hash)))
1435 ui.write((' local path: %s (flags "%s")\n') % (lfile, flags))
1435 ui.write((' local path: %s (flags "%s")\n') % (lfile, flags))
1436 ui.write((' ancestor path: %s (node %s)\n')
1436 ui.write((' ancestor path: %s (node %s)\n')
1437 % (afile, _hashornull(anode)))
1437 % (afile, _hashornull(anode)))
1438 ui.write((' other path: %s (node %s)\n')
1438 ui.write((' other path: %s (node %s)\n')
1439 % (ofile, _hashornull(onode)))
1439 % (ofile, _hashornull(onode)))
1440 elif rtype == 'f':
1440 elif rtype == 'f':
1441 filename, rawextras = record.split('\0', 1)
1441 filename, rawextras = record.split('\0', 1)
1442 extras = rawextras.split('\0')
1442 extras = rawextras.split('\0')
1443 i = 0
1443 i = 0
1444 extrastrings = []
1444 extrastrings = []
1445 while i < len(extras):
1445 while i < len(extras):
1446 extrastrings.append('%s = %s' % (extras[i], extras[i + 1]))
1446 extrastrings.append('%s = %s' % (extras[i], extras[i + 1]))
1447 i += 2
1447 i += 2
1448
1448
1449 ui.write(('file extras: %s (%s)\n')
1449 ui.write(('file extras: %s (%s)\n')
1450 % (filename, ', '.join(extrastrings)))
1450 % (filename, ', '.join(extrastrings)))
1451 elif rtype == 'l':
1451 elif rtype == 'l':
1452 labels = record.split('\0', 2)
1452 labels = record.split('\0', 2)
1453 labels = [l for l in labels if len(l) > 0]
1453 labels = [l for l in labels if len(l) > 0]
1454 ui.write(('labels:\n'))
1454 ui.write(('labels:\n'))
1455 ui.write((' local: %s\n' % labels[0]))
1455 ui.write((' local: %s\n' % labels[0]))
1456 ui.write((' other: %s\n' % labels[1]))
1456 ui.write((' other: %s\n' % labels[1]))
1457 if len(labels) > 2:
1457 if len(labels) > 2:
1458 ui.write((' base: %s\n' % labels[2]))
1458 ui.write((' base: %s\n' % labels[2]))
1459 else:
1459 else:
1460 ui.write(('unrecognized entry: %s\t%s\n')
1460 ui.write(('unrecognized entry: %s\t%s\n')
1461 % (rtype, record.replace('\0', '\t')))
1461 % (rtype, record.replace('\0', '\t')))
1462
1462
1463 # Avoid mergestate.read() since it may raise an exception for unsupported
1463 # Avoid mergestate.read() since it may raise an exception for unsupported
1464 # merge state records. We shouldn't be doing this, but this is OK since this
1464 # merge state records. We shouldn't be doing this, but this is OK since this
1465 # command is pretty low-level.
1465 # command is pretty low-level.
1466 ms = mergemod.mergestate(repo)
1466 ms = mergemod.mergestate(repo)
1467
1467
1468 # sort so that reasonable information is on top
1468 # sort so that reasonable information is on top
1469 v1records = ms._readrecordsv1()
1469 v1records = ms._readrecordsv1()
1470 v2records = ms._readrecordsv2()
1470 v2records = ms._readrecordsv2()
1471 order = 'LOml'
1471 order = 'LOml'
1472 def key(r):
1472 def key(r):
1473 idx = order.find(r[0])
1473 idx = order.find(r[0])
1474 if idx == -1:
1474 if idx == -1:
1475 return (1, r[1])
1475 return (1, r[1])
1476 else:
1476 else:
1477 return (0, idx)
1477 return (0, idx)
1478 v1records.sort(key=key)
1478 v1records.sort(key=key)
1479 v2records.sort(key=key)
1479 v2records.sort(key=key)
1480
1480
1481 if not v1records and not v2records:
1481 if not v1records and not v2records:
1482 ui.write(('no merge state found\n'))
1482 ui.write(('no merge state found\n'))
1483 elif not v2records:
1483 elif not v2records:
1484 ui.note(('no version 2 merge state\n'))
1484 ui.note(('no version 2 merge state\n'))
1485 printrecords(1)
1485 printrecords(1)
1486 elif ms._v1v2match(v1records, v2records):
1486 elif ms._v1v2match(v1records, v2records):
1487 ui.note(('v1 and v2 states match: using v2\n'))
1487 ui.note(('v1 and v2 states match: using v2\n'))
1488 printrecords(2)
1488 printrecords(2)
1489 else:
1489 else:
1490 ui.note(('v1 and v2 states mismatch: using v1\n'))
1490 ui.note(('v1 and v2 states mismatch: using v1\n'))
1491 printrecords(1)
1491 printrecords(1)
1492 if ui.verbose:
1492 if ui.verbose:
1493 printrecords(2)
1493 printrecords(2)
1494
1494
1495 @command('debugnamecomplete', [], _('NAME...'))
1495 @command('debugnamecomplete', [], _('NAME...'))
1496 def debugnamecomplete(ui, repo, *args):
1496 def debugnamecomplete(ui, repo, *args):
1497 '''complete "names" - tags, open branch names, bookmark names'''
1497 '''complete "names" - tags, open branch names, bookmark names'''
1498
1498
1499 names = set()
1499 names = set()
1500 # since we previously only listed open branches, we will handle that
1500 # since we previously only listed open branches, we will handle that
1501 # specially (after this for loop)
1501 # specially (after this for loop)
1502 for name, ns in repo.names.iteritems():
1502 for name, ns in repo.names.iteritems():
1503 if name != 'branches':
1503 if name != 'branches':
1504 names.update(ns.listnames(repo))
1504 names.update(ns.listnames(repo))
1505 names.update(tag for (tag, heads, tip, closed)
1505 names.update(tag for (tag, heads, tip, closed)
1506 in repo.branchmap().iterbranches() if not closed)
1506 in repo.branchmap().iterbranches() if not closed)
1507 completions = set()
1507 completions = set()
1508 if not args:
1508 if not args:
1509 args = ['']
1509 args = ['']
1510 for a in args:
1510 for a in args:
1511 completions.update(n for n in names if n.startswith(a))
1511 completions.update(n for n in names if n.startswith(a))
1512 ui.write('\n'.join(sorted(completions)))
1512 ui.write('\n'.join(sorted(completions)))
1513 ui.write('\n')
1513 ui.write('\n')
1514
1514
1515 @command('debugobsolete',
1515 @command('debugobsolete',
1516 [('', 'flags', 0, _('markers flag')),
1516 [('', 'flags', 0, _('markers flag')),
1517 ('', 'record-parents', False,
1517 ('', 'record-parents', False,
1518 _('record parent information for the precursor')),
1518 _('record parent information for the precursor')),
1519 ('r', 'rev', [], _('display markers relevant to REV')),
1519 ('r', 'rev', [], _('display markers relevant to REV')),
1520 ('', 'exclusive', False, _('restrict display to markers only '
1520 ('', 'exclusive', False, _('restrict display to markers only '
1521 'relevant to REV')),
1521 'relevant to REV')),
1522 ('', 'index', False, _('display index of the marker')),
1522 ('', 'index', False, _('display index of the marker')),
1523 ('', 'delete', [], _('delete markers specified by indices')),
1523 ('', 'delete', [], _('delete markers specified by indices')),
1524 ] + cmdutil.commitopts2 + cmdutil.formatteropts,
1524 ] + cmdutil.commitopts2 + cmdutil.formatteropts,
1525 _('[OBSOLETED [REPLACEMENT ...]]'))
1525 _('[OBSOLETED [REPLACEMENT ...]]'))
1526 def debugobsolete(ui, repo, precursor=None, *successors, **opts):
1526 def debugobsolete(ui, repo, precursor=None, *successors, **opts):
1527 """create arbitrary obsolete marker
1527 """create arbitrary obsolete marker
1528
1528
1529 With no arguments, displays the list of obsolescence markers."""
1529 With no arguments, displays the list of obsolescence markers."""
1530
1530
1531 opts = pycompat.byteskwargs(opts)
1531 opts = pycompat.byteskwargs(opts)
1532
1532
1533 def parsenodeid(s):
1533 def parsenodeid(s):
1534 try:
1534 try:
1535 # We do not use revsingle/revrange functions here to accept
1535 # We do not use revsingle/revrange functions here to accept
1536 # arbitrary node identifiers, possibly not present in the
1536 # arbitrary node identifiers, possibly not present in the
1537 # local repository.
1537 # local repository.
1538 n = bin(s)
1538 n = bin(s)
1539 if len(n) != len(nullid):
1539 if len(n) != len(nullid):
1540 raise TypeError()
1540 raise TypeError()
1541 return n
1541 return n
1542 except TypeError:
1542 except TypeError:
1543 raise error.Abort('changeset references must be full hexadecimal '
1543 raise error.Abort('changeset references must be full hexadecimal '
1544 'node identifiers')
1544 'node identifiers')
1545
1545
1546 if opts.get('delete'):
1546 if opts.get('delete'):
1547 indices = []
1547 indices = []
1548 for v in opts.get('delete'):
1548 for v in opts.get('delete'):
1549 try:
1549 try:
1550 indices.append(int(v))
1550 indices.append(int(v))
1551 except ValueError:
1551 except ValueError:
1552 raise error.Abort(_('invalid index value: %r') % v,
1552 raise error.Abort(_('invalid index value: %r') % v,
1553 hint=_('use integers for indices'))
1553 hint=_('use integers for indices'))
1554
1554
1555 if repo.currenttransaction():
1555 if repo.currenttransaction():
1556 raise error.Abort(_('cannot delete obsmarkers in the middle '
1556 raise error.Abort(_('cannot delete obsmarkers in the middle '
1557 'of transaction.'))
1557 'of transaction.'))
1558
1558
1559 with repo.lock():
1559 with repo.lock():
1560 n = repair.deleteobsmarkers(repo.obsstore, indices)
1560 n = repair.deleteobsmarkers(repo.obsstore, indices)
1561 ui.write(_('deleted %i obsolescence markers\n') % n)
1561 ui.write(_('deleted %i obsolescence markers\n') % n)
1562
1562
1563 return
1563 return
1564
1564
1565 if precursor is not None:
1565 if precursor is not None:
1566 if opts['rev']:
1566 if opts['rev']:
1567 raise error.Abort('cannot select revision when creating marker')
1567 raise error.Abort('cannot select revision when creating marker')
1568 metadata = {}
1568 metadata = {}
1569 metadata['user'] = opts['user'] or ui.username()
1569 metadata['user'] = opts['user'] or ui.username()
1570 succs = tuple(parsenodeid(succ) for succ in successors)
1570 succs = tuple(parsenodeid(succ) for succ in successors)
1571 l = repo.lock()
1571 l = repo.lock()
1572 try:
1572 try:
1573 tr = repo.transaction('debugobsolete')
1573 tr = repo.transaction('debugobsolete')
1574 try:
1574 try:
1575 date = opts.get('date')
1575 date = opts.get('date')
1576 if date:
1576 if date:
1577 date = util.parsedate(date)
1577 date = util.parsedate(date)
1578 else:
1578 else:
1579 date = None
1579 date = None
1580 prec = parsenodeid(precursor)
1580 prec = parsenodeid(precursor)
1581 parents = None
1581 parents = None
1582 if opts['record_parents']:
1582 if opts['record_parents']:
1583 if prec not in repo.unfiltered():
1583 if prec not in repo.unfiltered():
1584 raise error.Abort('cannot used --record-parents on '
1584 raise error.Abort('cannot used --record-parents on '
1585 'unknown changesets')
1585 'unknown changesets')
1586 parents = repo.unfiltered()[prec].parents()
1586 parents = repo.unfiltered()[prec].parents()
1587 parents = tuple(p.node() for p in parents)
1587 parents = tuple(p.node() for p in parents)
1588 repo.obsstore.create(tr, prec, succs, opts['flags'],
1588 repo.obsstore.create(tr, prec, succs, opts['flags'],
1589 parents=parents, date=date,
1589 parents=parents, date=date,
1590 metadata=metadata, ui=ui)
1590 metadata=metadata, ui=ui)
1591 tr.close()
1591 tr.close()
1592 except ValueError as exc:
1592 except ValueError as exc:
1593 raise error.Abort(_('bad obsmarker input: %s') % exc)
1593 raise error.Abort(_('bad obsmarker input: %s') % exc)
1594 finally:
1594 finally:
1595 tr.release()
1595 tr.release()
1596 finally:
1596 finally:
1597 l.release()
1597 l.release()
1598 else:
1598 else:
1599 if opts['rev']:
1599 if opts['rev']:
1600 revs = scmutil.revrange(repo, opts['rev'])
1600 revs = scmutil.revrange(repo, opts['rev'])
1601 nodes = [repo[r].node() for r in revs]
1601 nodes = [repo[r].node() for r in revs]
1602 markers = list(obsutil.getmarkers(repo, nodes=nodes,
1602 markers = list(obsutil.getmarkers(repo, nodes=nodes,
1603 exclusive=opts['exclusive']))
1603 exclusive=opts['exclusive']))
1604 markers.sort(key=lambda x: x._data)
1604 markers.sort(key=lambda x: x._data)
1605 else:
1605 else:
1606 markers = obsutil.getmarkers(repo)
1606 markers = obsutil.getmarkers(repo)
1607
1607
1608 markerstoiter = markers
1608 markerstoiter = markers
1609 isrelevant = lambda m: True
1609 isrelevant = lambda m: True
1610 if opts.get('rev') and opts.get('index'):
1610 if opts.get('rev') and opts.get('index'):
1611 markerstoiter = obsutil.getmarkers(repo)
1611 markerstoiter = obsutil.getmarkers(repo)
1612 markerset = set(markers)
1612 markerset = set(markers)
1613 isrelevant = lambda m: m in markerset
1613 isrelevant = lambda m: m in markerset
1614
1614
1615 fm = ui.formatter('debugobsolete', opts)
1615 fm = ui.formatter('debugobsolete', opts)
1616 for i, m in enumerate(markerstoiter):
1616 for i, m in enumerate(markerstoiter):
1617 if not isrelevant(m):
1617 if not isrelevant(m):
1618 # marker can be irrelevant when we're iterating over a set
1618 # marker can be irrelevant when we're iterating over a set
1619 # of markers (markerstoiter) which is bigger than the set
1619 # of markers (markerstoiter) which is bigger than the set
1620 # of markers we want to display (markers)
1620 # of markers we want to display (markers)
1621 # this can happen if both --index and --rev options are
1621 # this can happen if both --index and --rev options are
1622 # provided and thus we need to iterate over all of the markers
1622 # provided and thus we need to iterate over all of the markers
1623 # to get the correct indices, but only display the ones that
1623 # to get the correct indices, but only display the ones that
1624 # are relevant to --rev value
1624 # are relevant to --rev value
1625 continue
1625 continue
1626 fm.startitem()
1626 fm.startitem()
1627 ind = i if opts.get('index') else None
1627 ind = i if opts.get('index') else None
1628 cmdutil.showmarker(fm, m, index=ind)
1628 cmdutil.showmarker(fm, m, index=ind)
1629 fm.end()
1629 fm.end()
1630
1630
1631 @command('debugpathcomplete',
1631 @command('debugpathcomplete',
1632 [('f', 'full', None, _('complete an entire path')),
1632 [('f', 'full', None, _('complete an entire path')),
1633 ('n', 'normal', None, _('show only normal files')),
1633 ('n', 'normal', None, _('show only normal files')),
1634 ('a', 'added', None, _('show only added files')),
1634 ('a', 'added', None, _('show only added files')),
1635 ('r', 'removed', None, _('show only removed files'))],
1635 ('r', 'removed', None, _('show only removed files'))],
1636 _('FILESPEC...'))
1636 _('FILESPEC...'))
1637 def debugpathcomplete(ui, repo, *specs, **opts):
1637 def debugpathcomplete(ui, repo, *specs, **opts):
1638 '''complete part or all of a tracked path
1638 '''complete part or all of a tracked path
1639
1639
1640 This command supports shells that offer path name completion. It
1640 This command supports shells that offer path name completion. It
1641 currently completes only files already known to the dirstate.
1641 currently completes only files already known to the dirstate.
1642
1642
1643 Completion extends only to the next path segment unless
1643 Completion extends only to the next path segment unless
1644 --full is specified, in which case entire paths are used.'''
1644 --full is specified, in which case entire paths are used.'''
1645
1645
1646 def complete(path, acceptable):
1646 def complete(path, acceptable):
1647 dirstate = repo.dirstate
1647 dirstate = repo.dirstate
1648 spec = os.path.normpath(os.path.join(pycompat.getcwd(), path))
1648 spec = os.path.normpath(os.path.join(pycompat.getcwd(), path))
1649 rootdir = repo.root + pycompat.ossep
1649 rootdir = repo.root + pycompat.ossep
1650 if spec != repo.root and not spec.startswith(rootdir):
1650 if spec != repo.root and not spec.startswith(rootdir):
1651 return [], []
1651 return [], []
1652 if os.path.isdir(spec):
1652 if os.path.isdir(spec):
1653 spec += '/'
1653 spec += '/'
1654 spec = spec[len(rootdir):]
1654 spec = spec[len(rootdir):]
1655 fixpaths = pycompat.ossep != '/'
1655 fixpaths = pycompat.ossep != '/'
1656 if fixpaths:
1656 if fixpaths:
1657 spec = spec.replace(pycompat.ossep, '/')
1657 spec = spec.replace(pycompat.ossep, '/')
1658 speclen = len(spec)
1658 speclen = len(spec)
1659 fullpaths = opts[r'full']
1659 fullpaths = opts[r'full']
1660 files, dirs = set(), set()
1660 files, dirs = set(), set()
1661 adddir, addfile = dirs.add, files.add
1661 adddir, addfile = dirs.add, files.add
1662 for f, st in dirstate.iteritems():
1662 for f, st in dirstate.iteritems():
1663 if f.startswith(spec) and st[0] in acceptable:
1663 if f.startswith(spec) and st[0] in acceptable:
1664 if fixpaths:
1664 if fixpaths:
1665 f = f.replace('/', pycompat.ossep)
1665 f = f.replace('/', pycompat.ossep)
1666 if fullpaths:
1666 if fullpaths:
1667 addfile(f)
1667 addfile(f)
1668 continue
1668 continue
1669 s = f.find(pycompat.ossep, speclen)
1669 s = f.find(pycompat.ossep, speclen)
1670 if s >= 0:
1670 if s >= 0:
1671 adddir(f[:s])
1671 adddir(f[:s])
1672 else:
1672 else:
1673 addfile(f)
1673 addfile(f)
1674 return files, dirs
1674 return files, dirs
1675
1675
1676 acceptable = ''
1676 acceptable = ''
1677 if opts[r'normal']:
1677 if opts[r'normal']:
1678 acceptable += 'nm'
1678 acceptable += 'nm'
1679 if opts[r'added']:
1679 if opts[r'added']:
1680 acceptable += 'a'
1680 acceptable += 'a'
1681 if opts[r'removed']:
1681 if opts[r'removed']:
1682 acceptable += 'r'
1682 acceptable += 'r'
1683 cwd = repo.getcwd()
1683 cwd = repo.getcwd()
1684 if not specs:
1684 if not specs:
1685 specs = ['.']
1685 specs = ['.']
1686
1686
1687 files, dirs = set(), set()
1687 files, dirs = set(), set()
1688 for spec in specs:
1688 for spec in specs:
1689 f, d = complete(spec, acceptable or 'nmar')
1689 f, d = complete(spec, acceptable or 'nmar')
1690 files.update(f)
1690 files.update(f)
1691 dirs.update(d)
1691 dirs.update(d)
1692 files.update(dirs)
1692 files.update(dirs)
1693 ui.write('\n'.join(repo.pathto(p, cwd) for p in sorted(files)))
1693 ui.write('\n'.join(repo.pathto(p, cwd) for p in sorted(files)))
1694 ui.write('\n')
1694 ui.write('\n')
1695
1695
1696 @command('debugpickmergetool',
1696 @command('debugpickmergetool',
1697 [('r', 'rev', '', _('check for files in this revision'), _('REV')),
1697 [('r', 'rev', '', _('check for files in this revision'), _('REV')),
1698 ('', 'changedelete', None, _('emulate merging change and delete')),
1698 ('', 'changedelete', None, _('emulate merging change and delete')),
1699 ] + cmdutil.walkopts + cmdutil.mergetoolopts,
1699 ] + cmdutil.walkopts + cmdutil.mergetoolopts,
1700 _('[PATTERN]...'),
1700 _('[PATTERN]...'),
1701 inferrepo=True)
1701 inferrepo=True)
1702 def debugpickmergetool(ui, repo, *pats, **opts):
1702 def debugpickmergetool(ui, repo, *pats, **opts):
1703 """examine which merge tool is chosen for specified file
1703 """examine which merge tool is chosen for specified file
1704
1704
1705 As described in :hg:`help merge-tools`, Mercurial examines
1705 As described in :hg:`help merge-tools`, Mercurial examines
1706 configurations below in this order to decide which merge tool is
1706 configurations below in this order to decide which merge tool is
1707 chosen for specified file.
1707 chosen for specified file.
1708
1708
1709 1. ``--tool`` option
1709 1. ``--tool`` option
1710 2. ``HGMERGE`` environment variable
1710 2. ``HGMERGE`` environment variable
1711 3. configurations in ``merge-patterns`` section
1711 3. configurations in ``merge-patterns`` section
1712 4. configuration of ``ui.merge``
1712 4. configuration of ``ui.merge``
1713 5. configurations in ``merge-tools`` section
1713 5. configurations in ``merge-tools`` section
1714 6. ``hgmerge`` tool (for historical reason only)
1714 6. ``hgmerge`` tool (for historical reason only)
1715 7. default tool for fallback (``:merge`` or ``:prompt``)
1715 7. default tool for fallback (``:merge`` or ``:prompt``)
1716
1716
1717 This command writes out examination result in the style below::
1717 This command writes out examination result in the style below::
1718
1718
1719 FILE = MERGETOOL
1719 FILE = MERGETOOL
1720
1720
1721 By default, all files known in the first parent context of the
1721 By default, all files known in the first parent context of the
1722 working directory are examined. Use file patterns and/or -I/-X
1722 working directory are examined. Use file patterns and/or -I/-X
1723 options to limit target files. -r/--rev is also useful to examine
1723 options to limit target files. -r/--rev is also useful to examine
1724 files in another context without actual updating to it.
1724 files in another context without actual updating to it.
1725
1725
1726 With --debug, this command shows warning messages while matching
1726 With --debug, this command shows warning messages while matching
1727 against ``merge-patterns`` and so on, too. It is recommended to
1727 against ``merge-patterns`` and so on, too. It is recommended to
1728 use this option with explicit file patterns and/or -I/-X options,
1728 use this option with explicit file patterns and/or -I/-X options,
1729 because this option increases amount of output per file according
1729 because this option increases amount of output per file according
1730 to configurations in hgrc.
1730 to configurations in hgrc.
1731
1731
1732 With -v/--verbose, this command shows configurations below at
1732 With -v/--verbose, this command shows configurations below at
1733 first (only if specified).
1733 first (only if specified).
1734
1734
1735 - ``--tool`` option
1735 - ``--tool`` option
1736 - ``HGMERGE`` environment variable
1736 - ``HGMERGE`` environment variable
1737 - configuration of ``ui.merge``
1737 - configuration of ``ui.merge``
1738
1738
1739 If merge tool is chosen before matching against
1739 If merge tool is chosen before matching against
1740 ``merge-patterns``, this command can't show any helpful
1740 ``merge-patterns``, this command can't show any helpful
1741 information, even with --debug. In such case, information above is
1741 information, even with --debug. In such case, information above is
1742 useful to know why a merge tool is chosen.
1742 useful to know why a merge tool is chosen.
1743 """
1743 """
1744 opts = pycompat.byteskwargs(opts)
1744 opts = pycompat.byteskwargs(opts)
1745 overrides = {}
1745 overrides = {}
1746 if opts['tool']:
1746 if opts['tool']:
1747 overrides[('ui', 'forcemerge')] = opts['tool']
1747 overrides[('ui', 'forcemerge')] = opts['tool']
1748 ui.note(('with --tool %r\n') % (opts['tool']))
1748 ui.note(('with --tool %r\n') % (opts['tool']))
1749
1749
1750 with ui.configoverride(overrides, 'debugmergepatterns'):
1750 with ui.configoverride(overrides, 'debugmergepatterns'):
1751 hgmerge = encoding.environ.get("HGMERGE")
1751 hgmerge = encoding.environ.get("HGMERGE")
1752 if hgmerge is not None:
1752 if hgmerge is not None:
1753 ui.note(('with HGMERGE=%r\n') % (hgmerge))
1753 ui.note(('with HGMERGE=%r\n') % (hgmerge))
1754 uimerge = ui.config("ui", "merge")
1754 uimerge = ui.config("ui", "merge")
1755 if uimerge:
1755 if uimerge:
1756 ui.note(('with ui.merge=%r\n') % (uimerge))
1756 ui.note(('with ui.merge=%r\n') % (uimerge))
1757
1757
1758 ctx = scmutil.revsingle(repo, opts.get('rev'))
1758 ctx = scmutil.revsingle(repo, opts.get('rev'))
1759 m = scmutil.match(ctx, pats, opts)
1759 m = scmutil.match(ctx, pats, opts)
1760 changedelete = opts['changedelete']
1760 changedelete = opts['changedelete']
1761 for path in ctx.walk(m):
1761 for path in ctx.walk(m):
1762 fctx = ctx[path]
1762 fctx = ctx[path]
1763 try:
1763 try:
1764 if not ui.debugflag:
1764 if not ui.debugflag:
1765 ui.pushbuffer(error=True)
1765 ui.pushbuffer(error=True)
1766 tool, toolpath = filemerge._picktool(repo, ui, path,
1766 tool, toolpath = filemerge._picktool(repo, ui, path,
1767 fctx.isbinary(),
1767 fctx.isbinary(),
1768 'l' in fctx.flags(),
1768 'l' in fctx.flags(),
1769 changedelete)
1769 changedelete)
1770 finally:
1770 finally:
1771 if not ui.debugflag:
1771 if not ui.debugflag:
1772 ui.popbuffer()
1772 ui.popbuffer()
1773 ui.write(('%s = %s\n') % (path, tool))
1773 ui.write(('%s = %s\n') % (path, tool))
1774
1774
1775 @command('debugpushkey', [], _('REPO NAMESPACE [KEY OLD NEW]'), norepo=True)
1775 @command('debugpushkey', [], _('REPO NAMESPACE [KEY OLD NEW]'), norepo=True)
1776 def debugpushkey(ui, repopath, namespace, *keyinfo, **opts):
1776 def debugpushkey(ui, repopath, namespace, *keyinfo, **opts):
1777 '''access the pushkey key/value protocol
1777 '''access the pushkey key/value protocol
1778
1778
1779 With two args, list the keys in the given namespace.
1779 With two args, list the keys in the given namespace.
1780
1780
1781 With five args, set a key to new if it currently is set to old.
1781 With five args, set a key to new if it currently is set to old.
1782 Reports success or failure.
1782 Reports success or failure.
1783 '''
1783 '''
1784
1784
1785 target = hg.peer(ui, {}, repopath)
1785 target = hg.peer(ui, {}, repopath)
1786 if keyinfo:
1786 if keyinfo:
1787 key, old, new = keyinfo
1787 key, old, new = keyinfo
1788 r = target.pushkey(namespace, key, old, new)
1788 r = target.pushkey(namespace, key, old, new)
1789 ui.status(str(r) + '\n')
1789 ui.status(str(r) + '\n')
1790 return not r
1790 return not r
1791 else:
1791 else:
1792 for k, v in sorted(target.listkeys(namespace).iteritems()):
1792 for k, v in sorted(target.listkeys(namespace).iteritems()):
1793 ui.write("%s\t%s\n" % (util.escapestr(k),
1793 ui.write("%s\t%s\n" % (util.escapestr(k),
1794 util.escapestr(v)))
1794 util.escapestr(v)))
1795
1795
1796 @command('debugpvec', [], _('A B'))
1796 @command('debugpvec', [], _('A B'))
1797 def debugpvec(ui, repo, a, b=None):
1797 def debugpvec(ui, repo, a, b=None):
1798 ca = scmutil.revsingle(repo, a)
1798 ca = scmutil.revsingle(repo, a)
1799 cb = scmutil.revsingle(repo, b)
1799 cb = scmutil.revsingle(repo, b)
1800 pa = pvec.ctxpvec(ca)
1800 pa = pvec.ctxpvec(ca)
1801 pb = pvec.ctxpvec(cb)
1801 pb = pvec.ctxpvec(cb)
1802 if pa == pb:
1802 if pa == pb:
1803 rel = "="
1803 rel = "="
1804 elif pa > pb:
1804 elif pa > pb:
1805 rel = ">"
1805 rel = ">"
1806 elif pa < pb:
1806 elif pa < pb:
1807 rel = "<"
1807 rel = "<"
1808 elif pa | pb:
1808 elif pa | pb:
1809 rel = "|"
1809 rel = "|"
1810 ui.write(_("a: %s\n") % pa)
1810 ui.write(_("a: %s\n") % pa)
1811 ui.write(_("b: %s\n") % pb)
1811 ui.write(_("b: %s\n") % pb)
1812 ui.write(_("depth(a): %d depth(b): %d\n") % (pa._depth, pb._depth))
1812 ui.write(_("depth(a): %d depth(b): %d\n") % (pa._depth, pb._depth))
1813 ui.write(_("delta: %d hdist: %d distance: %d relation: %s\n") %
1813 ui.write(_("delta: %d hdist: %d distance: %d relation: %s\n") %
1814 (abs(pa._depth - pb._depth), pvec._hamming(pa._vec, pb._vec),
1814 (abs(pa._depth - pb._depth), pvec._hamming(pa._vec, pb._vec),
1815 pa.distance(pb), rel))
1815 pa.distance(pb), rel))
1816
1816
1817 @command('debugrebuilddirstate|debugrebuildstate',
1817 @command('debugrebuilddirstate|debugrebuildstate',
1818 [('r', 'rev', '', _('revision to rebuild to'), _('REV')),
1818 [('r', 'rev', '', _('revision to rebuild to'), _('REV')),
1819 ('', 'minimal', None, _('only rebuild files that are inconsistent with '
1819 ('', 'minimal', None, _('only rebuild files that are inconsistent with '
1820 'the working copy parent')),
1820 'the working copy parent')),
1821 ],
1821 ],
1822 _('[-r REV]'))
1822 _('[-r REV]'))
1823 def debugrebuilddirstate(ui, repo, rev, **opts):
1823 def debugrebuilddirstate(ui, repo, rev, **opts):
1824 """rebuild the dirstate as it would look like for the given revision
1824 """rebuild the dirstate as it would look like for the given revision
1825
1825
1826 If no revision is specified the first current parent will be used.
1826 If no revision is specified the first current parent will be used.
1827
1827
1828 The dirstate will be set to the files of the given revision.
1828 The dirstate will be set to the files of the given revision.
1829 The actual working directory content or existing dirstate
1829 The actual working directory content or existing dirstate
1830 information such as adds or removes is not considered.
1830 information such as adds or removes is not considered.
1831
1831
1832 ``minimal`` will only rebuild the dirstate status for files that claim to be
1832 ``minimal`` will only rebuild the dirstate status for files that claim to be
1833 tracked but are not in the parent manifest, or that exist in the parent
1833 tracked but are not in the parent manifest, or that exist in the parent
1834 manifest but are not in the dirstate. It will not change adds, removes, or
1834 manifest but are not in the dirstate. It will not change adds, removes, or
1835 modified files that are in the working copy parent.
1835 modified files that are in the working copy parent.
1836
1836
1837 One use of this command is to make the next :hg:`status` invocation
1837 One use of this command is to make the next :hg:`status` invocation
1838 check the actual file content.
1838 check the actual file content.
1839 """
1839 """
1840 ctx = scmutil.revsingle(repo, rev)
1840 ctx = scmutil.revsingle(repo, rev)
1841 with repo.wlock():
1841 with repo.wlock():
1842 dirstate = repo.dirstate
1842 dirstate = repo.dirstate
1843 changedfiles = None
1843 changedfiles = None
1844 # See command doc for what minimal does.
1844 # See command doc for what minimal does.
1845 if opts.get(r'minimal'):
1845 if opts.get(r'minimal'):
1846 manifestfiles = set(ctx.manifest().keys())
1846 manifestfiles = set(ctx.manifest().keys())
1847 dirstatefiles = set(dirstate)
1847 dirstatefiles = set(dirstate)
1848 manifestonly = manifestfiles - dirstatefiles
1848 manifestonly = manifestfiles - dirstatefiles
1849 dsonly = dirstatefiles - manifestfiles
1849 dsonly = dirstatefiles - manifestfiles
1850 dsnotadded = set(f for f in dsonly if dirstate[f] != 'a')
1850 dsnotadded = set(f for f in dsonly if dirstate[f] != 'a')
1851 changedfiles = manifestonly | dsnotadded
1851 changedfiles = manifestonly | dsnotadded
1852
1852
1853 dirstate.rebuild(ctx.node(), ctx.manifest(), changedfiles)
1853 dirstate.rebuild(ctx.node(), ctx.manifest(), changedfiles)
1854
1854
1855 @command('debugrebuildfncache', [], '')
1855 @command('debugrebuildfncache', [], '')
1856 def debugrebuildfncache(ui, repo):
1856 def debugrebuildfncache(ui, repo):
1857 """rebuild the fncache file"""
1857 """rebuild the fncache file"""
1858 repair.rebuildfncache(ui, repo)
1858 repair.rebuildfncache(ui, repo)
1859
1859
1860 @command('debugrename',
1860 @command('debugrename',
1861 [('r', 'rev', '', _('revision to debug'), _('REV'))],
1861 [('r', 'rev', '', _('revision to debug'), _('REV'))],
1862 _('[-r REV] FILE'))
1862 _('[-r REV] FILE'))
1863 def debugrename(ui, repo, file1, *pats, **opts):
1863 def debugrename(ui, repo, file1, *pats, **opts):
1864 """dump rename information"""
1864 """dump rename information"""
1865
1865
1866 opts = pycompat.byteskwargs(opts)
1866 opts = pycompat.byteskwargs(opts)
1867 ctx = scmutil.revsingle(repo, opts.get('rev'))
1867 ctx = scmutil.revsingle(repo, opts.get('rev'))
1868 m = scmutil.match(ctx, (file1,) + pats, opts)
1868 m = scmutil.match(ctx, (file1,) + pats, opts)
1869 for abs in ctx.walk(m):
1869 for abs in ctx.walk(m):
1870 fctx = ctx[abs]
1870 fctx = ctx[abs]
1871 o = fctx.filelog().renamed(fctx.filenode())
1871 o = fctx.filelog().renamed(fctx.filenode())
1872 rel = m.rel(abs)
1872 rel = m.rel(abs)
1873 if o:
1873 if o:
1874 ui.write(_("%s renamed from %s:%s\n") % (rel, o[0], hex(o[1])))
1874 ui.write(_("%s renamed from %s:%s\n") % (rel, o[0], hex(o[1])))
1875 else:
1875 else:
1876 ui.write(_("%s not renamed\n") % rel)
1876 ui.write(_("%s not renamed\n") % rel)
1877
1877
1878 @command('debugrevlog', cmdutil.debugrevlogopts +
1878 @command('debugrevlog', cmdutil.debugrevlogopts +
1879 [('d', 'dump', False, _('dump index data'))],
1879 [('d', 'dump', False, _('dump index data'))],
1880 _('-c|-m|FILE'),
1880 _('-c|-m|FILE'),
1881 optionalrepo=True)
1881 optionalrepo=True)
1882 def debugrevlog(ui, repo, file_=None, **opts):
1882 def debugrevlog(ui, repo, file_=None, **opts):
1883 """show data and statistics about a revlog"""
1883 """show data and statistics about a revlog"""
1884 opts = pycompat.byteskwargs(opts)
1884 opts = pycompat.byteskwargs(opts)
1885 r = cmdutil.openrevlog(repo, 'debugrevlog', file_, opts)
1885 r = cmdutil.openrevlog(repo, 'debugrevlog', file_, opts)
1886
1886
1887 if opts.get("dump"):
1887 if opts.get("dump"):
1888 numrevs = len(r)
1888 numrevs = len(r)
1889 ui.write(("# rev p1rev p2rev start end deltastart base p1 p2"
1889 ui.write(("# rev p1rev p2rev start end deltastart base p1 p2"
1890 " rawsize totalsize compression heads chainlen\n"))
1890 " rawsize totalsize compression heads chainlen\n"))
1891 ts = 0
1891 ts = 0
1892 heads = set()
1892 heads = set()
1893
1893
1894 for rev in xrange(numrevs):
1894 for rev in xrange(numrevs):
1895 dbase = r.deltaparent(rev)
1895 dbase = r.deltaparent(rev)
1896 if dbase == -1:
1896 if dbase == -1:
1897 dbase = rev
1897 dbase = rev
1898 cbase = r.chainbase(rev)
1898 cbase = r.chainbase(rev)
1899 clen = r.chainlen(rev)
1899 clen = r.chainlen(rev)
1900 p1, p2 = r.parentrevs(rev)
1900 p1, p2 = r.parentrevs(rev)
1901 rs = r.rawsize(rev)
1901 rs = r.rawsize(rev)
1902 ts = ts + rs
1902 ts = ts + rs
1903 heads -= set(r.parentrevs(rev))
1903 heads -= set(r.parentrevs(rev))
1904 heads.add(rev)
1904 heads.add(rev)
1905 try:
1905 try:
1906 compression = ts / r.end(rev)
1906 compression = ts / r.end(rev)
1907 except ZeroDivisionError:
1907 except ZeroDivisionError:
1908 compression = 0
1908 compression = 0
1909 ui.write("%5d %5d %5d %5d %5d %10d %4d %4d %4d %7d %9d "
1909 ui.write("%5d %5d %5d %5d %5d %10d %4d %4d %4d %7d %9d "
1910 "%11d %5d %8d\n" %
1910 "%11d %5d %8d\n" %
1911 (rev, p1, p2, r.start(rev), r.end(rev),
1911 (rev, p1, p2, r.start(rev), r.end(rev),
1912 r.start(dbase), r.start(cbase),
1912 r.start(dbase), r.start(cbase),
1913 r.start(p1), r.start(p2),
1913 r.start(p1), r.start(p2),
1914 rs, ts, compression, len(heads), clen))
1914 rs, ts, compression, len(heads), clen))
1915 return 0
1915 return 0
1916
1916
1917 v = r.version
1917 v = r.version
1918 format = v & 0xFFFF
1918 format = v & 0xFFFF
1919 flags = []
1919 flags = []
1920 gdelta = False
1920 gdelta = False
1921 if v & revlog.FLAG_INLINE_DATA:
1921 if v & revlog.FLAG_INLINE_DATA:
1922 flags.append('inline')
1922 flags.append('inline')
1923 if v & revlog.FLAG_GENERALDELTA:
1923 if v & revlog.FLAG_GENERALDELTA:
1924 gdelta = True
1924 gdelta = True
1925 flags.append('generaldelta')
1925 flags.append('generaldelta')
1926 if not flags:
1926 if not flags:
1927 flags = ['(none)']
1927 flags = ['(none)']
1928
1928
1929 nummerges = 0
1929 nummerges = 0
1930 numfull = 0
1930 numfull = 0
1931 numprev = 0
1931 numprev = 0
1932 nump1 = 0
1932 nump1 = 0
1933 nump2 = 0
1933 nump2 = 0
1934 numother = 0
1934 numother = 0
1935 nump1prev = 0
1935 nump1prev = 0
1936 nump2prev = 0
1936 nump2prev = 0
1937 chainlengths = []
1937 chainlengths = []
1938 chainbases = []
1938 chainbases = []
1939 chainspans = []
1939 chainspans = []
1940
1940
1941 datasize = [None, 0, 0]
1941 datasize = [None, 0, 0]
1942 fullsize = [None, 0, 0]
1942 fullsize = [None, 0, 0]
1943 deltasize = [None, 0, 0]
1943 deltasize = [None, 0, 0]
1944 chunktypecounts = {}
1944 chunktypecounts = {}
1945 chunktypesizes = {}
1945 chunktypesizes = {}
1946
1946
1947 def addsize(size, l):
1947 def addsize(size, l):
1948 if l[0] is None or size < l[0]:
1948 if l[0] is None or size < l[0]:
1949 l[0] = size
1949 l[0] = size
1950 if size > l[1]:
1950 if size > l[1]:
1951 l[1] = size
1951 l[1] = size
1952 l[2] += size
1952 l[2] += size
1953
1953
1954 numrevs = len(r)
1954 numrevs = len(r)
1955 for rev in xrange(numrevs):
1955 for rev in xrange(numrevs):
1956 p1, p2 = r.parentrevs(rev)
1956 p1, p2 = r.parentrevs(rev)
1957 delta = r.deltaparent(rev)
1957 delta = r.deltaparent(rev)
1958 if format > 0:
1958 if format > 0:
1959 addsize(r.rawsize(rev), datasize)
1959 addsize(r.rawsize(rev), datasize)
1960 if p2 != nullrev:
1960 if p2 != nullrev:
1961 nummerges += 1
1961 nummerges += 1
1962 size = r.length(rev)
1962 size = r.length(rev)
1963 if delta == nullrev:
1963 if delta == nullrev:
1964 chainlengths.append(0)
1964 chainlengths.append(0)
1965 chainbases.append(r.start(rev))
1965 chainbases.append(r.start(rev))
1966 chainspans.append(size)
1966 chainspans.append(size)
1967 numfull += 1
1967 numfull += 1
1968 addsize(size, fullsize)
1968 addsize(size, fullsize)
1969 else:
1969 else:
1970 chainlengths.append(chainlengths[delta] + 1)
1970 chainlengths.append(chainlengths[delta] + 1)
1971 baseaddr = chainbases[delta]
1971 baseaddr = chainbases[delta]
1972 revaddr = r.start(rev)
1972 revaddr = r.start(rev)
1973 chainbases.append(baseaddr)
1973 chainbases.append(baseaddr)
1974 chainspans.append((revaddr - baseaddr) + size)
1974 chainspans.append((revaddr - baseaddr) + size)
1975 addsize(size, deltasize)
1975 addsize(size, deltasize)
1976 if delta == rev - 1:
1976 if delta == rev - 1:
1977 numprev += 1
1977 numprev += 1
1978 if delta == p1:
1978 if delta == p1:
1979 nump1prev += 1
1979 nump1prev += 1
1980 elif delta == p2:
1980 elif delta == p2:
1981 nump2prev += 1
1981 nump2prev += 1
1982 elif delta == p1:
1982 elif delta == p1:
1983 nump1 += 1
1983 nump1 += 1
1984 elif delta == p2:
1984 elif delta == p2:
1985 nump2 += 1
1985 nump2 += 1
1986 elif delta != nullrev:
1986 elif delta != nullrev:
1987 numother += 1
1987 numother += 1
1988
1988
1989 # Obtain data on the raw chunks in the revlog.
1989 # Obtain data on the raw chunks in the revlog.
1990 segment = r._getsegmentforrevs(rev, rev)[1]
1990 segment = r._getsegmentforrevs(rev, rev)[1]
1991 if segment:
1991 if segment:
1992 chunktype = bytes(segment[0:1])
1992 chunktype = bytes(segment[0:1])
1993 else:
1993 else:
1994 chunktype = 'empty'
1994 chunktype = 'empty'
1995
1995
1996 if chunktype not in chunktypecounts:
1996 if chunktype not in chunktypecounts:
1997 chunktypecounts[chunktype] = 0
1997 chunktypecounts[chunktype] = 0
1998 chunktypesizes[chunktype] = 0
1998 chunktypesizes[chunktype] = 0
1999
1999
2000 chunktypecounts[chunktype] += 1
2000 chunktypecounts[chunktype] += 1
2001 chunktypesizes[chunktype] += size
2001 chunktypesizes[chunktype] += size
2002
2002
2003 # Adjust size min value for empty cases
2003 # Adjust size min value for empty cases
2004 for size in (datasize, fullsize, deltasize):
2004 for size in (datasize, fullsize, deltasize):
2005 if size[0] is None:
2005 if size[0] is None:
2006 size[0] = 0
2006 size[0] = 0
2007
2007
2008 numdeltas = numrevs - numfull
2008 numdeltas = numrevs - numfull
2009 numoprev = numprev - nump1prev - nump2prev
2009 numoprev = numprev - nump1prev - nump2prev
2010 totalrawsize = datasize[2]
2010 totalrawsize = datasize[2]
2011 datasize[2] /= numrevs
2011 datasize[2] /= numrevs
2012 fulltotal = fullsize[2]
2012 fulltotal = fullsize[2]
2013 fullsize[2] /= numfull
2013 fullsize[2] /= numfull
2014 deltatotal = deltasize[2]
2014 deltatotal = deltasize[2]
2015 if numrevs - numfull > 0:
2015 if numrevs - numfull > 0:
2016 deltasize[2] /= numrevs - numfull
2016 deltasize[2] /= numrevs - numfull
2017 totalsize = fulltotal + deltatotal
2017 totalsize = fulltotal + deltatotal
2018 avgchainlen = sum(chainlengths) / numrevs
2018 avgchainlen = sum(chainlengths) / numrevs
2019 maxchainlen = max(chainlengths)
2019 maxchainlen = max(chainlengths)
2020 maxchainspan = max(chainspans)
2020 maxchainspan = max(chainspans)
2021 compratio = 1
2021 compratio = 1
2022 if totalsize:
2022 if totalsize:
2023 compratio = totalrawsize / totalsize
2023 compratio = totalrawsize / totalsize
2024
2024
2025 basedfmtstr = '%%%dd\n'
2025 basedfmtstr = '%%%dd\n'
2026 basepcfmtstr = '%%%dd %s(%%5.2f%%%%)\n'
2026 basepcfmtstr = '%%%dd %s(%%5.2f%%%%)\n'
2027
2027
2028 def dfmtstr(max):
2028 def dfmtstr(max):
2029 return basedfmtstr % len(str(max))
2029 return basedfmtstr % len(str(max))
2030 def pcfmtstr(max, padding=0):
2030 def pcfmtstr(max, padding=0):
2031 return basepcfmtstr % (len(str(max)), ' ' * padding)
2031 return basepcfmtstr % (len(str(max)), ' ' * padding)
2032
2032
2033 def pcfmt(value, total):
2033 def pcfmt(value, total):
2034 if total:
2034 if total:
2035 return (value, 100 * float(value) / total)
2035 return (value, 100 * float(value) / total)
2036 else:
2036 else:
2037 return value, 100.0
2037 return value, 100.0
2038
2038
2039 ui.write(('format : %d\n') % format)
2039 ui.write(('format : %d\n') % format)
2040 ui.write(('flags : %s\n') % ', '.join(flags))
2040 ui.write(('flags : %s\n') % ', '.join(flags))
2041
2041
2042 ui.write('\n')
2042 ui.write('\n')
2043 fmt = pcfmtstr(totalsize)
2043 fmt = pcfmtstr(totalsize)
2044 fmt2 = dfmtstr(totalsize)
2044 fmt2 = dfmtstr(totalsize)
2045 ui.write(('revisions : ') + fmt2 % numrevs)
2045 ui.write(('revisions : ') + fmt2 % numrevs)
2046 ui.write((' merges : ') + fmt % pcfmt(nummerges, numrevs))
2046 ui.write((' merges : ') + fmt % pcfmt(nummerges, numrevs))
2047 ui.write((' normal : ') + fmt % pcfmt(numrevs - nummerges, numrevs))
2047 ui.write((' normal : ') + fmt % pcfmt(numrevs - nummerges, numrevs))
2048 ui.write(('revisions : ') + fmt2 % numrevs)
2048 ui.write(('revisions : ') + fmt2 % numrevs)
2049 ui.write((' full : ') + fmt % pcfmt(numfull, numrevs))
2049 ui.write((' full : ') + fmt % pcfmt(numfull, numrevs))
2050 ui.write((' deltas : ') + fmt % pcfmt(numdeltas, numrevs))
2050 ui.write((' deltas : ') + fmt % pcfmt(numdeltas, numrevs))
2051 ui.write(('revision size : ') + fmt2 % totalsize)
2051 ui.write(('revision size : ') + fmt2 % totalsize)
2052 ui.write((' full : ') + fmt % pcfmt(fulltotal, totalsize))
2052 ui.write((' full : ') + fmt % pcfmt(fulltotal, totalsize))
2053 ui.write((' deltas : ') + fmt % pcfmt(deltatotal, totalsize))
2053 ui.write((' deltas : ') + fmt % pcfmt(deltatotal, totalsize))
2054
2054
2055 def fmtchunktype(chunktype):
2055 def fmtchunktype(chunktype):
2056 if chunktype == 'empty':
2056 if chunktype == 'empty':
2057 return ' %s : ' % chunktype
2057 return ' %s : ' % chunktype
2058 elif chunktype in pycompat.bytestr(string.ascii_letters):
2058 elif chunktype in pycompat.bytestr(string.ascii_letters):
2059 return ' 0x%s (%s) : ' % (hex(chunktype), chunktype)
2059 return ' 0x%s (%s) : ' % (hex(chunktype), chunktype)
2060 else:
2060 else:
2061 return ' 0x%s : ' % hex(chunktype)
2061 return ' 0x%s : ' % hex(chunktype)
2062
2062
2063 ui.write('\n')
2063 ui.write('\n')
2064 ui.write(('chunks : ') + fmt2 % numrevs)
2064 ui.write(('chunks : ') + fmt2 % numrevs)
2065 for chunktype in sorted(chunktypecounts):
2065 for chunktype in sorted(chunktypecounts):
2066 ui.write(fmtchunktype(chunktype))
2066 ui.write(fmtchunktype(chunktype))
2067 ui.write(fmt % pcfmt(chunktypecounts[chunktype], numrevs))
2067 ui.write(fmt % pcfmt(chunktypecounts[chunktype], numrevs))
2068 ui.write(('chunks size : ') + fmt2 % totalsize)
2068 ui.write(('chunks size : ') + fmt2 % totalsize)
2069 for chunktype in sorted(chunktypecounts):
2069 for chunktype in sorted(chunktypecounts):
2070 ui.write(fmtchunktype(chunktype))
2070 ui.write(fmtchunktype(chunktype))
2071 ui.write(fmt % pcfmt(chunktypesizes[chunktype], totalsize))
2071 ui.write(fmt % pcfmt(chunktypesizes[chunktype], totalsize))
2072
2072
2073 ui.write('\n')
2073 ui.write('\n')
2074 fmt = dfmtstr(max(avgchainlen, maxchainlen, maxchainspan, compratio))
2074 fmt = dfmtstr(max(avgchainlen, maxchainlen, maxchainspan, compratio))
2075 ui.write(('avg chain length : ') + fmt % avgchainlen)
2075 ui.write(('avg chain length : ') + fmt % avgchainlen)
2076 ui.write(('max chain length : ') + fmt % maxchainlen)
2076 ui.write(('max chain length : ') + fmt % maxchainlen)
2077 ui.write(('max chain reach : ') + fmt % maxchainspan)
2077 ui.write(('max chain reach : ') + fmt % maxchainspan)
2078 ui.write(('compression ratio : ') + fmt % compratio)
2078 ui.write(('compression ratio : ') + fmt % compratio)
2079
2079
2080 if format > 0:
2080 if format > 0:
2081 ui.write('\n')
2081 ui.write('\n')
2082 ui.write(('uncompressed data size (min/max/avg) : %d / %d / %d\n')
2082 ui.write(('uncompressed data size (min/max/avg) : %d / %d / %d\n')
2083 % tuple(datasize))
2083 % tuple(datasize))
2084 ui.write(('full revision size (min/max/avg) : %d / %d / %d\n')
2084 ui.write(('full revision size (min/max/avg) : %d / %d / %d\n')
2085 % tuple(fullsize))
2085 % tuple(fullsize))
2086 ui.write(('delta size (min/max/avg) : %d / %d / %d\n')
2086 ui.write(('delta size (min/max/avg) : %d / %d / %d\n')
2087 % tuple(deltasize))
2087 % tuple(deltasize))
2088
2088
2089 if numdeltas > 0:
2089 if numdeltas > 0:
2090 ui.write('\n')
2090 ui.write('\n')
2091 fmt = pcfmtstr(numdeltas)
2091 fmt = pcfmtstr(numdeltas)
2092 fmt2 = pcfmtstr(numdeltas, 4)
2092 fmt2 = pcfmtstr(numdeltas, 4)
2093 ui.write(('deltas against prev : ') + fmt % pcfmt(numprev, numdeltas))
2093 ui.write(('deltas against prev : ') + fmt % pcfmt(numprev, numdeltas))
2094 if numprev > 0:
2094 if numprev > 0:
2095 ui.write((' where prev = p1 : ') + fmt2 % pcfmt(nump1prev,
2095 ui.write((' where prev = p1 : ') + fmt2 % pcfmt(nump1prev,
2096 numprev))
2096 numprev))
2097 ui.write((' where prev = p2 : ') + fmt2 % pcfmt(nump2prev,
2097 ui.write((' where prev = p2 : ') + fmt2 % pcfmt(nump2prev,
2098 numprev))
2098 numprev))
2099 ui.write((' other : ') + fmt2 % pcfmt(numoprev,
2099 ui.write((' other : ') + fmt2 % pcfmt(numoprev,
2100 numprev))
2100 numprev))
2101 if gdelta:
2101 if gdelta:
2102 ui.write(('deltas against p1 : ')
2102 ui.write(('deltas against p1 : ')
2103 + fmt % pcfmt(nump1, numdeltas))
2103 + fmt % pcfmt(nump1, numdeltas))
2104 ui.write(('deltas against p2 : ')
2104 ui.write(('deltas against p2 : ')
2105 + fmt % pcfmt(nump2, numdeltas))
2105 + fmt % pcfmt(nump2, numdeltas))
2106 ui.write(('deltas against other : ') + fmt % pcfmt(numother,
2106 ui.write(('deltas against other : ') + fmt % pcfmt(numother,
2107 numdeltas))
2107 numdeltas))
2108
2108
2109 @command('debugrevspec',
2109 @command('debugrevspec',
2110 [('', 'optimize', None,
2110 [('', 'optimize', None,
2111 _('print parsed tree after optimizing (DEPRECATED)')),
2111 _('print parsed tree after optimizing (DEPRECATED)')),
2112 ('', 'show-revs', True, _('print list of result revisions (default)')),
2112 ('', 'show-revs', True, _('print list of result revisions (default)')),
2113 ('s', 'show-set', None, _('print internal representation of result set')),
2113 ('s', 'show-set', None, _('print internal representation of result set')),
2114 ('p', 'show-stage', [],
2114 ('p', 'show-stage', [],
2115 _('print parsed tree at the given stage'), _('NAME')),
2115 _('print parsed tree at the given stage'), _('NAME')),
2116 ('', 'no-optimized', False, _('evaluate tree without optimization')),
2116 ('', 'no-optimized', False, _('evaluate tree without optimization')),
2117 ('', 'verify-optimized', False, _('verify optimized result')),
2117 ('', 'verify-optimized', False, _('verify optimized result')),
2118 ],
2118 ],
2119 ('REVSPEC'))
2119 ('REVSPEC'))
2120 def debugrevspec(ui, repo, expr, **opts):
2120 def debugrevspec(ui, repo, expr, **opts):
2121 """parse and apply a revision specification
2121 """parse and apply a revision specification
2122
2122
2123 Use -p/--show-stage option to print the parsed tree at the given stages.
2123 Use -p/--show-stage option to print the parsed tree at the given stages.
2124 Use -p all to print tree at every stage.
2124 Use -p all to print tree at every stage.
2125
2125
2126 Use --no-show-revs option with -s or -p to print only the set
2126 Use --no-show-revs option with -s or -p to print only the set
2127 representation or the parsed tree respectively.
2127 representation or the parsed tree respectively.
2128
2128
2129 Use --verify-optimized to compare the optimized result with the unoptimized
2129 Use --verify-optimized to compare the optimized result with the unoptimized
2130 one. Returns 1 if the optimized result differs.
2130 one. Returns 1 if the optimized result differs.
2131 """
2131 """
2132 opts = pycompat.byteskwargs(opts)
2132 opts = pycompat.byteskwargs(opts)
2133 aliases = ui.configitems('revsetalias')
2133 aliases = ui.configitems('revsetalias')
2134 stages = [
2134 stages = [
2135 ('parsed', lambda tree: tree),
2135 ('parsed', lambda tree: tree),
2136 ('expanded', lambda tree: revsetlang.expandaliases(tree, aliases,
2136 ('expanded', lambda tree: revsetlang.expandaliases(tree, aliases,
2137 ui.warn)),
2137 ui.warn)),
2138 ('concatenated', revsetlang.foldconcat),
2138 ('concatenated', revsetlang.foldconcat),
2139 ('analyzed', revsetlang.analyze),
2139 ('analyzed', revsetlang.analyze),
2140 ('optimized', revsetlang.optimize),
2140 ('optimized', revsetlang.optimize),
2141 ]
2141 ]
2142 if opts['no_optimized']:
2142 if opts['no_optimized']:
2143 stages = stages[:-1]
2143 stages = stages[:-1]
2144 if opts['verify_optimized'] and opts['no_optimized']:
2144 if opts['verify_optimized'] and opts['no_optimized']:
2145 raise error.Abort(_('cannot use --verify-optimized with '
2145 raise error.Abort(_('cannot use --verify-optimized with '
2146 '--no-optimized'))
2146 '--no-optimized'))
2147 stagenames = set(n for n, f in stages)
2147 stagenames = set(n for n, f in stages)
2148
2148
2149 showalways = set()
2149 showalways = set()
2150 showchanged = set()
2150 showchanged = set()
2151 if ui.verbose and not opts['show_stage']:
2151 if ui.verbose and not opts['show_stage']:
2152 # show parsed tree by --verbose (deprecated)
2152 # show parsed tree by --verbose (deprecated)
2153 showalways.add('parsed')
2153 showalways.add('parsed')
2154 showchanged.update(['expanded', 'concatenated'])
2154 showchanged.update(['expanded', 'concatenated'])
2155 if opts['optimize']:
2155 if opts['optimize']:
2156 showalways.add('optimized')
2156 showalways.add('optimized')
2157 if opts['show_stage'] and opts['optimize']:
2157 if opts['show_stage'] and opts['optimize']:
2158 raise error.Abort(_('cannot use --optimize with --show-stage'))
2158 raise error.Abort(_('cannot use --optimize with --show-stage'))
2159 if opts['show_stage'] == ['all']:
2159 if opts['show_stage'] == ['all']:
2160 showalways.update(stagenames)
2160 showalways.update(stagenames)
2161 else:
2161 else:
2162 for n in opts['show_stage']:
2162 for n in opts['show_stage']:
2163 if n not in stagenames:
2163 if n not in stagenames:
2164 raise error.Abort(_('invalid stage name: %s') % n)
2164 raise error.Abort(_('invalid stage name: %s') % n)
2165 showalways.update(opts['show_stage'])
2165 showalways.update(opts['show_stage'])
2166
2166
2167 treebystage = {}
2167 treebystage = {}
2168 printedtree = None
2168 printedtree = None
2169 tree = revsetlang.parse(expr, lookup=repo.__contains__)
2169 tree = revsetlang.parse(expr, lookup=repo.__contains__)
2170 for n, f in stages:
2170 for n, f in stages:
2171 treebystage[n] = tree = f(tree)
2171 treebystage[n] = tree = f(tree)
2172 if n in showalways or (n in showchanged and tree != printedtree):
2172 if n in showalways or (n in showchanged and tree != printedtree):
2173 if opts['show_stage'] or n != 'parsed':
2173 if opts['show_stage'] or n != 'parsed':
2174 ui.write(("* %s:\n") % n)
2174 ui.write(("* %s:\n") % n)
2175 ui.write(revsetlang.prettyformat(tree), "\n")
2175 ui.write(revsetlang.prettyformat(tree), "\n")
2176 printedtree = tree
2176 printedtree = tree
2177
2177
2178 if opts['verify_optimized']:
2178 if opts['verify_optimized']:
2179 arevs = revset.makematcher(treebystage['analyzed'])(repo)
2179 arevs = revset.makematcher(treebystage['analyzed'])(repo)
2180 brevs = revset.makematcher(treebystage['optimized'])(repo)
2180 brevs = revset.makematcher(treebystage['optimized'])(repo)
2181 if opts['show_set'] or (opts['show_set'] is None and ui.verbose):
2181 if opts['show_set'] or (opts['show_set'] is None and ui.verbose):
2182 ui.write(("* analyzed set:\n"), smartset.prettyformat(arevs), "\n")
2182 ui.write(("* analyzed set:\n"), smartset.prettyformat(arevs), "\n")
2183 ui.write(("* optimized set:\n"), smartset.prettyformat(brevs), "\n")
2183 ui.write(("* optimized set:\n"), smartset.prettyformat(brevs), "\n")
2184 arevs = list(arevs)
2184 arevs = list(arevs)
2185 brevs = list(brevs)
2185 brevs = list(brevs)
2186 if arevs == brevs:
2186 if arevs == brevs:
2187 return 0
2187 return 0
2188 ui.write(('--- analyzed\n'), label='diff.file_a')
2188 ui.write(('--- analyzed\n'), label='diff.file_a')
2189 ui.write(('+++ optimized\n'), label='diff.file_b')
2189 ui.write(('+++ optimized\n'), label='diff.file_b')
2190 sm = difflib.SequenceMatcher(None, arevs, brevs)
2190 sm = difflib.SequenceMatcher(None, arevs, brevs)
2191 for tag, alo, ahi, blo, bhi in sm.get_opcodes():
2191 for tag, alo, ahi, blo, bhi in sm.get_opcodes():
2192 if tag in ('delete', 'replace'):
2192 if tag in ('delete', 'replace'):
2193 for c in arevs[alo:ahi]:
2193 for c in arevs[alo:ahi]:
2194 ui.write('-%s\n' % c, label='diff.deleted')
2194 ui.write('-%s\n' % c, label='diff.deleted')
2195 if tag in ('insert', 'replace'):
2195 if tag in ('insert', 'replace'):
2196 for c in brevs[blo:bhi]:
2196 for c in brevs[blo:bhi]:
2197 ui.write('+%s\n' % c, label='diff.inserted')
2197 ui.write('+%s\n' % c, label='diff.inserted')
2198 if tag == 'equal':
2198 if tag == 'equal':
2199 for c in arevs[alo:ahi]:
2199 for c in arevs[alo:ahi]:
2200 ui.write(' %s\n' % c)
2200 ui.write(' %s\n' % c)
2201 return 1
2201 return 1
2202
2202
2203 func = revset.makematcher(tree)
2203 func = revset.makematcher(tree)
2204 revs = func(repo)
2204 revs = func(repo)
2205 if opts['show_set'] or (opts['show_set'] is None and ui.verbose):
2205 if opts['show_set'] or (opts['show_set'] is None and ui.verbose):
2206 ui.write(("* set:\n"), smartset.prettyformat(revs), "\n")
2206 ui.write(("* set:\n"), smartset.prettyformat(revs), "\n")
2207 if not opts['show_revs']:
2207 if not opts['show_revs']:
2208 return
2208 return
2209 for c in revs:
2209 for c in revs:
2210 ui.write("%s\n" % c)
2210 ui.write("%d\n" % c)
2211
2211
2212 @command('debugsetparents', [], _('REV1 [REV2]'))
2212 @command('debugsetparents', [], _('REV1 [REV2]'))
2213 def debugsetparents(ui, repo, rev1, rev2=None):
2213 def debugsetparents(ui, repo, rev1, rev2=None):
2214 """manually set the parents of the current working directory
2214 """manually set the parents of the current working directory
2215
2215
2216 This is useful for writing repository conversion tools, but should
2216 This is useful for writing repository conversion tools, but should
2217 be used with care. For example, neither the working directory nor the
2217 be used with care. For example, neither the working directory nor the
2218 dirstate is updated, so file status may be incorrect after running this
2218 dirstate is updated, so file status may be incorrect after running this
2219 command.
2219 command.
2220
2220
2221 Returns 0 on success.
2221 Returns 0 on success.
2222 """
2222 """
2223
2223
2224 r1 = scmutil.revsingle(repo, rev1).node()
2224 r1 = scmutil.revsingle(repo, rev1).node()
2225 r2 = scmutil.revsingle(repo, rev2, 'null').node()
2225 r2 = scmutil.revsingle(repo, rev2, 'null').node()
2226
2226
2227 with repo.wlock():
2227 with repo.wlock():
2228 repo.setparents(r1, r2)
2228 repo.setparents(r1, r2)
2229
2229
2230 @command('debugssl', [], '[SOURCE]', optionalrepo=True)
2230 @command('debugssl', [], '[SOURCE]', optionalrepo=True)
2231 def debugssl(ui, repo, source=None, **opts):
2231 def debugssl(ui, repo, source=None, **opts):
2232 '''test a secure connection to a server
2232 '''test a secure connection to a server
2233
2233
2234 This builds the certificate chain for the server on Windows, installing the
2234 This builds the certificate chain for the server on Windows, installing the
2235 missing intermediates and trusted root via Windows Update if necessary. It
2235 missing intermediates and trusted root via Windows Update if necessary. It
2236 does nothing on other platforms.
2236 does nothing on other platforms.
2237
2237
2238 If SOURCE is omitted, the 'default' path will be used. If a URL is given,
2238 If SOURCE is omitted, the 'default' path will be used. If a URL is given,
2239 that server is used. See :hg:`help urls` for more information.
2239 that server is used. See :hg:`help urls` for more information.
2240
2240
2241 If the update succeeds, retry the original operation. Otherwise, the cause
2241 If the update succeeds, retry the original operation. Otherwise, the cause
2242 of the SSL error is likely another issue.
2242 of the SSL error is likely another issue.
2243 '''
2243 '''
2244 if not pycompat.iswindows:
2244 if not pycompat.iswindows:
2245 raise error.Abort(_('certificate chain building is only possible on '
2245 raise error.Abort(_('certificate chain building is only possible on '
2246 'Windows'))
2246 'Windows'))
2247
2247
2248 if not source:
2248 if not source:
2249 if not repo:
2249 if not repo:
2250 raise error.Abort(_("there is no Mercurial repository here, and no "
2250 raise error.Abort(_("there is no Mercurial repository here, and no "
2251 "server specified"))
2251 "server specified"))
2252 source = "default"
2252 source = "default"
2253
2253
2254 source, branches = hg.parseurl(ui.expandpath(source))
2254 source, branches = hg.parseurl(ui.expandpath(source))
2255 url = util.url(source)
2255 url = util.url(source)
2256 addr = None
2256 addr = None
2257
2257
2258 defaultport = {'https': 443, 'ssh': 22}
2258 defaultport = {'https': 443, 'ssh': 22}
2259 if url.scheme in defaultport:
2259 if url.scheme in defaultport:
2260 try:
2260 try:
2261 addr = (url.host, int(url.port or defaultport[url.scheme]))
2261 addr = (url.host, int(url.port or defaultport[url.scheme]))
2262 except ValueError:
2262 except ValueError:
2263 raise error.Abort(_("malformed port number in URL"))
2263 raise error.Abort(_("malformed port number in URL"))
2264 else:
2264 else:
2265 raise error.Abort(_("only https and ssh connections are supported"))
2265 raise error.Abort(_("only https and ssh connections are supported"))
2266
2266
2267 from . import win32
2267 from . import win32
2268
2268
2269 s = ssl.wrap_socket(socket.socket(), ssl_version=ssl.PROTOCOL_TLS,
2269 s = ssl.wrap_socket(socket.socket(), ssl_version=ssl.PROTOCOL_TLS,
2270 cert_reqs=ssl.CERT_NONE, ca_certs=None)
2270 cert_reqs=ssl.CERT_NONE, ca_certs=None)
2271
2271
2272 try:
2272 try:
2273 s.connect(addr)
2273 s.connect(addr)
2274 cert = s.getpeercert(True)
2274 cert = s.getpeercert(True)
2275
2275
2276 ui.status(_('checking the certificate chain for %s\n') % url.host)
2276 ui.status(_('checking the certificate chain for %s\n') % url.host)
2277
2277
2278 complete = win32.checkcertificatechain(cert, build=False)
2278 complete = win32.checkcertificatechain(cert, build=False)
2279
2279
2280 if not complete:
2280 if not complete:
2281 ui.status(_('certificate chain is incomplete, updating... '))
2281 ui.status(_('certificate chain is incomplete, updating... '))
2282
2282
2283 if not win32.checkcertificatechain(cert):
2283 if not win32.checkcertificatechain(cert):
2284 ui.status(_('failed.\n'))
2284 ui.status(_('failed.\n'))
2285 else:
2285 else:
2286 ui.status(_('done.\n'))
2286 ui.status(_('done.\n'))
2287 else:
2287 else:
2288 ui.status(_('full certificate chain is available\n'))
2288 ui.status(_('full certificate chain is available\n'))
2289 finally:
2289 finally:
2290 s.close()
2290 s.close()
2291
2291
2292 @command('debugsub',
2292 @command('debugsub',
2293 [('r', 'rev', '',
2293 [('r', 'rev', '',
2294 _('revision to check'), _('REV'))],
2294 _('revision to check'), _('REV'))],
2295 _('[-r REV] [REV]'))
2295 _('[-r REV] [REV]'))
2296 def debugsub(ui, repo, rev=None):
2296 def debugsub(ui, repo, rev=None):
2297 ctx = scmutil.revsingle(repo, rev, None)
2297 ctx = scmutil.revsingle(repo, rev, None)
2298 for k, v in sorted(ctx.substate.items()):
2298 for k, v in sorted(ctx.substate.items()):
2299 ui.write(('path %s\n') % k)
2299 ui.write(('path %s\n') % k)
2300 ui.write((' source %s\n') % v[0])
2300 ui.write((' source %s\n') % v[0])
2301 ui.write((' revision %s\n') % v[1])
2301 ui.write((' revision %s\n') % v[1])
2302
2302
2303 @command('debugsuccessorssets',
2303 @command('debugsuccessorssets',
2304 [('', 'closest', False, _('return closest successors sets only'))],
2304 [('', 'closest', False, _('return closest successors sets only'))],
2305 _('[REV]'))
2305 _('[REV]'))
2306 def debugsuccessorssets(ui, repo, *revs, **opts):
2306 def debugsuccessorssets(ui, repo, *revs, **opts):
2307 """show set of successors for revision
2307 """show set of successors for revision
2308
2308
2309 A successors set of changeset A is a consistent group of revisions that
2309 A successors set of changeset A is a consistent group of revisions that
2310 succeed A. It contains non-obsolete changesets only unless closests
2310 succeed A. It contains non-obsolete changesets only unless closests
2311 successors set is set.
2311 successors set is set.
2312
2312
2313 In most cases a changeset A has a single successors set containing a single
2313 In most cases a changeset A has a single successors set containing a single
2314 successor (changeset A replaced by A').
2314 successor (changeset A replaced by A').
2315
2315
2316 A changeset that is made obsolete with no successors are called "pruned".
2316 A changeset that is made obsolete with no successors are called "pruned".
2317 Such changesets have no successors sets at all.
2317 Such changesets have no successors sets at all.
2318
2318
2319 A changeset that has been "split" will have a successors set containing
2319 A changeset that has been "split" will have a successors set containing
2320 more than one successor.
2320 more than one successor.
2321
2321
2322 A changeset that has been rewritten in multiple different ways is called
2322 A changeset that has been rewritten in multiple different ways is called
2323 "divergent". Such changesets have multiple successor sets (each of which
2323 "divergent". Such changesets have multiple successor sets (each of which
2324 may also be split, i.e. have multiple successors).
2324 may also be split, i.e. have multiple successors).
2325
2325
2326 Results are displayed as follows::
2326 Results are displayed as follows::
2327
2327
2328 <rev1>
2328 <rev1>
2329 <successors-1A>
2329 <successors-1A>
2330 <rev2>
2330 <rev2>
2331 <successors-2A>
2331 <successors-2A>
2332 <successors-2B1> <successors-2B2> <successors-2B3>
2332 <successors-2B1> <successors-2B2> <successors-2B3>
2333
2333
2334 Here rev2 has two possible (i.e. divergent) successors sets. The first
2334 Here rev2 has two possible (i.e. divergent) successors sets. The first
2335 holds one element, whereas the second holds three (i.e. the changeset has
2335 holds one element, whereas the second holds three (i.e. the changeset has
2336 been split).
2336 been split).
2337 """
2337 """
2338 # passed to successorssets caching computation from one call to another
2338 # passed to successorssets caching computation from one call to another
2339 cache = {}
2339 cache = {}
2340 ctx2str = str
2340 ctx2str = str
2341 node2str = short
2341 node2str = short
2342 for rev in scmutil.revrange(repo, revs):
2342 for rev in scmutil.revrange(repo, revs):
2343 ctx = repo[rev]
2343 ctx = repo[rev]
2344 ui.write('%s\n'% ctx2str(ctx))
2344 ui.write('%s\n'% ctx2str(ctx))
2345 for succsset in obsutil.successorssets(repo, ctx.node(),
2345 for succsset in obsutil.successorssets(repo, ctx.node(),
2346 closest=opts[r'closest'],
2346 closest=opts[r'closest'],
2347 cache=cache):
2347 cache=cache):
2348 if succsset:
2348 if succsset:
2349 ui.write(' ')
2349 ui.write(' ')
2350 ui.write(node2str(succsset[0]))
2350 ui.write(node2str(succsset[0]))
2351 for node in succsset[1:]:
2351 for node in succsset[1:]:
2352 ui.write(' ')
2352 ui.write(' ')
2353 ui.write(node2str(node))
2353 ui.write(node2str(node))
2354 ui.write('\n')
2354 ui.write('\n')
2355
2355
2356 @command('debugtemplate',
2356 @command('debugtemplate',
2357 [('r', 'rev', [], _('apply template on changesets'), _('REV')),
2357 [('r', 'rev', [], _('apply template on changesets'), _('REV')),
2358 ('D', 'define', [], _('define template keyword'), _('KEY=VALUE'))],
2358 ('D', 'define', [], _('define template keyword'), _('KEY=VALUE'))],
2359 _('[-r REV]... [-D KEY=VALUE]... TEMPLATE'),
2359 _('[-r REV]... [-D KEY=VALUE]... TEMPLATE'),
2360 optionalrepo=True)
2360 optionalrepo=True)
2361 def debugtemplate(ui, repo, tmpl, **opts):
2361 def debugtemplate(ui, repo, tmpl, **opts):
2362 """parse and apply a template
2362 """parse and apply a template
2363
2363
2364 If -r/--rev is given, the template is processed as a log template and
2364 If -r/--rev is given, the template is processed as a log template and
2365 applied to the given changesets. Otherwise, it is processed as a generic
2365 applied to the given changesets. Otherwise, it is processed as a generic
2366 template.
2366 template.
2367
2367
2368 Use --verbose to print the parsed tree.
2368 Use --verbose to print the parsed tree.
2369 """
2369 """
2370 revs = None
2370 revs = None
2371 if opts[r'rev']:
2371 if opts[r'rev']:
2372 if repo is None:
2372 if repo is None:
2373 raise error.RepoError(_('there is no Mercurial repository here '
2373 raise error.RepoError(_('there is no Mercurial repository here '
2374 '(.hg not found)'))
2374 '(.hg not found)'))
2375 revs = scmutil.revrange(repo, opts[r'rev'])
2375 revs = scmutil.revrange(repo, opts[r'rev'])
2376
2376
2377 props = {}
2377 props = {}
2378 for d in opts[r'define']:
2378 for d in opts[r'define']:
2379 try:
2379 try:
2380 k, v = (e.strip() for e in d.split('=', 1))
2380 k, v = (e.strip() for e in d.split('=', 1))
2381 if not k or k == 'ui':
2381 if not k or k == 'ui':
2382 raise ValueError
2382 raise ValueError
2383 props[k] = v
2383 props[k] = v
2384 except ValueError:
2384 except ValueError:
2385 raise error.Abort(_('malformed keyword definition: %s') % d)
2385 raise error.Abort(_('malformed keyword definition: %s') % d)
2386
2386
2387 if ui.verbose:
2387 if ui.verbose:
2388 aliases = ui.configitems('templatealias')
2388 aliases = ui.configitems('templatealias')
2389 tree = templater.parse(tmpl)
2389 tree = templater.parse(tmpl)
2390 ui.note(templater.prettyformat(tree), '\n')
2390 ui.note(templater.prettyformat(tree), '\n')
2391 newtree = templater.expandaliases(tree, aliases)
2391 newtree = templater.expandaliases(tree, aliases)
2392 if newtree != tree:
2392 if newtree != tree:
2393 ui.note(("* expanded:\n"), templater.prettyformat(newtree), '\n')
2393 ui.note(("* expanded:\n"), templater.prettyformat(newtree), '\n')
2394
2394
2395 if revs is None:
2395 if revs is None:
2396 tres = formatter.templateresources(ui, repo)
2396 tres = formatter.templateresources(ui, repo)
2397 t = formatter.maketemplater(ui, tmpl, resources=tres)
2397 t = formatter.maketemplater(ui, tmpl, resources=tres)
2398 ui.write(t.render(props))
2398 ui.write(t.render(props))
2399 else:
2399 else:
2400 displayer = logcmdutil.maketemplater(ui, repo, tmpl)
2400 displayer = logcmdutil.maketemplater(ui, repo, tmpl)
2401 for r in revs:
2401 for r in revs:
2402 displayer.show(repo[r], **pycompat.strkwargs(props))
2402 displayer.show(repo[r], **pycompat.strkwargs(props))
2403 displayer.close()
2403 displayer.close()
2404
2404
2405 @command('debugupdatecaches', [])
2405 @command('debugupdatecaches', [])
2406 def debugupdatecaches(ui, repo, *pats, **opts):
2406 def debugupdatecaches(ui, repo, *pats, **opts):
2407 """warm all known caches in the repository"""
2407 """warm all known caches in the repository"""
2408 with repo.wlock(), repo.lock():
2408 with repo.wlock(), repo.lock():
2409 repo.updatecaches()
2409 repo.updatecaches()
2410
2410
2411 @command('debugupgraderepo', [
2411 @command('debugupgraderepo', [
2412 ('o', 'optimize', [], _('extra optimization to perform'), _('NAME')),
2412 ('o', 'optimize', [], _('extra optimization to perform'), _('NAME')),
2413 ('', 'run', False, _('performs an upgrade')),
2413 ('', 'run', False, _('performs an upgrade')),
2414 ])
2414 ])
2415 def debugupgraderepo(ui, repo, run=False, optimize=None):
2415 def debugupgraderepo(ui, repo, run=False, optimize=None):
2416 """upgrade a repository to use different features
2416 """upgrade a repository to use different features
2417
2417
2418 If no arguments are specified, the repository is evaluated for upgrade
2418 If no arguments are specified, the repository is evaluated for upgrade
2419 and a list of problems and potential optimizations is printed.
2419 and a list of problems and potential optimizations is printed.
2420
2420
2421 With ``--run``, a repository upgrade is performed. Behavior of the upgrade
2421 With ``--run``, a repository upgrade is performed. Behavior of the upgrade
2422 can be influenced via additional arguments. More details will be provided
2422 can be influenced via additional arguments. More details will be provided
2423 by the command output when run without ``--run``.
2423 by the command output when run without ``--run``.
2424
2424
2425 During the upgrade, the repository will be locked and no writes will be
2425 During the upgrade, the repository will be locked and no writes will be
2426 allowed.
2426 allowed.
2427
2427
2428 At the end of the upgrade, the repository may not be readable while new
2428 At the end of the upgrade, the repository may not be readable while new
2429 repository data is swapped in. This window will be as long as it takes to
2429 repository data is swapped in. This window will be as long as it takes to
2430 rename some directories inside the ``.hg`` directory. On most machines, this
2430 rename some directories inside the ``.hg`` directory. On most machines, this
2431 should complete almost instantaneously and the chances of a consumer being
2431 should complete almost instantaneously and the chances of a consumer being
2432 unable to access the repository should be low.
2432 unable to access the repository should be low.
2433 """
2433 """
2434 return upgrade.upgraderepo(ui, repo, run=run, optimize=optimize)
2434 return upgrade.upgraderepo(ui, repo, run=run, optimize=optimize)
2435
2435
2436 @command('debugwalk', cmdutil.walkopts, _('[OPTION]... [FILE]...'),
2436 @command('debugwalk', cmdutil.walkopts, _('[OPTION]... [FILE]...'),
2437 inferrepo=True)
2437 inferrepo=True)
2438 def debugwalk(ui, repo, *pats, **opts):
2438 def debugwalk(ui, repo, *pats, **opts):
2439 """show how files match on given patterns"""
2439 """show how files match on given patterns"""
2440 opts = pycompat.byteskwargs(opts)
2440 opts = pycompat.byteskwargs(opts)
2441 m = scmutil.match(repo[None], pats, opts)
2441 m = scmutil.match(repo[None], pats, opts)
2442 ui.write(('matcher: %r\n' % m))
2442 ui.write(('matcher: %r\n' % m))
2443 items = list(repo[None].walk(m))
2443 items = list(repo[None].walk(m))
2444 if not items:
2444 if not items:
2445 return
2445 return
2446 f = lambda fn: fn
2446 f = lambda fn: fn
2447 if ui.configbool('ui', 'slash') and pycompat.ossep != '/':
2447 if ui.configbool('ui', 'slash') and pycompat.ossep != '/':
2448 f = lambda fn: util.normpath(fn)
2448 f = lambda fn: util.normpath(fn)
2449 fmt = 'f %%-%ds %%-%ds %%s' % (
2449 fmt = 'f %%-%ds %%-%ds %%s' % (
2450 max([len(abs) for abs in items]),
2450 max([len(abs) for abs in items]),
2451 max([len(m.rel(abs)) for abs in items]))
2451 max([len(m.rel(abs)) for abs in items]))
2452 for abs in items:
2452 for abs in items:
2453 line = fmt % (abs, f(m.rel(abs)), m.exact(abs) and 'exact' or '')
2453 line = fmt % (abs, f(m.rel(abs)), m.exact(abs) and 'exact' or '')
2454 ui.write("%s\n" % line.rstrip())
2454 ui.write("%s\n" % line.rstrip())
2455
2455
2456 @command('debugwireargs',
2456 @command('debugwireargs',
2457 [('', 'three', '', 'three'),
2457 [('', 'three', '', 'three'),
2458 ('', 'four', '', 'four'),
2458 ('', 'four', '', 'four'),
2459 ('', 'five', '', 'five'),
2459 ('', 'five', '', 'five'),
2460 ] + cmdutil.remoteopts,
2460 ] + cmdutil.remoteopts,
2461 _('REPO [OPTIONS]... [ONE [TWO]]'),
2461 _('REPO [OPTIONS]... [ONE [TWO]]'),
2462 norepo=True)
2462 norepo=True)
2463 def debugwireargs(ui, repopath, *vals, **opts):
2463 def debugwireargs(ui, repopath, *vals, **opts):
2464 opts = pycompat.byteskwargs(opts)
2464 opts = pycompat.byteskwargs(opts)
2465 repo = hg.peer(ui, opts, repopath)
2465 repo = hg.peer(ui, opts, repopath)
2466 for opt in cmdutil.remoteopts:
2466 for opt in cmdutil.remoteopts:
2467 del opts[opt[1]]
2467 del opts[opt[1]]
2468 args = {}
2468 args = {}
2469 for k, v in opts.iteritems():
2469 for k, v in opts.iteritems():
2470 if v:
2470 if v:
2471 args[k] = v
2471 args[k] = v
2472 args = pycompat.strkwargs(args)
2472 args = pycompat.strkwargs(args)
2473 # run twice to check that we don't mess up the stream for the next command
2473 # run twice to check that we don't mess up the stream for the next command
2474 res1 = repo.debugwireargs(*vals, **args)
2474 res1 = repo.debugwireargs(*vals, **args)
2475 res2 = repo.debugwireargs(*vals, **args)
2475 res2 = repo.debugwireargs(*vals, **args)
2476 ui.write("%s\n" % res1)
2476 ui.write("%s\n" % res1)
2477 if res1 != res2:
2477 if res1 != res2:
2478 ui.warn("%s\n" % res2)
2478 ui.warn("%s\n" % res2)
General Comments 0
You need to be logged in to leave comments. Login now