Show More
@@ -1,982 +1,973 b'' | |||||
1 | # dispatch.py - command dispatching for mercurial |
|
1 | # dispatch.py - command dispatching for mercurial | |
2 | # |
|
2 | # | |
3 | # Copyright 2005-2007 Matt Mackall <mpm@selenic.com> |
|
3 | # Copyright 2005-2007 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, print_function |
|
8 | from __future__ import absolute_import, print_function | |
9 |
|
9 | |||
10 | import atexit |
|
10 | import atexit | |
11 | import difflib |
|
11 | import difflib | |
12 | import errno |
|
12 | import errno | |
13 | import os |
|
13 | import os | |
14 | import pdb |
|
14 | import pdb | |
15 | import re |
|
15 | import re | |
16 | import shlex |
|
16 | import shlex | |
17 | import signal |
|
17 | import signal | |
18 | import socket |
|
18 | import socket | |
19 | import sys |
|
19 | import sys | |
20 | import time |
|
20 | import time | |
21 | import traceback |
|
21 | import traceback | |
22 |
|
22 | |||
23 |
|
23 | |||
24 | from .i18n import _ |
|
24 | from .i18n import _ | |
25 |
|
25 | |||
26 | from . import ( |
|
26 | from . import ( | |
27 | cmdutil, |
|
27 | cmdutil, | |
28 | commands, |
|
28 | commands, | |
29 | demandimport, |
|
29 | demandimport, | |
30 | encoding, |
|
30 | encoding, | |
31 | error, |
|
31 | error, | |
32 | extensions, |
|
32 | extensions, | |
33 | fancyopts, |
|
33 | fancyopts, | |
34 | fileset, |
|
34 | fileset, | |
35 | hg, |
|
35 | hg, | |
36 | hook, |
|
36 | hook, | |
37 | profiling, |
|
37 | profiling, | |
38 | revset, |
|
38 | revset, | |
39 | templatefilters, |
|
39 | templatefilters, | |
40 | templatekw, |
|
40 | templatekw, | |
41 | templater, |
|
41 | templater, | |
42 | ui as uimod, |
|
42 | ui as uimod, | |
43 | util, |
|
43 | util, | |
44 | ) |
|
44 | ) | |
45 |
|
45 | |||
46 | class request(object): |
|
46 | class request(object): | |
47 | def __init__(self, args, ui=None, repo=None, fin=None, fout=None, |
|
47 | def __init__(self, args, ui=None, repo=None, fin=None, fout=None, | |
48 | ferr=None): |
|
48 | ferr=None): | |
49 | self.args = args |
|
49 | self.args = args | |
50 | self.ui = ui |
|
50 | self.ui = ui | |
51 | self.repo = repo |
|
51 | self.repo = repo | |
52 |
|
52 | |||
53 | # input/output/error streams |
|
53 | # input/output/error streams | |
54 | self.fin = fin |
|
54 | self.fin = fin | |
55 | self.fout = fout |
|
55 | self.fout = fout | |
56 | self.ferr = ferr |
|
56 | self.ferr = ferr | |
57 |
|
57 | |||
58 | def run(): |
|
58 | def run(): | |
59 | "run the command in sys.argv" |
|
59 | "run the command in sys.argv" | |
60 | sys.exit((dispatch(request(sys.argv[1:])) or 0) & 255) |
|
60 | sys.exit((dispatch(request(sys.argv[1:])) or 0) & 255) | |
61 |
|
61 | |||
62 | def _getsimilar(symbols, value): |
|
62 | def _getsimilar(symbols, value): | |
63 | sim = lambda x: difflib.SequenceMatcher(None, value, x).ratio() |
|
63 | sim = lambda x: difflib.SequenceMatcher(None, value, x).ratio() | |
64 | # The cutoff for similarity here is pretty arbitrary. It should |
|
64 | # The cutoff for similarity here is pretty arbitrary. It should | |
65 | # probably be investigated and tweaked. |
|
65 | # probably be investigated and tweaked. | |
66 | return [s for s in symbols if sim(s) > 0.6] |
|
66 | return [s for s in symbols if sim(s) > 0.6] | |
67 |
|
67 | |||
68 | def _reportsimilar(write, similar): |
|
68 | def _reportsimilar(write, similar): | |
69 | if len(similar) == 1: |
|
69 | if len(similar) == 1: | |
70 | write(_("(did you mean %s?)\n") % similar[0]) |
|
70 | write(_("(did you mean %s?)\n") % similar[0]) | |
71 | elif similar: |
|
71 | elif similar: | |
72 | ss = ", ".join(sorted(similar)) |
|
72 | ss = ", ".join(sorted(similar)) | |
73 | write(_("(did you mean one of %s?)\n") % ss) |
|
73 | write(_("(did you mean one of %s?)\n") % ss) | |
74 |
|
74 | |||
75 | def _formatparse(write, inst): |
|
75 | def _formatparse(write, inst): | |
76 | similar = [] |
|
76 | similar = [] | |
77 | if isinstance(inst, error.UnknownIdentifier): |
|
77 | if isinstance(inst, error.UnknownIdentifier): | |
78 | # make sure to check fileset first, as revset can invoke fileset |
|
78 | # make sure to check fileset first, as revset can invoke fileset | |
79 | similar = _getsimilar(inst.symbols, inst.function) |
|
79 | similar = _getsimilar(inst.symbols, inst.function) | |
80 | if len(inst.args) > 1: |
|
80 | if len(inst.args) > 1: | |
81 | write(_("hg: parse error at %s: %s\n") % |
|
81 | write(_("hg: parse error at %s: %s\n") % | |
82 | (inst.args[1], inst.args[0])) |
|
82 | (inst.args[1], inst.args[0])) | |
83 | if (inst.args[0][0] == ' '): |
|
83 | if (inst.args[0][0] == ' '): | |
84 | write(_("unexpected leading whitespace\n")) |
|
84 | write(_("unexpected leading whitespace\n")) | |
85 | else: |
|
85 | else: | |
86 | write(_("hg: parse error: %s\n") % inst.args[0]) |
|
86 | write(_("hg: parse error: %s\n") % inst.args[0]) | |
87 | _reportsimilar(write, similar) |
|
87 | _reportsimilar(write, similar) | |
88 | if inst.hint: |
|
88 | if inst.hint: | |
89 | write(_("(%s)\n") % inst.hint) |
|
89 | write(_("(%s)\n") % inst.hint) | |
90 |
|
90 | |||
91 | def dispatch(req): |
|
91 | def dispatch(req): | |
92 | "run the command specified in req.args" |
|
92 | "run the command specified in req.args" | |
93 | if req.ferr: |
|
93 | if req.ferr: | |
94 | ferr = req.ferr |
|
94 | ferr = req.ferr | |
95 | elif req.ui: |
|
95 | elif req.ui: | |
96 | ferr = req.ui.ferr |
|
96 | ferr = req.ui.ferr | |
97 | else: |
|
97 | else: | |
98 | ferr = sys.stderr |
|
98 | ferr = sys.stderr | |
99 |
|
99 | |||
100 | try: |
|
100 | try: | |
101 | if not req.ui: |
|
101 | if not req.ui: | |
102 | req.ui = uimod.ui() |
|
102 | req.ui = uimod.ui() | |
103 | if '--traceback' in req.args: |
|
103 | if '--traceback' in req.args: | |
104 | req.ui.setconfig('ui', 'traceback', 'on', '--traceback') |
|
104 | req.ui.setconfig('ui', 'traceback', 'on', '--traceback') | |
105 |
|
105 | |||
106 | # set ui streams from the request |
|
106 | # set ui streams from the request | |
107 | if req.fin: |
|
107 | if req.fin: | |
108 | req.ui.fin = req.fin |
|
108 | req.ui.fin = req.fin | |
109 | if req.fout: |
|
109 | if req.fout: | |
110 | req.ui.fout = req.fout |
|
110 | req.ui.fout = req.fout | |
111 | if req.ferr: |
|
111 | if req.ferr: | |
112 | req.ui.ferr = req.ferr |
|
112 | req.ui.ferr = req.ferr | |
113 | except error.Abort as inst: |
|
113 | except error.Abort as inst: | |
114 | ferr.write(_("abort: %s\n") % inst) |
|
114 | ferr.write(_("abort: %s\n") % inst) | |
115 | if inst.hint: |
|
115 | if inst.hint: | |
116 | ferr.write(_("(%s)\n") % inst.hint) |
|
116 | ferr.write(_("(%s)\n") % inst.hint) | |
117 | return -1 |
|
117 | return -1 | |
118 | except error.ParseError as inst: |
|
118 | except error.ParseError as inst: | |
119 | _formatparse(ferr.write, inst) |
|
119 | _formatparse(ferr.write, inst) | |
120 | return -1 |
|
120 | return -1 | |
121 |
|
121 | |||
122 | msg = ' '.join(' ' in a and repr(a) or a for a in req.args) |
|
122 | msg = ' '.join(' ' in a and repr(a) or a for a in req.args) | |
123 | starttime = time.time() |
|
123 | starttime = time.time() | |
124 | ret = None |
|
124 | ret = None | |
125 | try: |
|
125 | try: | |
126 | ret = _runcatch(req) |
|
126 | ret = _runcatch(req) | |
127 | except KeyboardInterrupt: |
|
127 | except KeyboardInterrupt: | |
128 | try: |
|
128 | try: | |
129 | req.ui.warn(_("interrupted!\n")) |
|
129 | req.ui.warn(_("interrupted!\n")) | |
130 | except IOError as inst: |
|
130 | except IOError as inst: | |
131 | if inst.errno != errno.EPIPE: |
|
131 | if inst.errno != errno.EPIPE: | |
132 | raise |
|
132 | raise | |
133 | ret = -1 |
|
133 | ret = -1 | |
134 | finally: |
|
134 | finally: | |
135 | duration = time.time() - starttime |
|
135 | duration = time.time() - starttime | |
136 | req.ui.flush() |
|
136 | req.ui.flush() | |
137 | req.ui.log("commandfinish", "%s exited %s after %0.2f seconds\n", |
|
137 | req.ui.log("commandfinish", "%s exited %s after %0.2f seconds\n", | |
138 | msg, ret or 0, duration) |
|
138 | msg, ret or 0, duration) | |
139 | return ret |
|
139 | return ret | |
140 |
|
140 | |||
141 | def _runcatch(req): |
|
141 | def _runcatch(req): | |
142 | def catchterm(*args): |
|
142 | def catchterm(*args): | |
143 | raise error.SignalInterrupt |
|
143 | raise error.SignalInterrupt | |
144 |
|
144 | |||
145 | ui = req.ui |
|
145 | ui = req.ui | |
146 | try: |
|
146 | try: | |
147 | for name in 'SIGBREAK', 'SIGHUP', 'SIGTERM': |
|
147 | for name in 'SIGBREAK', 'SIGHUP', 'SIGTERM': | |
148 | num = getattr(signal, name, None) |
|
148 | num = getattr(signal, name, None) | |
149 | if num: |
|
149 | if num: | |
150 | signal.signal(num, catchterm) |
|
150 | signal.signal(num, catchterm) | |
151 | except ValueError: |
|
151 | except ValueError: | |
152 | pass # happens if called in a thread |
|
152 | pass # happens if called in a thread | |
153 |
|
153 | |||
154 | def _runcatchfunc(): |
|
154 | def _runcatchfunc(): | |
155 | try: |
|
155 | try: | |
156 | debugger = 'pdb' |
|
156 | debugger = 'pdb' | |
157 | debugtrace = { |
|
157 | debugtrace = { | |
158 | 'pdb' : pdb.set_trace |
|
158 | 'pdb' : pdb.set_trace | |
159 | } |
|
159 | } | |
160 | debugmortem = { |
|
160 | debugmortem = { | |
161 | 'pdb' : pdb.post_mortem |
|
161 | 'pdb' : pdb.post_mortem | |
162 | } |
|
162 | } | |
163 |
|
163 | |||
164 | # read --config before doing anything else |
|
164 | # read --config before doing anything else | |
165 | # (e.g. to change trust settings for reading .hg/hgrc) |
|
165 | # (e.g. to change trust settings for reading .hg/hgrc) | |
166 | cfgs = _parseconfig(req.ui, _earlygetopt(['--config'], req.args)) |
|
166 | cfgs = _parseconfig(req.ui, _earlygetopt(['--config'], req.args)) | |
167 |
|
167 | |||
168 | if req.repo: |
|
168 | if req.repo: | |
169 | # copy configs that were passed on the cmdline (--config) to |
|
169 | # copy configs that were passed on the cmdline (--config) to | |
170 | # the repo ui |
|
170 | # the repo ui | |
171 | for sec, name, val in cfgs: |
|
171 | for sec, name, val in cfgs: | |
172 | req.repo.ui.setconfig(sec, name, val, source='--config') |
|
172 | req.repo.ui.setconfig(sec, name, val, source='--config') | |
173 |
|
173 | |||
174 | # developer config: ui.debugger |
|
174 | # developer config: ui.debugger | |
175 | debugger = ui.config("ui", "debugger") |
|
175 | debugger = ui.config("ui", "debugger") | |
176 | debugmod = pdb |
|
176 | debugmod = pdb | |
177 | if not debugger or ui.plain(): |
|
177 | if not debugger or ui.plain(): | |
178 | # if we are in HGPLAIN mode, then disable custom debugging |
|
178 | # if we are in HGPLAIN mode, then disable custom debugging | |
179 | debugger = 'pdb' |
|
179 | debugger = 'pdb' | |
180 | elif '--debugger' in req.args: |
|
180 | elif '--debugger' in req.args: | |
181 | # This import can be slow for fancy debuggers, so only |
|
181 | # This import can be slow for fancy debuggers, so only | |
182 | # do it when absolutely necessary, i.e. when actual |
|
182 | # do it when absolutely necessary, i.e. when actual | |
183 | # debugging has been requested |
|
183 | # debugging has been requested | |
184 | with demandimport.deactivated(): |
|
184 | with demandimport.deactivated(): | |
185 | try: |
|
185 | try: | |
186 | debugmod = __import__(debugger) |
|
186 | debugmod = __import__(debugger) | |
187 | except ImportError: |
|
187 | except ImportError: | |
188 | pass # Leave debugmod = pdb |
|
188 | pass # Leave debugmod = pdb | |
189 |
|
189 | |||
190 | debugtrace[debugger] = debugmod.set_trace |
|
190 | debugtrace[debugger] = debugmod.set_trace | |
191 | debugmortem[debugger] = debugmod.post_mortem |
|
191 | debugmortem[debugger] = debugmod.post_mortem | |
192 |
|
192 | |||
193 | # enter the debugger before command execution |
|
193 | # enter the debugger before command execution | |
194 | if '--debugger' in req.args: |
|
194 | if '--debugger' in req.args: | |
195 | ui.warn(_("entering debugger - " |
|
195 | ui.warn(_("entering debugger - " | |
196 | "type c to continue starting hg or h for help\n")) |
|
196 | "type c to continue starting hg or h for help\n")) | |
197 |
|
197 | |||
198 | if (debugger != 'pdb' and |
|
198 | if (debugger != 'pdb' and | |
199 | debugtrace[debugger] == debugtrace['pdb']): |
|
199 | debugtrace[debugger] == debugtrace['pdb']): | |
200 | ui.warn(_("%s debugger specified " |
|
200 | ui.warn(_("%s debugger specified " | |
201 | "but its module was not found\n") % debugger) |
|
201 | "but its module was not found\n") % debugger) | |
202 | with demandimport.deactivated(): |
|
202 | with demandimport.deactivated(): | |
203 | debugtrace[debugger]() |
|
203 | debugtrace[debugger]() | |
204 | try: |
|
204 | try: | |
205 | return _dispatch(req) |
|
205 | return _dispatch(req) | |
206 | finally: |
|
206 | finally: | |
207 | ui.flush() |
|
207 | ui.flush() | |
208 | except: # re-raises |
|
208 | except: # re-raises | |
209 | # enter the debugger when we hit an exception |
|
209 | # enter the debugger when we hit an exception | |
210 | if '--debugger' in req.args: |
|
210 | if '--debugger' in req.args: | |
211 | traceback.print_exc() |
|
211 | traceback.print_exc() | |
212 | debugmortem[debugger](sys.exc_info()[2]) |
|
212 | debugmortem[debugger](sys.exc_info()[2]) | |
213 | ui.traceback() |
|
213 | ui.traceback() | |
214 | raise |
|
214 | raise | |
215 |
|
215 | |||
216 | return callcatch(ui, _runcatchfunc) |
|
216 | return callcatch(ui, _runcatchfunc) | |
217 |
|
217 | |||
218 | def callcatch(ui, func): |
|
218 | def callcatch(ui, func): | |
219 | """call func() with global exception handling |
|
219 | """call func() with global exception handling | |
220 |
|
220 | |||
221 | return func() if no exception happens. otherwise do some error handling |
|
221 | return func() if no exception happens. otherwise do some error handling | |
222 | and return an exit code accordingly. |
|
222 | and return an exit code accordingly. | |
223 | """ |
|
223 | """ | |
224 | try: |
|
224 | try: | |
225 | return func() |
|
225 | return func() | |
226 | # Global exception handling, alphabetically |
|
226 | # Global exception handling, alphabetically | |
227 | # Mercurial-specific first, followed by built-in and library exceptions |
|
227 | # Mercurial-specific first, followed by built-in and library exceptions | |
228 | except error.AmbiguousCommand as inst: |
|
228 | except error.AmbiguousCommand as inst: | |
229 | ui.warn(_("hg: command '%s' is ambiguous:\n %s\n") % |
|
229 | ui.warn(_("hg: command '%s' is ambiguous:\n %s\n") % | |
230 | (inst.args[0], " ".join(inst.args[1]))) |
|
230 | (inst.args[0], " ".join(inst.args[1]))) | |
231 | except error.ParseError as inst: |
|
231 | except error.ParseError as inst: | |
232 | _formatparse(ui.warn, inst) |
|
232 | _formatparse(ui.warn, inst) | |
233 | return -1 |
|
233 | return -1 | |
234 | except error.LockHeld as inst: |
|
234 | except error.LockHeld as inst: | |
235 | if inst.errno == errno.ETIMEDOUT: |
|
235 | if inst.errno == errno.ETIMEDOUT: | |
236 | reason = _('timed out waiting for lock held by %s') % inst.locker |
|
236 | reason = _('timed out waiting for lock held by %s') % inst.locker | |
237 | else: |
|
237 | else: | |
238 | reason = _('lock held by %s') % inst.locker |
|
238 | reason = _('lock held by %s') % inst.locker | |
239 | ui.warn(_("abort: %s: %s\n") % (inst.desc or inst.filename, reason)) |
|
239 | ui.warn(_("abort: %s: %s\n") % (inst.desc or inst.filename, reason)) | |
240 | except error.LockUnavailable as inst: |
|
240 | except error.LockUnavailable as inst: | |
241 | ui.warn(_("abort: could not lock %s: %s\n") % |
|
241 | ui.warn(_("abort: could not lock %s: %s\n") % | |
242 | (inst.desc or inst.filename, inst.strerror)) |
|
242 | (inst.desc or inst.filename, inst.strerror)) | |
243 | except error.CommandError as inst: |
|
243 | except error.CommandError as inst: | |
244 | if inst.args[0]: |
|
244 | if inst.args[0]: | |
245 | ui.warn(_("hg %s: %s\n") % (inst.args[0], inst.args[1])) |
|
245 | ui.warn(_("hg %s: %s\n") % (inst.args[0], inst.args[1])) | |
246 | commands.help_(ui, inst.args[0], full=False, command=True) |
|
246 | commands.help_(ui, inst.args[0], full=False, command=True) | |
247 | else: |
|
247 | else: | |
248 | ui.warn(_("hg: %s\n") % inst.args[1]) |
|
248 | ui.warn(_("hg: %s\n") % inst.args[1]) | |
249 | commands.help_(ui, 'shortlist') |
|
249 | commands.help_(ui, 'shortlist') | |
250 | except error.OutOfBandError as inst: |
|
250 | except error.OutOfBandError as inst: | |
251 | if inst.args: |
|
251 | if inst.args: | |
252 | msg = _("abort: remote error:\n") |
|
252 | msg = _("abort: remote error:\n") | |
253 | else: |
|
253 | else: | |
254 | msg = _("abort: remote error\n") |
|
254 | msg = _("abort: remote error\n") | |
255 | ui.warn(msg) |
|
255 | ui.warn(msg) | |
256 | if inst.args: |
|
256 | if inst.args: | |
257 | ui.warn(''.join(inst.args)) |
|
257 | ui.warn(''.join(inst.args)) | |
258 | if inst.hint: |
|
258 | if inst.hint: | |
259 | ui.warn('(%s)\n' % inst.hint) |
|
259 | ui.warn('(%s)\n' % inst.hint) | |
260 | except error.RepoError as inst: |
|
260 | except error.RepoError as inst: | |
261 | ui.warn(_("abort: %s!\n") % inst) |
|
261 | ui.warn(_("abort: %s!\n") % inst) | |
262 | if inst.hint: |
|
262 | if inst.hint: | |
263 | ui.warn(_("(%s)\n") % inst.hint) |
|
263 | ui.warn(_("(%s)\n") % inst.hint) | |
264 | except error.ResponseError as inst: |
|
264 | except error.ResponseError as inst: | |
265 | ui.warn(_("abort: %s") % inst.args[0]) |
|
265 | ui.warn(_("abort: %s") % inst.args[0]) | |
266 | if not isinstance(inst.args[1], basestring): |
|
266 | if not isinstance(inst.args[1], basestring): | |
267 | ui.warn(" %r\n" % (inst.args[1],)) |
|
267 | ui.warn(" %r\n" % (inst.args[1],)) | |
268 | elif not inst.args[1]: |
|
268 | elif not inst.args[1]: | |
269 | ui.warn(_(" empty string\n")) |
|
269 | ui.warn(_(" empty string\n")) | |
270 | else: |
|
270 | else: | |
271 | ui.warn("\n%r\n" % util.ellipsis(inst.args[1])) |
|
271 | ui.warn("\n%r\n" % util.ellipsis(inst.args[1])) | |
272 | except error.CensoredNodeError as inst: |
|
272 | except error.CensoredNodeError as inst: | |
273 | ui.warn(_("abort: file censored %s!\n") % inst) |
|
273 | ui.warn(_("abort: file censored %s!\n") % inst) | |
274 | except error.RevlogError as inst: |
|
274 | except error.RevlogError as inst: | |
275 | ui.warn(_("abort: %s!\n") % inst) |
|
275 | ui.warn(_("abort: %s!\n") % inst) | |
276 | except error.SignalInterrupt: |
|
276 | except error.SignalInterrupt: | |
277 | ui.warn(_("killed!\n")) |
|
277 | ui.warn(_("killed!\n")) | |
278 | except error.UnknownCommand as inst: |
|
278 | except error.UnknownCommand as inst: | |
279 | ui.warn(_("hg: unknown command '%s'\n") % inst.args[0]) |
|
279 | ui.warn(_("hg: unknown command '%s'\n") % inst.args[0]) | |
280 | try: |
|
280 | try: | |
281 | # check if the command is in a disabled extension |
|
281 | # check if the command is in a disabled extension | |
282 | # (but don't check for extensions themselves) |
|
282 | # (but don't check for extensions themselves) | |
283 | commands.help_(ui, inst.args[0], unknowncmd=True) |
|
283 | commands.help_(ui, inst.args[0], unknowncmd=True) | |
284 | except (error.UnknownCommand, error.Abort): |
|
284 | except (error.UnknownCommand, error.Abort): | |
285 | suggested = False |
|
285 | suggested = False | |
286 | if len(inst.args) == 2: |
|
286 | if len(inst.args) == 2: | |
287 | sim = _getsimilar(inst.args[1], inst.args[0]) |
|
287 | sim = _getsimilar(inst.args[1], inst.args[0]) | |
288 | if sim: |
|
288 | if sim: | |
289 | _reportsimilar(ui.warn, sim) |
|
289 | _reportsimilar(ui.warn, sim) | |
290 | suggested = True |
|
290 | suggested = True | |
291 | if not suggested: |
|
291 | if not suggested: | |
292 | commands.help_(ui, 'shortlist') |
|
292 | commands.help_(ui, 'shortlist') | |
293 | except error.InterventionRequired as inst: |
|
293 | except error.InterventionRequired as inst: | |
294 | ui.warn("%s\n" % inst) |
|
294 | ui.warn("%s\n" % inst) | |
295 | if inst.hint: |
|
295 | if inst.hint: | |
296 | ui.warn(_("(%s)\n") % inst.hint) |
|
296 | ui.warn(_("(%s)\n") % inst.hint) | |
297 | return 1 |
|
297 | return 1 | |
298 | except error.Abort as inst: |
|
298 | except error.Abort as inst: | |
299 | ui.warn(_("abort: %s\n") % inst) |
|
299 | ui.warn(_("abort: %s\n") % inst) | |
300 | if inst.hint: |
|
300 | if inst.hint: | |
301 | ui.warn(_("(%s)\n") % inst.hint) |
|
301 | ui.warn(_("(%s)\n") % inst.hint) | |
302 | except ImportError as inst: |
|
302 | except ImportError as inst: | |
303 | ui.warn(_("abort: %s!\n") % inst) |
|
303 | ui.warn(_("abort: %s!\n") % inst) | |
304 | m = str(inst).split()[-1] |
|
304 | m = str(inst).split()[-1] | |
305 | if m in "mpatch bdiff".split(): |
|
305 | if m in "mpatch bdiff".split(): | |
306 | ui.warn(_("(did you forget to compile extensions?)\n")) |
|
306 | ui.warn(_("(did you forget to compile extensions?)\n")) | |
307 | elif m in "zlib".split(): |
|
307 | elif m in "zlib".split(): | |
308 | ui.warn(_("(is your Python install correct?)\n")) |
|
308 | ui.warn(_("(is your Python install correct?)\n")) | |
309 | except IOError as inst: |
|
309 | except IOError as inst: | |
310 | if util.safehasattr(inst, "code"): |
|
310 | if util.safehasattr(inst, "code"): | |
311 | ui.warn(_("abort: %s\n") % inst) |
|
311 | ui.warn(_("abort: %s\n") % inst) | |
312 | elif util.safehasattr(inst, "reason"): |
|
312 | elif util.safehasattr(inst, "reason"): | |
313 | try: # usually it is in the form (errno, strerror) |
|
313 | try: # usually it is in the form (errno, strerror) | |
314 | reason = inst.reason.args[1] |
|
314 | reason = inst.reason.args[1] | |
315 | except (AttributeError, IndexError): |
|
315 | except (AttributeError, IndexError): | |
316 | # it might be anything, for example a string |
|
316 | # it might be anything, for example a string | |
317 | reason = inst.reason |
|
317 | reason = inst.reason | |
318 | if isinstance(reason, unicode): |
|
318 | if isinstance(reason, unicode): | |
319 | # SSLError of Python 2.7.9 contains a unicode |
|
319 | # SSLError of Python 2.7.9 contains a unicode | |
320 | reason = reason.encode(encoding.encoding, 'replace') |
|
320 | reason = reason.encode(encoding.encoding, 'replace') | |
321 | ui.warn(_("abort: error: %s\n") % reason) |
|
321 | ui.warn(_("abort: error: %s\n") % reason) | |
322 | elif (util.safehasattr(inst, "args") |
|
322 | elif (util.safehasattr(inst, "args") | |
323 | and inst.args and inst.args[0] == errno.EPIPE): |
|
323 | and inst.args and inst.args[0] == errno.EPIPE): | |
324 | pass |
|
324 | pass | |
325 | elif getattr(inst, "strerror", None): |
|
325 | elif getattr(inst, "strerror", None): | |
326 | if getattr(inst, "filename", None): |
|
326 | if getattr(inst, "filename", None): | |
327 | ui.warn(_("abort: %s: %s\n") % (inst.strerror, inst.filename)) |
|
327 | ui.warn(_("abort: %s: %s\n") % (inst.strerror, inst.filename)) | |
328 | else: |
|
328 | else: | |
329 | ui.warn(_("abort: %s\n") % inst.strerror) |
|
329 | ui.warn(_("abort: %s\n") % inst.strerror) | |
330 | else: |
|
330 | else: | |
331 | raise |
|
331 | raise | |
332 | except OSError as inst: |
|
332 | except OSError as inst: | |
333 | if getattr(inst, "filename", None) is not None: |
|
333 | if getattr(inst, "filename", None) is not None: | |
334 | ui.warn(_("abort: %s: '%s'\n") % (inst.strerror, inst.filename)) |
|
334 | ui.warn(_("abort: %s: '%s'\n") % (inst.strerror, inst.filename)) | |
335 | else: |
|
335 | else: | |
336 | ui.warn(_("abort: %s\n") % inst.strerror) |
|
336 | ui.warn(_("abort: %s\n") % inst.strerror) | |
337 | except KeyboardInterrupt: |
|
337 | except KeyboardInterrupt: | |
338 | raise |
|
338 | raise | |
339 | except MemoryError: |
|
339 | except MemoryError: | |
340 | ui.warn(_("abort: out of memory\n")) |
|
340 | ui.warn(_("abort: out of memory\n")) | |
341 | except SystemExit as inst: |
|
341 | except SystemExit as inst: | |
342 | # Commands shouldn't sys.exit directly, but give a return code. |
|
342 | # Commands shouldn't sys.exit directly, but give a return code. | |
343 | # Just in case catch this and and pass exit code to caller. |
|
343 | # Just in case catch this and and pass exit code to caller. | |
344 | return inst.code |
|
344 | return inst.code | |
345 | except socket.error as inst: |
|
345 | except socket.error as inst: | |
346 | ui.warn(_("abort: %s\n") % inst.args[-1]) |
|
346 | ui.warn(_("abort: %s\n") % inst.args[-1]) | |
347 | except: # perhaps re-raises |
|
347 | except: # perhaps re-raises | |
348 | if not handlecommandexception(ui): |
|
348 | if not handlecommandexception(ui): | |
349 | raise |
|
349 | raise | |
350 |
|
350 | |||
351 | return -1 |
|
351 | return -1 | |
352 |
|
352 | |||
353 | def aliasargs(fn, givenargs): |
|
353 | def aliasargs(fn, givenargs): | |
354 | args = getattr(fn, 'args', []) |
|
354 | args = getattr(fn, 'args', []) | |
355 | if args: |
|
355 | if args: | |
356 | cmd = ' '.join(map(util.shellquote, args)) |
|
356 | cmd = ' '.join(map(util.shellquote, args)) | |
357 |
|
357 | |||
358 | nums = [] |
|
358 | nums = [] | |
359 | def replacer(m): |
|
359 | def replacer(m): | |
360 | num = int(m.group(1)) - 1 |
|
360 | num = int(m.group(1)) - 1 | |
361 | nums.append(num) |
|
361 | nums.append(num) | |
362 | if num < len(givenargs): |
|
362 | if num < len(givenargs): | |
363 | return givenargs[num] |
|
363 | return givenargs[num] | |
364 | raise error.Abort(_('too few arguments for command alias')) |
|
364 | raise error.Abort(_('too few arguments for command alias')) | |
365 | cmd = re.sub(r'\$(\d+|\$)', replacer, cmd) |
|
365 | cmd = re.sub(r'\$(\d+|\$)', replacer, cmd) | |
366 | givenargs = [x for i, x in enumerate(givenargs) |
|
366 | givenargs = [x for i, x in enumerate(givenargs) | |
367 | if i not in nums] |
|
367 | if i not in nums] | |
368 | args = shlex.split(cmd) |
|
368 | args = shlex.split(cmd) | |
369 | return args + givenargs |
|
369 | return args + givenargs | |
370 |
|
370 | |||
371 | def aliasinterpolate(name, args, cmd): |
|
371 | def aliasinterpolate(name, args, cmd): | |
372 | '''interpolate args into cmd for shell aliases |
|
372 | '''interpolate args into cmd for shell aliases | |
373 |
|
373 | |||
374 | This also handles $0, $@ and "$@". |
|
374 | This also handles $0, $@ and "$@". | |
375 | ''' |
|
375 | ''' | |
376 | # util.interpolate can't deal with "$@" (with quotes) because it's only |
|
376 | # util.interpolate can't deal with "$@" (with quotes) because it's only | |
377 | # built to match prefix + patterns. |
|
377 | # built to match prefix + patterns. | |
378 | replacemap = dict(('$%d' % (i + 1), arg) for i, arg in enumerate(args)) |
|
378 | replacemap = dict(('$%d' % (i + 1), arg) for i, arg in enumerate(args)) | |
379 | replacemap['$0'] = name |
|
379 | replacemap['$0'] = name | |
380 | replacemap['$$'] = '$' |
|
380 | replacemap['$$'] = '$' | |
381 | replacemap['$@'] = ' '.join(args) |
|
381 | replacemap['$@'] = ' '.join(args) | |
382 | # Typical Unix shells interpolate "$@" (with quotes) as all the positional |
|
382 | # Typical Unix shells interpolate "$@" (with quotes) as all the positional | |
383 | # parameters, separated out into words. Emulate the same behavior here by |
|
383 | # parameters, separated out into words. Emulate the same behavior here by | |
384 | # quoting the arguments individually. POSIX shells will then typically |
|
384 | # quoting the arguments individually. POSIX shells will then typically | |
385 | # tokenize each argument into exactly one word. |
|
385 | # tokenize each argument into exactly one word. | |
386 | replacemap['"$@"'] = ' '.join(util.shellquote(arg) for arg in args) |
|
386 | replacemap['"$@"'] = ' '.join(util.shellquote(arg) for arg in args) | |
387 | # escape '\$' for regex |
|
387 | # escape '\$' for regex | |
388 | regex = '|'.join(replacemap.keys()).replace('$', r'\$') |
|
388 | regex = '|'.join(replacemap.keys()).replace('$', r'\$') | |
389 | r = re.compile(regex) |
|
389 | r = re.compile(regex) | |
390 | return r.sub(lambda x: replacemap[x.group()], cmd) |
|
390 | return r.sub(lambda x: replacemap[x.group()], cmd) | |
391 |
|
391 | |||
392 | class cmdalias(object): |
|
392 | class cmdalias(object): | |
393 | def __init__(self, name, definition, cmdtable, source): |
|
393 | def __init__(self, name, definition, cmdtable, source): | |
394 | self.name = self.cmd = name |
|
394 | self.name = self.cmd = name | |
395 | self.cmdname = '' |
|
395 | self.cmdname = '' | |
396 | self.definition = definition |
|
396 | self.definition = definition | |
397 | self.fn = None |
|
397 | self.fn = None | |
398 | self.givenargs = [] |
|
398 | self.givenargs = [] | |
399 | self.opts = [] |
|
399 | self.opts = [] | |
400 | self.help = '' |
|
400 | self.help = '' | |
401 | self.badalias = None |
|
401 | self.badalias = None | |
402 | self.unknowncmd = False |
|
402 | self.unknowncmd = False | |
403 | self.source = source |
|
403 | self.source = source | |
404 |
|
404 | |||
405 | try: |
|
405 | try: | |
406 | aliases, entry = cmdutil.findcmd(self.name, cmdtable) |
|
406 | aliases, entry = cmdutil.findcmd(self.name, cmdtable) | |
407 | for alias, e in cmdtable.iteritems(): |
|
407 | for alias, e in cmdtable.iteritems(): | |
408 | if e is entry: |
|
408 | if e is entry: | |
409 | self.cmd = alias |
|
409 | self.cmd = alias | |
410 | break |
|
410 | break | |
411 | self.shadows = True |
|
411 | self.shadows = True | |
412 | except error.UnknownCommand: |
|
412 | except error.UnknownCommand: | |
413 | self.shadows = False |
|
413 | self.shadows = False | |
414 |
|
414 | |||
415 | if not self.definition: |
|
415 | if not self.definition: | |
416 | self.badalias = _("no definition for alias '%s'") % self.name |
|
416 | self.badalias = _("no definition for alias '%s'") % self.name | |
417 | return |
|
417 | return | |
418 |
|
418 | |||
419 | if self.definition.startswith('!'): |
|
419 | if self.definition.startswith('!'): | |
420 | self.shell = True |
|
420 | self.shell = True | |
421 | def fn(ui, *args): |
|
421 | def fn(ui, *args): | |
422 | env = {'HG_ARGS': ' '.join((self.name,) + args)} |
|
422 | env = {'HG_ARGS': ' '.join((self.name,) + args)} | |
423 | def _checkvar(m): |
|
423 | def _checkvar(m): | |
424 | if m.groups()[0] == '$': |
|
424 | if m.groups()[0] == '$': | |
425 | return m.group() |
|
425 | return m.group() | |
426 | elif int(m.groups()[0]) <= len(args): |
|
426 | elif int(m.groups()[0]) <= len(args): | |
427 | return m.group() |
|
427 | return m.group() | |
428 | else: |
|
428 | else: | |
429 | ui.debug("No argument found for substitution " |
|
429 | ui.debug("No argument found for substitution " | |
430 | "of %i variable in alias '%s' definition." |
|
430 | "of %i variable in alias '%s' definition." | |
431 | % (int(m.groups()[0]), self.name)) |
|
431 | % (int(m.groups()[0]), self.name)) | |
432 | return '' |
|
432 | return '' | |
433 | cmd = re.sub(r'\$(\d+|\$)', _checkvar, self.definition[1:]) |
|
433 | cmd = re.sub(r'\$(\d+|\$)', _checkvar, self.definition[1:]) | |
434 | cmd = aliasinterpolate(self.name, args, cmd) |
|
434 | cmd = aliasinterpolate(self.name, args, cmd) | |
435 | return ui.system(cmd, environ=env) |
|
435 | return ui.system(cmd, environ=env) | |
436 | self.fn = fn |
|
436 | self.fn = fn | |
437 | return |
|
437 | return | |
438 |
|
438 | |||
439 | try: |
|
439 | try: | |
440 | args = shlex.split(self.definition) |
|
440 | args = shlex.split(self.definition) | |
441 | except ValueError as inst: |
|
441 | except ValueError as inst: | |
442 | self.badalias = (_("error in definition for alias '%s': %s") |
|
442 | self.badalias = (_("error in definition for alias '%s': %s") | |
443 | % (self.name, inst)) |
|
443 | % (self.name, inst)) | |
444 | return |
|
444 | return | |
445 | self.cmdname = cmd = args.pop(0) |
|
445 | self.cmdname = cmd = args.pop(0) | |
446 | self.givenargs = args |
|
446 | self.givenargs = args | |
447 |
|
447 | |||
448 | for invalidarg in ("--cwd", "-R", "--repository", "--repo", "--config"): |
|
448 | for invalidarg in ("--cwd", "-R", "--repository", "--repo", "--config"): | |
449 | if _earlygetopt([invalidarg], args): |
|
449 | if _earlygetopt([invalidarg], args): | |
450 | self.badalias = (_("error in definition for alias '%s': %s may " |
|
450 | self.badalias = (_("error in definition for alias '%s': %s may " | |
451 | "only be given on the command line") |
|
451 | "only be given on the command line") | |
452 | % (self.name, invalidarg)) |
|
452 | % (self.name, invalidarg)) | |
453 | return |
|
453 | return | |
454 |
|
454 | |||
455 | try: |
|
455 | try: | |
456 | tableentry = cmdutil.findcmd(cmd, cmdtable, False)[1] |
|
456 | tableentry = cmdutil.findcmd(cmd, cmdtable, False)[1] | |
457 | if len(tableentry) > 2: |
|
457 | if len(tableentry) > 2: | |
458 | self.fn, self.opts, self.help = tableentry |
|
458 | self.fn, self.opts, self.help = tableentry | |
459 | else: |
|
459 | else: | |
460 | self.fn, self.opts = tableentry |
|
460 | self.fn, self.opts = tableentry | |
461 |
|
461 | |||
462 | if self.help.startswith("hg " + cmd): |
|
462 | if self.help.startswith("hg " + cmd): | |
463 | # drop prefix in old-style help lines so hg shows the alias |
|
463 | # drop prefix in old-style help lines so hg shows the alias | |
464 | self.help = self.help[4 + len(cmd):] |
|
464 | self.help = self.help[4 + len(cmd):] | |
465 | self.__doc__ = self.fn.__doc__ |
|
465 | self.__doc__ = self.fn.__doc__ | |
466 |
|
466 | |||
467 | except error.UnknownCommand: |
|
467 | except error.UnknownCommand: | |
468 | self.badalias = (_("alias '%s' resolves to unknown command '%s'") |
|
468 | self.badalias = (_("alias '%s' resolves to unknown command '%s'") | |
469 | % (self.name, cmd)) |
|
469 | % (self.name, cmd)) | |
470 | self.unknowncmd = True |
|
470 | self.unknowncmd = True | |
471 | except error.AmbiguousCommand: |
|
471 | except error.AmbiguousCommand: | |
472 | self.badalias = (_("alias '%s' resolves to ambiguous command '%s'") |
|
472 | self.badalias = (_("alias '%s' resolves to ambiguous command '%s'") | |
473 | % (self.name, cmd)) |
|
473 | % (self.name, cmd)) | |
474 |
|
474 | |||
475 | @property |
|
475 | @property | |
476 | def args(self): |
|
476 | def args(self): | |
477 | args = map(util.expandpath, self.givenargs) |
|
477 | args = map(util.expandpath, self.givenargs) | |
478 | return aliasargs(self.fn, args) |
|
478 | return aliasargs(self.fn, args) | |
479 |
|
479 | |||
480 | def __getattr__(self, name): |
|
480 | def __getattr__(self, name): | |
481 | adefaults = {'norepo': True, 'optionalrepo': False, 'inferrepo': False} |
|
481 | adefaults = {'norepo': True, 'optionalrepo': False, 'inferrepo': False} | |
482 | if name not in adefaults: |
|
482 | if name not in adefaults: | |
483 | raise AttributeError(name) |
|
483 | raise AttributeError(name) | |
484 | if self.badalias or util.safehasattr(self, 'shell'): |
|
484 | if self.badalias or util.safehasattr(self, 'shell'): | |
485 | return adefaults[name] |
|
485 | return adefaults[name] | |
486 | return getattr(self.fn, name) |
|
486 | return getattr(self.fn, name) | |
487 |
|
487 | |||
488 | def __call__(self, ui, *args, **opts): |
|
488 | def __call__(self, ui, *args, **opts): | |
489 | if self.badalias: |
|
489 | if self.badalias: | |
490 | hint = None |
|
490 | hint = None | |
491 | if self.unknowncmd: |
|
491 | if self.unknowncmd: | |
492 | try: |
|
492 | try: | |
493 | # check if the command is in a disabled extension |
|
493 | # check if the command is in a disabled extension | |
494 | cmd, ext = extensions.disabledcmd(ui, self.cmdname)[:2] |
|
494 | cmd, ext = extensions.disabledcmd(ui, self.cmdname)[:2] | |
495 | hint = _("'%s' is provided by '%s' extension") % (cmd, ext) |
|
495 | hint = _("'%s' is provided by '%s' extension") % (cmd, ext) | |
496 | except error.UnknownCommand: |
|
496 | except error.UnknownCommand: | |
497 | pass |
|
497 | pass | |
498 | raise error.Abort(self.badalias, hint=hint) |
|
498 | raise error.Abort(self.badalias, hint=hint) | |
499 | if self.shadows: |
|
499 | if self.shadows: | |
500 | ui.debug("alias '%s' shadows command '%s'\n" % |
|
500 | ui.debug("alias '%s' shadows command '%s'\n" % | |
501 | (self.name, self.cmdname)) |
|
501 | (self.name, self.cmdname)) | |
502 |
|
502 | |||
503 | if util.safehasattr(self, 'shell'): |
|
503 | if util.safehasattr(self, 'shell'): | |
504 | return self.fn(ui, *args, **opts) |
|
504 | return self.fn(ui, *args, **opts) | |
505 | else: |
|
505 | else: | |
506 | try: |
|
506 | try: | |
507 | return util.checksignature(self.fn)(ui, *args, **opts) |
|
507 | return util.checksignature(self.fn)(ui, *args, **opts) | |
508 | except error.SignatureError: |
|
508 | except error.SignatureError: | |
509 | args = ' '.join([self.cmdname] + self.args) |
|
509 | args = ' '.join([self.cmdname] + self.args) | |
510 | ui.debug("alias '%s' expands to '%s'\n" % (self.name, args)) |
|
510 | ui.debug("alias '%s' expands to '%s'\n" % (self.name, args)) | |
511 | raise |
|
511 | raise | |
512 |
|
512 | |||
513 | def addaliases(ui, cmdtable): |
|
513 | def addaliases(ui, cmdtable): | |
514 | # aliases are processed after extensions have been loaded, so they |
|
514 | # aliases are processed after extensions have been loaded, so they | |
515 | # may use extension commands. Aliases can also use other alias definitions, |
|
515 | # may use extension commands. Aliases can also use other alias definitions, | |
516 | # but only if they have been defined prior to the current definition. |
|
516 | # but only if they have been defined prior to the current definition. | |
517 | for alias, definition in ui.configitems('alias'): |
|
517 | for alias, definition in ui.configitems('alias'): | |
518 | source = ui.configsource('alias', alias) |
|
518 | source = ui.configsource('alias', alias) | |
519 | aliasdef = cmdalias(alias, definition, cmdtable, source) |
|
519 | aliasdef = cmdalias(alias, definition, cmdtable, source) | |
520 |
|
520 | |||
521 | try: |
|
521 | try: | |
522 | olddef = cmdtable[aliasdef.cmd][0] |
|
522 | olddef = cmdtable[aliasdef.cmd][0] | |
523 | if olddef.definition == aliasdef.definition: |
|
523 | if olddef.definition == aliasdef.definition: | |
524 | continue |
|
524 | continue | |
525 | except (KeyError, AttributeError): |
|
525 | except (KeyError, AttributeError): | |
526 | # definition might not exist or it might not be a cmdalias |
|
526 | # definition might not exist or it might not be a cmdalias | |
527 | pass |
|
527 | pass | |
528 |
|
528 | |||
529 | cmdtable[aliasdef.name] = (aliasdef, aliasdef.opts, aliasdef.help) |
|
529 | cmdtable[aliasdef.name] = (aliasdef, aliasdef.opts, aliasdef.help) | |
530 |
|
530 | |||
531 | def _parse(ui, args): |
|
531 | def _parse(ui, args): | |
532 | options = {} |
|
532 | options = {} | |
533 | cmdoptions = {} |
|
533 | cmdoptions = {} | |
534 |
|
534 | |||
535 | try: |
|
535 | try: | |
536 | args = fancyopts.fancyopts(args, commands.globalopts, options) |
|
536 | args = fancyopts.fancyopts(args, commands.globalopts, options) | |
537 | except fancyopts.getopt.GetoptError as inst: |
|
537 | except fancyopts.getopt.GetoptError as inst: | |
538 | raise error.CommandError(None, inst) |
|
538 | raise error.CommandError(None, inst) | |
539 |
|
539 | |||
540 | if args: |
|
540 | if args: | |
541 | cmd, args = args[0], args[1:] |
|
541 | cmd, args = args[0], args[1:] | |
542 | aliases, entry = cmdutil.findcmd(cmd, commands.table, |
|
542 | aliases, entry = cmdutil.findcmd(cmd, commands.table, | |
543 | ui.configbool("ui", "strict")) |
|
543 | ui.configbool("ui", "strict")) | |
544 | cmd = aliases[0] |
|
544 | cmd = aliases[0] | |
545 | args = aliasargs(entry[0], args) |
|
545 | args = aliasargs(entry[0], args) | |
546 | defaults = ui.config("defaults", cmd) |
|
546 | defaults = ui.config("defaults", cmd) | |
547 | if defaults: |
|
547 | if defaults: | |
548 | args = map(util.expandpath, shlex.split(defaults)) + args |
|
548 | args = map(util.expandpath, shlex.split(defaults)) + args | |
549 | c = list(entry[1]) |
|
549 | c = list(entry[1]) | |
550 | else: |
|
550 | else: | |
551 | cmd = None |
|
551 | cmd = None | |
552 | c = [] |
|
552 | c = [] | |
553 |
|
553 | |||
554 | # combine global options into local |
|
554 | # combine global options into local | |
555 | for o in commands.globalopts: |
|
555 | for o in commands.globalopts: | |
556 | c.append((o[0], o[1], options[o[1]], o[3])) |
|
556 | c.append((o[0], o[1], options[o[1]], o[3])) | |
557 |
|
557 | |||
558 | try: |
|
558 | try: | |
559 | args = fancyopts.fancyopts(args, c, cmdoptions, True) |
|
559 | args = fancyopts.fancyopts(args, c, cmdoptions, True) | |
560 | except fancyopts.getopt.GetoptError as inst: |
|
560 | except fancyopts.getopt.GetoptError as inst: | |
561 | raise error.CommandError(cmd, inst) |
|
561 | raise error.CommandError(cmd, inst) | |
562 |
|
562 | |||
563 | # separate global options back out |
|
563 | # separate global options back out | |
564 | for o in commands.globalopts: |
|
564 | for o in commands.globalopts: | |
565 | n = o[1] |
|
565 | n = o[1] | |
566 | options[n] = cmdoptions[n] |
|
566 | options[n] = cmdoptions[n] | |
567 | del cmdoptions[n] |
|
567 | del cmdoptions[n] | |
568 |
|
568 | |||
569 | return (cmd, cmd and entry[0] or None, args, options, cmdoptions) |
|
569 | return (cmd, cmd and entry[0] or None, args, options, cmdoptions) | |
570 |
|
570 | |||
571 | def _parseconfig(ui, config): |
|
571 | def _parseconfig(ui, config): | |
572 | """parse the --config options from the command line""" |
|
572 | """parse the --config options from the command line""" | |
573 | configs = [] |
|
573 | configs = [] | |
574 |
|
574 | |||
575 | for cfg in config: |
|
575 | for cfg in config: | |
576 | try: |
|
576 | try: | |
577 | name, value = [cfgelem.strip() |
|
577 | name, value = [cfgelem.strip() | |
578 | for cfgelem in cfg.split('=', 1)] |
|
578 | for cfgelem in cfg.split('=', 1)] | |
579 | section, name = name.split('.', 1) |
|
579 | section, name = name.split('.', 1) | |
580 | if not section or not name: |
|
580 | if not section or not name: | |
581 | raise IndexError |
|
581 | raise IndexError | |
582 | ui.setconfig(section, name, value, '--config') |
|
582 | ui.setconfig(section, name, value, '--config') | |
583 | configs.append((section, name, value)) |
|
583 | configs.append((section, name, value)) | |
584 | except (IndexError, ValueError): |
|
584 | except (IndexError, ValueError): | |
585 | raise error.Abort(_('malformed --config option: %r ' |
|
585 | raise error.Abort(_('malformed --config option: %r ' | |
586 | '(use --config section.name=value)') % cfg) |
|
586 | '(use --config section.name=value)') % cfg) | |
587 |
|
587 | |||
588 | return configs |
|
588 | return configs | |
589 |
|
589 | |||
590 | def _earlygetopt(aliases, args): |
|
590 | def _earlygetopt(aliases, args): | |
591 | """Return list of values for an option (or aliases). |
|
591 | """Return list of values for an option (or aliases). | |
592 |
|
592 | |||
593 | The values are listed in the order they appear in args. |
|
593 | The values are listed in the order they appear in args. | |
594 | The options and values are removed from args. |
|
594 | The options and values are removed from args. | |
595 |
|
595 | |||
596 | >>> args = ['x', '--cwd', 'foo', 'y'] |
|
596 | >>> args = ['x', '--cwd', 'foo', 'y'] | |
597 | >>> _earlygetopt(['--cwd'], args), args |
|
597 | >>> _earlygetopt(['--cwd'], args), args | |
598 | (['foo'], ['x', 'y']) |
|
598 | (['foo'], ['x', 'y']) | |
599 |
|
599 | |||
600 | >>> args = ['x', '--cwd=bar', 'y'] |
|
600 | >>> args = ['x', '--cwd=bar', 'y'] | |
601 | >>> _earlygetopt(['--cwd'], args), args |
|
601 | >>> _earlygetopt(['--cwd'], args), args | |
602 | (['bar'], ['x', 'y']) |
|
602 | (['bar'], ['x', 'y']) | |
603 |
|
603 | |||
604 | >>> args = ['x', '-R', 'foo', 'y'] |
|
604 | >>> args = ['x', '-R', 'foo', 'y'] | |
605 | >>> _earlygetopt(['-R'], args), args |
|
605 | >>> _earlygetopt(['-R'], args), args | |
606 | (['foo'], ['x', 'y']) |
|
606 | (['foo'], ['x', 'y']) | |
607 |
|
607 | |||
608 | >>> args = ['x', '-Rbar', 'y'] |
|
608 | >>> args = ['x', '-Rbar', 'y'] | |
609 | >>> _earlygetopt(['-R'], args), args |
|
609 | >>> _earlygetopt(['-R'], args), args | |
610 | (['bar'], ['x', 'y']) |
|
610 | (['bar'], ['x', 'y']) | |
611 | """ |
|
611 | """ | |
612 | try: |
|
612 | try: | |
613 | argcount = args.index("--") |
|
613 | argcount = args.index("--") | |
614 | except ValueError: |
|
614 | except ValueError: | |
615 | argcount = len(args) |
|
615 | argcount = len(args) | |
616 | shortopts = [opt for opt in aliases if len(opt) == 2] |
|
616 | shortopts = [opt for opt in aliases if len(opt) == 2] | |
617 | values = [] |
|
617 | values = [] | |
618 | pos = 0 |
|
618 | pos = 0 | |
619 | while pos < argcount: |
|
619 | while pos < argcount: | |
620 | fullarg = arg = args[pos] |
|
620 | fullarg = arg = args[pos] | |
621 | equals = arg.find('=') |
|
621 | equals = arg.find('=') | |
622 | if equals > -1: |
|
622 | if equals > -1: | |
623 | arg = arg[:equals] |
|
623 | arg = arg[:equals] | |
624 | if arg in aliases: |
|
624 | if arg in aliases: | |
625 | del args[pos] |
|
625 | del args[pos] | |
626 | if equals > -1: |
|
626 | if equals > -1: | |
627 | values.append(fullarg[equals + 1:]) |
|
627 | values.append(fullarg[equals + 1:]) | |
628 | argcount -= 1 |
|
628 | argcount -= 1 | |
629 | else: |
|
629 | else: | |
630 | if pos + 1 >= argcount: |
|
630 | if pos + 1 >= argcount: | |
631 | # ignore and let getopt report an error if there is no value |
|
631 | # ignore and let getopt report an error if there is no value | |
632 | break |
|
632 | break | |
633 | values.append(args.pop(pos)) |
|
633 | values.append(args.pop(pos)) | |
634 | argcount -= 2 |
|
634 | argcount -= 2 | |
635 | elif arg[:2] in shortopts: |
|
635 | elif arg[:2] in shortopts: | |
636 | # short option can have no following space, e.g. hg log -Rfoo |
|
636 | # short option can have no following space, e.g. hg log -Rfoo | |
637 | values.append(args.pop(pos)[2:]) |
|
637 | values.append(args.pop(pos)[2:]) | |
638 | argcount -= 1 |
|
638 | argcount -= 1 | |
639 | else: |
|
639 | else: | |
640 | pos += 1 |
|
640 | pos += 1 | |
641 | return values |
|
641 | return values | |
642 |
|
642 | |||
643 | def runcommand(lui, repo, cmd, fullargs, ui, options, d, cmdpats, cmdoptions): |
|
643 | def runcommand(lui, repo, cmd, fullargs, ui, options, d, cmdpats, cmdoptions): | |
644 | # run pre-hook, and abort if it fails |
|
644 | # run pre-hook, and abort if it fails | |
645 | hook.hook(lui, repo, "pre-%s" % cmd, True, args=" ".join(fullargs), |
|
645 | hook.hook(lui, repo, "pre-%s" % cmd, True, args=" ".join(fullargs), | |
646 | pats=cmdpats, opts=cmdoptions) |
|
646 | pats=cmdpats, opts=cmdoptions) | |
647 | try: |
|
647 | try: | |
648 | ret = _runcommand(ui, options, cmd, d) |
|
648 | ret = _runcommand(ui, options, cmd, d) | |
649 | # run post-hook, passing command result |
|
649 | # run post-hook, passing command result | |
650 | hook.hook(lui, repo, "post-%s" % cmd, False, args=" ".join(fullargs), |
|
650 | hook.hook(lui, repo, "post-%s" % cmd, False, args=" ".join(fullargs), | |
651 | result=ret, pats=cmdpats, opts=cmdoptions) |
|
651 | result=ret, pats=cmdpats, opts=cmdoptions) | |
652 | except Exception: |
|
652 | except Exception: | |
653 | # run failure hook and re-raise |
|
653 | # run failure hook and re-raise | |
654 | hook.hook(lui, repo, "fail-%s" % cmd, False, args=" ".join(fullargs), |
|
654 | hook.hook(lui, repo, "fail-%s" % cmd, False, args=" ".join(fullargs), | |
655 | pats=cmdpats, opts=cmdoptions) |
|
655 | pats=cmdpats, opts=cmdoptions) | |
656 | raise |
|
656 | raise | |
657 | return ret |
|
657 | return ret | |
658 |
|
658 | |||
659 | def _getlocal(ui, rpath, wd=None): |
|
659 | def _getlocal(ui, rpath, wd=None): | |
660 | """Return (path, local ui object) for the given target path. |
|
660 | """Return (path, local ui object) for the given target path. | |
661 |
|
661 | |||
662 | Takes paths in [cwd]/.hg/hgrc into account." |
|
662 | Takes paths in [cwd]/.hg/hgrc into account." | |
663 | """ |
|
663 | """ | |
664 | if wd is None: |
|
664 | if wd is None: | |
665 | try: |
|
665 | try: | |
666 | wd = os.getcwd() |
|
666 | wd = os.getcwd() | |
667 | except OSError as e: |
|
667 | except OSError as e: | |
668 | raise error.Abort(_("error getting current working directory: %s") % |
|
668 | raise error.Abort(_("error getting current working directory: %s") % | |
669 | e.strerror) |
|
669 | e.strerror) | |
670 | path = cmdutil.findrepo(wd) or "" |
|
670 | path = cmdutil.findrepo(wd) or "" | |
671 | if not path: |
|
671 | if not path: | |
672 | lui = ui |
|
672 | lui = ui | |
673 | else: |
|
673 | else: | |
674 | lui = ui.copy() |
|
674 | lui = ui.copy() | |
675 | lui.readconfig(os.path.join(path, ".hg", "hgrc"), path) |
|
675 | lui.readconfig(os.path.join(path, ".hg", "hgrc"), path) | |
676 |
|
676 | |||
677 | if rpath and rpath[-1]: |
|
677 | if rpath and rpath[-1]: | |
678 | path = lui.expandpath(rpath[-1]) |
|
678 | path = lui.expandpath(rpath[-1]) | |
679 | lui = ui.copy() |
|
679 | lui = ui.copy() | |
680 | lui.readconfig(os.path.join(path, ".hg", "hgrc"), path) |
|
680 | lui.readconfig(os.path.join(path, ".hg", "hgrc"), path) | |
681 |
|
681 | |||
682 | return path, lui |
|
682 | return path, lui | |
683 |
|
683 | |||
684 | def _checkshellalias(lui, ui, args): |
|
684 | def _checkshellalias(lui, ui, args): | |
685 | """Return the function to run the shell alias, if it is required""" |
|
685 | """Return the function to run the shell alias, if it is required""" | |
686 | options = {} |
|
686 | options = {} | |
687 |
|
687 | |||
688 | try: |
|
688 | try: | |
689 | args = fancyopts.fancyopts(args, commands.globalopts, options) |
|
689 | args = fancyopts.fancyopts(args, commands.globalopts, options) | |
690 | except fancyopts.getopt.GetoptError: |
|
690 | except fancyopts.getopt.GetoptError: | |
691 | return |
|
691 | return | |
692 |
|
692 | |||
693 | if not args: |
|
693 | if not args: | |
694 | return |
|
694 | return | |
695 |
|
695 | |||
696 | cmdtable = commands.table |
|
696 | cmdtable = commands.table | |
697 |
|
697 | |||
698 | cmd = args[0] |
|
698 | cmd = args[0] | |
699 | try: |
|
699 | try: | |
700 | strict = ui.configbool("ui", "strict") |
|
700 | strict = ui.configbool("ui", "strict") | |
701 | aliases, entry = cmdutil.findcmd(cmd, cmdtable, strict) |
|
701 | aliases, entry = cmdutil.findcmd(cmd, cmdtable, strict) | |
702 | except (error.AmbiguousCommand, error.UnknownCommand): |
|
702 | except (error.AmbiguousCommand, error.UnknownCommand): | |
703 | return |
|
703 | return | |
704 |
|
704 | |||
705 | cmd = aliases[0] |
|
705 | cmd = aliases[0] | |
706 | fn = entry[0] |
|
706 | fn = entry[0] | |
707 |
|
707 | |||
708 | if cmd and util.safehasattr(fn, 'shell'): |
|
708 | if cmd and util.safehasattr(fn, 'shell'): | |
709 | d = lambda: fn(ui, *args[1:]) |
|
709 | d = lambda: fn(ui, *args[1:]) | |
710 | return lambda: runcommand(lui, None, cmd, args[:1], ui, options, d, |
|
710 | return lambda: runcommand(lui, None, cmd, args[:1], ui, options, d, | |
711 | [], {}) |
|
711 | [], {}) | |
712 |
|
712 | |||
713 | def _cmdattr(ui, cmd, func, attr): |
|
713 | def _cmdattr(ui, cmd, func, attr): | |
714 | try: |
|
714 | try: | |
715 | return getattr(func, attr) |
|
715 | return getattr(func, attr) | |
716 | except AttributeError: |
|
716 | except AttributeError: | |
717 | ui.deprecwarn("missing attribute '%s', use @command decorator " |
|
717 | ui.deprecwarn("missing attribute '%s', use @command decorator " | |
718 | "to register '%s'" % (attr, cmd), '3.8') |
|
718 | "to register '%s'" % (attr, cmd), '3.8') | |
719 | return False |
|
719 | return False | |
720 |
|
720 | |||
721 | _loaded = set() |
|
721 | _loaded = set() | |
722 |
|
722 | |||
723 | # list of (objname, loadermod, loadername) tuple: |
|
723 | # list of (objname, loadermod, loadername) tuple: | |
724 | # - objname is the name of an object in extension module, from which |
|
724 | # - objname is the name of an object in extension module, from which | |
725 | # extra information is loaded |
|
725 | # extra information is loaded | |
726 | # - loadermod is the module where loader is placed |
|
726 | # - loadermod is the module where loader is placed | |
727 | # - loadername is the name of the function, which takes (ui, extensionname, |
|
727 | # - loadername is the name of the function, which takes (ui, extensionname, | |
728 | # extraobj) arguments |
|
728 | # extraobj) arguments | |
729 | extraloaders = [ |
|
729 | extraloaders = [ | |
730 | ('cmdtable', commands, 'loadcmdtable'), |
|
730 | ('cmdtable', commands, 'loadcmdtable'), | |
731 | ('filesetpredicate', fileset, 'loadpredicate'), |
|
731 | ('filesetpredicate', fileset, 'loadpredicate'), | |
732 | ('revsetpredicate', revset, 'loadpredicate'), |
|
732 | ('revsetpredicate', revset, 'loadpredicate'), | |
733 | ('templatefilter', templatefilters, 'loadfilter'), |
|
733 | ('templatefilter', templatefilters, 'loadfilter'), | |
734 | ('templatefunc', templater, 'loadfunction'), |
|
734 | ('templatefunc', templater, 'loadfunction'), | |
735 | ('templatekeyword', templatekw, 'loadkeyword'), |
|
735 | ('templatekeyword', templatekw, 'loadkeyword'), | |
736 | ] |
|
736 | ] | |
737 |
|
737 | |||
738 | def _dispatch(req): |
|
738 | def _dispatch(req): | |
739 | args = req.args |
|
739 | args = req.args | |
740 | ui = req.ui |
|
740 | ui = req.ui | |
741 |
|
741 | |||
742 | # check for cwd |
|
742 | # check for cwd | |
743 | cwd = _earlygetopt(['--cwd'], args) |
|
743 | cwd = _earlygetopt(['--cwd'], args) | |
744 | if cwd: |
|
744 | if cwd: | |
745 | os.chdir(cwd[-1]) |
|
745 | os.chdir(cwd[-1]) | |
746 |
|
746 | |||
747 | rpath = _earlygetopt(["-R", "--repository", "--repo"], args) |
|
747 | rpath = _earlygetopt(["-R", "--repository", "--repo"], args) | |
748 | path, lui = _getlocal(ui, rpath) |
|
748 | path, lui = _getlocal(ui, rpath) | |
749 |
|
749 | |||
750 | # Configure extensions in phases: uisetup, extsetup, cmdtable, and |
|
750 | # Configure extensions in phases: uisetup, extsetup, cmdtable, and | |
751 | # reposetup. Programs like TortoiseHg will call _dispatch several |
|
751 | # reposetup. Programs like TortoiseHg will call _dispatch several | |
752 | # times so we keep track of configured extensions in _loaded. |
|
752 | # times so we keep track of configured extensions in _loaded. | |
753 | extensions.loadall(lui) |
|
753 | extensions.loadall(lui) | |
754 | exts = [ext for ext in extensions.extensions() if ext[0] not in _loaded] |
|
754 | exts = [ext for ext in extensions.extensions() if ext[0] not in _loaded] | |
755 | # Propagate any changes to lui.__class__ by extensions |
|
755 | # Propagate any changes to lui.__class__ by extensions | |
756 | ui.__class__ = lui.__class__ |
|
756 | ui.__class__ = lui.__class__ | |
757 |
|
757 | |||
758 | # (uisetup and extsetup are handled in extensions.loadall) |
|
758 | # (uisetup and extsetup are handled in extensions.loadall) | |
759 |
|
759 | |||
760 | for name, module in exts: |
|
760 | for name, module in exts: | |
761 | for objname, loadermod, loadername in extraloaders: |
|
761 | for objname, loadermod, loadername in extraloaders: | |
762 | extraobj = getattr(module, objname, None) |
|
762 | extraobj = getattr(module, objname, None) | |
763 | if extraobj is not None: |
|
763 | if extraobj is not None: | |
764 | getattr(loadermod, loadername)(ui, name, extraobj) |
|
764 | getattr(loadermod, loadername)(ui, name, extraobj) | |
765 | _loaded.add(name) |
|
765 | _loaded.add(name) | |
766 |
|
766 | |||
767 | # (reposetup is handled in hg.repository) |
|
767 | # (reposetup is handled in hg.repository) | |
768 |
|
768 | |||
769 | addaliases(lui, commands.table) |
|
769 | addaliases(lui, commands.table) | |
770 |
|
770 | |||
771 | # All aliases and commands are completely defined, now. |
|
771 | # All aliases and commands are completely defined, now. | |
772 | # Check abbreviation/ambiguity of shell alias. |
|
772 | # Check abbreviation/ambiguity of shell alias. | |
773 | shellaliasfn = _checkshellalias(lui, ui, args) |
|
773 | shellaliasfn = _checkshellalias(lui, ui, args) | |
774 | if shellaliasfn: |
|
774 | if shellaliasfn: | |
775 | return shellaliasfn() |
|
775 | return shellaliasfn() | |
776 |
|
776 | |||
777 | # check for fallback encoding |
|
777 | # check for fallback encoding | |
778 | fallback = lui.config('ui', 'fallbackencoding') |
|
778 | fallback = lui.config('ui', 'fallbackencoding') | |
779 | if fallback: |
|
779 | if fallback: | |
780 | encoding.fallbackencoding = fallback |
|
780 | encoding.fallbackencoding = fallback | |
781 |
|
781 | |||
782 | fullargs = args |
|
782 | fullargs = args | |
783 | cmd, func, args, options, cmdoptions = _parse(lui, args) |
|
783 | cmd, func, args, options, cmdoptions = _parse(lui, args) | |
784 |
|
784 | |||
785 | if options["config"]: |
|
785 | if options["config"]: | |
786 | raise error.Abort(_("option --config may not be abbreviated!")) |
|
786 | raise error.Abort(_("option --config may not be abbreviated!")) | |
787 | if options["cwd"]: |
|
787 | if options["cwd"]: | |
788 | raise error.Abort(_("option --cwd may not be abbreviated!")) |
|
788 | raise error.Abort(_("option --cwd may not be abbreviated!")) | |
789 | if options["repository"]: |
|
789 | if options["repository"]: | |
790 | raise error.Abort(_( |
|
790 | raise error.Abort(_( | |
791 | "option -R has to be separated from other options (e.g. not -qR) " |
|
791 | "option -R has to be separated from other options (e.g. not -qR) " | |
792 | "and --repository may only be abbreviated as --repo!")) |
|
792 | "and --repository may only be abbreviated as --repo!")) | |
793 |
|
793 | |||
794 | if options["encoding"]: |
|
794 | if options["encoding"]: | |
795 | encoding.encoding = options["encoding"] |
|
795 | encoding.encoding = options["encoding"] | |
796 | if options["encodingmode"]: |
|
796 | if options["encodingmode"]: | |
797 | encoding.encodingmode = options["encodingmode"] |
|
797 | encoding.encodingmode = options["encodingmode"] | |
798 | if options["time"]: |
|
798 | if options["time"]: | |
799 | def get_times(): |
|
799 | def get_times(): | |
800 | t = os.times() |
|
800 | t = os.times() | |
801 | if t[4] == 0.0: # Windows leaves this as zero, so use time.clock() |
|
801 | if t[4] == 0.0: # Windows leaves this as zero, so use time.clock() | |
802 | t = (t[0], t[1], t[2], t[3], time.clock()) |
|
802 | t = (t[0], t[1], t[2], t[3], time.clock()) | |
803 | return t |
|
803 | return t | |
804 | s = get_times() |
|
804 | s = get_times() | |
805 | def print_time(): |
|
805 | def print_time(): | |
806 | t = get_times() |
|
806 | t = get_times() | |
807 | ui.warn(_("time: real %.3f secs (user %.3f+%.3f sys %.3f+%.3f)\n") % |
|
807 | ui.warn(_("time: real %.3f secs (user %.3f+%.3f sys %.3f+%.3f)\n") % | |
808 | (t[4]-s[4], t[0]-s[0], t[2]-s[2], t[1]-s[1], t[3]-s[3])) |
|
808 | (t[4]-s[4], t[0]-s[0], t[2]-s[2], t[1]-s[1], t[3]-s[3])) | |
809 | atexit.register(print_time) |
|
809 | atexit.register(print_time) | |
810 |
|
810 | |||
811 | uis = set([ui, lui]) |
|
811 | uis = set([ui, lui]) | |
812 |
|
812 | |||
813 | if req.repo: |
|
813 | if req.repo: | |
814 | uis.add(req.repo.ui) |
|
814 | uis.add(req.repo.ui) | |
815 |
|
815 | |||
816 | if options['verbose'] or options['debug'] or options['quiet']: |
|
816 | if options['verbose'] or options['debug'] or options['quiet']: | |
817 | for opt in ('verbose', 'debug', 'quiet'): |
|
817 | for opt in ('verbose', 'debug', 'quiet'): | |
818 | val = str(bool(options[opt])) |
|
818 | val = str(bool(options[opt])) | |
819 | for ui_ in uis: |
|
819 | for ui_ in uis: | |
820 | ui_.setconfig('ui', opt, val, '--' + opt) |
|
820 | ui_.setconfig('ui', opt, val, '--' + opt) | |
821 |
|
821 | |||
822 | if options['profile']: |
|
822 | if options['profile']: | |
823 | for ui_ in uis: |
|
823 | for ui_ in uis: | |
824 | ui_.setconfig('profiling', 'enabled', 'true', '--profile') |
|
824 | ui_.setconfig('profiling', 'enabled', 'true', '--profile') | |
825 |
|
825 | |||
826 | if options['traceback']: |
|
826 | if options['traceback']: | |
827 | for ui_ in uis: |
|
827 | for ui_ in uis: | |
828 | ui_.setconfig('ui', 'traceback', 'on', '--traceback') |
|
828 | ui_.setconfig('ui', 'traceback', 'on', '--traceback') | |
829 |
|
829 | |||
830 | if options['noninteractive']: |
|
830 | if options['noninteractive']: | |
831 | for ui_ in uis: |
|
831 | for ui_ in uis: | |
832 | ui_.setconfig('ui', 'interactive', 'off', '-y') |
|
832 | ui_.setconfig('ui', 'interactive', 'off', '-y') | |
833 |
|
833 | |||
834 | if cmdoptions.get('insecure', False): |
|
834 | if cmdoptions.get('insecure', False): | |
835 | for ui_ in uis: |
|
835 | for ui_ in uis: | |
836 | ui_.insecureconnections = True |
|
836 | ui_.insecureconnections = True | |
837 |
|
837 | |||
838 | if options['version']: |
|
838 | if options['version']: | |
839 | return commands.version_(ui) |
|
839 | return commands.version_(ui) | |
840 | if options['help']: |
|
840 | if options['help']: | |
841 | return commands.help_(ui, cmd, command=cmd is not None) |
|
841 | return commands.help_(ui, cmd, command=cmd is not None) | |
842 | elif not cmd: |
|
842 | elif not cmd: | |
843 | return commands.help_(ui, 'shortlist') |
|
843 | return commands.help_(ui, 'shortlist') | |
844 |
|
844 | |||
845 | repo = None |
|
845 | repo = None | |
846 | cmdpats = args[:] |
|
846 | cmdpats = args[:] | |
847 | if not _cmdattr(ui, cmd, func, 'norepo'): |
|
847 | if not _cmdattr(ui, cmd, func, 'norepo'): | |
848 | # use the repo from the request only if we don't have -R |
|
848 | # use the repo from the request only if we don't have -R | |
849 | if not rpath and not cwd: |
|
849 | if not rpath and not cwd: | |
850 | repo = req.repo |
|
850 | repo = req.repo | |
851 |
|
851 | |||
852 | if repo: |
|
852 | if repo: | |
853 | # set the descriptors of the repo ui to those of ui |
|
853 | # set the descriptors of the repo ui to those of ui | |
854 | repo.ui.fin = ui.fin |
|
854 | repo.ui.fin = ui.fin | |
855 | repo.ui.fout = ui.fout |
|
855 | repo.ui.fout = ui.fout | |
856 | repo.ui.ferr = ui.ferr |
|
856 | repo.ui.ferr = ui.ferr | |
857 | else: |
|
857 | else: | |
858 | try: |
|
858 | try: | |
859 | repo = hg.repository(ui, path=path) |
|
859 | repo = hg.repository(ui, path=path) | |
860 | if not repo.local(): |
|
860 | if not repo.local(): | |
861 | raise error.Abort(_("repository '%s' is not local") % path) |
|
861 | raise error.Abort(_("repository '%s' is not local") % path) | |
862 | repo.ui.setconfig("bundle", "mainreporoot", repo.root, 'repo') |
|
862 | repo.ui.setconfig("bundle", "mainreporoot", repo.root, 'repo') | |
863 | except error.RequirementError: |
|
863 | except error.RequirementError: | |
864 | raise |
|
864 | raise | |
865 | except error.RepoError: |
|
865 | except error.RepoError: | |
866 | if rpath and rpath[-1]: # invalid -R path |
|
866 | if rpath and rpath[-1]: # invalid -R path | |
867 | raise |
|
867 | raise | |
868 | if not _cmdattr(ui, cmd, func, 'optionalrepo'): |
|
868 | if not _cmdattr(ui, cmd, func, 'optionalrepo'): | |
869 | if (_cmdattr(ui, cmd, func, 'inferrepo') and |
|
869 | if (_cmdattr(ui, cmd, func, 'inferrepo') and | |
870 | args and not path): |
|
870 | args and not path): | |
871 | # try to infer -R from command args |
|
871 | # try to infer -R from command args | |
872 | repos = map(cmdutil.findrepo, args) |
|
872 | repos = map(cmdutil.findrepo, args) | |
873 | guess = repos[0] |
|
873 | guess = repos[0] | |
874 | if guess and repos.count(guess) == len(repos): |
|
874 | if guess and repos.count(guess) == len(repos): | |
875 | req.args = ['--repository', guess] + fullargs |
|
875 | req.args = ['--repository', guess] + fullargs | |
876 | return _dispatch(req) |
|
876 | return _dispatch(req) | |
877 | if not path: |
|
877 | if not path: | |
878 | raise error.RepoError(_("no repository found in '%s'" |
|
878 | raise error.RepoError(_("no repository found in '%s'" | |
879 | " (.hg not found)") |
|
879 | " (.hg not found)") | |
880 | % os.getcwd()) |
|
880 | % os.getcwd()) | |
881 | raise |
|
881 | raise | |
882 | if repo: |
|
882 | if repo: | |
883 | ui = repo.ui |
|
883 | ui = repo.ui | |
884 | if options['hidden']: |
|
884 | if options['hidden']: | |
885 | repo = repo.unfiltered() |
|
885 | repo = repo.unfiltered() | |
886 | args.insert(0, repo) |
|
886 | args.insert(0, repo) | |
887 | elif rpath: |
|
887 | elif rpath: | |
888 | ui.warn(_("warning: --repository ignored\n")) |
|
888 | ui.warn(_("warning: --repository ignored\n")) | |
889 |
|
889 | |||
890 | msg = ' '.join(' ' in a and repr(a) or a for a in fullargs) |
|
890 | msg = ' '.join(' ' in a and repr(a) or a for a in fullargs) | |
891 | ui.log("command", '%s\n', msg) |
|
891 | ui.log("command", '%s\n', msg) | |
892 | d = lambda: util.checksignature(func)(ui, *args, **cmdoptions) |
|
892 | d = lambda: util.checksignature(func)(ui, *args, **cmdoptions) | |
893 | try: |
|
893 | try: | |
894 | return runcommand(lui, repo, cmd, fullargs, ui, options, d, |
|
894 | return runcommand(lui, repo, cmd, fullargs, ui, options, d, | |
895 | cmdpats, cmdoptions) |
|
895 | cmdpats, cmdoptions) | |
896 | finally: |
|
896 | finally: | |
897 | if repo and repo != req.repo: |
|
897 | if repo and repo != req.repo: | |
898 | repo.close() |
|
898 | repo.close() | |
899 |
|
899 | |||
900 | def _runcommand(ui, options, cmd, cmdfunc): |
|
900 | def _runcommand(ui, options, cmd, cmdfunc): | |
901 | """Enables the profiler if applicable. |
|
901 | """Run a command function, possibly with profiling enabled.""" | |
902 |
|
902 | with profiling.maybeprofile(ui): | ||
903 | ``profiling.enabled`` - boolean config that enables or disables profiling |
|
|||
904 | """ |
|
|||
905 | def checkargs(): |
|
|||
906 | try: |
|
903 | try: | |
907 | return cmdfunc() |
|
904 | return cmdfunc() | |
908 | except error.SignatureError: |
|
905 | except error.SignatureError: | |
909 |
raise error.CommandError(cmd, _( |
|
906 | raise error.CommandError(cmd, _('invalid arguments')) | |
910 |
|
||||
911 | if ui.configbool('profiling', 'enabled'): |
|
|||
912 | with profiling.profile(ui): |
|
|||
913 | return checkargs() |
|
|||
914 | else: |
|
|||
915 | return checkargs() |
|
|||
916 |
|
907 | |||
917 | def _exceptionwarning(ui): |
|
908 | def _exceptionwarning(ui): | |
918 | """Produce a warning message for the current active exception""" |
|
909 | """Produce a warning message for the current active exception""" | |
919 |
|
910 | |||
920 | # For compatibility checking, we discard the portion of the hg |
|
911 | # For compatibility checking, we discard the portion of the hg | |
921 | # version after the + on the assumption that if a "normal |
|
912 | # version after the + on the assumption that if a "normal | |
922 | # user" is running a build with a + in it the packager |
|
913 | # user" is running a build with a + in it the packager | |
923 | # probably built from fairly close to a tag and anyone with a |
|
914 | # probably built from fairly close to a tag and anyone with a | |
924 | # 'make local' copy of hg (where the version number can be out |
|
915 | # 'make local' copy of hg (where the version number can be out | |
925 | # of date) will be clueful enough to notice the implausible |
|
916 | # of date) will be clueful enough to notice the implausible | |
926 | # version number and try updating. |
|
917 | # version number and try updating. | |
927 | ct = util.versiontuple(n=2) |
|
918 | ct = util.versiontuple(n=2) | |
928 | worst = None, ct, '' |
|
919 | worst = None, ct, '' | |
929 | if ui.config('ui', 'supportcontact', None) is None: |
|
920 | if ui.config('ui', 'supportcontact', None) is None: | |
930 | for name, mod in extensions.extensions(): |
|
921 | for name, mod in extensions.extensions(): | |
931 | testedwith = getattr(mod, 'testedwith', '') |
|
922 | testedwith = getattr(mod, 'testedwith', '') | |
932 | report = getattr(mod, 'buglink', _('the extension author.')) |
|
923 | report = getattr(mod, 'buglink', _('the extension author.')) | |
933 | if not testedwith.strip(): |
|
924 | if not testedwith.strip(): | |
934 | # We found an untested extension. It's likely the culprit. |
|
925 | # We found an untested extension. It's likely the culprit. | |
935 | worst = name, 'unknown', report |
|
926 | worst = name, 'unknown', report | |
936 | break |
|
927 | break | |
937 |
|
928 | |||
938 | # Never blame on extensions bundled with Mercurial. |
|
929 | # Never blame on extensions bundled with Mercurial. | |
939 | if testedwith == 'internal': |
|
930 | if testedwith == 'internal': | |
940 | continue |
|
931 | continue | |
941 |
|
932 | |||
942 | tested = [util.versiontuple(t, 2) for t in testedwith.split()] |
|
933 | tested = [util.versiontuple(t, 2) for t in testedwith.split()] | |
943 | if ct in tested: |
|
934 | if ct in tested: | |
944 | continue |
|
935 | continue | |
945 |
|
936 | |||
946 | lower = [t for t in tested if t < ct] |
|
937 | lower = [t for t in tested if t < ct] | |
947 | nearest = max(lower or tested) |
|
938 | nearest = max(lower or tested) | |
948 | if worst[0] is None or nearest < worst[1]: |
|
939 | if worst[0] is None or nearest < worst[1]: | |
949 | worst = name, nearest, report |
|
940 | worst = name, nearest, report | |
950 | if worst[0] is not None: |
|
941 | if worst[0] is not None: | |
951 | name, testedwith, report = worst |
|
942 | name, testedwith, report = worst | |
952 | if not isinstance(testedwith, str): |
|
943 | if not isinstance(testedwith, str): | |
953 | testedwith = '.'.join([str(c) for c in testedwith]) |
|
944 | testedwith = '.'.join([str(c) for c in testedwith]) | |
954 | warning = (_('** Unknown exception encountered with ' |
|
945 | warning = (_('** Unknown exception encountered with ' | |
955 | 'possibly-broken third-party extension %s\n' |
|
946 | 'possibly-broken third-party extension %s\n' | |
956 | '** which supports versions %s of Mercurial.\n' |
|
947 | '** which supports versions %s of Mercurial.\n' | |
957 | '** Please disable %s and try your action again.\n' |
|
948 | '** Please disable %s and try your action again.\n' | |
958 | '** If that fixes the bug please report it to %s\n') |
|
949 | '** If that fixes the bug please report it to %s\n') | |
959 | % (name, testedwith, name, report)) |
|
950 | % (name, testedwith, name, report)) | |
960 | else: |
|
951 | else: | |
961 | bugtracker = ui.config('ui', 'supportcontact', None) |
|
952 | bugtracker = ui.config('ui', 'supportcontact', None) | |
962 | if bugtracker is None: |
|
953 | if bugtracker is None: | |
963 | bugtracker = _("https://mercurial-scm.org/wiki/BugTracker") |
|
954 | bugtracker = _("https://mercurial-scm.org/wiki/BugTracker") | |
964 | warning = (_("** unknown exception encountered, " |
|
955 | warning = (_("** unknown exception encountered, " | |
965 | "please report by visiting\n** ") + bugtracker + '\n') |
|
956 | "please report by visiting\n** ") + bugtracker + '\n') | |
966 | warning += ((_("** Python %s\n") % sys.version.replace('\n', '')) + |
|
957 | warning += ((_("** Python %s\n") % sys.version.replace('\n', '')) + | |
967 | (_("** Mercurial Distributed SCM (version %s)\n") % |
|
958 | (_("** Mercurial Distributed SCM (version %s)\n") % | |
968 | util.version()) + |
|
959 | util.version()) + | |
969 | (_("** Extensions loaded: %s\n") % |
|
960 | (_("** Extensions loaded: %s\n") % | |
970 | ", ".join([x[0] for x in extensions.extensions()]))) |
|
961 | ", ".join([x[0] for x in extensions.extensions()]))) | |
971 | return warning |
|
962 | return warning | |
972 |
|
963 | |||
973 | def handlecommandexception(ui): |
|
964 | def handlecommandexception(ui): | |
974 | """Produce a warning message for broken commands |
|
965 | """Produce a warning message for broken commands | |
975 |
|
966 | |||
976 | Called when handling an exception; the exception is reraised if |
|
967 | Called when handling an exception; the exception is reraised if | |
977 | this function returns False, ignored otherwise. |
|
968 | this function returns False, ignored otherwise. | |
978 | """ |
|
969 | """ | |
979 | warning = _exceptionwarning(ui) |
|
970 | warning = _exceptionwarning(ui) | |
980 | ui.log("commandexception", "%s\n%s\n", warning, traceback.format_exc()) |
|
971 | ui.log("commandexception", "%s\n%s\n", warning, traceback.format_exc()) | |
981 | ui.warn(warning) |
|
972 | ui.warn(warning) | |
982 | return False # re-raise the exception |
|
973 | return False # re-raise the exception |
@@ -1,2234 +1,2240 b'' | |||||
1 | The Mercurial system uses a set of configuration files to control |
|
1 | The Mercurial system uses a set of configuration files to control | |
2 | aspects of its behavior. |
|
2 | aspects of its behavior. | |
3 |
|
3 | |||
4 | Troubleshooting |
|
4 | Troubleshooting | |
5 | =============== |
|
5 | =============== | |
6 |
|
6 | |||
7 | If you're having problems with your configuration, |
|
7 | If you're having problems with your configuration, | |
8 | :hg:`config --debug` can help you understand what is introducing |
|
8 | :hg:`config --debug` can help you understand what is introducing | |
9 | a setting into your environment. |
|
9 | a setting into your environment. | |
10 |
|
10 | |||
11 | See :hg:`help config.syntax` and :hg:`help config.files` |
|
11 | See :hg:`help config.syntax` and :hg:`help config.files` | |
12 | for information about how and where to override things. |
|
12 | for information about how and where to override things. | |
13 |
|
13 | |||
14 | Structure |
|
14 | Structure | |
15 | ========= |
|
15 | ========= | |
16 |
|
16 | |||
17 | The configuration files use a simple ini-file format. A configuration |
|
17 | The configuration files use a simple ini-file format. A configuration | |
18 | file consists of sections, led by a ``[section]`` header and followed |
|
18 | file consists of sections, led by a ``[section]`` header and followed | |
19 | by ``name = value`` entries:: |
|
19 | by ``name = value`` entries:: | |
20 |
|
20 | |||
21 | [ui] |
|
21 | [ui] | |
22 | username = Firstname Lastname <firstname.lastname@example.net> |
|
22 | username = Firstname Lastname <firstname.lastname@example.net> | |
23 | verbose = True |
|
23 | verbose = True | |
24 |
|
24 | |||
25 | The above entries will be referred to as ``ui.username`` and |
|
25 | The above entries will be referred to as ``ui.username`` and | |
26 | ``ui.verbose``, respectively. See :hg:`help config.syntax`. |
|
26 | ``ui.verbose``, respectively. See :hg:`help config.syntax`. | |
27 |
|
27 | |||
28 | Files |
|
28 | Files | |
29 | ===== |
|
29 | ===== | |
30 |
|
30 | |||
31 | Mercurial reads configuration data from several files, if they exist. |
|
31 | Mercurial reads configuration data from several files, if they exist. | |
32 | These files do not exist by default and you will have to create the |
|
32 | These files do not exist by default and you will have to create the | |
33 | appropriate configuration files yourself: |
|
33 | appropriate configuration files yourself: | |
34 |
|
34 | |||
35 | Local configuration is put into the per-repository ``<repo>/.hg/hgrc`` file. |
|
35 | Local configuration is put into the per-repository ``<repo>/.hg/hgrc`` file. | |
36 |
|
36 | |||
37 | Global configuration like the username setting is typically put into: |
|
37 | Global configuration like the username setting is typically put into: | |
38 |
|
38 | |||
39 | .. container:: windows |
|
39 | .. container:: windows | |
40 |
|
40 | |||
41 | - ``%USERPROFILE%\mercurial.ini`` (on Windows) |
|
41 | - ``%USERPROFILE%\mercurial.ini`` (on Windows) | |
42 |
|
42 | |||
43 | .. container:: unix.plan9 |
|
43 | .. container:: unix.plan9 | |
44 |
|
44 | |||
45 | - ``$HOME/.hgrc`` (on Unix, Plan9) |
|
45 | - ``$HOME/.hgrc`` (on Unix, Plan9) | |
46 |
|
46 | |||
47 | The names of these files depend on the system on which Mercurial is |
|
47 | The names of these files depend on the system on which Mercurial is | |
48 | installed. ``*.rc`` files from a single directory are read in |
|
48 | installed. ``*.rc`` files from a single directory are read in | |
49 | alphabetical order, later ones overriding earlier ones. Where multiple |
|
49 | alphabetical order, later ones overriding earlier ones. Where multiple | |
50 | paths are given below, settings from earlier paths override later |
|
50 | paths are given below, settings from earlier paths override later | |
51 | ones. |
|
51 | ones. | |
52 |
|
52 | |||
53 | .. container:: verbose.unix |
|
53 | .. container:: verbose.unix | |
54 |
|
54 | |||
55 | On Unix, the following files are consulted: |
|
55 | On Unix, the following files are consulted: | |
56 |
|
56 | |||
57 | - ``<repo>/.hg/hgrc`` (per-repository) |
|
57 | - ``<repo>/.hg/hgrc`` (per-repository) | |
58 | - ``$HOME/.hgrc`` (per-user) |
|
58 | - ``$HOME/.hgrc`` (per-user) | |
59 | - ``<install-root>/etc/mercurial/hgrc`` (per-installation) |
|
59 | - ``<install-root>/etc/mercurial/hgrc`` (per-installation) | |
60 | - ``<install-root>/etc/mercurial/hgrc.d/*.rc`` (per-installation) |
|
60 | - ``<install-root>/etc/mercurial/hgrc.d/*.rc`` (per-installation) | |
61 | - ``/etc/mercurial/hgrc`` (per-system) |
|
61 | - ``/etc/mercurial/hgrc`` (per-system) | |
62 | - ``/etc/mercurial/hgrc.d/*.rc`` (per-system) |
|
62 | - ``/etc/mercurial/hgrc.d/*.rc`` (per-system) | |
63 | - ``<internal>/default.d/*.rc`` (defaults) |
|
63 | - ``<internal>/default.d/*.rc`` (defaults) | |
64 |
|
64 | |||
65 | .. container:: verbose.windows |
|
65 | .. container:: verbose.windows | |
66 |
|
66 | |||
67 | On Windows, the following files are consulted: |
|
67 | On Windows, the following files are consulted: | |
68 |
|
68 | |||
69 | - ``<repo>/.hg/hgrc`` (per-repository) |
|
69 | - ``<repo>/.hg/hgrc`` (per-repository) | |
70 | - ``%USERPROFILE%\.hgrc`` (per-user) |
|
70 | - ``%USERPROFILE%\.hgrc`` (per-user) | |
71 | - ``%USERPROFILE%\Mercurial.ini`` (per-user) |
|
71 | - ``%USERPROFILE%\Mercurial.ini`` (per-user) | |
72 | - ``%HOME%\.hgrc`` (per-user) |
|
72 | - ``%HOME%\.hgrc`` (per-user) | |
73 | - ``%HOME%\Mercurial.ini`` (per-user) |
|
73 | - ``%HOME%\Mercurial.ini`` (per-user) | |
74 | - ``HKEY_LOCAL_MACHINE\SOFTWARE\Mercurial`` (per-installation) |
|
74 | - ``HKEY_LOCAL_MACHINE\SOFTWARE\Mercurial`` (per-installation) | |
75 | - ``<install-dir>\hgrc.d\*.rc`` (per-installation) |
|
75 | - ``<install-dir>\hgrc.d\*.rc`` (per-installation) | |
76 | - ``<install-dir>\Mercurial.ini`` (per-installation) |
|
76 | - ``<install-dir>\Mercurial.ini`` (per-installation) | |
77 | - ``<internal>/default.d/*.rc`` (defaults) |
|
77 | - ``<internal>/default.d/*.rc`` (defaults) | |
78 |
|
78 | |||
79 | .. note:: |
|
79 | .. note:: | |
80 |
|
80 | |||
81 | The registry key ``HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Mercurial`` |
|
81 | The registry key ``HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Mercurial`` | |
82 | is used when running 32-bit Python on 64-bit Windows. |
|
82 | is used when running 32-bit Python on 64-bit Windows. | |
83 |
|
83 | |||
84 | .. container:: windows |
|
84 | .. container:: windows | |
85 |
|
85 | |||
86 | On Windows 9x, ``%HOME%`` is replaced by ``%APPDATA%``. |
|
86 | On Windows 9x, ``%HOME%`` is replaced by ``%APPDATA%``. | |
87 |
|
87 | |||
88 | .. container:: verbose.plan9 |
|
88 | .. container:: verbose.plan9 | |
89 |
|
89 | |||
90 | On Plan9, the following files are consulted: |
|
90 | On Plan9, the following files are consulted: | |
91 |
|
91 | |||
92 | - ``<repo>/.hg/hgrc`` (per-repository) |
|
92 | - ``<repo>/.hg/hgrc`` (per-repository) | |
93 | - ``$home/lib/hgrc`` (per-user) |
|
93 | - ``$home/lib/hgrc`` (per-user) | |
94 | - ``<install-root>/lib/mercurial/hgrc`` (per-installation) |
|
94 | - ``<install-root>/lib/mercurial/hgrc`` (per-installation) | |
95 | - ``<install-root>/lib/mercurial/hgrc.d/*.rc`` (per-installation) |
|
95 | - ``<install-root>/lib/mercurial/hgrc.d/*.rc`` (per-installation) | |
96 | - ``/lib/mercurial/hgrc`` (per-system) |
|
96 | - ``/lib/mercurial/hgrc`` (per-system) | |
97 | - ``/lib/mercurial/hgrc.d/*.rc`` (per-system) |
|
97 | - ``/lib/mercurial/hgrc.d/*.rc`` (per-system) | |
98 | - ``<internal>/default.d/*.rc`` (defaults) |
|
98 | - ``<internal>/default.d/*.rc`` (defaults) | |
99 |
|
99 | |||
100 | Per-repository configuration options only apply in a |
|
100 | Per-repository configuration options only apply in a | |
101 | particular repository. This file is not version-controlled, and |
|
101 | particular repository. This file is not version-controlled, and | |
102 | will not get transferred during a "clone" operation. Options in |
|
102 | will not get transferred during a "clone" operation. Options in | |
103 | this file override options in all other configuration files. |
|
103 | this file override options in all other configuration files. | |
104 |
|
104 | |||
105 | .. container:: unix.plan9 |
|
105 | .. container:: unix.plan9 | |
106 |
|
106 | |||
107 | On Plan 9 and Unix, most of this file will be ignored if it doesn't |
|
107 | On Plan 9 and Unix, most of this file will be ignored if it doesn't | |
108 | belong to a trusted user or to a trusted group. See |
|
108 | belong to a trusted user or to a trusted group. See | |
109 | :hg:`help config.trusted` for more details. |
|
109 | :hg:`help config.trusted` for more details. | |
110 |
|
110 | |||
111 | Per-user configuration file(s) are for the user running Mercurial. Options |
|
111 | Per-user configuration file(s) are for the user running Mercurial. Options | |
112 | in these files apply to all Mercurial commands executed by this user in any |
|
112 | in these files apply to all Mercurial commands executed by this user in any | |
113 | directory. Options in these files override per-system and per-installation |
|
113 | directory. Options in these files override per-system and per-installation | |
114 | options. |
|
114 | options. | |
115 |
|
115 | |||
116 | Per-installation configuration files are searched for in the |
|
116 | Per-installation configuration files are searched for in the | |
117 | directory where Mercurial is installed. ``<install-root>`` is the |
|
117 | directory where Mercurial is installed. ``<install-root>`` is the | |
118 | parent directory of the **hg** executable (or symlink) being run. |
|
118 | parent directory of the **hg** executable (or symlink) being run. | |
119 |
|
119 | |||
120 | .. container:: unix.plan9 |
|
120 | .. container:: unix.plan9 | |
121 |
|
121 | |||
122 | For example, if installed in ``/shared/tools/bin/hg``, Mercurial |
|
122 | For example, if installed in ``/shared/tools/bin/hg``, Mercurial | |
123 | will look in ``/shared/tools/etc/mercurial/hgrc``. Options in these |
|
123 | will look in ``/shared/tools/etc/mercurial/hgrc``. Options in these | |
124 | files apply to all Mercurial commands executed by any user in any |
|
124 | files apply to all Mercurial commands executed by any user in any | |
125 | directory. |
|
125 | directory. | |
126 |
|
126 | |||
127 | Per-installation configuration files are for the system on |
|
127 | Per-installation configuration files are for the system on | |
128 | which Mercurial is running. Options in these files apply to all |
|
128 | which Mercurial is running. Options in these files apply to all | |
129 | Mercurial commands executed by any user in any directory. Registry |
|
129 | Mercurial commands executed by any user in any directory. Registry | |
130 | keys contain PATH-like strings, every part of which must reference |
|
130 | keys contain PATH-like strings, every part of which must reference | |
131 | a ``Mercurial.ini`` file or be a directory where ``*.rc`` files will |
|
131 | a ``Mercurial.ini`` file or be a directory where ``*.rc`` files will | |
132 | be read. Mercurial checks each of these locations in the specified |
|
132 | be read. Mercurial checks each of these locations in the specified | |
133 | order until one or more configuration files are detected. |
|
133 | order until one or more configuration files are detected. | |
134 |
|
134 | |||
135 | Per-system configuration files are for the system on which Mercurial |
|
135 | Per-system configuration files are for the system on which Mercurial | |
136 | is running. Options in these files apply to all Mercurial commands |
|
136 | is running. Options in these files apply to all Mercurial commands | |
137 | executed by any user in any directory. Options in these files |
|
137 | executed by any user in any directory. Options in these files | |
138 | override per-installation options. |
|
138 | override per-installation options. | |
139 |
|
139 | |||
140 | Mercurial comes with some default configuration. The default configuration |
|
140 | Mercurial comes with some default configuration. The default configuration | |
141 | files are installed with Mercurial and will be overwritten on upgrades. Default |
|
141 | files are installed with Mercurial and will be overwritten on upgrades. Default | |
142 | configuration files should never be edited by users or administrators but can |
|
142 | configuration files should never be edited by users or administrators but can | |
143 | be overridden in other configuration files. So far the directory only contains |
|
143 | be overridden in other configuration files. So far the directory only contains | |
144 | merge tool configuration but packagers can also put other default configuration |
|
144 | merge tool configuration but packagers can also put other default configuration | |
145 | there. |
|
145 | there. | |
146 |
|
146 | |||
147 | Syntax |
|
147 | Syntax | |
148 | ====== |
|
148 | ====== | |
149 |
|
149 | |||
150 | A configuration file consists of sections, led by a ``[section]`` header |
|
150 | A configuration file consists of sections, led by a ``[section]`` header | |
151 | and followed by ``name = value`` entries (sometimes called |
|
151 | and followed by ``name = value`` entries (sometimes called | |
152 | ``configuration keys``):: |
|
152 | ``configuration keys``):: | |
153 |
|
153 | |||
154 | [spam] |
|
154 | [spam] | |
155 | eggs=ham |
|
155 | eggs=ham | |
156 | green= |
|
156 | green= | |
157 | eggs |
|
157 | eggs | |
158 |
|
158 | |||
159 | Each line contains one entry. If the lines that follow are indented, |
|
159 | Each line contains one entry. If the lines that follow are indented, | |
160 | they are treated as continuations of that entry. Leading whitespace is |
|
160 | they are treated as continuations of that entry. Leading whitespace is | |
161 | removed from values. Empty lines are skipped. Lines beginning with |
|
161 | removed from values. Empty lines are skipped. Lines beginning with | |
162 | ``#`` or ``;`` are ignored and may be used to provide comments. |
|
162 | ``#`` or ``;`` are ignored and may be used to provide comments. | |
163 |
|
163 | |||
164 | Configuration keys can be set multiple times, in which case Mercurial |
|
164 | Configuration keys can be set multiple times, in which case Mercurial | |
165 | will use the value that was configured last. As an example:: |
|
165 | will use the value that was configured last. As an example:: | |
166 |
|
166 | |||
167 | [spam] |
|
167 | [spam] | |
168 | eggs=large |
|
168 | eggs=large | |
169 | ham=serrano |
|
169 | ham=serrano | |
170 | eggs=small |
|
170 | eggs=small | |
171 |
|
171 | |||
172 | This would set the configuration key named ``eggs`` to ``small``. |
|
172 | This would set the configuration key named ``eggs`` to ``small``. | |
173 |
|
173 | |||
174 | It is also possible to define a section multiple times. A section can |
|
174 | It is also possible to define a section multiple times. A section can | |
175 | be redefined on the same and/or on different configuration files. For |
|
175 | be redefined on the same and/or on different configuration files. For | |
176 | example:: |
|
176 | example:: | |
177 |
|
177 | |||
178 | [foo] |
|
178 | [foo] | |
179 | eggs=large |
|
179 | eggs=large | |
180 | ham=serrano |
|
180 | ham=serrano | |
181 | eggs=small |
|
181 | eggs=small | |
182 |
|
182 | |||
183 | [bar] |
|
183 | [bar] | |
184 | eggs=ham |
|
184 | eggs=ham | |
185 | green= |
|
185 | green= | |
186 | eggs |
|
186 | eggs | |
187 |
|
187 | |||
188 | [foo] |
|
188 | [foo] | |
189 | ham=prosciutto |
|
189 | ham=prosciutto | |
190 | eggs=medium |
|
190 | eggs=medium | |
191 | bread=toasted |
|
191 | bread=toasted | |
192 |
|
192 | |||
193 | This would set the ``eggs``, ``ham``, and ``bread`` configuration keys |
|
193 | This would set the ``eggs``, ``ham``, and ``bread`` configuration keys | |
194 | of the ``foo`` section to ``medium``, ``prosciutto``, and ``toasted``, |
|
194 | of the ``foo`` section to ``medium``, ``prosciutto``, and ``toasted``, | |
195 | respectively. As you can see there only thing that matters is the last |
|
195 | respectively. As you can see there only thing that matters is the last | |
196 | value that was set for each of the configuration keys. |
|
196 | value that was set for each of the configuration keys. | |
197 |
|
197 | |||
198 | If a configuration key is set multiple times in different |
|
198 | If a configuration key is set multiple times in different | |
199 | configuration files the final value will depend on the order in which |
|
199 | configuration files the final value will depend on the order in which | |
200 | the different configuration files are read, with settings from earlier |
|
200 | the different configuration files are read, with settings from earlier | |
201 | paths overriding later ones as described on the ``Files`` section |
|
201 | paths overriding later ones as described on the ``Files`` section | |
202 | above. |
|
202 | above. | |
203 |
|
203 | |||
204 | A line of the form ``%include file`` will include ``file`` into the |
|
204 | A line of the form ``%include file`` will include ``file`` into the | |
205 | current configuration file. The inclusion is recursive, which means |
|
205 | current configuration file. The inclusion is recursive, which means | |
206 | that included files can include other files. Filenames are relative to |
|
206 | that included files can include other files. Filenames are relative to | |
207 | the configuration file in which the ``%include`` directive is found. |
|
207 | the configuration file in which the ``%include`` directive is found. | |
208 | Environment variables and ``~user`` constructs are expanded in |
|
208 | Environment variables and ``~user`` constructs are expanded in | |
209 | ``file``. This lets you do something like:: |
|
209 | ``file``. This lets you do something like:: | |
210 |
|
210 | |||
211 | %include ~/.hgrc.d/$HOST.rc |
|
211 | %include ~/.hgrc.d/$HOST.rc | |
212 |
|
212 | |||
213 | to include a different configuration file on each computer you use. |
|
213 | to include a different configuration file on each computer you use. | |
214 |
|
214 | |||
215 | A line with ``%unset name`` will remove ``name`` from the current |
|
215 | A line with ``%unset name`` will remove ``name`` from the current | |
216 | section, if it has been set previously. |
|
216 | section, if it has been set previously. | |
217 |
|
217 | |||
218 | The values are either free-form text strings, lists of text strings, |
|
218 | The values are either free-form text strings, lists of text strings, | |
219 | or Boolean values. Boolean values can be set to true using any of "1", |
|
219 | or Boolean values. Boolean values can be set to true using any of "1", | |
220 | "yes", "true", or "on" and to false using "0", "no", "false", or "off" |
|
220 | "yes", "true", or "on" and to false using "0", "no", "false", or "off" | |
221 | (all case insensitive). |
|
221 | (all case insensitive). | |
222 |
|
222 | |||
223 | List values are separated by whitespace or comma, except when values are |
|
223 | List values are separated by whitespace or comma, except when values are | |
224 | placed in double quotation marks:: |
|
224 | placed in double quotation marks:: | |
225 |
|
225 | |||
226 | allow_read = "John Doe, PhD", brian, betty |
|
226 | allow_read = "John Doe, PhD", brian, betty | |
227 |
|
227 | |||
228 | Quotation marks can be escaped by prefixing them with a backslash. Only |
|
228 | Quotation marks can be escaped by prefixing them with a backslash. Only | |
229 | quotation marks at the beginning of a word is counted as a quotation |
|
229 | quotation marks at the beginning of a word is counted as a quotation | |
230 | (e.g., ``foo"bar baz`` is the list of ``foo"bar`` and ``baz``). |
|
230 | (e.g., ``foo"bar baz`` is the list of ``foo"bar`` and ``baz``). | |
231 |
|
231 | |||
232 | Sections |
|
232 | Sections | |
233 | ======== |
|
233 | ======== | |
234 |
|
234 | |||
235 | This section describes the different sections that may appear in a |
|
235 | This section describes the different sections that may appear in a | |
236 | Mercurial configuration file, the purpose of each section, its possible |
|
236 | Mercurial configuration file, the purpose of each section, its possible | |
237 | keys, and their possible values. |
|
237 | keys, and their possible values. | |
238 |
|
238 | |||
239 | ``alias`` |
|
239 | ``alias`` | |
240 | --------- |
|
240 | --------- | |
241 |
|
241 | |||
242 | Defines command aliases. |
|
242 | Defines command aliases. | |
243 |
|
243 | |||
244 | Aliases allow you to define your own commands in terms of other |
|
244 | Aliases allow you to define your own commands in terms of other | |
245 | commands (or aliases), optionally including arguments. Positional |
|
245 | commands (or aliases), optionally including arguments. Positional | |
246 | arguments in the form of ``$1``, ``$2``, etc. in the alias definition |
|
246 | arguments in the form of ``$1``, ``$2``, etc. in the alias definition | |
247 | are expanded by Mercurial before execution. Positional arguments not |
|
247 | are expanded by Mercurial before execution. Positional arguments not | |
248 | already used by ``$N`` in the definition are put at the end of the |
|
248 | already used by ``$N`` in the definition are put at the end of the | |
249 | command to be executed. |
|
249 | command to be executed. | |
250 |
|
250 | |||
251 | Alias definitions consist of lines of the form:: |
|
251 | Alias definitions consist of lines of the form:: | |
252 |
|
252 | |||
253 | <alias> = <command> [<argument>]... |
|
253 | <alias> = <command> [<argument>]... | |
254 |
|
254 | |||
255 | For example, this definition:: |
|
255 | For example, this definition:: | |
256 |
|
256 | |||
257 | latest = log --limit 5 |
|
257 | latest = log --limit 5 | |
258 |
|
258 | |||
259 | creates a new command ``latest`` that shows only the five most recent |
|
259 | creates a new command ``latest`` that shows only the five most recent | |
260 | changesets. You can define subsequent aliases using earlier ones:: |
|
260 | changesets. You can define subsequent aliases using earlier ones:: | |
261 |
|
261 | |||
262 | stable5 = latest -b stable |
|
262 | stable5 = latest -b stable | |
263 |
|
263 | |||
264 | .. note:: |
|
264 | .. note:: | |
265 |
|
265 | |||
266 | It is possible to create aliases with the same names as |
|
266 | It is possible to create aliases with the same names as | |
267 | existing commands, which will then override the original |
|
267 | existing commands, which will then override the original | |
268 | definitions. This is almost always a bad idea! |
|
268 | definitions. This is almost always a bad idea! | |
269 |
|
269 | |||
270 | An alias can start with an exclamation point (``!``) to make it a |
|
270 | An alias can start with an exclamation point (``!``) to make it a | |
271 | shell alias. A shell alias is executed with the shell and will let you |
|
271 | shell alias. A shell alias is executed with the shell and will let you | |
272 | run arbitrary commands. As an example, :: |
|
272 | run arbitrary commands. As an example, :: | |
273 |
|
273 | |||
274 | echo = !echo $@ |
|
274 | echo = !echo $@ | |
275 |
|
275 | |||
276 | will let you do ``hg echo foo`` to have ``foo`` printed in your |
|
276 | will let you do ``hg echo foo`` to have ``foo`` printed in your | |
277 | terminal. A better example might be:: |
|
277 | terminal. A better example might be:: | |
278 |
|
278 | |||
279 | purge = !$HG status --no-status --unknown -0 re: | xargs -0 rm |
|
279 | purge = !$HG status --no-status --unknown -0 re: | xargs -0 rm | |
280 |
|
280 | |||
281 | which will make ``hg purge`` delete all unknown files in the |
|
281 | which will make ``hg purge`` delete all unknown files in the | |
282 | repository in the same manner as the purge extension. |
|
282 | repository in the same manner as the purge extension. | |
283 |
|
283 | |||
284 | Positional arguments like ``$1``, ``$2``, etc. in the alias definition |
|
284 | Positional arguments like ``$1``, ``$2``, etc. in the alias definition | |
285 | expand to the command arguments. Unmatched arguments are |
|
285 | expand to the command arguments. Unmatched arguments are | |
286 | removed. ``$0`` expands to the alias name and ``$@`` expands to all |
|
286 | removed. ``$0`` expands to the alias name and ``$@`` expands to all | |
287 | arguments separated by a space. ``"$@"`` (with quotes) expands to all |
|
287 | arguments separated by a space. ``"$@"`` (with quotes) expands to all | |
288 | arguments quoted individually and separated by a space. These expansions |
|
288 | arguments quoted individually and separated by a space. These expansions | |
289 | happen before the command is passed to the shell. |
|
289 | happen before the command is passed to the shell. | |
290 |
|
290 | |||
291 | Shell aliases are executed in an environment where ``$HG`` expands to |
|
291 | Shell aliases are executed in an environment where ``$HG`` expands to | |
292 | the path of the Mercurial that was used to execute the alias. This is |
|
292 | the path of the Mercurial that was used to execute the alias. This is | |
293 | useful when you want to call further Mercurial commands in a shell |
|
293 | useful when you want to call further Mercurial commands in a shell | |
294 | alias, as was done above for the purge alias. In addition, |
|
294 | alias, as was done above for the purge alias. In addition, | |
295 | ``$HG_ARGS`` expands to the arguments given to Mercurial. In the ``hg |
|
295 | ``$HG_ARGS`` expands to the arguments given to Mercurial. In the ``hg | |
296 | echo foo`` call above, ``$HG_ARGS`` would expand to ``echo foo``. |
|
296 | echo foo`` call above, ``$HG_ARGS`` would expand to ``echo foo``. | |
297 |
|
297 | |||
298 | .. note:: |
|
298 | .. note:: | |
299 |
|
299 | |||
300 | Some global configuration options such as ``-R`` are |
|
300 | Some global configuration options such as ``-R`` are | |
301 | processed before shell aliases and will thus not be passed to |
|
301 | processed before shell aliases and will thus not be passed to | |
302 | aliases. |
|
302 | aliases. | |
303 |
|
303 | |||
304 |
|
304 | |||
305 | ``annotate`` |
|
305 | ``annotate`` | |
306 | ------------ |
|
306 | ------------ | |
307 |
|
307 | |||
308 | Settings used when displaying file annotations. All values are |
|
308 | Settings used when displaying file annotations. All values are | |
309 | Booleans and default to False. See :hg:`help config.diff` for |
|
309 | Booleans and default to False. See :hg:`help config.diff` for | |
310 | related options for the diff command. |
|
310 | related options for the diff command. | |
311 |
|
311 | |||
312 | ``ignorews`` |
|
312 | ``ignorews`` | |
313 | Ignore white space when comparing lines. |
|
313 | Ignore white space when comparing lines. | |
314 |
|
314 | |||
315 | ``ignorewsamount`` |
|
315 | ``ignorewsamount`` | |
316 | Ignore changes in the amount of white space. |
|
316 | Ignore changes in the amount of white space. | |
317 |
|
317 | |||
318 | ``ignoreblanklines`` |
|
318 | ``ignoreblanklines`` | |
319 | Ignore changes whose lines are all blank. |
|
319 | Ignore changes whose lines are all blank. | |
320 |
|
320 | |||
321 |
|
321 | |||
322 | ``auth`` |
|
322 | ``auth`` | |
323 | -------- |
|
323 | -------- | |
324 |
|
324 | |||
325 | Authentication credentials for HTTP authentication. This section |
|
325 | Authentication credentials for HTTP authentication. This section | |
326 | allows you to store usernames and passwords for use when logging |
|
326 | allows you to store usernames and passwords for use when logging | |
327 | *into* HTTP servers. See :hg:`help config.web` if |
|
327 | *into* HTTP servers. See :hg:`help config.web` if | |
328 | you want to configure *who* can login to your HTTP server. |
|
328 | you want to configure *who* can login to your HTTP server. | |
329 |
|
329 | |||
330 | Each line has the following format:: |
|
330 | Each line has the following format:: | |
331 |
|
331 | |||
332 | <name>.<argument> = <value> |
|
332 | <name>.<argument> = <value> | |
333 |
|
333 | |||
334 | where ``<name>`` is used to group arguments into authentication |
|
334 | where ``<name>`` is used to group arguments into authentication | |
335 | entries. Example:: |
|
335 | entries. Example:: | |
336 |
|
336 | |||
337 | foo.prefix = hg.intevation.de/mercurial |
|
337 | foo.prefix = hg.intevation.de/mercurial | |
338 | foo.username = foo |
|
338 | foo.username = foo | |
339 | foo.password = bar |
|
339 | foo.password = bar | |
340 | foo.schemes = http https |
|
340 | foo.schemes = http https | |
341 |
|
341 | |||
342 | bar.prefix = secure.example.org |
|
342 | bar.prefix = secure.example.org | |
343 | bar.key = path/to/file.key |
|
343 | bar.key = path/to/file.key | |
344 | bar.cert = path/to/file.cert |
|
344 | bar.cert = path/to/file.cert | |
345 | bar.schemes = https |
|
345 | bar.schemes = https | |
346 |
|
346 | |||
347 | Supported arguments: |
|
347 | Supported arguments: | |
348 |
|
348 | |||
349 | ``prefix`` |
|
349 | ``prefix`` | |
350 | Either ``*`` or a URI prefix with or without the scheme part. |
|
350 | Either ``*`` or a URI prefix with or without the scheme part. | |
351 | The authentication entry with the longest matching prefix is used |
|
351 | The authentication entry with the longest matching prefix is used | |
352 | (where ``*`` matches everything and counts as a match of length |
|
352 | (where ``*`` matches everything and counts as a match of length | |
353 | 1). If the prefix doesn't include a scheme, the match is performed |
|
353 | 1). If the prefix doesn't include a scheme, the match is performed | |
354 | against the URI with its scheme stripped as well, and the schemes |
|
354 | against the URI with its scheme stripped as well, and the schemes | |
355 | argument, q.v., is then subsequently consulted. |
|
355 | argument, q.v., is then subsequently consulted. | |
356 |
|
356 | |||
357 | ``username`` |
|
357 | ``username`` | |
358 | Optional. Username to authenticate with. If not given, and the |
|
358 | Optional. Username to authenticate with. If not given, and the | |
359 | remote site requires basic or digest authentication, the user will |
|
359 | remote site requires basic or digest authentication, the user will | |
360 | be prompted for it. Environment variables are expanded in the |
|
360 | be prompted for it. Environment variables are expanded in the | |
361 | username letting you do ``foo.username = $USER``. If the URI |
|
361 | username letting you do ``foo.username = $USER``. If the URI | |
362 | includes a username, only ``[auth]`` entries with a matching |
|
362 | includes a username, only ``[auth]`` entries with a matching | |
363 | username or without a username will be considered. |
|
363 | username or without a username will be considered. | |
364 |
|
364 | |||
365 | ``password`` |
|
365 | ``password`` | |
366 | Optional. Password to authenticate with. If not given, and the |
|
366 | Optional. Password to authenticate with. If not given, and the | |
367 | remote site requires basic or digest authentication, the user |
|
367 | remote site requires basic or digest authentication, the user | |
368 | will be prompted for it. |
|
368 | will be prompted for it. | |
369 |
|
369 | |||
370 | ``key`` |
|
370 | ``key`` | |
371 | Optional. PEM encoded client certificate key file. Environment |
|
371 | Optional. PEM encoded client certificate key file. Environment | |
372 | variables are expanded in the filename. |
|
372 | variables are expanded in the filename. | |
373 |
|
373 | |||
374 | ``cert`` |
|
374 | ``cert`` | |
375 | Optional. PEM encoded client certificate chain file. Environment |
|
375 | Optional. PEM encoded client certificate chain file. Environment | |
376 | variables are expanded in the filename. |
|
376 | variables are expanded in the filename. | |
377 |
|
377 | |||
378 | ``schemes`` |
|
378 | ``schemes`` | |
379 | Optional. Space separated list of URI schemes to use this |
|
379 | Optional. Space separated list of URI schemes to use this | |
380 | authentication entry with. Only used if the prefix doesn't include |
|
380 | authentication entry with. Only used if the prefix doesn't include | |
381 | a scheme. Supported schemes are http and https. They will match |
|
381 | a scheme. Supported schemes are http and https. They will match | |
382 | static-http and static-https respectively, as well. |
|
382 | static-http and static-https respectively, as well. | |
383 | (default: https) |
|
383 | (default: https) | |
384 |
|
384 | |||
385 | If no suitable authentication entry is found, the user is prompted |
|
385 | If no suitable authentication entry is found, the user is prompted | |
386 | for credentials as usual if required by the remote. |
|
386 | for credentials as usual if required by the remote. | |
387 |
|
387 | |||
388 |
|
388 | |||
389 | ``committemplate`` |
|
389 | ``committemplate`` | |
390 | ------------------ |
|
390 | ------------------ | |
391 |
|
391 | |||
392 | ``changeset`` |
|
392 | ``changeset`` | |
393 | String: configuration in this section is used as the template to |
|
393 | String: configuration in this section is used as the template to | |
394 | customize the text shown in the editor when committing. |
|
394 | customize the text shown in the editor when committing. | |
395 |
|
395 | |||
396 | In addition to pre-defined template keywords, commit log specific one |
|
396 | In addition to pre-defined template keywords, commit log specific one | |
397 | below can be used for customization: |
|
397 | below can be used for customization: | |
398 |
|
398 | |||
399 | ``extramsg`` |
|
399 | ``extramsg`` | |
400 | String: Extra message (typically 'Leave message empty to abort |
|
400 | String: Extra message (typically 'Leave message empty to abort | |
401 | commit.'). This may be changed by some commands or extensions. |
|
401 | commit.'). This may be changed by some commands or extensions. | |
402 |
|
402 | |||
403 | For example, the template configuration below shows as same text as |
|
403 | For example, the template configuration below shows as same text as | |
404 | one shown by default:: |
|
404 | one shown by default:: | |
405 |
|
405 | |||
406 | [committemplate] |
|
406 | [committemplate] | |
407 | changeset = {desc}\n\n |
|
407 | changeset = {desc}\n\n | |
408 | HG: Enter commit message. Lines beginning with 'HG:' are removed. |
|
408 | HG: Enter commit message. Lines beginning with 'HG:' are removed. | |
409 | HG: {extramsg} |
|
409 | HG: {extramsg} | |
410 | HG: -- |
|
410 | HG: -- | |
411 | HG: user: {author}\n{ifeq(p2rev, "-1", "", |
|
411 | HG: user: {author}\n{ifeq(p2rev, "-1", "", | |
412 | "HG: branch merge\n") |
|
412 | "HG: branch merge\n") | |
413 | }HG: branch '{branch}'\n{if(activebookmark, |
|
413 | }HG: branch '{branch}'\n{if(activebookmark, | |
414 | "HG: bookmark '{activebookmark}'\n") }{subrepos % |
|
414 | "HG: bookmark '{activebookmark}'\n") }{subrepos % | |
415 | "HG: subrepo {subrepo}\n" }{file_adds % |
|
415 | "HG: subrepo {subrepo}\n" }{file_adds % | |
416 | "HG: added {file}\n" }{file_mods % |
|
416 | "HG: added {file}\n" }{file_mods % | |
417 | "HG: changed {file}\n" }{file_dels % |
|
417 | "HG: changed {file}\n" }{file_dels % | |
418 | "HG: removed {file}\n" }{if(files, "", |
|
418 | "HG: removed {file}\n" }{if(files, "", | |
419 | "HG: no files changed\n")} |
|
419 | "HG: no files changed\n")} | |
420 |
|
420 | |||
421 | .. note:: |
|
421 | .. note:: | |
422 |
|
422 | |||
423 | For some problematic encodings (see :hg:`help win32mbcs` for |
|
423 | For some problematic encodings (see :hg:`help win32mbcs` for | |
424 | detail), this customization should be configured carefully, to |
|
424 | detail), this customization should be configured carefully, to | |
425 | avoid showing broken characters. |
|
425 | avoid showing broken characters. | |
426 |
|
426 | |||
427 | For example, if a multibyte character ending with backslash (0x5c) is |
|
427 | For example, if a multibyte character ending with backslash (0x5c) is | |
428 | followed by the ASCII character 'n' in the customized template, |
|
428 | followed by the ASCII character 'n' in the customized template, | |
429 | the sequence of backslash and 'n' is treated as line-feed unexpectedly |
|
429 | the sequence of backslash and 'n' is treated as line-feed unexpectedly | |
430 | (and the multibyte character is broken, too). |
|
430 | (and the multibyte character is broken, too). | |
431 |
|
431 | |||
432 | Customized template is used for commands below (``--edit`` may be |
|
432 | Customized template is used for commands below (``--edit`` may be | |
433 | required): |
|
433 | required): | |
434 |
|
434 | |||
435 | - :hg:`backout` |
|
435 | - :hg:`backout` | |
436 | - :hg:`commit` |
|
436 | - :hg:`commit` | |
437 | - :hg:`fetch` (for merge commit only) |
|
437 | - :hg:`fetch` (for merge commit only) | |
438 | - :hg:`graft` |
|
438 | - :hg:`graft` | |
439 | - :hg:`histedit` |
|
439 | - :hg:`histedit` | |
440 | - :hg:`import` |
|
440 | - :hg:`import` | |
441 | - :hg:`qfold`, :hg:`qnew` and :hg:`qrefresh` |
|
441 | - :hg:`qfold`, :hg:`qnew` and :hg:`qrefresh` | |
442 | - :hg:`rebase` |
|
442 | - :hg:`rebase` | |
443 | - :hg:`shelve` |
|
443 | - :hg:`shelve` | |
444 | - :hg:`sign` |
|
444 | - :hg:`sign` | |
445 | - :hg:`tag` |
|
445 | - :hg:`tag` | |
446 | - :hg:`transplant` |
|
446 | - :hg:`transplant` | |
447 |
|
447 | |||
448 | Configuring items below instead of ``changeset`` allows showing |
|
448 | Configuring items below instead of ``changeset`` allows showing | |
449 | customized message only for specific actions, or showing different |
|
449 | customized message only for specific actions, or showing different | |
450 | messages for each action. |
|
450 | messages for each action. | |
451 |
|
451 | |||
452 | - ``changeset.backout`` for :hg:`backout` |
|
452 | - ``changeset.backout`` for :hg:`backout` | |
453 | - ``changeset.commit.amend.merge`` for :hg:`commit --amend` on merges |
|
453 | - ``changeset.commit.amend.merge`` for :hg:`commit --amend` on merges | |
454 | - ``changeset.commit.amend.normal`` for :hg:`commit --amend` on other |
|
454 | - ``changeset.commit.amend.normal`` for :hg:`commit --amend` on other | |
455 | - ``changeset.commit.normal.merge`` for :hg:`commit` on merges |
|
455 | - ``changeset.commit.normal.merge`` for :hg:`commit` on merges | |
456 | - ``changeset.commit.normal.normal`` for :hg:`commit` on other |
|
456 | - ``changeset.commit.normal.normal`` for :hg:`commit` on other | |
457 | - ``changeset.fetch`` for :hg:`fetch` (impling merge commit) |
|
457 | - ``changeset.fetch`` for :hg:`fetch` (impling merge commit) | |
458 | - ``changeset.gpg.sign`` for :hg:`sign` |
|
458 | - ``changeset.gpg.sign`` for :hg:`sign` | |
459 | - ``changeset.graft`` for :hg:`graft` |
|
459 | - ``changeset.graft`` for :hg:`graft` | |
460 | - ``changeset.histedit.edit`` for ``edit`` of :hg:`histedit` |
|
460 | - ``changeset.histedit.edit`` for ``edit`` of :hg:`histedit` | |
461 | - ``changeset.histedit.fold`` for ``fold`` of :hg:`histedit` |
|
461 | - ``changeset.histedit.fold`` for ``fold`` of :hg:`histedit` | |
462 | - ``changeset.histedit.mess`` for ``mess`` of :hg:`histedit` |
|
462 | - ``changeset.histedit.mess`` for ``mess`` of :hg:`histedit` | |
463 | - ``changeset.histedit.pick`` for ``pick`` of :hg:`histedit` |
|
463 | - ``changeset.histedit.pick`` for ``pick`` of :hg:`histedit` | |
464 | - ``changeset.import.bypass`` for :hg:`import --bypass` |
|
464 | - ``changeset.import.bypass`` for :hg:`import --bypass` | |
465 | - ``changeset.import.normal.merge`` for :hg:`import` on merges |
|
465 | - ``changeset.import.normal.merge`` for :hg:`import` on merges | |
466 | - ``changeset.import.normal.normal`` for :hg:`import` on other |
|
466 | - ``changeset.import.normal.normal`` for :hg:`import` on other | |
467 | - ``changeset.mq.qnew`` for :hg:`qnew` |
|
467 | - ``changeset.mq.qnew`` for :hg:`qnew` | |
468 | - ``changeset.mq.qfold`` for :hg:`qfold` |
|
468 | - ``changeset.mq.qfold`` for :hg:`qfold` | |
469 | - ``changeset.mq.qrefresh`` for :hg:`qrefresh` |
|
469 | - ``changeset.mq.qrefresh`` for :hg:`qrefresh` | |
470 | - ``changeset.rebase.collapse`` for :hg:`rebase --collapse` |
|
470 | - ``changeset.rebase.collapse`` for :hg:`rebase --collapse` | |
471 | - ``changeset.rebase.merge`` for :hg:`rebase` on merges |
|
471 | - ``changeset.rebase.merge`` for :hg:`rebase` on merges | |
472 | - ``changeset.rebase.normal`` for :hg:`rebase` on other |
|
472 | - ``changeset.rebase.normal`` for :hg:`rebase` on other | |
473 | - ``changeset.shelve.shelve`` for :hg:`shelve` |
|
473 | - ``changeset.shelve.shelve`` for :hg:`shelve` | |
474 | - ``changeset.tag.add`` for :hg:`tag` without ``--remove`` |
|
474 | - ``changeset.tag.add`` for :hg:`tag` without ``--remove`` | |
475 | - ``changeset.tag.remove`` for :hg:`tag --remove` |
|
475 | - ``changeset.tag.remove`` for :hg:`tag --remove` | |
476 | - ``changeset.transplant.merge`` for :hg:`transplant` on merges |
|
476 | - ``changeset.transplant.merge`` for :hg:`transplant` on merges | |
477 | - ``changeset.transplant.normal`` for :hg:`transplant` on other |
|
477 | - ``changeset.transplant.normal`` for :hg:`transplant` on other | |
478 |
|
478 | |||
479 | These dot-separated lists of names are treated as hierarchical ones. |
|
479 | These dot-separated lists of names are treated as hierarchical ones. | |
480 | For example, ``changeset.tag.remove`` customizes the commit message |
|
480 | For example, ``changeset.tag.remove`` customizes the commit message | |
481 | only for :hg:`tag --remove`, but ``changeset.tag`` customizes the |
|
481 | only for :hg:`tag --remove`, but ``changeset.tag`` customizes the | |
482 | commit message for :hg:`tag` regardless of ``--remove`` option. |
|
482 | commit message for :hg:`tag` regardless of ``--remove`` option. | |
483 |
|
483 | |||
484 | When the external editor is invoked for a commit, the corresponding |
|
484 | When the external editor is invoked for a commit, the corresponding | |
485 | dot-separated list of names without the ``changeset.`` prefix |
|
485 | dot-separated list of names without the ``changeset.`` prefix | |
486 | (e.g. ``commit.normal.normal``) is in the ``HGEDITFORM`` environment |
|
486 | (e.g. ``commit.normal.normal``) is in the ``HGEDITFORM`` environment | |
487 | variable. |
|
487 | variable. | |
488 |
|
488 | |||
489 | In this section, items other than ``changeset`` can be referred from |
|
489 | In this section, items other than ``changeset`` can be referred from | |
490 | others. For example, the configuration to list committed files up |
|
490 | others. For example, the configuration to list committed files up | |
491 | below can be referred as ``{listupfiles}``:: |
|
491 | below can be referred as ``{listupfiles}``:: | |
492 |
|
492 | |||
493 | [committemplate] |
|
493 | [committemplate] | |
494 | listupfiles = {file_adds % |
|
494 | listupfiles = {file_adds % | |
495 | "HG: added {file}\n" }{file_mods % |
|
495 | "HG: added {file}\n" }{file_mods % | |
496 | "HG: changed {file}\n" }{file_dels % |
|
496 | "HG: changed {file}\n" }{file_dels % | |
497 | "HG: removed {file}\n" }{if(files, "", |
|
497 | "HG: removed {file}\n" }{if(files, "", | |
498 | "HG: no files changed\n")} |
|
498 | "HG: no files changed\n")} | |
499 |
|
499 | |||
500 | ``decode/encode`` |
|
500 | ``decode/encode`` | |
501 | ----------------- |
|
501 | ----------------- | |
502 |
|
502 | |||
503 | Filters for transforming files on checkout/checkin. This would |
|
503 | Filters for transforming files on checkout/checkin. This would | |
504 | typically be used for newline processing or other |
|
504 | typically be used for newline processing or other | |
505 | localization/canonicalization of files. |
|
505 | localization/canonicalization of files. | |
506 |
|
506 | |||
507 | Filters consist of a filter pattern followed by a filter command. |
|
507 | Filters consist of a filter pattern followed by a filter command. | |
508 | Filter patterns are globs by default, rooted at the repository root. |
|
508 | Filter patterns are globs by default, rooted at the repository root. | |
509 | For example, to match any file ending in ``.txt`` in the root |
|
509 | For example, to match any file ending in ``.txt`` in the root | |
510 | directory only, use the pattern ``*.txt``. To match any file ending |
|
510 | directory only, use the pattern ``*.txt``. To match any file ending | |
511 | in ``.c`` anywhere in the repository, use the pattern ``**.c``. |
|
511 | in ``.c`` anywhere in the repository, use the pattern ``**.c``. | |
512 | For each file only the first matching filter applies. |
|
512 | For each file only the first matching filter applies. | |
513 |
|
513 | |||
514 | The filter command can start with a specifier, either ``pipe:`` or |
|
514 | The filter command can start with a specifier, either ``pipe:`` or | |
515 | ``tempfile:``. If no specifier is given, ``pipe:`` is used by default. |
|
515 | ``tempfile:``. If no specifier is given, ``pipe:`` is used by default. | |
516 |
|
516 | |||
517 | A ``pipe:`` command must accept data on stdin and return the transformed |
|
517 | A ``pipe:`` command must accept data on stdin and return the transformed | |
518 | data on stdout. |
|
518 | data on stdout. | |
519 |
|
519 | |||
520 | Pipe example:: |
|
520 | Pipe example:: | |
521 |
|
521 | |||
522 | [encode] |
|
522 | [encode] | |
523 | # uncompress gzip files on checkin to improve delta compression |
|
523 | # uncompress gzip files on checkin to improve delta compression | |
524 | # note: not necessarily a good idea, just an example |
|
524 | # note: not necessarily a good idea, just an example | |
525 | *.gz = pipe: gunzip |
|
525 | *.gz = pipe: gunzip | |
526 |
|
526 | |||
527 | [decode] |
|
527 | [decode] | |
528 | # recompress gzip files when writing them to the working dir (we |
|
528 | # recompress gzip files when writing them to the working dir (we | |
529 | # can safely omit "pipe:", because it's the default) |
|
529 | # can safely omit "pipe:", because it's the default) | |
530 | *.gz = gzip |
|
530 | *.gz = gzip | |
531 |
|
531 | |||
532 | A ``tempfile:`` command is a template. The string ``INFILE`` is replaced |
|
532 | A ``tempfile:`` command is a template. The string ``INFILE`` is replaced | |
533 | with the name of a temporary file that contains the data to be |
|
533 | with the name of a temporary file that contains the data to be | |
534 | filtered by the command. The string ``OUTFILE`` is replaced with the name |
|
534 | filtered by the command. The string ``OUTFILE`` is replaced with the name | |
535 | of an empty temporary file, where the filtered data must be written by |
|
535 | of an empty temporary file, where the filtered data must be written by | |
536 | the command. |
|
536 | the command. | |
537 |
|
537 | |||
538 | .. container:: windows |
|
538 | .. container:: windows | |
539 |
|
539 | |||
540 | .. note:: |
|
540 | .. note:: | |
541 |
|
541 | |||
542 | The tempfile mechanism is recommended for Windows systems, |
|
542 | The tempfile mechanism is recommended for Windows systems, | |
543 | where the standard shell I/O redirection operators often have |
|
543 | where the standard shell I/O redirection operators often have | |
544 | strange effects and may corrupt the contents of your files. |
|
544 | strange effects and may corrupt the contents of your files. | |
545 |
|
545 | |||
546 | This filter mechanism is used internally by the ``eol`` extension to |
|
546 | This filter mechanism is used internally by the ``eol`` extension to | |
547 | translate line ending characters between Windows (CRLF) and Unix (LF) |
|
547 | translate line ending characters between Windows (CRLF) and Unix (LF) | |
548 | format. We suggest you use the ``eol`` extension for convenience. |
|
548 | format. We suggest you use the ``eol`` extension for convenience. | |
549 |
|
549 | |||
550 |
|
550 | |||
551 | ``defaults`` |
|
551 | ``defaults`` | |
552 | ------------ |
|
552 | ------------ | |
553 |
|
553 | |||
554 | (defaults are deprecated. Don't use them. Use aliases instead.) |
|
554 | (defaults are deprecated. Don't use them. Use aliases instead.) | |
555 |
|
555 | |||
556 | Use the ``[defaults]`` section to define command defaults, i.e. the |
|
556 | Use the ``[defaults]`` section to define command defaults, i.e. the | |
557 | default options/arguments to pass to the specified commands. |
|
557 | default options/arguments to pass to the specified commands. | |
558 |
|
558 | |||
559 | The following example makes :hg:`log` run in verbose mode, and |
|
559 | The following example makes :hg:`log` run in verbose mode, and | |
560 | :hg:`status` show only the modified files, by default:: |
|
560 | :hg:`status` show only the modified files, by default:: | |
561 |
|
561 | |||
562 | [defaults] |
|
562 | [defaults] | |
563 | log = -v |
|
563 | log = -v | |
564 | status = -m |
|
564 | status = -m | |
565 |
|
565 | |||
566 | The actual commands, instead of their aliases, must be used when |
|
566 | The actual commands, instead of their aliases, must be used when | |
567 | defining command defaults. The command defaults will also be applied |
|
567 | defining command defaults. The command defaults will also be applied | |
568 | to the aliases of the commands defined. |
|
568 | to the aliases of the commands defined. | |
569 |
|
569 | |||
570 |
|
570 | |||
571 | ``diff`` |
|
571 | ``diff`` | |
572 | -------- |
|
572 | -------- | |
573 |
|
573 | |||
574 | Settings used when displaying diffs. Everything except for ``unified`` |
|
574 | Settings used when displaying diffs. Everything except for ``unified`` | |
575 | is a Boolean and defaults to False. See :hg:`help config.annotate` |
|
575 | is a Boolean and defaults to False. See :hg:`help config.annotate` | |
576 | for related options for the annotate command. |
|
576 | for related options for the annotate command. | |
577 |
|
577 | |||
578 | ``git`` |
|
578 | ``git`` | |
579 | Use git extended diff format. |
|
579 | Use git extended diff format. | |
580 |
|
580 | |||
581 | ``nobinary`` |
|
581 | ``nobinary`` | |
582 | Omit git binary patches. |
|
582 | Omit git binary patches. | |
583 |
|
583 | |||
584 | ``nodates`` |
|
584 | ``nodates`` | |
585 | Don't include dates in diff headers. |
|
585 | Don't include dates in diff headers. | |
586 |
|
586 | |||
587 | ``noprefix`` |
|
587 | ``noprefix`` | |
588 | Omit 'a/' and 'b/' prefixes from filenames. Ignored in plain mode. |
|
588 | Omit 'a/' and 'b/' prefixes from filenames. Ignored in plain mode. | |
589 |
|
589 | |||
590 | ``showfunc`` |
|
590 | ``showfunc`` | |
591 | Show which function each change is in. |
|
591 | Show which function each change is in. | |
592 |
|
592 | |||
593 | ``ignorews`` |
|
593 | ``ignorews`` | |
594 | Ignore white space when comparing lines. |
|
594 | Ignore white space when comparing lines. | |
595 |
|
595 | |||
596 | ``ignorewsamount`` |
|
596 | ``ignorewsamount`` | |
597 | Ignore changes in the amount of white space. |
|
597 | Ignore changes in the amount of white space. | |
598 |
|
598 | |||
599 | ``ignoreblanklines`` |
|
599 | ``ignoreblanklines`` | |
600 | Ignore changes whose lines are all blank. |
|
600 | Ignore changes whose lines are all blank. | |
601 |
|
601 | |||
602 | ``unified`` |
|
602 | ``unified`` | |
603 | Number of lines of context to show. |
|
603 | Number of lines of context to show. | |
604 |
|
604 | |||
605 | ``email`` |
|
605 | ``email`` | |
606 | --------- |
|
606 | --------- | |
607 |
|
607 | |||
608 | Settings for extensions that send email messages. |
|
608 | Settings for extensions that send email messages. | |
609 |
|
609 | |||
610 | ``from`` |
|
610 | ``from`` | |
611 | Optional. Email address to use in "From" header and SMTP envelope |
|
611 | Optional. Email address to use in "From" header and SMTP envelope | |
612 | of outgoing messages. |
|
612 | of outgoing messages. | |
613 |
|
613 | |||
614 | ``to`` |
|
614 | ``to`` | |
615 | Optional. Comma-separated list of recipients' email addresses. |
|
615 | Optional. Comma-separated list of recipients' email addresses. | |
616 |
|
616 | |||
617 | ``cc`` |
|
617 | ``cc`` | |
618 | Optional. Comma-separated list of carbon copy recipients' |
|
618 | Optional. Comma-separated list of carbon copy recipients' | |
619 | email addresses. |
|
619 | email addresses. | |
620 |
|
620 | |||
621 | ``bcc`` |
|
621 | ``bcc`` | |
622 | Optional. Comma-separated list of blind carbon copy recipients' |
|
622 | Optional. Comma-separated list of blind carbon copy recipients' | |
623 | email addresses. |
|
623 | email addresses. | |
624 |
|
624 | |||
625 | ``method`` |
|
625 | ``method`` | |
626 | Optional. Method to use to send email messages. If value is ``smtp`` |
|
626 | Optional. Method to use to send email messages. If value is ``smtp`` | |
627 | (default), use SMTP (see the ``[smtp]`` section for configuration). |
|
627 | (default), use SMTP (see the ``[smtp]`` section for configuration). | |
628 | Otherwise, use as name of program to run that acts like sendmail |
|
628 | Otherwise, use as name of program to run that acts like sendmail | |
629 | (takes ``-f`` option for sender, list of recipients on command line, |
|
629 | (takes ``-f`` option for sender, list of recipients on command line, | |
630 | message on stdin). Normally, setting this to ``sendmail`` or |
|
630 | message on stdin). Normally, setting this to ``sendmail`` or | |
631 | ``/usr/sbin/sendmail`` is enough to use sendmail to send messages. |
|
631 | ``/usr/sbin/sendmail`` is enough to use sendmail to send messages. | |
632 |
|
632 | |||
633 | ``charsets`` |
|
633 | ``charsets`` | |
634 | Optional. Comma-separated list of character sets considered |
|
634 | Optional. Comma-separated list of character sets considered | |
635 | convenient for recipients. Addresses, headers, and parts not |
|
635 | convenient for recipients. Addresses, headers, and parts not | |
636 | containing patches of outgoing messages will be encoded in the |
|
636 | containing patches of outgoing messages will be encoded in the | |
637 | first character set to which conversion from local encoding |
|
637 | first character set to which conversion from local encoding | |
638 | (``$HGENCODING``, ``ui.fallbackencoding``) succeeds. If correct |
|
638 | (``$HGENCODING``, ``ui.fallbackencoding``) succeeds. If correct | |
639 | conversion fails, the text in question is sent as is. |
|
639 | conversion fails, the text in question is sent as is. | |
640 | (default: '') |
|
640 | (default: '') | |
641 |
|
641 | |||
642 | Order of outgoing email character sets: |
|
642 | Order of outgoing email character sets: | |
643 |
|
643 | |||
644 | 1. ``us-ascii``: always first, regardless of settings |
|
644 | 1. ``us-ascii``: always first, regardless of settings | |
645 | 2. ``email.charsets``: in order given by user |
|
645 | 2. ``email.charsets``: in order given by user | |
646 | 3. ``ui.fallbackencoding``: if not in email.charsets |
|
646 | 3. ``ui.fallbackencoding``: if not in email.charsets | |
647 | 4. ``$HGENCODING``: if not in email.charsets |
|
647 | 4. ``$HGENCODING``: if not in email.charsets | |
648 | 5. ``utf-8``: always last, regardless of settings |
|
648 | 5. ``utf-8``: always last, regardless of settings | |
649 |
|
649 | |||
650 | Email example:: |
|
650 | Email example:: | |
651 |
|
651 | |||
652 | [email] |
|
652 | [email] | |
653 | from = Joseph User <joe.user@example.com> |
|
653 | from = Joseph User <joe.user@example.com> | |
654 | method = /usr/sbin/sendmail |
|
654 | method = /usr/sbin/sendmail | |
655 | # charsets for western Europeans |
|
655 | # charsets for western Europeans | |
656 | # us-ascii, utf-8 omitted, as they are tried first and last |
|
656 | # us-ascii, utf-8 omitted, as they are tried first and last | |
657 | charsets = iso-8859-1, iso-8859-15, windows-1252 |
|
657 | charsets = iso-8859-1, iso-8859-15, windows-1252 | |
658 |
|
658 | |||
659 |
|
659 | |||
660 | ``extensions`` |
|
660 | ``extensions`` | |
661 | -------------- |
|
661 | -------------- | |
662 |
|
662 | |||
663 | Mercurial has an extension mechanism for adding new features. To |
|
663 | Mercurial has an extension mechanism for adding new features. To | |
664 | enable an extension, create an entry for it in this section. |
|
664 | enable an extension, create an entry for it in this section. | |
665 |
|
665 | |||
666 | If you know that the extension is already in Python's search path, |
|
666 | If you know that the extension is already in Python's search path, | |
667 | you can give the name of the module, followed by ``=``, with nothing |
|
667 | you can give the name of the module, followed by ``=``, with nothing | |
668 | after the ``=``. |
|
668 | after the ``=``. | |
669 |
|
669 | |||
670 | Otherwise, give a name that you choose, followed by ``=``, followed by |
|
670 | Otherwise, give a name that you choose, followed by ``=``, followed by | |
671 | the path to the ``.py`` file (including the file name extension) that |
|
671 | the path to the ``.py`` file (including the file name extension) that | |
672 | defines the extension. |
|
672 | defines the extension. | |
673 |
|
673 | |||
674 | To explicitly disable an extension that is enabled in an hgrc of |
|
674 | To explicitly disable an extension that is enabled in an hgrc of | |
675 | broader scope, prepend its path with ``!``, as in ``foo = !/ext/path`` |
|
675 | broader scope, prepend its path with ``!``, as in ``foo = !/ext/path`` | |
676 | or ``foo = !`` when path is not supplied. |
|
676 | or ``foo = !`` when path is not supplied. | |
677 |
|
677 | |||
678 | Example for ``~/.hgrc``:: |
|
678 | Example for ``~/.hgrc``:: | |
679 |
|
679 | |||
680 | [extensions] |
|
680 | [extensions] | |
681 | # (the color extension will get loaded from Mercurial's path) |
|
681 | # (the color extension will get loaded from Mercurial's path) | |
682 | color = |
|
682 | color = | |
683 | # (this extension will get loaded from the file specified) |
|
683 | # (this extension will get loaded from the file specified) | |
684 | myfeature = ~/.hgext/myfeature.py |
|
684 | myfeature = ~/.hgext/myfeature.py | |
685 |
|
685 | |||
686 |
|
686 | |||
687 | ``format`` |
|
687 | ``format`` | |
688 | ---------- |
|
688 | ---------- | |
689 |
|
689 | |||
690 | ``usegeneraldelta`` |
|
690 | ``usegeneraldelta`` | |
691 | Enable or disable the "generaldelta" repository format which improves |
|
691 | Enable or disable the "generaldelta" repository format which improves | |
692 | repository compression by allowing "revlog" to store delta against arbitrary |
|
692 | repository compression by allowing "revlog" to store delta against arbitrary | |
693 | revision instead of the previous stored one. This provides significant |
|
693 | revision instead of the previous stored one. This provides significant | |
694 | improvement for repositories with branches. |
|
694 | improvement for repositories with branches. | |
695 |
|
695 | |||
696 | Repositories with this on-disk format require Mercurial version 1.9. |
|
696 | Repositories with this on-disk format require Mercurial version 1.9. | |
697 |
|
697 | |||
698 | Enabled by default. |
|
698 | Enabled by default. | |
699 |
|
699 | |||
700 | ``dotencode`` |
|
700 | ``dotencode`` | |
701 | Enable or disable the "dotencode" repository format which enhances |
|
701 | Enable or disable the "dotencode" repository format which enhances | |
702 | the "fncache" repository format (which has to be enabled to use |
|
702 | the "fncache" repository format (which has to be enabled to use | |
703 | dotencode) to avoid issues with filenames starting with ._ on |
|
703 | dotencode) to avoid issues with filenames starting with ._ on | |
704 | Mac OS X and spaces on Windows. |
|
704 | Mac OS X and spaces on Windows. | |
705 |
|
705 | |||
706 | Repositories with this on-disk format require Mercurial version 1.7. |
|
706 | Repositories with this on-disk format require Mercurial version 1.7. | |
707 |
|
707 | |||
708 | Enabled by default. |
|
708 | Enabled by default. | |
709 |
|
709 | |||
710 | ``usefncache`` |
|
710 | ``usefncache`` | |
711 | Enable or disable the "fncache" repository format which enhances |
|
711 | Enable or disable the "fncache" repository format which enhances | |
712 | the "store" repository format (which has to be enabled to use |
|
712 | the "store" repository format (which has to be enabled to use | |
713 | fncache) to allow longer filenames and avoids using Windows |
|
713 | fncache) to allow longer filenames and avoids using Windows | |
714 | reserved names, e.g. "nul". |
|
714 | reserved names, e.g. "nul". | |
715 |
|
715 | |||
716 | Repositories with this on-disk format require Mercurial version 1.1. |
|
716 | Repositories with this on-disk format require Mercurial version 1.1. | |
717 |
|
717 | |||
718 | Enabled by default. |
|
718 | Enabled by default. | |
719 |
|
719 | |||
720 | ``usestore`` |
|
720 | ``usestore`` | |
721 | Enable or disable the "store" repository format which improves |
|
721 | Enable or disable the "store" repository format which improves | |
722 | compatibility with systems that fold case or otherwise mangle |
|
722 | compatibility with systems that fold case or otherwise mangle | |
723 | filenames. Disabling this option will allow you to store longer filenames |
|
723 | filenames. Disabling this option will allow you to store longer filenames | |
724 | in some situations at the expense of compatibility. |
|
724 | in some situations at the expense of compatibility. | |
725 |
|
725 | |||
726 | Repositories with this on-disk format require Mercurial version 0.9.4. |
|
726 | Repositories with this on-disk format require Mercurial version 0.9.4. | |
727 |
|
727 | |||
728 | Enabled by default. |
|
728 | Enabled by default. | |
729 |
|
729 | |||
730 | ``graph`` |
|
730 | ``graph`` | |
731 | --------- |
|
731 | --------- | |
732 |
|
732 | |||
733 | Web graph view configuration. This section let you change graph |
|
733 | Web graph view configuration. This section let you change graph | |
734 | elements display properties by branches, for instance to make the |
|
734 | elements display properties by branches, for instance to make the | |
735 | ``default`` branch stand out. |
|
735 | ``default`` branch stand out. | |
736 |
|
736 | |||
737 | Each line has the following format:: |
|
737 | Each line has the following format:: | |
738 |
|
738 | |||
739 | <branch>.<argument> = <value> |
|
739 | <branch>.<argument> = <value> | |
740 |
|
740 | |||
741 | where ``<branch>`` is the name of the branch being |
|
741 | where ``<branch>`` is the name of the branch being | |
742 | customized. Example:: |
|
742 | customized. Example:: | |
743 |
|
743 | |||
744 | [graph] |
|
744 | [graph] | |
745 | # 2px width |
|
745 | # 2px width | |
746 | default.width = 2 |
|
746 | default.width = 2 | |
747 | # red color |
|
747 | # red color | |
748 | default.color = FF0000 |
|
748 | default.color = FF0000 | |
749 |
|
749 | |||
750 | Supported arguments: |
|
750 | Supported arguments: | |
751 |
|
751 | |||
752 | ``width`` |
|
752 | ``width`` | |
753 | Set branch edges width in pixels. |
|
753 | Set branch edges width in pixels. | |
754 |
|
754 | |||
755 | ``color`` |
|
755 | ``color`` | |
756 | Set branch edges color in hexadecimal RGB notation. |
|
756 | Set branch edges color in hexadecimal RGB notation. | |
757 |
|
757 | |||
758 | ``hooks`` |
|
758 | ``hooks`` | |
759 | --------- |
|
759 | --------- | |
760 |
|
760 | |||
761 | Commands or Python functions that get automatically executed by |
|
761 | Commands or Python functions that get automatically executed by | |
762 | various actions such as starting or finishing a commit. Multiple |
|
762 | various actions such as starting or finishing a commit. Multiple | |
763 | hooks can be run for the same action by appending a suffix to the |
|
763 | hooks can be run for the same action by appending a suffix to the | |
764 | action. Overriding a site-wide hook can be done by changing its |
|
764 | action. Overriding a site-wide hook can be done by changing its | |
765 | value or setting it to an empty string. Hooks can be prioritized |
|
765 | value or setting it to an empty string. Hooks can be prioritized | |
766 | by adding a prefix of ``priority.`` to the hook name on a new line |
|
766 | by adding a prefix of ``priority.`` to the hook name on a new line | |
767 | and setting the priority. The default priority is 0. |
|
767 | and setting the priority. The default priority is 0. | |
768 |
|
768 | |||
769 | Example ``.hg/hgrc``:: |
|
769 | Example ``.hg/hgrc``:: | |
770 |
|
770 | |||
771 | [hooks] |
|
771 | [hooks] | |
772 | # update working directory after adding changesets |
|
772 | # update working directory after adding changesets | |
773 | changegroup.update = hg update |
|
773 | changegroup.update = hg update | |
774 | # do not use the site-wide hook |
|
774 | # do not use the site-wide hook | |
775 | incoming = |
|
775 | incoming = | |
776 | incoming.email = /my/email/hook |
|
776 | incoming.email = /my/email/hook | |
777 | incoming.autobuild = /my/build/hook |
|
777 | incoming.autobuild = /my/build/hook | |
778 | # force autobuild hook to run before other incoming hooks |
|
778 | # force autobuild hook to run before other incoming hooks | |
779 | priority.incoming.autobuild = 1 |
|
779 | priority.incoming.autobuild = 1 | |
780 |
|
780 | |||
781 | Most hooks are run with environment variables set that give useful |
|
781 | Most hooks are run with environment variables set that give useful | |
782 | additional information. For each hook below, the environment |
|
782 | additional information. For each hook below, the environment | |
783 | variables it is passed are listed with names of the form ``$HG_foo``. |
|
783 | variables it is passed are listed with names of the form ``$HG_foo``. | |
784 |
|
784 | |||
785 | ``changegroup`` |
|
785 | ``changegroup`` | |
786 | Run after a changegroup has been added via push, pull or unbundle. ID of the |
|
786 | Run after a changegroup has been added via push, pull or unbundle. ID of the | |
787 | first new changeset is in ``$HG_NODE`` and last in ``$HG_NODE_LAST``. URL |
|
787 | first new changeset is in ``$HG_NODE`` and last in ``$HG_NODE_LAST``. URL | |
788 | from which changes came is in ``$HG_URL``. |
|
788 | from which changes came is in ``$HG_URL``. | |
789 |
|
789 | |||
790 | ``commit`` |
|
790 | ``commit`` | |
791 | Run after a changeset has been created in the local repository. ID |
|
791 | Run after a changeset has been created in the local repository. ID | |
792 | of the newly created changeset is in ``$HG_NODE``. Parent changeset |
|
792 | of the newly created changeset is in ``$HG_NODE``. Parent changeset | |
793 | IDs are in ``$HG_PARENT1`` and ``$HG_PARENT2``. |
|
793 | IDs are in ``$HG_PARENT1`` and ``$HG_PARENT2``. | |
794 |
|
794 | |||
795 | ``incoming`` |
|
795 | ``incoming`` | |
796 | Run after a changeset has been pulled, pushed, or unbundled into |
|
796 | Run after a changeset has been pulled, pushed, or unbundled into | |
797 | the local repository. The ID of the newly arrived changeset is in |
|
797 | the local repository. The ID of the newly arrived changeset is in | |
798 | ``$HG_NODE``. URL that was source of changes came is in ``$HG_URL``. |
|
798 | ``$HG_NODE``. URL that was source of changes came is in ``$HG_URL``. | |
799 |
|
799 | |||
800 | ``outgoing`` |
|
800 | ``outgoing`` | |
801 | Run after sending changes from local repository to another. ID of |
|
801 | Run after sending changes from local repository to another. ID of | |
802 | first changeset sent is in ``$HG_NODE``. Source of operation is in |
|
802 | first changeset sent is in ``$HG_NODE``. Source of operation is in | |
803 | ``$HG_SOURCE``; Also see :hg:`help config.hooks.preoutgoing` hook. |
|
803 | ``$HG_SOURCE``; Also see :hg:`help config.hooks.preoutgoing` hook. | |
804 |
|
804 | |||
805 | ``post-<command>`` |
|
805 | ``post-<command>`` | |
806 | Run after successful invocations of the associated command. The |
|
806 | Run after successful invocations of the associated command. The | |
807 | contents of the command line are passed as ``$HG_ARGS`` and the result |
|
807 | contents of the command line are passed as ``$HG_ARGS`` and the result | |
808 | code in ``$HG_RESULT``. Parsed command line arguments are passed as |
|
808 | code in ``$HG_RESULT``. Parsed command line arguments are passed as | |
809 | ``$HG_PATS`` and ``$HG_OPTS``. These contain string representations of |
|
809 | ``$HG_PATS`` and ``$HG_OPTS``. These contain string representations of | |
810 | the python data internally passed to <command>. ``$HG_OPTS`` is a |
|
810 | the python data internally passed to <command>. ``$HG_OPTS`` is a | |
811 | dictionary of options (with unspecified options set to their defaults). |
|
811 | dictionary of options (with unspecified options set to their defaults). | |
812 | ``$HG_PATS`` is a list of arguments. Hook failure is ignored. |
|
812 | ``$HG_PATS`` is a list of arguments. Hook failure is ignored. | |
813 |
|
813 | |||
814 | ``fail-<command>`` |
|
814 | ``fail-<command>`` | |
815 | Run after a failed invocation of an associated command. The contents |
|
815 | Run after a failed invocation of an associated command. The contents | |
816 | of the command line are passed as ``$HG_ARGS``. Parsed command line |
|
816 | of the command line are passed as ``$HG_ARGS``. Parsed command line | |
817 | arguments are passed as ``$HG_PATS`` and ``$HG_OPTS``. These contain |
|
817 | arguments are passed as ``$HG_PATS`` and ``$HG_OPTS``. These contain | |
818 | string representations of the python data internally passed to |
|
818 | string representations of the python data internally passed to | |
819 | <command>. ``$HG_OPTS`` is a dictionary of options (with unspecified |
|
819 | <command>. ``$HG_OPTS`` is a dictionary of options (with unspecified | |
820 | options set to their defaults). ``$HG_PATS`` is a list of arguments. |
|
820 | options set to their defaults). ``$HG_PATS`` is a list of arguments. | |
821 | Hook failure is ignored. |
|
821 | Hook failure is ignored. | |
822 |
|
822 | |||
823 | ``pre-<command>`` |
|
823 | ``pre-<command>`` | |
824 | Run before executing the associated command. The contents of the |
|
824 | Run before executing the associated command. The contents of the | |
825 | command line are passed as ``$HG_ARGS``. Parsed command line arguments |
|
825 | command line are passed as ``$HG_ARGS``. Parsed command line arguments | |
826 | are passed as ``$HG_PATS`` and ``$HG_OPTS``. These contain string |
|
826 | are passed as ``$HG_PATS`` and ``$HG_OPTS``. These contain string | |
827 | representations of the data internally passed to <command>. ``$HG_OPTS`` |
|
827 | representations of the data internally passed to <command>. ``$HG_OPTS`` | |
828 | is a dictionary of options (with unspecified options set to their |
|
828 | is a dictionary of options (with unspecified options set to their | |
829 | defaults). ``$HG_PATS`` is a list of arguments. If the hook returns |
|
829 | defaults). ``$HG_PATS`` is a list of arguments. If the hook returns | |
830 | failure, the command doesn't execute and Mercurial returns the failure |
|
830 | failure, the command doesn't execute and Mercurial returns the failure | |
831 | code. |
|
831 | code. | |
832 |
|
832 | |||
833 | ``prechangegroup`` |
|
833 | ``prechangegroup`` | |
834 | Run before a changegroup is added via push, pull or unbundle. Exit |
|
834 | Run before a changegroup is added via push, pull or unbundle. Exit | |
835 | status 0 allows the changegroup to proceed. Non-zero status will |
|
835 | status 0 allows the changegroup to proceed. Non-zero status will | |
836 | cause the push, pull or unbundle to fail. URL from which changes |
|
836 | cause the push, pull or unbundle to fail. URL from which changes | |
837 | will come is in ``$HG_URL``. |
|
837 | will come is in ``$HG_URL``. | |
838 |
|
838 | |||
839 | ``precommit`` |
|
839 | ``precommit`` | |
840 | Run before starting a local commit. Exit status 0 allows the |
|
840 | Run before starting a local commit. Exit status 0 allows the | |
841 | commit to proceed. Non-zero status will cause the commit to fail. |
|
841 | commit to proceed. Non-zero status will cause the commit to fail. | |
842 | Parent changeset IDs are in ``$HG_PARENT1`` and ``$HG_PARENT2``. |
|
842 | Parent changeset IDs are in ``$HG_PARENT1`` and ``$HG_PARENT2``. | |
843 |
|
843 | |||
844 | ``prelistkeys`` |
|
844 | ``prelistkeys`` | |
845 | Run before listing pushkeys (like bookmarks) in the |
|
845 | Run before listing pushkeys (like bookmarks) in the | |
846 | repository. Non-zero status will cause failure. The key namespace is |
|
846 | repository. Non-zero status will cause failure. The key namespace is | |
847 | in ``$HG_NAMESPACE``. |
|
847 | in ``$HG_NAMESPACE``. | |
848 |
|
848 | |||
849 | ``preoutgoing`` |
|
849 | ``preoutgoing`` | |
850 | Run before collecting changes to send from the local repository to |
|
850 | Run before collecting changes to send from the local repository to | |
851 | another. Non-zero status will cause failure. This lets you prevent |
|
851 | another. Non-zero status will cause failure. This lets you prevent | |
852 | pull over HTTP or SSH. Also prevents against local pull, push |
|
852 | pull over HTTP or SSH. Also prevents against local pull, push | |
853 | (outbound) or bundle commands, but not effective, since you can |
|
853 | (outbound) or bundle commands, but not effective, since you can | |
854 | just copy files instead then. Source of operation is in |
|
854 | just copy files instead then. Source of operation is in | |
855 | ``$HG_SOURCE``. If "serve", operation is happening on behalf of remote |
|
855 | ``$HG_SOURCE``. If "serve", operation is happening on behalf of remote | |
856 | SSH or HTTP repository. If "push", "pull" or "bundle", operation |
|
856 | SSH or HTTP repository. If "push", "pull" or "bundle", operation | |
857 | is happening on behalf of repository on same system. |
|
857 | is happening on behalf of repository on same system. | |
858 |
|
858 | |||
859 | ``prepushkey`` |
|
859 | ``prepushkey`` | |
860 | Run before a pushkey (like a bookmark) is added to the |
|
860 | Run before a pushkey (like a bookmark) is added to the | |
861 | repository. Non-zero status will cause the key to be rejected. The |
|
861 | repository. Non-zero status will cause the key to be rejected. The | |
862 | key namespace is in ``$HG_NAMESPACE``, the key is in ``$HG_KEY``, |
|
862 | key namespace is in ``$HG_NAMESPACE``, the key is in ``$HG_KEY``, | |
863 | the old value (if any) is in ``$HG_OLD``, and the new value is in |
|
863 | the old value (if any) is in ``$HG_OLD``, and the new value is in | |
864 | ``$HG_NEW``. |
|
864 | ``$HG_NEW``. | |
865 |
|
865 | |||
866 | ``pretag`` |
|
866 | ``pretag`` | |
867 | Run before creating a tag. Exit status 0 allows the tag to be |
|
867 | Run before creating a tag. Exit status 0 allows the tag to be | |
868 | created. Non-zero status will cause the tag to fail. ID of |
|
868 | created. Non-zero status will cause the tag to fail. ID of | |
869 | changeset to tag is in ``$HG_NODE``. Name of tag is in ``$HG_TAG``. Tag is |
|
869 | changeset to tag is in ``$HG_NODE``. Name of tag is in ``$HG_TAG``. Tag is | |
870 | local if ``$HG_LOCAL=1``, in repository if ``$HG_LOCAL=0``. |
|
870 | local if ``$HG_LOCAL=1``, in repository if ``$HG_LOCAL=0``. | |
871 |
|
871 | |||
872 | ``pretxnopen`` |
|
872 | ``pretxnopen`` | |
873 | Run before any new repository transaction is open. The reason for the |
|
873 | Run before any new repository transaction is open. The reason for the | |
874 | transaction will be in ``$HG_TXNNAME`` and a unique identifier for the |
|
874 | transaction will be in ``$HG_TXNNAME`` and a unique identifier for the | |
875 | transaction will be in ``HG_TXNID``. A non-zero status will prevent the |
|
875 | transaction will be in ``HG_TXNID``. A non-zero status will prevent the | |
876 | transaction from being opened. |
|
876 | transaction from being opened. | |
877 |
|
877 | |||
878 | ``pretxnclose`` |
|
878 | ``pretxnclose`` | |
879 | Run right before the transaction is actually finalized. Any repository change |
|
879 | Run right before the transaction is actually finalized. Any repository change | |
880 | will be visible to the hook program. This lets you validate the transaction |
|
880 | will be visible to the hook program. This lets you validate the transaction | |
881 | content or change it. Exit status 0 allows the commit to proceed. Non-zero |
|
881 | content or change it. Exit status 0 allows the commit to proceed. Non-zero | |
882 | status will cause the transaction to be rolled back. The reason for the |
|
882 | status will cause the transaction to be rolled back. The reason for the | |
883 | transaction opening will be in ``$HG_TXNNAME`` and a unique identifier for |
|
883 | transaction opening will be in ``$HG_TXNNAME`` and a unique identifier for | |
884 | the transaction will be in ``HG_TXNID``. The rest of the available data will |
|
884 | the transaction will be in ``HG_TXNID``. The rest of the available data will | |
885 | vary according the transaction type. New changesets will add ``$HG_NODE`` (id |
|
885 | vary according the transaction type. New changesets will add ``$HG_NODE`` (id | |
886 | of the first added changeset), ``$HG_NODE_LAST`` (id of the last added |
|
886 | of the first added changeset), ``$HG_NODE_LAST`` (id of the last added | |
887 | changeset), ``$HG_URL`` and ``$HG_SOURCE`` variables, bookmarks and phases |
|
887 | changeset), ``$HG_URL`` and ``$HG_SOURCE`` variables, bookmarks and phases | |
888 | changes will set ``HG_BOOKMARK_MOVED`` and ``HG_PHASES_MOVED`` to ``1``, etc. |
|
888 | changes will set ``HG_BOOKMARK_MOVED`` and ``HG_PHASES_MOVED`` to ``1``, etc. | |
889 |
|
889 | |||
890 | ``txnclose`` |
|
890 | ``txnclose`` | |
891 | Run after any repository transaction has been committed. At this |
|
891 | Run after any repository transaction has been committed. At this | |
892 | point, the transaction can no longer be rolled back. The hook will run |
|
892 | point, the transaction can no longer be rolled back. The hook will run | |
893 | after the lock is released. See :hg:`help config.hooks.pretxnclose` docs for |
|
893 | after the lock is released. See :hg:`help config.hooks.pretxnclose` docs for | |
894 | details about available variables. |
|
894 | details about available variables. | |
895 |
|
895 | |||
896 | ``txnabort`` |
|
896 | ``txnabort`` | |
897 | Run when a transaction is aborted. See :hg:`help config.hooks.pretxnclose` |
|
897 | Run when a transaction is aborted. See :hg:`help config.hooks.pretxnclose` | |
898 | docs for details about available variables. |
|
898 | docs for details about available variables. | |
899 |
|
899 | |||
900 | ``pretxnchangegroup`` |
|
900 | ``pretxnchangegroup`` | |
901 | Run after a changegroup has been added via push, pull or unbundle, but before |
|
901 | Run after a changegroup has been added via push, pull or unbundle, but before | |
902 | the transaction has been committed. Changegroup is visible to hook program. |
|
902 | the transaction has been committed. Changegroup is visible to hook program. | |
903 | This lets you validate incoming changes before accepting them. Passed the ID |
|
903 | This lets you validate incoming changes before accepting them. Passed the ID | |
904 | of the first new changeset in ``$HG_NODE`` and last in ``$HG_NODE_LAST``. |
|
904 | of the first new changeset in ``$HG_NODE`` and last in ``$HG_NODE_LAST``. | |
905 | Exit status 0 allows the transaction to commit. Non-zero status will cause |
|
905 | Exit status 0 allows the transaction to commit. Non-zero status will cause | |
906 | the transaction to be rolled back and the push, pull or unbundle will fail. |
|
906 | the transaction to be rolled back and the push, pull or unbundle will fail. | |
907 | URL that was source of changes is in ``$HG_URL``. |
|
907 | URL that was source of changes is in ``$HG_URL``. | |
908 |
|
908 | |||
909 | ``pretxncommit`` |
|
909 | ``pretxncommit`` | |
910 | Run after a changeset has been created but the transaction not yet |
|
910 | Run after a changeset has been created but the transaction not yet | |
911 | committed. Changeset is visible to hook program. This lets you |
|
911 | committed. Changeset is visible to hook program. This lets you | |
912 | validate commit message and changes. Exit status 0 allows the |
|
912 | validate commit message and changes. Exit status 0 allows the | |
913 | commit to proceed. Non-zero status will cause the transaction to |
|
913 | commit to proceed. Non-zero status will cause the transaction to | |
914 | be rolled back. ID of changeset is in ``$HG_NODE``. Parent changeset |
|
914 | be rolled back. ID of changeset is in ``$HG_NODE``. Parent changeset | |
915 | IDs are in ``$HG_PARENT1`` and ``$HG_PARENT2``. |
|
915 | IDs are in ``$HG_PARENT1`` and ``$HG_PARENT2``. | |
916 |
|
916 | |||
917 | ``preupdate`` |
|
917 | ``preupdate`` | |
918 | Run before updating the working directory. Exit status 0 allows |
|
918 | Run before updating the working directory. Exit status 0 allows | |
919 | the update to proceed. Non-zero status will prevent the update. |
|
919 | the update to proceed. Non-zero status will prevent the update. | |
920 | Changeset ID of first new parent is in ``$HG_PARENT1``. If merge, ID |
|
920 | Changeset ID of first new parent is in ``$HG_PARENT1``. If merge, ID | |
921 | of second new parent is in ``$HG_PARENT2``. |
|
921 | of second new parent is in ``$HG_PARENT2``. | |
922 |
|
922 | |||
923 | ``listkeys`` |
|
923 | ``listkeys`` | |
924 | Run after listing pushkeys (like bookmarks) in the repository. The |
|
924 | Run after listing pushkeys (like bookmarks) in the repository. The | |
925 | key namespace is in ``$HG_NAMESPACE``. ``$HG_VALUES`` is a |
|
925 | key namespace is in ``$HG_NAMESPACE``. ``$HG_VALUES`` is a | |
926 | dictionary containing the keys and values. |
|
926 | dictionary containing the keys and values. | |
927 |
|
927 | |||
928 | ``pushkey`` |
|
928 | ``pushkey`` | |
929 | Run after a pushkey (like a bookmark) is added to the |
|
929 | Run after a pushkey (like a bookmark) is added to the | |
930 | repository. The key namespace is in ``$HG_NAMESPACE``, the key is in |
|
930 | repository. The key namespace is in ``$HG_NAMESPACE``, the key is in | |
931 | ``$HG_KEY``, the old value (if any) is in ``$HG_OLD``, and the new |
|
931 | ``$HG_KEY``, the old value (if any) is in ``$HG_OLD``, and the new | |
932 | value is in ``$HG_NEW``. |
|
932 | value is in ``$HG_NEW``. | |
933 |
|
933 | |||
934 | ``tag`` |
|
934 | ``tag`` | |
935 | Run after a tag is created. ID of tagged changeset is in ``$HG_NODE``. |
|
935 | Run after a tag is created. ID of tagged changeset is in ``$HG_NODE``. | |
936 | Name of tag is in ``$HG_TAG``. Tag is local if ``$HG_LOCAL=1``, in |
|
936 | Name of tag is in ``$HG_TAG``. Tag is local if ``$HG_LOCAL=1``, in | |
937 | repository if ``$HG_LOCAL=0``. |
|
937 | repository if ``$HG_LOCAL=0``. | |
938 |
|
938 | |||
939 | ``update`` |
|
939 | ``update`` | |
940 | Run after updating the working directory. Changeset ID of first |
|
940 | Run after updating the working directory. Changeset ID of first | |
941 | new parent is in ``$HG_PARENT1``. If merge, ID of second new parent is |
|
941 | new parent is in ``$HG_PARENT1``. If merge, ID of second new parent is | |
942 | in ``$HG_PARENT2``. If the update succeeded, ``$HG_ERROR=0``. If the |
|
942 | in ``$HG_PARENT2``. If the update succeeded, ``$HG_ERROR=0``. If the | |
943 | update failed (e.g. because conflicts not resolved), ``$HG_ERROR=1``. |
|
943 | update failed (e.g. because conflicts not resolved), ``$HG_ERROR=1``. | |
944 |
|
944 | |||
945 | .. note:: |
|
945 | .. note:: | |
946 |
|
946 | |||
947 | It is generally better to use standard hooks rather than the |
|
947 | It is generally better to use standard hooks rather than the | |
948 | generic pre- and post- command hooks as they are guaranteed to be |
|
948 | generic pre- and post- command hooks as they are guaranteed to be | |
949 | called in the appropriate contexts for influencing transactions. |
|
949 | called in the appropriate contexts for influencing transactions. | |
950 | Also, hooks like "commit" will be called in all contexts that |
|
950 | Also, hooks like "commit" will be called in all contexts that | |
951 | generate a commit (e.g. tag) and not just the commit command. |
|
951 | generate a commit (e.g. tag) and not just the commit command. | |
952 |
|
952 | |||
953 | .. note:: |
|
953 | .. note:: | |
954 |
|
954 | |||
955 | Environment variables with empty values may not be passed to |
|
955 | Environment variables with empty values may not be passed to | |
956 | hooks on platforms such as Windows. As an example, ``$HG_PARENT2`` |
|
956 | hooks on platforms such as Windows. As an example, ``$HG_PARENT2`` | |
957 | will have an empty value under Unix-like platforms for non-merge |
|
957 | will have an empty value under Unix-like platforms for non-merge | |
958 | changesets, while it will not be available at all under Windows. |
|
958 | changesets, while it will not be available at all under Windows. | |
959 |
|
959 | |||
960 | The syntax for Python hooks is as follows:: |
|
960 | The syntax for Python hooks is as follows:: | |
961 |
|
961 | |||
962 | hookname = python:modulename.submodule.callable |
|
962 | hookname = python:modulename.submodule.callable | |
963 | hookname = python:/path/to/python/module.py:callable |
|
963 | hookname = python:/path/to/python/module.py:callable | |
964 |
|
964 | |||
965 | Python hooks are run within the Mercurial process. Each hook is |
|
965 | Python hooks are run within the Mercurial process. Each hook is | |
966 | called with at least three keyword arguments: a ui object (keyword |
|
966 | called with at least three keyword arguments: a ui object (keyword | |
967 | ``ui``), a repository object (keyword ``repo``), and a ``hooktype`` |
|
967 | ``ui``), a repository object (keyword ``repo``), and a ``hooktype`` | |
968 | keyword that tells what kind of hook is used. Arguments listed as |
|
968 | keyword that tells what kind of hook is used. Arguments listed as | |
969 | environment variables above are passed as keyword arguments, with no |
|
969 | environment variables above are passed as keyword arguments, with no | |
970 | ``HG_`` prefix, and names in lower case. |
|
970 | ``HG_`` prefix, and names in lower case. | |
971 |
|
971 | |||
972 | If a Python hook returns a "true" value or raises an exception, this |
|
972 | If a Python hook returns a "true" value or raises an exception, this | |
973 | is treated as a failure. |
|
973 | is treated as a failure. | |
974 |
|
974 | |||
975 |
|
975 | |||
976 | ``hostfingerprints`` |
|
976 | ``hostfingerprints`` | |
977 | -------------------- |
|
977 | -------------------- | |
978 |
|
978 | |||
979 | (Deprecated. Use ``[hostsecurity]``'s ``fingerprints`` options instead.) |
|
979 | (Deprecated. Use ``[hostsecurity]``'s ``fingerprints`` options instead.) | |
980 |
|
980 | |||
981 | Fingerprints of the certificates of known HTTPS servers. |
|
981 | Fingerprints of the certificates of known HTTPS servers. | |
982 |
|
982 | |||
983 | A HTTPS connection to a server with a fingerprint configured here will |
|
983 | A HTTPS connection to a server with a fingerprint configured here will | |
984 | only succeed if the servers certificate matches the fingerprint. |
|
984 | only succeed if the servers certificate matches the fingerprint. | |
985 | This is very similar to how ssh known hosts works. |
|
985 | This is very similar to how ssh known hosts works. | |
986 |
|
986 | |||
987 | The fingerprint is the SHA-1 hash value of the DER encoded certificate. |
|
987 | The fingerprint is the SHA-1 hash value of the DER encoded certificate. | |
988 | Multiple values can be specified (separated by spaces or commas). This can |
|
988 | Multiple values can be specified (separated by spaces or commas). This can | |
989 | be used to define both old and new fingerprints while a host transitions |
|
989 | be used to define both old and new fingerprints while a host transitions | |
990 | to a new certificate. |
|
990 | to a new certificate. | |
991 |
|
991 | |||
992 | The CA chain and web.cacerts is not used for servers with a fingerprint. |
|
992 | The CA chain and web.cacerts is not used for servers with a fingerprint. | |
993 |
|
993 | |||
994 | For example:: |
|
994 | For example:: | |
995 |
|
995 | |||
996 | [hostfingerprints] |
|
996 | [hostfingerprints] | |
997 | hg.intevation.de = fc:e2:8d:d9:51:cd:cb:c1:4d:18:6b:b7:44:8d:49:72:57:e6:cd:33 |
|
997 | hg.intevation.de = fc:e2:8d:d9:51:cd:cb:c1:4d:18:6b:b7:44:8d:49:72:57:e6:cd:33 | |
998 | hg.intevation.org = fc:e2:8d:d9:51:cd:cb:c1:4d:18:6b:b7:44:8d:49:72:57:e6:cd:33 |
|
998 | hg.intevation.org = fc:e2:8d:d9:51:cd:cb:c1:4d:18:6b:b7:44:8d:49:72:57:e6:cd:33 | |
999 |
|
999 | |||
1000 | ``hostsecurity`` |
|
1000 | ``hostsecurity`` | |
1001 | ---------------- |
|
1001 | ---------------- | |
1002 |
|
1002 | |||
1003 | Used to specify global and per-host security settings for connecting to |
|
1003 | Used to specify global and per-host security settings for connecting to | |
1004 | other machines. |
|
1004 | other machines. | |
1005 |
|
1005 | |||
1006 | The following options control default behavior for all hosts. |
|
1006 | The following options control default behavior for all hosts. | |
1007 |
|
1007 | |||
1008 | ``ciphers`` |
|
1008 | ``ciphers`` | |
1009 | Defines the cryptographic ciphers to use for connections. |
|
1009 | Defines the cryptographic ciphers to use for connections. | |
1010 |
|
1010 | |||
1011 | Value must be a valid OpenSSL Cipher List Format as documented at |
|
1011 | Value must be a valid OpenSSL Cipher List Format as documented at | |
1012 | https://www.openssl.org/docs/manmaster/apps/ciphers.html#CIPHER-LIST-FORMAT. |
|
1012 | https://www.openssl.org/docs/manmaster/apps/ciphers.html#CIPHER-LIST-FORMAT. | |
1013 |
|
1013 | |||
1014 | This setting is for advanced users only. Setting to incorrect values |
|
1014 | This setting is for advanced users only. Setting to incorrect values | |
1015 | can significantly lower connection security or decrease performance. |
|
1015 | can significantly lower connection security or decrease performance. | |
1016 | You have been warned. |
|
1016 | You have been warned. | |
1017 |
|
1017 | |||
1018 | This option requires Python 2.7. |
|
1018 | This option requires Python 2.7. | |
1019 |
|
1019 | |||
1020 | ``minimumprotocol`` |
|
1020 | ``minimumprotocol`` | |
1021 | Defines the minimum channel encryption protocol to use. |
|
1021 | Defines the minimum channel encryption protocol to use. | |
1022 |
|
1022 | |||
1023 | By default, the highest version of TLS supported by both client and server |
|
1023 | By default, the highest version of TLS supported by both client and server | |
1024 | is used. |
|
1024 | is used. | |
1025 |
|
1025 | |||
1026 | Allowed values are: ``tls1.0``, ``tls1.1``, ``tls1.2``. |
|
1026 | Allowed values are: ``tls1.0``, ``tls1.1``, ``tls1.2``. | |
1027 |
|
1027 | |||
1028 | When running on an old Python version, only ``tls1.0`` is allowed since |
|
1028 | When running on an old Python version, only ``tls1.0`` is allowed since | |
1029 | old versions of Python only support up to TLS 1.0. |
|
1029 | old versions of Python only support up to TLS 1.0. | |
1030 |
|
1030 | |||
1031 | When running a Python that supports modern TLS versions, the default is |
|
1031 | When running a Python that supports modern TLS versions, the default is | |
1032 | ``tls1.1``. ``tls1.0`` can still be used to allow TLS 1.0. However, this |
|
1032 | ``tls1.1``. ``tls1.0`` can still be used to allow TLS 1.0. However, this | |
1033 | weakens security and should only be used as a feature of last resort if |
|
1033 | weakens security and should only be used as a feature of last resort if | |
1034 | a server does not support TLS 1.1+. |
|
1034 | a server does not support TLS 1.1+. | |
1035 |
|
1035 | |||
1036 | Options in the ``[hostsecurity]`` section can have the form |
|
1036 | Options in the ``[hostsecurity]`` section can have the form | |
1037 | ``hostname``:``setting``. This allows multiple settings to be defined on a |
|
1037 | ``hostname``:``setting``. This allows multiple settings to be defined on a | |
1038 | per-host basis. |
|
1038 | per-host basis. | |
1039 |
|
1039 | |||
1040 | The following per-host settings can be defined. |
|
1040 | The following per-host settings can be defined. | |
1041 |
|
1041 | |||
1042 | ``ciphers`` |
|
1042 | ``ciphers`` | |
1043 | This behaves like ``ciphers`` as described above except it only applies |
|
1043 | This behaves like ``ciphers`` as described above except it only applies | |
1044 | to the host on which it is defined. |
|
1044 | to the host on which it is defined. | |
1045 |
|
1045 | |||
1046 | ``fingerprints`` |
|
1046 | ``fingerprints`` | |
1047 | A list of hashes of the DER encoded peer/remote certificate. Values have |
|
1047 | A list of hashes of the DER encoded peer/remote certificate. Values have | |
1048 | the form ``algorithm``:``fingerprint``. e.g. |
|
1048 | the form ``algorithm``:``fingerprint``. e.g. | |
1049 | ``sha256:c3ab8ff13720e8ad9047dd39466b3c8974e592c2fa383d4a3960714caef0c4f2``. |
|
1049 | ``sha256:c3ab8ff13720e8ad9047dd39466b3c8974e592c2fa383d4a3960714caef0c4f2``. | |
1050 |
|
1050 | |||
1051 | The following algorithms/prefixes are supported: ``sha1``, ``sha256``, |
|
1051 | The following algorithms/prefixes are supported: ``sha1``, ``sha256``, | |
1052 | ``sha512``. |
|
1052 | ``sha512``. | |
1053 |
|
1053 | |||
1054 | Use of ``sha256`` or ``sha512`` is preferred. |
|
1054 | Use of ``sha256`` or ``sha512`` is preferred. | |
1055 |
|
1055 | |||
1056 | If a fingerprint is specified, the CA chain is not validated for this |
|
1056 | If a fingerprint is specified, the CA chain is not validated for this | |
1057 | host and Mercurial will require the remote certificate to match one |
|
1057 | host and Mercurial will require the remote certificate to match one | |
1058 | of the fingerprints specified. This means if the server updates its |
|
1058 | of the fingerprints specified. This means if the server updates its | |
1059 | certificate, Mercurial will abort until a new fingerprint is defined. |
|
1059 | certificate, Mercurial will abort until a new fingerprint is defined. | |
1060 | This can provide stronger security than traditional CA-based validation |
|
1060 | This can provide stronger security than traditional CA-based validation | |
1061 | at the expense of convenience. |
|
1061 | at the expense of convenience. | |
1062 |
|
1062 | |||
1063 | This option takes precedence over ``verifycertsfile``. |
|
1063 | This option takes precedence over ``verifycertsfile``. | |
1064 |
|
1064 | |||
1065 | ``minimumprotocol`` |
|
1065 | ``minimumprotocol`` | |
1066 | This behaves like ``minimumprotocol`` as described above except it |
|
1066 | This behaves like ``minimumprotocol`` as described above except it | |
1067 | only applies to the host on which it is defined. |
|
1067 | only applies to the host on which it is defined. | |
1068 |
|
1068 | |||
1069 | ``verifycertsfile`` |
|
1069 | ``verifycertsfile`` | |
1070 | Path to file a containing a list of PEM encoded certificates used to |
|
1070 | Path to file a containing a list of PEM encoded certificates used to | |
1071 | verify the server certificate. Environment variables and ``~user`` |
|
1071 | verify the server certificate. Environment variables and ``~user`` | |
1072 | constructs are expanded in the filename. |
|
1072 | constructs are expanded in the filename. | |
1073 |
|
1073 | |||
1074 | The server certificate or the certificate's certificate authority (CA) |
|
1074 | The server certificate or the certificate's certificate authority (CA) | |
1075 | must match a certificate from this file or certificate verification |
|
1075 | must match a certificate from this file or certificate verification | |
1076 | will fail and connections to the server will be refused. |
|
1076 | will fail and connections to the server will be refused. | |
1077 |
|
1077 | |||
1078 | If defined, only certificates provided by this file will be used: |
|
1078 | If defined, only certificates provided by this file will be used: | |
1079 | ``web.cacerts`` and any system/default certificates will not be |
|
1079 | ``web.cacerts`` and any system/default certificates will not be | |
1080 | used. |
|
1080 | used. | |
1081 |
|
1081 | |||
1082 | This option has no effect if the per-host ``fingerprints`` option |
|
1082 | This option has no effect if the per-host ``fingerprints`` option | |
1083 | is set. |
|
1083 | is set. | |
1084 |
|
1084 | |||
1085 | The format of the file is as follows:: |
|
1085 | The format of the file is as follows:: | |
1086 |
|
1086 | |||
1087 | -----BEGIN CERTIFICATE----- |
|
1087 | -----BEGIN CERTIFICATE----- | |
1088 | ... (certificate in base64 PEM encoding) ... |
|
1088 | ... (certificate in base64 PEM encoding) ... | |
1089 | -----END CERTIFICATE----- |
|
1089 | -----END CERTIFICATE----- | |
1090 | -----BEGIN CERTIFICATE----- |
|
1090 | -----BEGIN CERTIFICATE----- | |
1091 | ... (certificate in base64 PEM encoding) ... |
|
1091 | ... (certificate in base64 PEM encoding) ... | |
1092 | -----END CERTIFICATE----- |
|
1092 | -----END CERTIFICATE----- | |
1093 |
|
1093 | |||
1094 | For example:: |
|
1094 | For example:: | |
1095 |
|
1095 | |||
1096 | [hostsecurity] |
|
1096 | [hostsecurity] | |
1097 | hg.example.com:fingerprints = sha256:c3ab8ff13720e8ad9047dd39466b3c8974e592c2fa383d4a3960714caef0c4f2 |
|
1097 | hg.example.com:fingerprints = sha256:c3ab8ff13720e8ad9047dd39466b3c8974e592c2fa383d4a3960714caef0c4f2 | |
1098 | hg2.example.com:fingerprints = sha1:914f1aff87249c09b6859b88b1906d30756491ca, sha1:fc:e2:8d:d9:51:cd:cb:c1:4d:18:6b:b7:44:8d:49:72:57:e6:cd:33 |
|
1098 | hg2.example.com:fingerprints = sha1:914f1aff87249c09b6859b88b1906d30756491ca, sha1:fc:e2:8d:d9:51:cd:cb:c1:4d:18:6b:b7:44:8d:49:72:57:e6:cd:33 | |
1099 | foo.example.com:verifycertsfile = /etc/ssl/trusted-ca-certs.pem |
|
1099 | foo.example.com:verifycertsfile = /etc/ssl/trusted-ca-certs.pem | |
1100 |
|
1100 | |||
1101 | To change the default minimum protocol version to TLS 1.2 but to allow TLS 1.1 |
|
1101 | To change the default minimum protocol version to TLS 1.2 but to allow TLS 1.1 | |
1102 | when connecting to ``hg.example.com``:: |
|
1102 | when connecting to ``hg.example.com``:: | |
1103 |
|
1103 | |||
1104 | [hostsecurity] |
|
1104 | [hostsecurity] | |
1105 | minimumprotocol = tls1.2 |
|
1105 | minimumprotocol = tls1.2 | |
1106 | hg.example.com:minimumprotocol = tls1.1 |
|
1106 | hg.example.com:minimumprotocol = tls1.1 | |
1107 |
|
1107 | |||
1108 | ``http_proxy`` |
|
1108 | ``http_proxy`` | |
1109 | -------------- |
|
1109 | -------------- | |
1110 |
|
1110 | |||
1111 | Used to access web-based Mercurial repositories through a HTTP |
|
1111 | Used to access web-based Mercurial repositories through a HTTP | |
1112 | proxy. |
|
1112 | proxy. | |
1113 |
|
1113 | |||
1114 | ``host`` |
|
1114 | ``host`` | |
1115 | Host name and (optional) port of the proxy server, for example |
|
1115 | Host name and (optional) port of the proxy server, for example | |
1116 | "myproxy:8000". |
|
1116 | "myproxy:8000". | |
1117 |
|
1117 | |||
1118 | ``no`` |
|
1118 | ``no`` | |
1119 | Optional. Comma-separated list of host names that should bypass |
|
1119 | Optional. Comma-separated list of host names that should bypass | |
1120 | the proxy. |
|
1120 | the proxy. | |
1121 |
|
1121 | |||
1122 | ``passwd`` |
|
1122 | ``passwd`` | |
1123 | Optional. Password to authenticate with at the proxy server. |
|
1123 | Optional. Password to authenticate with at the proxy server. | |
1124 |
|
1124 | |||
1125 | ``user`` |
|
1125 | ``user`` | |
1126 | Optional. User name to authenticate with at the proxy server. |
|
1126 | Optional. User name to authenticate with at the proxy server. | |
1127 |
|
1127 | |||
1128 | ``always`` |
|
1128 | ``always`` | |
1129 | Optional. Always use the proxy, even for localhost and any entries |
|
1129 | Optional. Always use the proxy, even for localhost and any entries | |
1130 | in ``http_proxy.no``. (default: False) |
|
1130 | in ``http_proxy.no``. (default: False) | |
1131 |
|
1131 | |||
1132 | ``merge`` |
|
1132 | ``merge`` | |
1133 | --------- |
|
1133 | --------- | |
1134 |
|
1134 | |||
1135 | This section specifies behavior during merges and updates. |
|
1135 | This section specifies behavior during merges and updates. | |
1136 |
|
1136 | |||
1137 | ``checkignored`` |
|
1137 | ``checkignored`` | |
1138 | Controls behavior when an ignored file on disk has the same name as a tracked |
|
1138 | Controls behavior when an ignored file on disk has the same name as a tracked | |
1139 | file in the changeset being merged or updated to, and has different |
|
1139 | file in the changeset being merged or updated to, and has different | |
1140 | contents. Options are ``abort``, ``warn`` and ``ignore``. With ``abort``, |
|
1140 | contents. Options are ``abort``, ``warn`` and ``ignore``. With ``abort``, | |
1141 | abort on such files. With ``warn``, warn on such files and back them up as |
|
1141 | abort on such files. With ``warn``, warn on such files and back them up as | |
1142 | ``.orig``. With ``ignore``, don't print a warning and back them up as |
|
1142 | ``.orig``. With ``ignore``, don't print a warning and back them up as | |
1143 | ``.orig``. (default: ``abort``) |
|
1143 | ``.orig``. (default: ``abort``) | |
1144 |
|
1144 | |||
1145 | ``checkunknown`` |
|
1145 | ``checkunknown`` | |
1146 | Controls behavior when an unknown file that isn't ignored has the same name |
|
1146 | Controls behavior when an unknown file that isn't ignored has the same name | |
1147 | as a tracked file in the changeset being merged or updated to, and has |
|
1147 | as a tracked file in the changeset being merged or updated to, and has | |
1148 | different contents. Similar to ``merge.checkignored``, except for files that |
|
1148 | different contents. Similar to ``merge.checkignored``, except for files that | |
1149 | are not ignored. (default: ``abort``) |
|
1149 | are not ignored. (default: ``abort``) | |
1150 |
|
1150 | |||
1151 | ``merge-patterns`` |
|
1151 | ``merge-patterns`` | |
1152 | ------------------ |
|
1152 | ------------------ | |
1153 |
|
1153 | |||
1154 | This section specifies merge tools to associate with particular file |
|
1154 | This section specifies merge tools to associate with particular file | |
1155 | patterns. Tools matched here will take precedence over the default |
|
1155 | patterns. Tools matched here will take precedence over the default | |
1156 | merge tool. Patterns are globs by default, rooted at the repository |
|
1156 | merge tool. Patterns are globs by default, rooted at the repository | |
1157 | root. |
|
1157 | root. | |
1158 |
|
1158 | |||
1159 | Example:: |
|
1159 | Example:: | |
1160 |
|
1160 | |||
1161 | [merge-patterns] |
|
1161 | [merge-patterns] | |
1162 | **.c = kdiff3 |
|
1162 | **.c = kdiff3 | |
1163 | **.jpg = myimgmerge |
|
1163 | **.jpg = myimgmerge | |
1164 |
|
1164 | |||
1165 | ``merge-tools`` |
|
1165 | ``merge-tools`` | |
1166 | --------------- |
|
1166 | --------------- | |
1167 |
|
1167 | |||
1168 | This section configures external merge tools to use for file-level |
|
1168 | This section configures external merge tools to use for file-level | |
1169 | merges. This section has likely been preconfigured at install time. |
|
1169 | merges. This section has likely been preconfigured at install time. | |
1170 | Use :hg:`config merge-tools` to check the existing configuration. |
|
1170 | Use :hg:`config merge-tools` to check the existing configuration. | |
1171 | Also see :hg:`help merge-tools` for more details. |
|
1171 | Also see :hg:`help merge-tools` for more details. | |
1172 |
|
1172 | |||
1173 | Example ``~/.hgrc``:: |
|
1173 | Example ``~/.hgrc``:: | |
1174 |
|
1174 | |||
1175 | [merge-tools] |
|
1175 | [merge-tools] | |
1176 | # Override stock tool location |
|
1176 | # Override stock tool location | |
1177 | kdiff3.executable = ~/bin/kdiff3 |
|
1177 | kdiff3.executable = ~/bin/kdiff3 | |
1178 | # Specify command line |
|
1178 | # Specify command line | |
1179 | kdiff3.args = $base $local $other -o $output |
|
1179 | kdiff3.args = $base $local $other -o $output | |
1180 | # Give higher priority |
|
1180 | # Give higher priority | |
1181 | kdiff3.priority = 1 |
|
1181 | kdiff3.priority = 1 | |
1182 |
|
1182 | |||
1183 | # Changing the priority of preconfigured tool |
|
1183 | # Changing the priority of preconfigured tool | |
1184 | meld.priority = 0 |
|
1184 | meld.priority = 0 | |
1185 |
|
1185 | |||
1186 | # Disable a preconfigured tool |
|
1186 | # Disable a preconfigured tool | |
1187 | vimdiff.disabled = yes |
|
1187 | vimdiff.disabled = yes | |
1188 |
|
1188 | |||
1189 | # Define new tool |
|
1189 | # Define new tool | |
1190 | myHtmlTool.args = -m $local $other $base $output |
|
1190 | myHtmlTool.args = -m $local $other $base $output | |
1191 | myHtmlTool.regkey = Software\FooSoftware\HtmlMerge |
|
1191 | myHtmlTool.regkey = Software\FooSoftware\HtmlMerge | |
1192 | myHtmlTool.priority = 1 |
|
1192 | myHtmlTool.priority = 1 | |
1193 |
|
1193 | |||
1194 | Supported arguments: |
|
1194 | Supported arguments: | |
1195 |
|
1195 | |||
1196 | ``priority`` |
|
1196 | ``priority`` | |
1197 | The priority in which to evaluate this tool. |
|
1197 | The priority in which to evaluate this tool. | |
1198 | (default: 0) |
|
1198 | (default: 0) | |
1199 |
|
1199 | |||
1200 | ``executable`` |
|
1200 | ``executable`` | |
1201 | Either just the name of the executable or its pathname. |
|
1201 | Either just the name of the executable or its pathname. | |
1202 |
|
1202 | |||
1203 | .. container:: windows |
|
1203 | .. container:: windows | |
1204 |
|
1204 | |||
1205 | On Windows, the path can use environment variables with ${ProgramFiles} |
|
1205 | On Windows, the path can use environment variables with ${ProgramFiles} | |
1206 | syntax. |
|
1206 | syntax. | |
1207 |
|
1207 | |||
1208 | (default: the tool name) |
|
1208 | (default: the tool name) | |
1209 |
|
1209 | |||
1210 | ``args`` |
|
1210 | ``args`` | |
1211 | The arguments to pass to the tool executable. You can refer to the |
|
1211 | The arguments to pass to the tool executable. You can refer to the | |
1212 | files being merged as well as the output file through these |
|
1212 | files being merged as well as the output file through these | |
1213 | variables: ``$base``, ``$local``, ``$other``, ``$output``. The meaning |
|
1213 | variables: ``$base``, ``$local``, ``$other``, ``$output``. The meaning | |
1214 | of ``$local`` and ``$other`` can vary depending on which action is being |
|
1214 | of ``$local`` and ``$other`` can vary depending on which action is being | |
1215 | performed. During and update or merge, ``$local`` represents the original |
|
1215 | performed. During and update or merge, ``$local`` represents the original | |
1216 | state of the file, while ``$other`` represents the commit you are updating |
|
1216 | state of the file, while ``$other`` represents the commit you are updating | |
1217 | to or the commit you are merging with. During a rebase ``$local`` |
|
1217 | to or the commit you are merging with. During a rebase ``$local`` | |
1218 | represents the destination of the rebase, and ``$other`` represents the |
|
1218 | represents the destination of the rebase, and ``$other`` represents the | |
1219 | commit being rebased. |
|
1219 | commit being rebased. | |
1220 | (default: ``$local $base $other``) |
|
1220 | (default: ``$local $base $other``) | |
1221 |
|
1221 | |||
1222 | ``premerge`` |
|
1222 | ``premerge`` | |
1223 | Attempt to run internal non-interactive 3-way merge tool before |
|
1223 | Attempt to run internal non-interactive 3-way merge tool before | |
1224 | launching external tool. Options are ``true``, ``false``, ``keep`` or |
|
1224 | launching external tool. Options are ``true``, ``false``, ``keep`` or | |
1225 | ``keep-merge3``. The ``keep`` option will leave markers in the file if the |
|
1225 | ``keep-merge3``. The ``keep`` option will leave markers in the file if the | |
1226 | premerge fails. The ``keep-merge3`` will do the same but include information |
|
1226 | premerge fails. The ``keep-merge3`` will do the same but include information | |
1227 | about the base of the merge in the marker (see internal :merge3 in |
|
1227 | about the base of the merge in the marker (see internal :merge3 in | |
1228 | :hg:`help merge-tools`). |
|
1228 | :hg:`help merge-tools`). | |
1229 | (default: True) |
|
1229 | (default: True) | |
1230 |
|
1230 | |||
1231 | ``binary`` |
|
1231 | ``binary`` | |
1232 | This tool can merge binary files. (default: False, unless tool |
|
1232 | This tool can merge binary files. (default: False, unless tool | |
1233 | was selected by file pattern match) |
|
1233 | was selected by file pattern match) | |
1234 |
|
1234 | |||
1235 | ``symlink`` |
|
1235 | ``symlink`` | |
1236 | This tool can merge symlinks. (default: False) |
|
1236 | This tool can merge symlinks. (default: False) | |
1237 |
|
1237 | |||
1238 | ``check`` |
|
1238 | ``check`` | |
1239 | A list of merge success-checking options: |
|
1239 | A list of merge success-checking options: | |
1240 |
|
1240 | |||
1241 | ``changed`` |
|
1241 | ``changed`` | |
1242 | Ask whether merge was successful when the merged file shows no changes. |
|
1242 | Ask whether merge was successful when the merged file shows no changes. | |
1243 | ``conflicts`` |
|
1243 | ``conflicts`` | |
1244 | Check whether there are conflicts even though the tool reported success. |
|
1244 | Check whether there are conflicts even though the tool reported success. | |
1245 | ``prompt`` |
|
1245 | ``prompt`` | |
1246 | Always prompt for merge success, regardless of success reported by tool. |
|
1246 | Always prompt for merge success, regardless of success reported by tool. | |
1247 |
|
1247 | |||
1248 | ``fixeol`` |
|
1248 | ``fixeol`` | |
1249 | Attempt to fix up EOL changes caused by the merge tool. |
|
1249 | Attempt to fix up EOL changes caused by the merge tool. | |
1250 | (default: False) |
|
1250 | (default: False) | |
1251 |
|
1251 | |||
1252 | ``gui`` |
|
1252 | ``gui`` | |
1253 | This tool requires a graphical interface to run. (default: False) |
|
1253 | This tool requires a graphical interface to run. (default: False) | |
1254 |
|
1254 | |||
1255 | .. container:: windows |
|
1255 | .. container:: windows | |
1256 |
|
1256 | |||
1257 | ``regkey`` |
|
1257 | ``regkey`` | |
1258 | Windows registry key which describes install location of this |
|
1258 | Windows registry key which describes install location of this | |
1259 | tool. Mercurial will search for this key first under |
|
1259 | tool. Mercurial will search for this key first under | |
1260 | ``HKEY_CURRENT_USER`` and then under ``HKEY_LOCAL_MACHINE``. |
|
1260 | ``HKEY_CURRENT_USER`` and then under ``HKEY_LOCAL_MACHINE``. | |
1261 | (default: None) |
|
1261 | (default: None) | |
1262 |
|
1262 | |||
1263 | ``regkeyalt`` |
|
1263 | ``regkeyalt`` | |
1264 | An alternate Windows registry key to try if the first key is not |
|
1264 | An alternate Windows registry key to try if the first key is not | |
1265 | found. The alternate key uses the same ``regname`` and ``regappend`` |
|
1265 | found. The alternate key uses the same ``regname`` and ``regappend`` | |
1266 | semantics of the primary key. The most common use for this key |
|
1266 | semantics of the primary key. The most common use for this key | |
1267 | is to search for 32bit applications on 64bit operating systems. |
|
1267 | is to search for 32bit applications on 64bit operating systems. | |
1268 | (default: None) |
|
1268 | (default: None) | |
1269 |
|
1269 | |||
1270 | ``regname`` |
|
1270 | ``regname`` | |
1271 | Name of value to read from specified registry key. |
|
1271 | Name of value to read from specified registry key. | |
1272 | (default: the unnamed (default) value) |
|
1272 | (default: the unnamed (default) value) | |
1273 |
|
1273 | |||
1274 | ``regappend`` |
|
1274 | ``regappend`` | |
1275 | String to append to the value read from the registry, typically |
|
1275 | String to append to the value read from the registry, typically | |
1276 | the executable name of the tool. |
|
1276 | the executable name of the tool. | |
1277 | (default: None) |
|
1277 | (default: None) | |
1278 |
|
1278 | |||
1279 |
|
1279 | |||
1280 | ``patch`` |
|
1280 | ``patch`` | |
1281 | --------- |
|
1281 | --------- | |
1282 |
|
1282 | |||
1283 | Settings used when applying patches, for instance through the 'import' |
|
1283 | Settings used when applying patches, for instance through the 'import' | |
1284 | command or with Mercurial Queues extension. |
|
1284 | command or with Mercurial Queues extension. | |
1285 |
|
1285 | |||
1286 | ``eol`` |
|
1286 | ``eol`` | |
1287 | When set to 'strict' patch content and patched files end of lines |
|
1287 | When set to 'strict' patch content and patched files end of lines | |
1288 | are preserved. When set to ``lf`` or ``crlf``, both files end of |
|
1288 | are preserved. When set to ``lf`` or ``crlf``, both files end of | |
1289 | lines are ignored when patching and the result line endings are |
|
1289 | lines are ignored when patching and the result line endings are | |
1290 | normalized to either LF (Unix) or CRLF (Windows). When set to |
|
1290 | normalized to either LF (Unix) or CRLF (Windows). When set to | |
1291 | ``auto``, end of lines are again ignored while patching but line |
|
1291 | ``auto``, end of lines are again ignored while patching but line | |
1292 | endings in patched files are normalized to their original setting |
|
1292 | endings in patched files are normalized to their original setting | |
1293 | on a per-file basis. If target file does not exist or has no end |
|
1293 | on a per-file basis. If target file does not exist or has no end | |
1294 | of line, patch line endings are preserved. |
|
1294 | of line, patch line endings are preserved. | |
1295 | (default: strict) |
|
1295 | (default: strict) | |
1296 |
|
1296 | |||
1297 | ``fuzz`` |
|
1297 | ``fuzz`` | |
1298 | The number of lines of 'fuzz' to allow when applying patches. This |
|
1298 | The number of lines of 'fuzz' to allow when applying patches. This | |
1299 | controls how much context the patcher is allowed to ignore when |
|
1299 | controls how much context the patcher is allowed to ignore when | |
1300 | trying to apply a patch. |
|
1300 | trying to apply a patch. | |
1301 | (default: 2) |
|
1301 | (default: 2) | |
1302 |
|
1302 | |||
1303 | ``paths`` |
|
1303 | ``paths`` | |
1304 | --------- |
|
1304 | --------- | |
1305 |
|
1305 | |||
1306 | Assigns symbolic names and behavior to repositories. |
|
1306 | Assigns symbolic names and behavior to repositories. | |
1307 |
|
1307 | |||
1308 | Options are symbolic names defining the URL or directory that is the |
|
1308 | Options are symbolic names defining the URL or directory that is the | |
1309 | location of the repository. Example:: |
|
1309 | location of the repository. Example:: | |
1310 |
|
1310 | |||
1311 | [paths] |
|
1311 | [paths] | |
1312 | my_server = https://example.com/my_repo |
|
1312 | my_server = https://example.com/my_repo | |
1313 | local_path = /home/me/repo |
|
1313 | local_path = /home/me/repo | |
1314 |
|
1314 | |||
1315 | These symbolic names can be used from the command line. To pull |
|
1315 | These symbolic names can be used from the command line. To pull | |
1316 | from ``my_server``: :hg:`pull my_server`. To push to ``local_path``: |
|
1316 | from ``my_server``: :hg:`pull my_server`. To push to ``local_path``: | |
1317 | :hg:`push local_path`. |
|
1317 | :hg:`push local_path`. | |
1318 |
|
1318 | |||
1319 | Options containing colons (``:``) denote sub-options that can influence |
|
1319 | Options containing colons (``:``) denote sub-options that can influence | |
1320 | behavior for that specific path. Example:: |
|
1320 | behavior for that specific path. Example:: | |
1321 |
|
1321 | |||
1322 | [paths] |
|
1322 | [paths] | |
1323 | my_server = https://example.com/my_path |
|
1323 | my_server = https://example.com/my_path | |
1324 | my_server:pushurl = ssh://example.com/my_path |
|
1324 | my_server:pushurl = ssh://example.com/my_path | |
1325 |
|
1325 | |||
1326 | The following sub-options can be defined: |
|
1326 | The following sub-options can be defined: | |
1327 |
|
1327 | |||
1328 | ``pushurl`` |
|
1328 | ``pushurl`` | |
1329 | The URL to use for push operations. If not defined, the location |
|
1329 | The URL to use for push operations. If not defined, the location | |
1330 | defined by the path's main entry is used. |
|
1330 | defined by the path's main entry is used. | |
1331 |
|
1331 | |||
1332 | ``pushrev`` |
|
1332 | ``pushrev`` | |
1333 | A revset defining which revisions to push by default. |
|
1333 | A revset defining which revisions to push by default. | |
1334 |
|
1334 | |||
1335 | When :hg:`push` is executed without a ``-r`` argument, the revset |
|
1335 | When :hg:`push` is executed without a ``-r`` argument, the revset | |
1336 | defined by this sub-option is evaluated to determine what to push. |
|
1336 | defined by this sub-option is evaluated to determine what to push. | |
1337 |
|
1337 | |||
1338 | For example, a value of ``.`` will push the working directory's |
|
1338 | For example, a value of ``.`` will push the working directory's | |
1339 | revision by default. |
|
1339 | revision by default. | |
1340 |
|
1340 | |||
1341 | Revsets specifying bookmarks will not result in the bookmark being |
|
1341 | Revsets specifying bookmarks will not result in the bookmark being | |
1342 | pushed. |
|
1342 | pushed. | |
1343 |
|
1343 | |||
1344 | The following special named paths exist: |
|
1344 | The following special named paths exist: | |
1345 |
|
1345 | |||
1346 | ``default`` |
|
1346 | ``default`` | |
1347 | The URL or directory to use when no source or remote is specified. |
|
1347 | The URL or directory to use when no source or remote is specified. | |
1348 |
|
1348 | |||
1349 | :hg:`clone` will automatically define this path to the location the |
|
1349 | :hg:`clone` will automatically define this path to the location the | |
1350 | repository was cloned from. |
|
1350 | repository was cloned from. | |
1351 |
|
1351 | |||
1352 | ``default-push`` |
|
1352 | ``default-push`` | |
1353 | (deprecated) The URL or directory for the default :hg:`push` location. |
|
1353 | (deprecated) The URL or directory for the default :hg:`push` location. | |
1354 | ``default:pushurl`` should be used instead. |
|
1354 | ``default:pushurl`` should be used instead. | |
1355 |
|
1355 | |||
1356 | ``phases`` |
|
1356 | ``phases`` | |
1357 | ---------- |
|
1357 | ---------- | |
1358 |
|
1358 | |||
1359 | Specifies default handling of phases. See :hg:`help phases` for more |
|
1359 | Specifies default handling of phases. See :hg:`help phases` for more | |
1360 | information about working with phases. |
|
1360 | information about working with phases. | |
1361 |
|
1361 | |||
1362 | ``publish`` |
|
1362 | ``publish`` | |
1363 | Controls draft phase behavior when working as a server. When true, |
|
1363 | Controls draft phase behavior when working as a server. When true, | |
1364 | pushed changesets are set to public in both client and server and |
|
1364 | pushed changesets are set to public in both client and server and | |
1365 | pulled or cloned changesets are set to public in the client. |
|
1365 | pulled or cloned changesets are set to public in the client. | |
1366 | (default: True) |
|
1366 | (default: True) | |
1367 |
|
1367 | |||
1368 | ``new-commit`` |
|
1368 | ``new-commit`` | |
1369 | Phase of newly-created commits. |
|
1369 | Phase of newly-created commits. | |
1370 | (default: draft) |
|
1370 | (default: draft) | |
1371 |
|
1371 | |||
1372 | ``checksubrepos`` |
|
1372 | ``checksubrepos`` | |
1373 | Check the phase of the current revision of each subrepository. Allowed |
|
1373 | Check the phase of the current revision of each subrepository. Allowed | |
1374 | values are "ignore", "follow" and "abort". For settings other than |
|
1374 | values are "ignore", "follow" and "abort". For settings other than | |
1375 | "ignore", the phase of the current revision of each subrepository is |
|
1375 | "ignore", the phase of the current revision of each subrepository is | |
1376 | checked before committing the parent repository. If any of those phases is |
|
1376 | checked before committing the parent repository. If any of those phases is | |
1377 | greater than the phase of the parent repository (e.g. if a subrepo is in a |
|
1377 | greater than the phase of the parent repository (e.g. if a subrepo is in a | |
1378 | "secret" phase while the parent repo is in "draft" phase), the commit is |
|
1378 | "secret" phase while the parent repo is in "draft" phase), the commit is | |
1379 | either aborted (if checksubrepos is set to "abort") or the higher phase is |
|
1379 | either aborted (if checksubrepos is set to "abort") or the higher phase is | |
1380 | used for the parent repository commit (if set to "follow"). |
|
1380 | used for the parent repository commit (if set to "follow"). | |
1381 | (default: follow) |
|
1381 | (default: follow) | |
1382 |
|
1382 | |||
1383 |
|
1383 | |||
1384 | ``profiling`` |
|
1384 | ``profiling`` | |
1385 | ------------- |
|
1385 | ------------- | |
1386 |
|
1386 | |||
1387 | Specifies profiling type, format, and file output. Two profilers are |
|
1387 | Specifies profiling type, format, and file output. Two profilers are | |
1388 | supported: an instrumenting profiler (named ``ls``), and a sampling |
|
1388 | supported: an instrumenting profiler (named ``ls``), and a sampling | |
1389 | profiler (named ``stat``). |
|
1389 | profiler (named ``stat``). | |
1390 |
|
1390 | |||
1391 | In this section description, 'profiling data' stands for the raw data |
|
1391 | In this section description, 'profiling data' stands for the raw data | |
1392 | collected during profiling, while 'profiling report' stands for a |
|
1392 | collected during profiling, while 'profiling report' stands for a | |
1393 | statistical text report generated from the profiling data. The |
|
1393 | statistical text report generated from the profiling data. The | |
1394 | profiling is done using lsprof. |
|
1394 | profiling is done using lsprof. | |
1395 |
|
1395 | |||
|
1396 | ``enabled`` | |||
|
1397 | Enable the profiler. | |||
|
1398 | (default: false) | |||
|
1399 | ||||
|
1400 | This is equivalent to passing ``--profile`` on the command line. | |||
|
1401 | ||||
1396 | ``type`` |
|
1402 | ``type`` | |
1397 | The type of profiler to use. |
|
1403 | The type of profiler to use. | |
1398 | (default: ls) |
|
1404 | (default: ls) | |
1399 |
|
1405 | |||
1400 | ``ls`` |
|
1406 | ``ls`` | |
1401 | Use Python's built-in instrumenting profiler. This profiler |
|
1407 | Use Python's built-in instrumenting profiler. This profiler | |
1402 | works on all platforms, but each line number it reports is the |
|
1408 | works on all platforms, but each line number it reports is the | |
1403 | first line of a function. This restriction makes it difficult to |
|
1409 | first line of a function. This restriction makes it difficult to | |
1404 | identify the expensive parts of a non-trivial function. |
|
1410 | identify the expensive parts of a non-trivial function. | |
1405 | ``stat`` |
|
1411 | ``stat`` | |
1406 | Use a third-party statistical profiler, statprof. This profiler |
|
1412 | Use a third-party statistical profiler, statprof. This profiler | |
1407 | currently runs only on Unix systems, and is most useful for |
|
1413 | currently runs only on Unix systems, and is most useful for | |
1408 | profiling commands that run for longer than about 0.1 seconds. |
|
1414 | profiling commands that run for longer than about 0.1 seconds. | |
1409 |
|
1415 | |||
1410 | ``format`` |
|
1416 | ``format`` | |
1411 | Profiling format. Specific to the ``ls`` instrumenting profiler. |
|
1417 | Profiling format. Specific to the ``ls`` instrumenting profiler. | |
1412 | (default: text) |
|
1418 | (default: text) | |
1413 |
|
1419 | |||
1414 | ``text`` |
|
1420 | ``text`` | |
1415 | Generate a profiling report. When saving to a file, it should be |
|
1421 | Generate a profiling report. When saving to a file, it should be | |
1416 | noted that only the report is saved, and the profiling data is |
|
1422 | noted that only the report is saved, and the profiling data is | |
1417 | not kept. |
|
1423 | not kept. | |
1418 | ``kcachegrind`` |
|
1424 | ``kcachegrind`` | |
1419 | Format profiling data for kcachegrind use: when saving to a |
|
1425 | Format profiling data for kcachegrind use: when saving to a | |
1420 | file, the generated file can directly be loaded into |
|
1426 | file, the generated file can directly be loaded into | |
1421 | kcachegrind. |
|
1427 | kcachegrind. | |
1422 |
|
1428 | |||
1423 | ``frequency`` |
|
1429 | ``frequency`` | |
1424 | Sampling frequency. Specific to the ``stat`` sampling profiler. |
|
1430 | Sampling frequency. Specific to the ``stat`` sampling profiler. | |
1425 | (default: 1000) |
|
1431 | (default: 1000) | |
1426 |
|
1432 | |||
1427 | ``output`` |
|
1433 | ``output`` | |
1428 | File path where profiling data or report should be saved. If the |
|
1434 | File path where profiling data or report should be saved. If the | |
1429 | file exists, it is replaced. (default: None, data is printed on |
|
1435 | file exists, it is replaced. (default: None, data is printed on | |
1430 | stderr) |
|
1436 | stderr) | |
1431 |
|
1437 | |||
1432 | ``sort`` |
|
1438 | ``sort`` | |
1433 | Sort field. Specific to the ``ls`` instrumenting profiler. |
|
1439 | Sort field. Specific to the ``ls`` instrumenting profiler. | |
1434 | One of ``callcount``, ``reccallcount``, ``totaltime`` and |
|
1440 | One of ``callcount``, ``reccallcount``, ``totaltime`` and | |
1435 | ``inlinetime``. |
|
1441 | ``inlinetime``. | |
1436 | (default: inlinetime) |
|
1442 | (default: inlinetime) | |
1437 |
|
1443 | |||
1438 | ``limit`` |
|
1444 | ``limit`` | |
1439 | Number of lines to show. Specific to the ``ls`` instrumenting profiler. |
|
1445 | Number of lines to show. Specific to the ``ls`` instrumenting profiler. | |
1440 | (default: 30) |
|
1446 | (default: 30) | |
1441 |
|
1447 | |||
1442 | ``nested`` |
|
1448 | ``nested`` | |
1443 | Show at most this number of lines of drill-down info after each main entry. |
|
1449 | Show at most this number of lines of drill-down info after each main entry. | |
1444 | This can help explain the difference between Total and Inline. |
|
1450 | This can help explain the difference between Total and Inline. | |
1445 | Specific to the ``ls`` instrumenting profiler. |
|
1451 | Specific to the ``ls`` instrumenting profiler. | |
1446 | (default: 5) |
|
1452 | (default: 5) | |
1447 |
|
1453 | |||
1448 | ``progress`` |
|
1454 | ``progress`` | |
1449 | ------------ |
|
1455 | ------------ | |
1450 |
|
1456 | |||
1451 | Mercurial commands can draw progress bars that are as informative as |
|
1457 | Mercurial commands can draw progress bars that are as informative as | |
1452 | possible. Some progress bars only offer indeterminate information, while others |
|
1458 | possible. Some progress bars only offer indeterminate information, while others | |
1453 | have a definite end point. |
|
1459 | have a definite end point. | |
1454 |
|
1460 | |||
1455 | ``delay`` |
|
1461 | ``delay`` | |
1456 | Number of seconds (float) before showing the progress bar. (default: 3) |
|
1462 | Number of seconds (float) before showing the progress bar. (default: 3) | |
1457 |
|
1463 | |||
1458 | ``changedelay`` |
|
1464 | ``changedelay`` | |
1459 | Minimum delay before showing a new topic. When set to less than 3 * refresh, |
|
1465 | Minimum delay before showing a new topic. When set to less than 3 * refresh, | |
1460 | that value will be used instead. (default: 1) |
|
1466 | that value will be used instead. (default: 1) | |
1461 |
|
1467 | |||
1462 | ``refresh`` |
|
1468 | ``refresh`` | |
1463 | Time in seconds between refreshes of the progress bar. (default: 0.1) |
|
1469 | Time in seconds between refreshes of the progress bar. (default: 0.1) | |
1464 |
|
1470 | |||
1465 | ``format`` |
|
1471 | ``format`` | |
1466 | Format of the progress bar. |
|
1472 | Format of the progress bar. | |
1467 |
|
1473 | |||
1468 | Valid entries for the format field are ``topic``, ``bar``, ``number``, |
|
1474 | Valid entries for the format field are ``topic``, ``bar``, ``number``, | |
1469 | ``unit``, ``estimate``, ``speed``, and ``item``. ``item`` defaults to the |
|
1475 | ``unit``, ``estimate``, ``speed``, and ``item``. ``item`` defaults to the | |
1470 | last 20 characters of the item, but this can be changed by adding either |
|
1476 | last 20 characters of the item, but this can be changed by adding either | |
1471 | ``-<num>`` which would take the last num characters, or ``+<num>`` for the |
|
1477 | ``-<num>`` which would take the last num characters, or ``+<num>`` for the | |
1472 | first num characters. |
|
1478 | first num characters. | |
1473 |
|
1479 | |||
1474 | (default: topic bar number estimate) |
|
1480 | (default: topic bar number estimate) | |
1475 |
|
1481 | |||
1476 | ``width`` |
|
1482 | ``width`` | |
1477 | If set, the maximum width of the progress information (that is, min(width, |
|
1483 | If set, the maximum width of the progress information (that is, min(width, | |
1478 | term width) will be used). |
|
1484 | term width) will be used). | |
1479 |
|
1485 | |||
1480 | ``clear-complete`` |
|
1486 | ``clear-complete`` | |
1481 | Clear the progress bar after it's done. (default: True) |
|
1487 | Clear the progress bar after it's done. (default: True) | |
1482 |
|
1488 | |||
1483 | ``disable`` |
|
1489 | ``disable`` | |
1484 | If true, don't show a progress bar. |
|
1490 | If true, don't show a progress bar. | |
1485 |
|
1491 | |||
1486 | ``assume-tty`` |
|
1492 | ``assume-tty`` | |
1487 | If true, ALWAYS show a progress bar, unless disable is given. |
|
1493 | If true, ALWAYS show a progress bar, unless disable is given. | |
1488 |
|
1494 | |||
1489 | ``rebase`` |
|
1495 | ``rebase`` | |
1490 | ---------- |
|
1496 | ---------- | |
1491 |
|
1497 | |||
1492 | ``allowdivergence`` |
|
1498 | ``allowdivergence`` | |
1493 | Default to False, when True allow creating divergence when performing |
|
1499 | Default to False, when True allow creating divergence when performing | |
1494 | rebase of obsolete changesets. |
|
1500 | rebase of obsolete changesets. | |
1495 |
|
1501 | |||
1496 | ``revsetalias`` |
|
1502 | ``revsetalias`` | |
1497 | --------------- |
|
1503 | --------------- | |
1498 |
|
1504 | |||
1499 | Alias definitions for revsets. See :hg:`help revsets` for details. |
|
1505 | Alias definitions for revsets. See :hg:`help revsets` for details. | |
1500 |
|
1506 | |||
1501 | ``server`` |
|
1507 | ``server`` | |
1502 | ---------- |
|
1508 | ---------- | |
1503 |
|
1509 | |||
1504 | Controls generic server settings. |
|
1510 | Controls generic server settings. | |
1505 |
|
1511 | |||
1506 | ``uncompressed`` |
|
1512 | ``uncompressed`` | |
1507 | Whether to allow clients to clone a repository using the |
|
1513 | Whether to allow clients to clone a repository using the | |
1508 | uncompressed streaming protocol. This transfers about 40% more |
|
1514 | uncompressed streaming protocol. This transfers about 40% more | |
1509 | data than a regular clone, but uses less memory and CPU on both |
|
1515 | data than a regular clone, but uses less memory and CPU on both | |
1510 | server and client. Over a LAN (100 Mbps or better) or a very fast |
|
1516 | server and client. Over a LAN (100 Mbps or better) or a very fast | |
1511 | WAN, an uncompressed streaming clone is a lot faster (~10x) than a |
|
1517 | WAN, an uncompressed streaming clone is a lot faster (~10x) than a | |
1512 | regular clone. Over most WAN connections (anything slower than |
|
1518 | regular clone. Over most WAN connections (anything slower than | |
1513 | about 6 Mbps), uncompressed streaming is slower, because of the |
|
1519 | about 6 Mbps), uncompressed streaming is slower, because of the | |
1514 | extra data transfer overhead. This mode will also temporarily hold |
|
1520 | extra data transfer overhead. This mode will also temporarily hold | |
1515 | the write lock while determining what data to transfer. |
|
1521 | the write lock while determining what data to transfer. | |
1516 | (default: True) |
|
1522 | (default: True) | |
1517 |
|
1523 | |||
1518 | ``preferuncompressed`` |
|
1524 | ``preferuncompressed`` | |
1519 | When set, clients will try to use the uncompressed streaming |
|
1525 | When set, clients will try to use the uncompressed streaming | |
1520 | protocol. (default: False) |
|
1526 | protocol. (default: False) | |
1521 |
|
1527 | |||
1522 | ``validate`` |
|
1528 | ``validate`` | |
1523 | Whether to validate the completeness of pushed changesets by |
|
1529 | Whether to validate the completeness of pushed changesets by | |
1524 | checking that all new file revisions specified in manifests are |
|
1530 | checking that all new file revisions specified in manifests are | |
1525 | present. (default: False) |
|
1531 | present. (default: False) | |
1526 |
|
1532 | |||
1527 | ``maxhttpheaderlen`` |
|
1533 | ``maxhttpheaderlen`` | |
1528 | Instruct HTTP clients not to send request headers longer than this |
|
1534 | Instruct HTTP clients not to send request headers longer than this | |
1529 | many bytes. (default: 1024) |
|
1535 | many bytes. (default: 1024) | |
1530 |
|
1536 | |||
1531 | ``bundle1`` |
|
1537 | ``bundle1`` | |
1532 | Whether to allow clients to push and pull using the legacy bundle1 |
|
1538 | Whether to allow clients to push and pull using the legacy bundle1 | |
1533 | exchange format. (default: True) |
|
1539 | exchange format. (default: True) | |
1534 |
|
1540 | |||
1535 | ``bundle1gd`` |
|
1541 | ``bundle1gd`` | |
1536 | Like ``bundle1`` but only used if the repository is using the |
|
1542 | Like ``bundle1`` but only used if the repository is using the | |
1537 | *generaldelta* storage format. (default: True) |
|
1543 | *generaldelta* storage format. (default: True) | |
1538 |
|
1544 | |||
1539 | ``bundle1.push`` |
|
1545 | ``bundle1.push`` | |
1540 | Whether to allow clients to push using the legacy bundle1 exchange |
|
1546 | Whether to allow clients to push using the legacy bundle1 exchange | |
1541 | format. (default: True) |
|
1547 | format. (default: True) | |
1542 |
|
1548 | |||
1543 | ``bundle1gd.push`` |
|
1549 | ``bundle1gd.push`` | |
1544 | Like ``bundle1.push`` but only used if the repository is using the |
|
1550 | Like ``bundle1.push`` but only used if the repository is using the | |
1545 | *generaldelta* storage format. (default: True) |
|
1551 | *generaldelta* storage format. (default: True) | |
1546 |
|
1552 | |||
1547 | ``bundle1.pull`` |
|
1553 | ``bundle1.pull`` | |
1548 | Whether to allow clients to pull using the legacy bundle1 exchange |
|
1554 | Whether to allow clients to pull using the legacy bundle1 exchange | |
1549 | format. (default: True) |
|
1555 | format. (default: True) | |
1550 |
|
1556 | |||
1551 | ``bundle1gd.pull`` |
|
1557 | ``bundle1gd.pull`` | |
1552 | Like ``bundle1.pull`` but only used if the repository is using the |
|
1558 | Like ``bundle1.pull`` but only used if the repository is using the | |
1553 | *generaldelta* storage format. (default: True) |
|
1559 | *generaldelta* storage format. (default: True) | |
1554 |
|
1560 | |||
1555 | Large repositories using the *generaldelta* storage format should |
|
1561 | Large repositories using the *generaldelta* storage format should | |
1556 | consider setting this option because converting *generaldelta* |
|
1562 | consider setting this option because converting *generaldelta* | |
1557 | repositories to the exchange format required by the bundle1 data |
|
1563 | repositories to the exchange format required by the bundle1 data | |
1558 | format can consume a lot of CPU. |
|
1564 | format can consume a lot of CPU. | |
1559 |
|
1565 | |||
1560 | ``zliblevel`` |
|
1566 | ``zliblevel`` | |
1561 | Integer between ``-1`` and ``9`` that controls the zlib compression level |
|
1567 | Integer between ``-1`` and ``9`` that controls the zlib compression level | |
1562 | for wire protocol commands that send zlib compressed output (notably the |
|
1568 | for wire protocol commands that send zlib compressed output (notably the | |
1563 | commands that send repository history data). |
|
1569 | commands that send repository history data). | |
1564 |
|
1570 | |||
1565 | The default (``-1``) uses the default zlib compression level, which is |
|
1571 | The default (``-1``) uses the default zlib compression level, which is | |
1566 | likely equivalent to ``6``. ``0`` means no compression. ``9`` means |
|
1572 | likely equivalent to ``6``. ``0`` means no compression. ``9`` means | |
1567 | maximum compression. |
|
1573 | maximum compression. | |
1568 |
|
1574 | |||
1569 | Setting this option allows server operators to make trade-offs between |
|
1575 | Setting this option allows server operators to make trade-offs between | |
1570 | bandwidth and CPU used. Lowering the compression lowers CPU utilization |
|
1576 | bandwidth and CPU used. Lowering the compression lowers CPU utilization | |
1571 | but sends more bytes to clients. |
|
1577 | but sends more bytes to clients. | |
1572 |
|
1578 | |||
1573 | This option only impacts the HTTP server. |
|
1579 | This option only impacts the HTTP server. | |
1574 |
|
1580 | |||
1575 | ``smtp`` |
|
1581 | ``smtp`` | |
1576 | -------- |
|
1582 | -------- | |
1577 |
|
1583 | |||
1578 | Configuration for extensions that need to send email messages. |
|
1584 | Configuration for extensions that need to send email messages. | |
1579 |
|
1585 | |||
1580 | ``host`` |
|
1586 | ``host`` | |
1581 | Host name of mail server, e.g. "mail.example.com". |
|
1587 | Host name of mail server, e.g. "mail.example.com". | |
1582 |
|
1588 | |||
1583 | ``port`` |
|
1589 | ``port`` | |
1584 | Optional. Port to connect to on mail server. (default: 465 if |
|
1590 | Optional. Port to connect to on mail server. (default: 465 if | |
1585 | ``tls`` is smtps; 25 otherwise) |
|
1591 | ``tls`` is smtps; 25 otherwise) | |
1586 |
|
1592 | |||
1587 | ``tls`` |
|
1593 | ``tls`` | |
1588 | Optional. Method to enable TLS when connecting to mail server: starttls, |
|
1594 | Optional. Method to enable TLS when connecting to mail server: starttls, | |
1589 | smtps or none. (default: none) |
|
1595 | smtps or none. (default: none) | |
1590 |
|
1596 | |||
1591 | ``username`` |
|
1597 | ``username`` | |
1592 | Optional. User name for authenticating with the SMTP server. |
|
1598 | Optional. User name for authenticating with the SMTP server. | |
1593 | (default: None) |
|
1599 | (default: None) | |
1594 |
|
1600 | |||
1595 | ``password`` |
|
1601 | ``password`` | |
1596 | Optional. Password for authenticating with the SMTP server. If not |
|
1602 | Optional. Password for authenticating with the SMTP server. If not | |
1597 | specified, interactive sessions will prompt the user for a |
|
1603 | specified, interactive sessions will prompt the user for a | |
1598 | password; non-interactive sessions will fail. (default: None) |
|
1604 | password; non-interactive sessions will fail. (default: None) | |
1599 |
|
1605 | |||
1600 | ``local_hostname`` |
|
1606 | ``local_hostname`` | |
1601 | Optional. The hostname that the sender can use to identify |
|
1607 | Optional. The hostname that the sender can use to identify | |
1602 | itself to the MTA. |
|
1608 | itself to the MTA. | |
1603 |
|
1609 | |||
1604 |
|
1610 | |||
1605 | ``subpaths`` |
|
1611 | ``subpaths`` | |
1606 | ------------ |
|
1612 | ------------ | |
1607 |
|
1613 | |||
1608 | Subrepository source URLs can go stale if a remote server changes name |
|
1614 | Subrepository source URLs can go stale if a remote server changes name | |
1609 | or becomes temporarily unavailable. This section lets you define |
|
1615 | or becomes temporarily unavailable. This section lets you define | |
1610 | rewrite rules of the form:: |
|
1616 | rewrite rules of the form:: | |
1611 |
|
1617 | |||
1612 | <pattern> = <replacement> |
|
1618 | <pattern> = <replacement> | |
1613 |
|
1619 | |||
1614 | where ``pattern`` is a regular expression matching a subrepository |
|
1620 | where ``pattern`` is a regular expression matching a subrepository | |
1615 | source URL and ``replacement`` is the replacement string used to |
|
1621 | source URL and ``replacement`` is the replacement string used to | |
1616 | rewrite it. Groups can be matched in ``pattern`` and referenced in |
|
1622 | rewrite it. Groups can be matched in ``pattern`` and referenced in | |
1617 | ``replacements``. For instance:: |
|
1623 | ``replacements``. For instance:: | |
1618 |
|
1624 | |||
1619 | http://server/(.*)-hg/ = http://hg.server/\1/ |
|
1625 | http://server/(.*)-hg/ = http://hg.server/\1/ | |
1620 |
|
1626 | |||
1621 | rewrites ``http://server/foo-hg/`` into ``http://hg.server/foo/``. |
|
1627 | rewrites ``http://server/foo-hg/`` into ``http://hg.server/foo/``. | |
1622 |
|
1628 | |||
1623 | Relative subrepository paths are first made absolute, and the |
|
1629 | Relative subrepository paths are first made absolute, and the | |
1624 | rewrite rules are then applied on the full (absolute) path. If ``pattern`` |
|
1630 | rewrite rules are then applied on the full (absolute) path. If ``pattern`` | |
1625 | doesn't match the full path, an attempt is made to apply it on the |
|
1631 | doesn't match the full path, an attempt is made to apply it on the | |
1626 | relative path alone. The rules are applied in definition order. |
|
1632 | relative path alone. The rules are applied in definition order. | |
1627 |
|
1633 | |||
1628 | ``templatealias`` |
|
1634 | ``templatealias`` | |
1629 | ----------------- |
|
1635 | ----------------- | |
1630 |
|
1636 | |||
1631 | Alias definitions for templates. See :hg:`help templates` for details. |
|
1637 | Alias definitions for templates. See :hg:`help templates` for details. | |
1632 |
|
1638 | |||
1633 | ``templates`` |
|
1639 | ``templates`` | |
1634 | ------------- |
|
1640 | ------------- | |
1635 |
|
1641 | |||
1636 | Use the ``[templates]`` section to define template strings. |
|
1642 | Use the ``[templates]`` section to define template strings. | |
1637 | See :hg:`help templates` for details. |
|
1643 | See :hg:`help templates` for details. | |
1638 |
|
1644 | |||
1639 | ``trusted`` |
|
1645 | ``trusted`` | |
1640 | ----------- |
|
1646 | ----------- | |
1641 |
|
1647 | |||
1642 | Mercurial will not use the settings in the |
|
1648 | Mercurial will not use the settings in the | |
1643 | ``.hg/hgrc`` file from a repository if it doesn't belong to a trusted |
|
1649 | ``.hg/hgrc`` file from a repository if it doesn't belong to a trusted | |
1644 | user or to a trusted group, as various hgrc features allow arbitrary |
|
1650 | user or to a trusted group, as various hgrc features allow arbitrary | |
1645 | commands to be run. This issue is often encountered when configuring |
|
1651 | commands to be run. This issue is often encountered when configuring | |
1646 | hooks or extensions for shared repositories or servers. However, |
|
1652 | hooks or extensions for shared repositories or servers. However, | |
1647 | the web interface will use some safe settings from the ``[web]`` |
|
1653 | the web interface will use some safe settings from the ``[web]`` | |
1648 | section. |
|
1654 | section. | |
1649 |
|
1655 | |||
1650 | This section specifies what users and groups are trusted. The |
|
1656 | This section specifies what users and groups are trusted. The | |
1651 | current user is always trusted. To trust everybody, list a user or a |
|
1657 | current user is always trusted. To trust everybody, list a user or a | |
1652 | group with name ``*``. These settings must be placed in an |
|
1658 | group with name ``*``. These settings must be placed in an | |
1653 | *already-trusted file* to take effect, such as ``$HOME/.hgrc`` of the |
|
1659 | *already-trusted file* to take effect, such as ``$HOME/.hgrc`` of the | |
1654 | user or service running Mercurial. |
|
1660 | user or service running Mercurial. | |
1655 |
|
1661 | |||
1656 | ``users`` |
|
1662 | ``users`` | |
1657 | Comma-separated list of trusted users. |
|
1663 | Comma-separated list of trusted users. | |
1658 |
|
1664 | |||
1659 | ``groups`` |
|
1665 | ``groups`` | |
1660 | Comma-separated list of trusted groups. |
|
1666 | Comma-separated list of trusted groups. | |
1661 |
|
1667 | |||
1662 |
|
1668 | |||
1663 | ``ui`` |
|
1669 | ``ui`` | |
1664 | ------ |
|
1670 | ------ | |
1665 |
|
1671 | |||
1666 | User interface controls. |
|
1672 | User interface controls. | |
1667 |
|
1673 | |||
1668 | ``archivemeta`` |
|
1674 | ``archivemeta`` | |
1669 | Whether to include the .hg_archival.txt file containing meta data |
|
1675 | Whether to include the .hg_archival.txt file containing meta data | |
1670 | (hashes for the repository base and for tip) in archives created |
|
1676 | (hashes for the repository base and for tip) in archives created | |
1671 | by the :hg:`archive` command or downloaded via hgweb. |
|
1677 | by the :hg:`archive` command or downloaded via hgweb. | |
1672 | (default: True) |
|
1678 | (default: True) | |
1673 |
|
1679 | |||
1674 | ``askusername`` |
|
1680 | ``askusername`` | |
1675 | Whether to prompt for a username when committing. If True, and |
|
1681 | Whether to prompt for a username when committing. If True, and | |
1676 | neither ``$HGUSER`` nor ``$EMAIL`` has been specified, then the user will |
|
1682 | neither ``$HGUSER`` nor ``$EMAIL`` has been specified, then the user will | |
1677 | be prompted to enter a username. If no username is entered, the |
|
1683 | be prompted to enter a username. If no username is entered, the | |
1678 | default ``USER@HOST`` is used instead. |
|
1684 | default ``USER@HOST`` is used instead. | |
1679 | (default: False) |
|
1685 | (default: False) | |
1680 |
|
1686 | |||
1681 | ``clonebundles`` |
|
1687 | ``clonebundles`` | |
1682 | Whether the "clone bundles" feature is enabled. |
|
1688 | Whether the "clone bundles" feature is enabled. | |
1683 |
|
1689 | |||
1684 | When enabled, :hg:`clone` may download and apply a server-advertised |
|
1690 | When enabled, :hg:`clone` may download and apply a server-advertised | |
1685 | bundle file from a URL instead of using the normal exchange mechanism. |
|
1691 | bundle file from a URL instead of using the normal exchange mechanism. | |
1686 |
|
1692 | |||
1687 | This can likely result in faster and more reliable clones. |
|
1693 | This can likely result in faster and more reliable clones. | |
1688 |
|
1694 | |||
1689 | (default: True) |
|
1695 | (default: True) | |
1690 |
|
1696 | |||
1691 | ``clonebundlefallback`` |
|
1697 | ``clonebundlefallback`` | |
1692 | Whether failure to apply an advertised "clone bundle" from a server |
|
1698 | Whether failure to apply an advertised "clone bundle" from a server | |
1693 | should result in fallback to a regular clone. |
|
1699 | should result in fallback to a regular clone. | |
1694 |
|
1700 | |||
1695 | This is disabled by default because servers advertising "clone |
|
1701 | This is disabled by default because servers advertising "clone | |
1696 | bundles" often do so to reduce server load. If advertised bundles |
|
1702 | bundles" often do so to reduce server load. If advertised bundles | |
1697 | start mass failing and clients automatically fall back to a regular |
|
1703 | start mass failing and clients automatically fall back to a regular | |
1698 | clone, this would add significant and unexpected load to the server |
|
1704 | clone, this would add significant and unexpected load to the server | |
1699 | since the server is expecting clone operations to be offloaded to |
|
1705 | since the server is expecting clone operations to be offloaded to | |
1700 | pre-generated bundles. Failing fast (the default behavior) ensures |
|
1706 | pre-generated bundles. Failing fast (the default behavior) ensures | |
1701 | clients don't overwhelm the server when "clone bundle" application |
|
1707 | clients don't overwhelm the server when "clone bundle" application | |
1702 | fails. |
|
1708 | fails. | |
1703 |
|
1709 | |||
1704 | (default: False) |
|
1710 | (default: False) | |
1705 |
|
1711 | |||
1706 | ``clonebundleprefers`` |
|
1712 | ``clonebundleprefers`` | |
1707 | Defines preferences for which "clone bundles" to use. |
|
1713 | Defines preferences for which "clone bundles" to use. | |
1708 |
|
1714 | |||
1709 | Servers advertising "clone bundles" may advertise multiple available |
|
1715 | Servers advertising "clone bundles" may advertise multiple available | |
1710 | bundles. Each bundle may have different attributes, such as the bundle |
|
1716 | bundles. Each bundle may have different attributes, such as the bundle | |
1711 | type and compression format. This option is used to prefer a particular |
|
1717 | type and compression format. This option is used to prefer a particular | |
1712 | bundle over another. |
|
1718 | bundle over another. | |
1713 |
|
1719 | |||
1714 | The following keys are defined by Mercurial: |
|
1720 | The following keys are defined by Mercurial: | |
1715 |
|
1721 | |||
1716 | BUNDLESPEC |
|
1722 | BUNDLESPEC | |
1717 | A bundle type specifier. These are strings passed to :hg:`bundle -t`. |
|
1723 | A bundle type specifier. These are strings passed to :hg:`bundle -t`. | |
1718 | e.g. ``gzip-v2`` or ``bzip2-v1``. |
|
1724 | e.g. ``gzip-v2`` or ``bzip2-v1``. | |
1719 |
|
1725 | |||
1720 | COMPRESSION |
|
1726 | COMPRESSION | |
1721 | The compression format of the bundle. e.g. ``gzip`` and ``bzip2``. |
|
1727 | The compression format of the bundle. e.g. ``gzip`` and ``bzip2``. | |
1722 |
|
1728 | |||
1723 | Server operators may define custom keys. |
|
1729 | Server operators may define custom keys. | |
1724 |
|
1730 | |||
1725 | Example values: ``COMPRESSION=bzip2``, |
|
1731 | Example values: ``COMPRESSION=bzip2``, | |
1726 | ``BUNDLESPEC=gzip-v2, COMPRESSION=gzip``. |
|
1732 | ``BUNDLESPEC=gzip-v2, COMPRESSION=gzip``. | |
1727 |
|
1733 | |||
1728 | By default, the first bundle advertised by the server is used. |
|
1734 | By default, the first bundle advertised by the server is used. | |
1729 |
|
1735 | |||
1730 | ``commitsubrepos`` |
|
1736 | ``commitsubrepos`` | |
1731 | Whether to commit modified subrepositories when committing the |
|
1737 | Whether to commit modified subrepositories when committing the | |
1732 | parent repository. If False and one subrepository has uncommitted |
|
1738 | parent repository. If False and one subrepository has uncommitted | |
1733 | changes, abort the commit. |
|
1739 | changes, abort the commit. | |
1734 | (default: False) |
|
1740 | (default: False) | |
1735 |
|
1741 | |||
1736 | ``debug`` |
|
1742 | ``debug`` | |
1737 | Print debugging information. (default: False) |
|
1743 | Print debugging information. (default: False) | |
1738 |
|
1744 | |||
1739 | ``editor`` |
|
1745 | ``editor`` | |
1740 | The editor to use during a commit. (default: ``$EDITOR`` or ``vi``) |
|
1746 | The editor to use during a commit. (default: ``$EDITOR`` or ``vi``) | |
1741 |
|
1747 | |||
1742 | ``fallbackencoding`` |
|
1748 | ``fallbackencoding`` | |
1743 | Encoding to try if it's not possible to decode the changelog using |
|
1749 | Encoding to try if it's not possible to decode the changelog using | |
1744 | UTF-8. (default: ISO-8859-1) |
|
1750 | UTF-8. (default: ISO-8859-1) | |
1745 |
|
1751 | |||
1746 | ``graphnodetemplate`` |
|
1752 | ``graphnodetemplate`` | |
1747 | The template used to print changeset nodes in an ASCII revision graph. |
|
1753 | The template used to print changeset nodes in an ASCII revision graph. | |
1748 | (default: ``{graphnode}``) |
|
1754 | (default: ``{graphnode}``) | |
1749 |
|
1755 | |||
1750 | ``ignore`` |
|
1756 | ``ignore`` | |
1751 | A file to read per-user ignore patterns from. This file should be |
|
1757 | A file to read per-user ignore patterns from. This file should be | |
1752 | in the same format as a repository-wide .hgignore file. Filenames |
|
1758 | in the same format as a repository-wide .hgignore file. Filenames | |
1753 | are relative to the repository root. This option supports hook syntax, |
|
1759 | are relative to the repository root. This option supports hook syntax, | |
1754 | so if you want to specify multiple ignore files, you can do so by |
|
1760 | so if you want to specify multiple ignore files, you can do so by | |
1755 | setting something like ``ignore.other = ~/.hgignore2``. For details |
|
1761 | setting something like ``ignore.other = ~/.hgignore2``. For details | |
1756 | of the ignore file format, see the ``hgignore(5)`` man page. |
|
1762 | of the ignore file format, see the ``hgignore(5)`` man page. | |
1757 |
|
1763 | |||
1758 | ``interactive`` |
|
1764 | ``interactive`` | |
1759 | Allow to prompt the user. (default: True) |
|
1765 | Allow to prompt the user. (default: True) | |
1760 |
|
1766 | |||
1761 | ``interface`` |
|
1767 | ``interface`` | |
1762 | Select the default interface for interactive features (default: text). |
|
1768 | Select the default interface for interactive features (default: text). | |
1763 | Possible values are 'text' and 'curses'. |
|
1769 | Possible values are 'text' and 'curses'. | |
1764 |
|
1770 | |||
1765 | ``interface.chunkselector`` |
|
1771 | ``interface.chunkselector`` | |
1766 | Select the interface for change recording (e.g. :hg:`commit -i`). |
|
1772 | Select the interface for change recording (e.g. :hg:`commit -i`). | |
1767 | Possible values are 'text' and 'curses'. |
|
1773 | Possible values are 'text' and 'curses'. | |
1768 | This config overrides the interface specified by ui.interface. |
|
1774 | This config overrides the interface specified by ui.interface. | |
1769 |
|
1775 | |||
1770 | ``logtemplate`` |
|
1776 | ``logtemplate`` | |
1771 | Template string for commands that print changesets. |
|
1777 | Template string for commands that print changesets. | |
1772 |
|
1778 | |||
1773 | ``merge`` |
|
1779 | ``merge`` | |
1774 | The conflict resolution program to use during a manual merge. |
|
1780 | The conflict resolution program to use during a manual merge. | |
1775 | For more information on merge tools see :hg:`help merge-tools`. |
|
1781 | For more information on merge tools see :hg:`help merge-tools`. | |
1776 | For configuring merge tools see the ``[merge-tools]`` section. |
|
1782 | For configuring merge tools see the ``[merge-tools]`` section. | |
1777 |
|
1783 | |||
1778 | ``mergemarkers`` |
|
1784 | ``mergemarkers`` | |
1779 | Sets the merge conflict marker label styling. The ``detailed`` |
|
1785 | Sets the merge conflict marker label styling. The ``detailed`` | |
1780 | style uses the ``mergemarkertemplate`` setting to style the labels. |
|
1786 | style uses the ``mergemarkertemplate`` setting to style the labels. | |
1781 | The ``basic`` style just uses 'local' and 'other' as the marker label. |
|
1787 | The ``basic`` style just uses 'local' and 'other' as the marker label. | |
1782 | One of ``basic`` or ``detailed``. |
|
1788 | One of ``basic`` or ``detailed``. | |
1783 | (default: ``basic``) |
|
1789 | (default: ``basic``) | |
1784 |
|
1790 | |||
1785 | ``mergemarkertemplate`` |
|
1791 | ``mergemarkertemplate`` | |
1786 | The template used to print the commit description next to each conflict |
|
1792 | The template used to print the commit description next to each conflict | |
1787 | marker during merge conflicts. See :hg:`help templates` for the template |
|
1793 | marker during merge conflicts. See :hg:`help templates` for the template | |
1788 | format. |
|
1794 | format. | |
1789 |
|
1795 | |||
1790 | Defaults to showing the hash, tags, branches, bookmarks, author, and |
|
1796 | Defaults to showing the hash, tags, branches, bookmarks, author, and | |
1791 | the first line of the commit description. |
|
1797 | the first line of the commit description. | |
1792 |
|
1798 | |||
1793 | If you use non-ASCII characters in names for tags, branches, bookmarks, |
|
1799 | If you use non-ASCII characters in names for tags, branches, bookmarks, | |
1794 | authors, and/or commit descriptions, you must pay attention to encodings of |
|
1800 | authors, and/or commit descriptions, you must pay attention to encodings of | |
1795 | managed files. At template expansion, non-ASCII characters use the encoding |
|
1801 | managed files. At template expansion, non-ASCII characters use the encoding | |
1796 | specified by the ``--encoding`` global option, ``HGENCODING`` or other |
|
1802 | specified by the ``--encoding`` global option, ``HGENCODING`` or other | |
1797 | environment variables that govern your locale. If the encoding of the merge |
|
1803 | environment variables that govern your locale. If the encoding of the merge | |
1798 | markers is different from the encoding of the merged files, |
|
1804 | markers is different from the encoding of the merged files, | |
1799 | serious problems may occur. |
|
1805 | serious problems may occur. | |
1800 |
|
1806 | |||
1801 | ``origbackuppath`` |
|
1807 | ``origbackuppath`` | |
1802 | The path to a directory used to store generated .orig files. If the path is |
|
1808 | The path to a directory used to store generated .orig files. If the path is | |
1803 | not a directory, one will be created. |
|
1809 | not a directory, one will be created. | |
1804 |
|
1810 | |||
1805 | ``patch`` |
|
1811 | ``patch`` | |
1806 | An optional external tool that ``hg import`` and some extensions |
|
1812 | An optional external tool that ``hg import`` and some extensions | |
1807 | will use for applying patches. By default Mercurial uses an |
|
1813 | will use for applying patches. By default Mercurial uses an | |
1808 | internal patch utility. The external tool must work as the common |
|
1814 | internal patch utility. The external tool must work as the common | |
1809 | Unix ``patch`` program. In particular, it must accept a ``-p`` |
|
1815 | Unix ``patch`` program. In particular, it must accept a ``-p`` | |
1810 | argument to strip patch headers, a ``-d`` argument to specify the |
|
1816 | argument to strip patch headers, a ``-d`` argument to specify the | |
1811 | current directory, a file name to patch, and a patch file to take |
|
1817 | current directory, a file name to patch, and a patch file to take | |
1812 | from stdin. |
|
1818 | from stdin. | |
1813 |
|
1819 | |||
1814 | It is possible to specify a patch tool together with extra |
|
1820 | It is possible to specify a patch tool together with extra | |
1815 | arguments. For example, setting this option to ``patch --merge`` |
|
1821 | arguments. For example, setting this option to ``patch --merge`` | |
1816 | will use the ``patch`` program with its 2-way merge option. |
|
1822 | will use the ``patch`` program with its 2-way merge option. | |
1817 |
|
1823 | |||
1818 | ``portablefilenames`` |
|
1824 | ``portablefilenames`` | |
1819 | Check for portable filenames. Can be ``warn``, ``ignore`` or ``abort``. |
|
1825 | Check for portable filenames. Can be ``warn``, ``ignore`` or ``abort``. | |
1820 | (default: ``warn``) |
|
1826 | (default: ``warn``) | |
1821 |
|
1827 | |||
1822 | ``warn`` |
|
1828 | ``warn`` | |
1823 | Print a warning message on POSIX platforms, if a file with a non-portable |
|
1829 | Print a warning message on POSIX platforms, if a file with a non-portable | |
1824 | filename is added (e.g. a file with a name that can't be created on |
|
1830 | filename is added (e.g. a file with a name that can't be created on | |
1825 | Windows because it contains reserved parts like ``AUX``, reserved |
|
1831 | Windows because it contains reserved parts like ``AUX``, reserved | |
1826 | characters like ``:``, or would cause a case collision with an existing |
|
1832 | characters like ``:``, or would cause a case collision with an existing | |
1827 | file). |
|
1833 | file). | |
1828 |
|
1834 | |||
1829 | ``ignore`` |
|
1835 | ``ignore`` | |
1830 | Don't print a warning. |
|
1836 | Don't print a warning. | |
1831 |
|
1837 | |||
1832 | ``abort`` |
|
1838 | ``abort`` | |
1833 | The command is aborted. |
|
1839 | The command is aborted. | |
1834 |
|
1840 | |||
1835 | ``true`` |
|
1841 | ``true`` | |
1836 | Alias for ``warn``. |
|
1842 | Alias for ``warn``. | |
1837 |
|
1843 | |||
1838 | ``false`` |
|
1844 | ``false`` | |
1839 | Alias for ``ignore``. |
|
1845 | Alias for ``ignore``. | |
1840 |
|
1846 | |||
1841 | .. container:: windows |
|
1847 | .. container:: windows | |
1842 |
|
1848 | |||
1843 | On Windows, this configuration option is ignored and the command aborted. |
|
1849 | On Windows, this configuration option is ignored and the command aborted. | |
1844 |
|
1850 | |||
1845 | ``quiet`` |
|
1851 | ``quiet`` | |
1846 | Reduce the amount of output printed. |
|
1852 | Reduce the amount of output printed. | |
1847 | (default: False) |
|
1853 | (default: False) | |
1848 |
|
1854 | |||
1849 | ``remotecmd`` |
|
1855 | ``remotecmd`` | |
1850 | Remote command to use for clone/push/pull operations. |
|
1856 | Remote command to use for clone/push/pull operations. | |
1851 | (default: ``hg``) |
|
1857 | (default: ``hg``) | |
1852 |
|
1858 | |||
1853 | ``report_untrusted`` |
|
1859 | ``report_untrusted`` | |
1854 | Warn if a ``.hg/hgrc`` file is ignored due to not being owned by a |
|
1860 | Warn if a ``.hg/hgrc`` file is ignored due to not being owned by a | |
1855 | trusted user or group. |
|
1861 | trusted user or group. | |
1856 | (default: True) |
|
1862 | (default: True) | |
1857 |
|
1863 | |||
1858 | ``slash`` |
|
1864 | ``slash`` | |
1859 | Display paths using a slash (``/``) as the path separator. This |
|
1865 | Display paths using a slash (``/``) as the path separator. This | |
1860 | only makes a difference on systems where the default path |
|
1866 | only makes a difference on systems where the default path | |
1861 | separator is not the slash character (e.g. Windows uses the |
|
1867 | separator is not the slash character (e.g. Windows uses the | |
1862 | backslash character (``\``)). |
|
1868 | backslash character (``\``)). | |
1863 | (default: False) |
|
1869 | (default: False) | |
1864 |
|
1870 | |||
1865 | ``statuscopies`` |
|
1871 | ``statuscopies`` | |
1866 | Display copies in the status command. |
|
1872 | Display copies in the status command. | |
1867 |
|
1873 | |||
1868 | ``ssh`` |
|
1874 | ``ssh`` | |
1869 | Command to use for SSH connections. (default: ``ssh``) |
|
1875 | Command to use for SSH connections. (default: ``ssh``) | |
1870 |
|
1876 | |||
1871 | ``strict`` |
|
1877 | ``strict`` | |
1872 | Require exact command names, instead of allowing unambiguous |
|
1878 | Require exact command names, instead of allowing unambiguous | |
1873 | abbreviations. (default: False) |
|
1879 | abbreviations. (default: False) | |
1874 |
|
1880 | |||
1875 | ``style`` |
|
1881 | ``style`` | |
1876 | Name of style to use for command output. |
|
1882 | Name of style to use for command output. | |
1877 |
|
1883 | |||
1878 | ``supportcontact`` |
|
1884 | ``supportcontact`` | |
1879 | A URL where users should report a Mercurial traceback. Use this if you are a |
|
1885 | A URL where users should report a Mercurial traceback. Use this if you are a | |
1880 | large organisation with its own Mercurial deployment process and crash |
|
1886 | large organisation with its own Mercurial deployment process and crash | |
1881 | reports should be addressed to your internal support. |
|
1887 | reports should be addressed to your internal support. | |
1882 |
|
1888 | |||
1883 | ``textwidth`` |
|
1889 | ``textwidth`` | |
1884 | Maximum width of help text. A longer line generated by ``hg help`` or |
|
1890 | Maximum width of help text. A longer line generated by ``hg help`` or | |
1885 | ``hg subcommand --help`` will be broken after white space to get this |
|
1891 | ``hg subcommand --help`` will be broken after white space to get this | |
1886 | width or the terminal width, whichever comes first. |
|
1892 | width or the terminal width, whichever comes first. | |
1887 | A non-positive value will disable this and the terminal width will be |
|
1893 | A non-positive value will disable this and the terminal width will be | |
1888 | used. (default: 78) |
|
1894 | used. (default: 78) | |
1889 |
|
1895 | |||
1890 | ``timeout`` |
|
1896 | ``timeout`` | |
1891 | The timeout used when a lock is held (in seconds), a negative value |
|
1897 | The timeout used when a lock is held (in seconds), a negative value | |
1892 | means no timeout. (default: 600) |
|
1898 | means no timeout. (default: 600) | |
1893 |
|
1899 | |||
1894 | ``traceback`` |
|
1900 | ``traceback`` | |
1895 | Mercurial always prints a traceback when an unknown exception |
|
1901 | Mercurial always prints a traceback when an unknown exception | |
1896 | occurs. Setting this to True will make Mercurial print a traceback |
|
1902 | occurs. Setting this to True will make Mercurial print a traceback | |
1897 | on all exceptions, even those recognized by Mercurial (such as |
|
1903 | on all exceptions, even those recognized by Mercurial (such as | |
1898 | IOError or MemoryError). (default: False) |
|
1904 | IOError or MemoryError). (default: False) | |
1899 |
|
1905 | |||
1900 | ``username`` |
|
1906 | ``username`` | |
1901 | The committer of a changeset created when running "commit". |
|
1907 | The committer of a changeset created when running "commit". | |
1902 | Typically a person's name and email address, e.g. ``Fred Widget |
|
1908 | Typically a person's name and email address, e.g. ``Fred Widget | |
1903 | <fred@example.com>``. Environment variables in the |
|
1909 | <fred@example.com>``. Environment variables in the | |
1904 | username are expanded. |
|
1910 | username are expanded. | |
1905 |
|
1911 | |||
1906 | (default: ``$EMAIL`` or ``username@hostname``. If the username in |
|
1912 | (default: ``$EMAIL`` or ``username@hostname``. If the username in | |
1907 | hgrc is empty, e.g. if the system admin set ``username =`` in the |
|
1913 | hgrc is empty, e.g. if the system admin set ``username =`` in the | |
1908 | system hgrc, it has to be specified manually or in a different |
|
1914 | system hgrc, it has to be specified manually or in a different | |
1909 | hgrc file) |
|
1915 | hgrc file) | |
1910 |
|
1916 | |||
1911 | ``verbose`` |
|
1917 | ``verbose`` | |
1912 | Increase the amount of output printed. (default: False) |
|
1918 | Increase the amount of output printed. (default: False) | |
1913 |
|
1919 | |||
1914 |
|
1920 | |||
1915 | ``web`` |
|
1921 | ``web`` | |
1916 | ------- |
|
1922 | ------- | |
1917 |
|
1923 | |||
1918 | Web interface configuration. The settings in this section apply to |
|
1924 | Web interface configuration. The settings in this section apply to | |
1919 | both the builtin webserver (started by :hg:`serve`) and the script you |
|
1925 | both the builtin webserver (started by :hg:`serve`) and the script you | |
1920 | run through a webserver (``hgweb.cgi`` and the derivatives for FastCGI |
|
1926 | run through a webserver (``hgweb.cgi`` and the derivatives for FastCGI | |
1921 | and WSGI). |
|
1927 | and WSGI). | |
1922 |
|
1928 | |||
1923 | The Mercurial webserver does no authentication (it does not prompt for |
|
1929 | The Mercurial webserver does no authentication (it does not prompt for | |
1924 | usernames and passwords to validate *who* users are), but it does do |
|
1930 | usernames and passwords to validate *who* users are), but it does do | |
1925 | authorization (it grants or denies access for *authenticated users* |
|
1931 | authorization (it grants or denies access for *authenticated users* | |
1926 | based on settings in this section). You must either configure your |
|
1932 | based on settings in this section). You must either configure your | |
1927 | webserver to do authentication for you, or disable the authorization |
|
1933 | webserver to do authentication for you, or disable the authorization | |
1928 | checks. |
|
1934 | checks. | |
1929 |
|
1935 | |||
1930 | For a quick setup in a trusted environment, e.g., a private LAN, where |
|
1936 | For a quick setup in a trusted environment, e.g., a private LAN, where | |
1931 | you want it to accept pushes from anybody, you can use the following |
|
1937 | you want it to accept pushes from anybody, you can use the following | |
1932 | command line:: |
|
1938 | command line:: | |
1933 |
|
1939 | |||
1934 | $ hg --config web.allow_push=* --config web.push_ssl=False serve |
|
1940 | $ hg --config web.allow_push=* --config web.push_ssl=False serve | |
1935 |
|
1941 | |||
1936 | Note that this will allow anybody to push anything to the server and |
|
1942 | Note that this will allow anybody to push anything to the server and | |
1937 | that this should not be used for public servers. |
|
1943 | that this should not be used for public servers. | |
1938 |
|
1944 | |||
1939 | The full set of options is: |
|
1945 | The full set of options is: | |
1940 |
|
1946 | |||
1941 | ``accesslog`` |
|
1947 | ``accesslog`` | |
1942 | Where to output the access log. (default: stdout) |
|
1948 | Where to output the access log. (default: stdout) | |
1943 |
|
1949 | |||
1944 | ``address`` |
|
1950 | ``address`` | |
1945 | Interface address to bind to. (default: all) |
|
1951 | Interface address to bind to. (default: all) | |
1946 |
|
1952 | |||
1947 | ``allow_archive`` |
|
1953 | ``allow_archive`` | |
1948 | List of archive format (bz2, gz, zip) allowed for downloading. |
|
1954 | List of archive format (bz2, gz, zip) allowed for downloading. | |
1949 | (default: empty) |
|
1955 | (default: empty) | |
1950 |
|
1956 | |||
1951 | ``allowbz2`` |
|
1957 | ``allowbz2`` | |
1952 | (DEPRECATED) Whether to allow .tar.bz2 downloading of repository |
|
1958 | (DEPRECATED) Whether to allow .tar.bz2 downloading of repository | |
1953 | revisions. |
|
1959 | revisions. | |
1954 | (default: False) |
|
1960 | (default: False) | |
1955 |
|
1961 | |||
1956 | ``allowgz`` |
|
1962 | ``allowgz`` | |
1957 | (DEPRECATED) Whether to allow .tar.gz downloading of repository |
|
1963 | (DEPRECATED) Whether to allow .tar.gz downloading of repository | |
1958 | revisions. |
|
1964 | revisions. | |
1959 | (default: False) |
|
1965 | (default: False) | |
1960 |
|
1966 | |||
1961 | ``allowpull`` |
|
1967 | ``allowpull`` | |
1962 | Whether to allow pulling from the repository. (default: True) |
|
1968 | Whether to allow pulling from the repository. (default: True) | |
1963 |
|
1969 | |||
1964 | ``allow_push`` |
|
1970 | ``allow_push`` | |
1965 | Whether to allow pushing to the repository. If empty or not set, |
|
1971 | Whether to allow pushing to the repository. If empty or not set, | |
1966 | pushing is not allowed. If the special value ``*``, any remote |
|
1972 | pushing is not allowed. If the special value ``*``, any remote | |
1967 | user can push, including unauthenticated users. Otherwise, the |
|
1973 | user can push, including unauthenticated users. Otherwise, the | |
1968 | remote user must have been authenticated, and the authenticated |
|
1974 | remote user must have been authenticated, and the authenticated | |
1969 | user name must be present in this list. The contents of the |
|
1975 | user name must be present in this list. The contents of the | |
1970 | allow_push list are examined after the deny_push list. |
|
1976 | allow_push list are examined after the deny_push list. | |
1971 |
|
1977 | |||
1972 | ``allow_read`` |
|
1978 | ``allow_read`` | |
1973 | If the user has not already been denied repository access due to |
|
1979 | If the user has not already been denied repository access due to | |
1974 | the contents of deny_read, this list determines whether to grant |
|
1980 | the contents of deny_read, this list determines whether to grant | |
1975 | repository access to the user. If this list is not empty, and the |
|
1981 | repository access to the user. If this list is not empty, and the | |
1976 | user is unauthenticated or not present in the list, then access is |
|
1982 | user is unauthenticated or not present in the list, then access is | |
1977 | denied for the user. If the list is empty or not set, then access |
|
1983 | denied for the user. If the list is empty or not set, then access | |
1978 | is permitted to all users by default. Setting allow_read to the |
|
1984 | is permitted to all users by default. Setting allow_read to the | |
1979 | special value ``*`` is equivalent to it not being set (i.e. access |
|
1985 | special value ``*`` is equivalent to it not being set (i.e. access | |
1980 | is permitted to all users). The contents of the allow_read list are |
|
1986 | is permitted to all users). The contents of the allow_read list are | |
1981 | examined after the deny_read list. |
|
1987 | examined after the deny_read list. | |
1982 |
|
1988 | |||
1983 | ``allowzip`` |
|
1989 | ``allowzip`` | |
1984 | (DEPRECATED) Whether to allow .zip downloading of repository |
|
1990 | (DEPRECATED) Whether to allow .zip downloading of repository | |
1985 | revisions. This feature creates temporary files. |
|
1991 | revisions. This feature creates temporary files. | |
1986 | (default: False) |
|
1992 | (default: False) | |
1987 |
|
1993 | |||
1988 | ``archivesubrepos`` |
|
1994 | ``archivesubrepos`` | |
1989 | Whether to recurse into subrepositories when archiving. |
|
1995 | Whether to recurse into subrepositories when archiving. | |
1990 | (default: False) |
|
1996 | (default: False) | |
1991 |
|
1997 | |||
1992 | ``baseurl`` |
|
1998 | ``baseurl`` | |
1993 | Base URL to use when publishing URLs in other locations, so |
|
1999 | Base URL to use when publishing URLs in other locations, so | |
1994 | third-party tools like email notification hooks can construct |
|
2000 | third-party tools like email notification hooks can construct | |
1995 | URLs. Example: ``http://hgserver/repos/``. |
|
2001 | URLs. Example: ``http://hgserver/repos/``. | |
1996 |
|
2002 | |||
1997 | ``cacerts`` |
|
2003 | ``cacerts`` | |
1998 | Path to file containing a list of PEM encoded certificate |
|
2004 | Path to file containing a list of PEM encoded certificate | |
1999 | authority certificates. Environment variables and ``~user`` |
|
2005 | authority certificates. Environment variables and ``~user`` | |
2000 | constructs are expanded in the filename. If specified on the |
|
2006 | constructs are expanded in the filename. If specified on the | |
2001 | client, then it will verify the identity of remote HTTPS servers |
|
2007 | client, then it will verify the identity of remote HTTPS servers | |
2002 | with these certificates. |
|
2008 | with these certificates. | |
2003 |
|
2009 | |||
2004 | To disable SSL verification temporarily, specify ``--insecure`` from |
|
2010 | To disable SSL verification temporarily, specify ``--insecure`` from | |
2005 | command line. |
|
2011 | command line. | |
2006 |
|
2012 | |||
2007 | You can use OpenSSL's CA certificate file if your platform has |
|
2013 | You can use OpenSSL's CA certificate file if your platform has | |
2008 | one. On most Linux systems this will be |
|
2014 | one. On most Linux systems this will be | |
2009 | ``/etc/ssl/certs/ca-certificates.crt``. Otherwise you will have to |
|
2015 | ``/etc/ssl/certs/ca-certificates.crt``. Otherwise you will have to | |
2010 | generate this file manually. The form must be as follows:: |
|
2016 | generate this file manually. The form must be as follows:: | |
2011 |
|
2017 | |||
2012 | -----BEGIN CERTIFICATE----- |
|
2018 | -----BEGIN CERTIFICATE----- | |
2013 | ... (certificate in base64 PEM encoding) ... |
|
2019 | ... (certificate in base64 PEM encoding) ... | |
2014 | -----END CERTIFICATE----- |
|
2020 | -----END CERTIFICATE----- | |
2015 | -----BEGIN CERTIFICATE----- |
|
2021 | -----BEGIN CERTIFICATE----- | |
2016 | ... (certificate in base64 PEM encoding) ... |
|
2022 | ... (certificate in base64 PEM encoding) ... | |
2017 | -----END CERTIFICATE----- |
|
2023 | -----END CERTIFICATE----- | |
2018 |
|
2024 | |||
2019 | ``cache`` |
|
2025 | ``cache`` | |
2020 | Whether to support caching in hgweb. (default: True) |
|
2026 | Whether to support caching in hgweb. (default: True) | |
2021 |
|
2027 | |||
2022 | ``certificate`` |
|
2028 | ``certificate`` | |
2023 | Certificate to use when running :hg:`serve`. |
|
2029 | Certificate to use when running :hg:`serve`. | |
2024 |
|
2030 | |||
2025 | ``collapse`` |
|
2031 | ``collapse`` | |
2026 | With ``descend`` enabled, repositories in subdirectories are shown at |
|
2032 | With ``descend`` enabled, repositories in subdirectories are shown at | |
2027 | a single level alongside repositories in the current path. With |
|
2033 | a single level alongside repositories in the current path. With | |
2028 | ``collapse`` also enabled, repositories residing at a deeper level than |
|
2034 | ``collapse`` also enabled, repositories residing at a deeper level than | |
2029 | the current path are grouped behind navigable directory entries that |
|
2035 | the current path are grouped behind navigable directory entries that | |
2030 | lead to the locations of these repositories. In effect, this setting |
|
2036 | lead to the locations of these repositories. In effect, this setting | |
2031 | collapses each collection of repositories found within a subdirectory |
|
2037 | collapses each collection of repositories found within a subdirectory | |
2032 | into a single entry for that subdirectory. (default: False) |
|
2038 | into a single entry for that subdirectory. (default: False) | |
2033 |
|
2039 | |||
2034 | ``comparisoncontext`` |
|
2040 | ``comparisoncontext`` | |
2035 | Number of lines of context to show in side-by-side file comparison. If |
|
2041 | Number of lines of context to show in side-by-side file comparison. If | |
2036 | negative or the value ``full``, whole files are shown. (default: 5) |
|
2042 | negative or the value ``full``, whole files are shown. (default: 5) | |
2037 |
|
2043 | |||
2038 | This setting can be overridden by a ``context`` request parameter to the |
|
2044 | This setting can be overridden by a ``context`` request parameter to the | |
2039 | ``comparison`` command, taking the same values. |
|
2045 | ``comparison`` command, taking the same values. | |
2040 |
|
2046 | |||
2041 | ``contact`` |
|
2047 | ``contact`` | |
2042 | Name or email address of the person in charge of the repository. |
|
2048 | Name or email address of the person in charge of the repository. | |
2043 | (default: ui.username or ``$EMAIL`` or "unknown" if unset or empty) |
|
2049 | (default: ui.username or ``$EMAIL`` or "unknown" if unset or empty) | |
2044 |
|
2050 | |||
2045 | ``deny_push`` |
|
2051 | ``deny_push`` | |
2046 | Whether to deny pushing to the repository. If empty or not set, |
|
2052 | Whether to deny pushing to the repository. If empty or not set, | |
2047 | push is not denied. If the special value ``*``, all remote users are |
|
2053 | push is not denied. If the special value ``*``, all remote users are | |
2048 | denied push. Otherwise, unauthenticated users are all denied, and |
|
2054 | denied push. Otherwise, unauthenticated users are all denied, and | |
2049 | any authenticated user name present in this list is also denied. The |
|
2055 | any authenticated user name present in this list is also denied. The | |
2050 | contents of the deny_push list are examined before the allow_push list. |
|
2056 | contents of the deny_push list are examined before the allow_push list. | |
2051 |
|
2057 | |||
2052 | ``deny_read`` |
|
2058 | ``deny_read`` | |
2053 | Whether to deny reading/viewing of the repository. If this list is |
|
2059 | Whether to deny reading/viewing of the repository. If this list is | |
2054 | not empty, unauthenticated users are all denied, and any |
|
2060 | not empty, unauthenticated users are all denied, and any | |
2055 | authenticated user name present in this list is also denied access to |
|
2061 | authenticated user name present in this list is also denied access to | |
2056 | the repository. If set to the special value ``*``, all remote users |
|
2062 | the repository. If set to the special value ``*``, all remote users | |
2057 | are denied access (rarely needed ;). If deny_read is empty or not set, |
|
2063 | are denied access (rarely needed ;). If deny_read is empty or not set, | |
2058 | the determination of repository access depends on the presence and |
|
2064 | the determination of repository access depends on the presence and | |
2059 | content of the allow_read list (see description). If both |
|
2065 | content of the allow_read list (see description). If both | |
2060 | deny_read and allow_read are empty or not set, then access is |
|
2066 | deny_read and allow_read are empty or not set, then access is | |
2061 | permitted to all users by default. If the repository is being |
|
2067 | permitted to all users by default. If the repository is being | |
2062 | served via hgwebdir, denied users will not be able to see it in |
|
2068 | served via hgwebdir, denied users will not be able to see it in | |
2063 | the list of repositories. The contents of the deny_read list have |
|
2069 | the list of repositories. The contents of the deny_read list have | |
2064 | priority over (are examined before) the contents of the allow_read |
|
2070 | priority over (are examined before) the contents of the allow_read | |
2065 | list. |
|
2071 | list. | |
2066 |
|
2072 | |||
2067 | ``descend`` |
|
2073 | ``descend`` | |
2068 | hgwebdir indexes will not descend into subdirectories. Only repositories |
|
2074 | hgwebdir indexes will not descend into subdirectories. Only repositories | |
2069 | directly in the current path will be shown (other repositories are still |
|
2075 | directly in the current path will be shown (other repositories are still | |
2070 | available from the index corresponding to their containing path). |
|
2076 | available from the index corresponding to their containing path). | |
2071 |
|
2077 | |||
2072 | ``description`` |
|
2078 | ``description`` | |
2073 | Textual description of the repository's purpose or contents. |
|
2079 | Textual description of the repository's purpose or contents. | |
2074 | (default: "unknown") |
|
2080 | (default: "unknown") | |
2075 |
|
2081 | |||
2076 | ``encoding`` |
|
2082 | ``encoding`` | |
2077 | Character encoding name. (default: the current locale charset) |
|
2083 | Character encoding name. (default: the current locale charset) | |
2078 | Example: "UTF-8". |
|
2084 | Example: "UTF-8". | |
2079 |
|
2085 | |||
2080 | ``errorlog`` |
|
2086 | ``errorlog`` | |
2081 | Where to output the error log. (default: stderr) |
|
2087 | Where to output the error log. (default: stderr) | |
2082 |
|
2088 | |||
2083 | ``guessmime`` |
|
2089 | ``guessmime`` | |
2084 | Control MIME types for raw download of file content. |
|
2090 | Control MIME types for raw download of file content. | |
2085 | Set to True to let hgweb guess the content type from the file |
|
2091 | Set to True to let hgweb guess the content type from the file | |
2086 | extension. This will serve HTML files as ``text/html`` and might |
|
2092 | extension. This will serve HTML files as ``text/html`` and might | |
2087 | allow cross-site scripting attacks when serving untrusted |
|
2093 | allow cross-site scripting attacks when serving untrusted | |
2088 | repositories. (default: False) |
|
2094 | repositories. (default: False) | |
2089 |
|
2095 | |||
2090 | ``hidden`` |
|
2096 | ``hidden`` | |
2091 | Whether to hide the repository in the hgwebdir index. |
|
2097 | Whether to hide the repository in the hgwebdir index. | |
2092 | (default: False) |
|
2098 | (default: False) | |
2093 |
|
2099 | |||
2094 | ``ipv6`` |
|
2100 | ``ipv6`` | |
2095 | Whether to use IPv6. (default: False) |
|
2101 | Whether to use IPv6. (default: False) | |
2096 |
|
2102 | |||
2097 | ``labels`` |
|
2103 | ``labels`` | |
2098 | List of string *labels* associated with the repository. |
|
2104 | List of string *labels* associated with the repository. | |
2099 |
|
2105 | |||
2100 | Labels are exposed as a template keyword and can be used to customize |
|
2106 | Labels are exposed as a template keyword and can be used to customize | |
2101 | output. e.g. the ``index`` template can group or filter repositories |
|
2107 | output. e.g. the ``index`` template can group or filter repositories | |
2102 | by labels and the ``summary`` template can display additional content |
|
2108 | by labels and the ``summary`` template can display additional content | |
2103 | if a specific label is present. |
|
2109 | if a specific label is present. | |
2104 |
|
2110 | |||
2105 | ``logoimg`` |
|
2111 | ``logoimg`` | |
2106 | File name of the logo image that some templates display on each page. |
|
2112 | File name of the logo image that some templates display on each page. | |
2107 | The file name is relative to ``staticurl``. That is, the full path to |
|
2113 | The file name is relative to ``staticurl``. That is, the full path to | |
2108 | the logo image is "staticurl/logoimg". |
|
2114 | the logo image is "staticurl/logoimg". | |
2109 | If unset, ``hglogo.png`` will be used. |
|
2115 | If unset, ``hglogo.png`` will be used. | |
2110 |
|
2116 | |||
2111 | ``logourl`` |
|
2117 | ``logourl`` | |
2112 | Base URL to use for logos. If unset, ``https://mercurial-scm.org/`` |
|
2118 | Base URL to use for logos. If unset, ``https://mercurial-scm.org/`` | |
2113 | will be used. |
|
2119 | will be used. | |
2114 |
|
2120 | |||
2115 | ``maxchanges`` |
|
2121 | ``maxchanges`` | |
2116 | Maximum number of changes to list on the changelog. (default: 10) |
|
2122 | Maximum number of changes to list on the changelog. (default: 10) | |
2117 |
|
2123 | |||
2118 | ``maxfiles`` |
|
2124 | ``maxfiles`` | |
2119 | Maximum number of files to list per changeset. (default: 10) |
|
2125 | Maximum number of files to list per changeset. (default: 10) | |
2120 |
|
2126 | |||
2121 | ``maxshortchanges`` |
|
2127 | ``maxshortchanges`` | |
2122 | Maximum number of changes to list on the shortlog, graph or filelog |
|
2128 | Maximum number of changes to list on the shortlog, graph or filelog | |
2123 | pages. (default: 60) |
|
2129 | pages. (default: 60) | |
2124 |
|
2130 | |||
2125 | ``name`` |
|
2131 | ``name`` | |
2126 | Repository name to use in the web interface. |
|
2132 | Repository name to use in the web interface. | |
2127 | (default: current working directory) |
|
2133 | (default: current working directory) | |
2128 |
|
2134 | |||
2129 | ``port`` |
|
2135 | ``port`` | |
2130 | Port to listen on. (default: 8000) |
|
2136 | Port to listen on. (default: 8000) | |
2131 |
|
2137 | |||
2132 | ``prefix`` |
|
2138 | ``prefix`` | |
2133 | Prefix path to serve from. (default: '' (server root)) |
|
2139 | Prefix path to serve from. (default: '' (server root)) | |
2134 |
|
2140 | |||
2135 | ``push_ssl`` |
|
2141 | ``push_ssl`` | |
2136 | Whether to require that inbound pushes be transported over SSL to |
|
2142 | Whether to require that inbound pushes be transported over SSL to | |
2137 | prevent password sniffing. (default: True) |
|
2143 | prevent password sniffing. (default: True) | |
2138 |
|
2144 | |||
2139 | ``refreshinterval`` |
|
2145 | ``refreshinterval`` | |
2140 | How frequently directory listings re-scan the filesystem for new |
|
2146 | How frequently directory listings re-scan the filesystem for new | |
2141 | repositories, in seconds. This is relevant when wildcards are used |
|
2147 | repositories, in seconds. This is relevant when wildcards are used | |
2142 | to define paths. Depending on how much filesystem traversal is |
|
2148 | to define paths. Depending on how much filesystem traversal is | |
2143 | required, refreshing may negatively impact performance. |
|
2149 | required, refreshing may negatively impact performance. | |
2144 |
|
2150 | |||
2145 | Values less than or equal to 0 always refresh. |
|
2151 | Values less than or equal to 0 always refresh. | |
2146 | (default: 20) |
|
2152 | (default: 20) | |
2147 |
|
2153 | |||
2148 | ``staticurl`` |
|
2154 | ``staticurl`` | |
2149 | Base URL to use for static files. If unset, static files (e.g. the |
|
2155 | Base URL to use for static files. If unset, static files (e.g. the | |
2150 | hgicon.png favicon) will be served by the CGI script itself. Use |
|
2156 | hgicon.png favicon) will be served by the CGI script itself. Use | |
2151 | this setting to serve them directly with the HTTP server. |
|
2157 | this setting to serve them directly with the HTTP server. | |
2152 | Example: ``http://hgserver/static/``. |
|
2158 | Example: ``http://hgserver/static/``. | |
2153 |
|
2159 | |||
2154 | ``stripes`` |
|
2160 | ``stripes`` | |
2155 | How many lines a "zebra stripe" should span in multi-line output. |
|
2161 | How many lines a "zebra stripe" should span in multi-line output. | |
2156 | Set to 0 to disable. (default: 1) |
|
2162 | Set to 0 to disable. (default: 1) | |
2157 |
|
2163 | |||
2158 | ``style`` |
|
2164 | ``style`` | |
2159 | Which template map style to use. The available options are the names of |
|
2165 | Which template map style to use. The available options are the names of | |
2160 | subdirectories in the HTML templates path. (default: ``paper``) |
|
2166 | subdirectories in the HTML templates path. (default: ``paper``) | |
2161 | Example: ``monoblue``. |
|
2167 | Example: ``monoblue``. | |
2162 |
|
2168 | |||
2163 | ``templates`` |
|
2169 | ``templates`` | |
2164 | Where to find the HTML templates. The default path to the HTML templates |
|
2170 | Where to find the HTML templates. The default path to the HTML templates | |
2165 | can be obtained from ``hg debuginstall``. |
|
2171 | can be obtained from ``hg debuginstall``. | |
2166 |
|
2172 | |||
2167 | ``websub`` |
|
2173 | ``websub`` | |
2168 | ---------- |
|
2174 | ---------- | |
2169 |
|
2175 | |||
2170 | Web substitution filter definition. You can use this section to |
|
2176 | Web substitution filter definition. You can use this section to | |
2171 | define a set of regular expression substitution patterns which |
|
2177 | define a set of regular expression substitution patterns which | |
2172 | let you automatically modify the hgweb server output. |
|
2178 | let you automatically modify the hgweb server output. | |
2173 |
|
2179 | |||
2174 | The default hgweb templates only apply these substitution patterns |
|
2180 | The default hgweb templates only apply these substitution patterns | |
2175 | on the revision description fields. You can apply them anywhere |
|
2181 | on the revision description fields. You can apply them anywhere | |
2176 | you want when you create your own templates by adding calls to the |
|
2182 | you want when you create your own templates by adding calls to the | |
2177 | "websub" filter (usually after calling the "escape" filter). |
|
2183 | "websub" filter (usually after calling the "escape" filter). | |
2178 |
|
2184 | |||
2179 | This can be used, for example, to convert issue references to links |
|
2185 | This can be used, for example, to convert issue references to links | |
2180 | to your issue tracker, or to convert "markdown-like" syntax into |
|
2186 | to your issue tracker, or to convert "markdown-like" syntax into | |
2181 | HTML (see the examples below). |
|
2187 | HTML (see the examples below). | |
2182 |
|
2188 | |||
2183 | Each entry in this section names a substitution filter. |
|
2189 | Each entry in this section names a substitution filter. | |
2184 | The value of each entry defines the substitution expression itself. |
|
2190 | The value of each entry defines the substitution expression itself. | |
2185 | The websub expressions follow the old interhg extension syntax, |
|
2191 | The websub expressions follow the old interhg extension syntax, | |
2186 | which in turn imitates the Unix sed replacement syntax:: |
|
2192 | which in turn imitates the Unix sed replacement syntax:: | |
2187 |
|
2193 | |||
2188 | patternname = s/SEARCH_REGEX/REPLACE_EXPRESSION/[i] |
|
2194 | patternname = s/SEARCH_REGEX/REPLACE_EXPRESSION/[i] | |
2189 |
|
2195 | |||
2190 | You can use any separator other than "/". The final "i" is optional |
|
2196 | You can use any separator other than "/". The final "i" is optional | |
2191 | and indicates that the search must be case insensitive. |
|
2197 | and indicates that the search must be case insensitive. | |
2192 |
|
2198 | |||
2193 | Examples:: |
|
2199 | Examples:: | |
2194 |
|
2200 | |||
2195 | [websub] |
|
2201 | [websub] | |
2196 | issues = s|issue(\d+)|<a href="http://bts.example.org/issue\1">issue\1</a>|i |
|
2202 | issues = s|issue(\d+)|<a href="http://bts.example.org/issue\1">issue\1</a>|i | |
2197 | italic = s/\b_(\S+)_\b/<i>\1<\/i>/ |
|
2203 | italic = s/\b_(\S+)_\b/<i>\1<\/i>/ | |
2198 | bold = s/\*\b(\S+)\b\*/<b>\1<\/b>/ |
|
2204 | bold = s/\*\b(\S+)\b\*/<b>\1<\/b>/ | |
2199 |
|
2205 | |||
2200 | ``worker`` |
|
2206 | ``worker`` | |
2201 | ---------- |
|
2207 | ---------- | |
2202 |
|
2208 | |||
2203 | Parallel master/worker configuration. We currently perform working |
|
2209 | Parallel master/worker configuration. We currently perform working | |
2204 | directory updates in parallel on Unix-like systems, which greatly |
|
2210 | directory updates in parallel on Unix-like systems, which greatly | |
2205 | helps performance. |
|
2211 | helps performance. | |
2206 |
|
2212 | |||
2207 | ``numcpus`` |
|
2213 | ``numcpus`` | |
2208 | Number of CPUs to use for parallel operations. A zero or |
|
2214 | Number of CPUs to use for parallel operations. A zero or | |
2209 | negative value is treated as ``use the default``. |
|
2215 | negative value is treated as ``use the default``. | |
2210 | (default: 4 or the number of CPUs on the system, whichever is larger) |
|
2216 | (default: 4 or the number of CPUs on the system, whichever is larger) | |
2211 |
|
2217 | |||
2212 | ``backgroundclose`` |
|
2218 | ``backgroundclose`` | |
2213 | Whether to enable closing file handles on background threads during certain |
|
2219 | Whether to enable closing file handles on background threads during certain | |
2214 | operations. Some platforms aren't very efficient at closing file |
|
2220 | operations. Some platforms aren't very efficient at closing file | |
2215 | handles that have been written or appended to. By performing file closing |
|
2221 | handles that have been written or appended to. By performing file closing | |
2216 | on background threads, file write rate can increase substantially. |
|
2222 | on background threads, file write rate can increase substantially. | |
2217 | (default: true on Windows, false elsewhere) |
|
2223 | (default: true on Windows, false elsewhere) | |
2218 |
|
2224 | |||
2219 | ``backgroundcloseminfilecount`` |
|
2225 | ``backgroundcloseminfilecount`` | |
2220 | Minimum number of files required to trigger background file closing. |
|
2226 | Minimum number of files required to trigger background file closing. | |
2221 | Operations not writing this many files won't start background close |
|
2227 | Operations not writing this many files won't start background close | |
2222 | threads. |
|
2228 | threads. | |
2223 | (default: 2048) |
|
2229 | (default: 2048) | |
2224 |
|
2230 | |||
2225 | ``backgroundclosemaxqueue`` |
|
2231 | ``backgroundclosemaxqueue`` | |
2226 | The maximum number of opened file handles waiting to be closed in the |
|
2232 | The maximum number of opened file handles waiting to be closed in the | |
2227 | background. This option only has an effect if ``backgroundclose`` is |
|
2233 | background. This option only has an effect if ``backgroundclose`` is | |
2228 | enabled. |
|
2234 | enabled. | |
2229 | (default: 384) |
|
2235 | (default: 384) | |
2230 |
|
2236 | |||
2231 | ``backgroundclosethreadcount`` |
|
2237 | ``backgroundclosethreadcount`` | |
2232 | Number of threads to process background file closes. Only relevant if |
|
2238 | Number of threads to process background file closes. Only relevant if | |
2233 | ``backgroundclose`` is enabled. |
|
2239 | ``backgroundclose`` is enabled. | |
2234 | (default: 4) |
|
2240 | (default: 4) |
@@ -1,145 +1,162 b'' | |||||
1 | # profiling.py - profiling functions |
|
1 | # profiling.py - profiling functions | |
2 | # |
|
2 | # | |
3 | # Copyright 2016 Gregory Szorc <gregory.szorc@gmail.com> |
|
3 | # Copyright 2016 Gregory Szorc <gregory.szorc@gmail.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, print_function |
|
8 | from __future__ import absolute_import, print_function | |
9 |
|
9 | |||
10 | import contextlib |
|
10 | import contextlib | |
11 | import os |
|
11 | import os | |
12 | import sys |
|
12 | import sys | |
13 | import time |
|
13 | import time | |
14 |
|
14 | |||
15 | from .i18n import _ |
|
15 | from .i18n import _ | |
16 | from . import ( |
|
16 | from . import ( | |
17 | error, |
|
17 | error, | |
18 | util, |
|
18 | util, | |
19 | ) |
|
19 | ) | |
20 |
|
20 | |||
21 | @contextlib.contextmanager |
|
21 | @contextlib.contextmanager | |
22 | def lsprofile(ui, fp): |
|
22 | def lsprofile(ui, fp): | |
23 | format = ui.config('profiling', 'format', default='text') |
|
23 | format = ui.config('profiling', 'format', default='text') | |
24 | field = ui.config('profiling', 'sort', default='inlinetime') |
|
24 | field = ui.config('profiling', 'sort', default='inlinetime') | |
25 | limit = ui.configint('profiling', 'limit', default=30) |
|
25 | limit = ui.configint('profiling', 'limit', default=30) | |
26 | climit = ui.configint('profiling', 'nested', default=0) |
|
26 | climit = ui.configint('profiling', 'nested', default=0) | |
27 |
|
27 | |||
28 | if format not in ['text', 'kcachegrind']: |
|
28 | if format not in ['text', 'kcachegrind']: | |
29 | ui.warn(_("unrecognized profiling format '%s'" |
|
29 | ui.warn(_("unrecognized profiling format '%s'" | |
30 | " - Ignored\n") % format) |
|
30 | " - Ignored\n") % format) | |
31 | format = 'text' |
|
31 | format = 'text' | |
32 |
|
32 | |||
33 | try: |
|
33 | try: | |
34 | from . import lsprof |
|
34 | from . import lsprof | |
35 | except ImportError: |
|
35 | except ImportError: | |
36 | raise error.Abort(_( |
|
36 | raise error.Abort(_( | |
37 | 'lsprof not available - install from ' |
|
37 | 'lsprof not available - install from ' | |
38 | 'http://codespeak.net/svn/user/arigo/hack/misc/lsprof/')) |
|
38 | 'http://codespeak.net/svn/user/arigo/hack/misc/lsprof/')) | |
39 | p = lsprof.Profiler() |
|
39 | p = lsprof.Profiler() | |
40 | p.enable(subcalls=True) |
|
40 | p.enable(subcalls=True) | |
41 | try: |
|
41 | try: | |
42 | yield |
|
42 | yield | |
43 | finally: |
|
43 | finally: | |
44 | p.disable() |
|
44 | p.disable() | |
45 |
|
45 | |||
46 | if format == 'kcachegrind': |
|
46 | if format == 'kcachegrind': | |
47 | from . import lsprofcalltree |
|
47 | from . import lsprofcalltree | |
48 | calltree = lsprofcalltree.KCacheGrind(p) |
|
48 | calltree = lsprofcalltree.KCacheGrind(p) | |
49 | calltree.output(fp) |
|
49 | calltree.output(fp) | |
50 | else: |
|
50 | else: | |
51 | # format == 'text' |
|
51 | # format == 'text' | |
52 | stats = lsprof.Stats(p.getstats()) |
|
52 | stats = lsprof.Stats(p.getstats()) | |
53 | stats.sort(field) |
|
53 | stats.sort(field) | |
54 | stats.pprint(limit=limit, file=fp, climit=climit) |
|
54 | stats.pprint(limit=limit, file=fp, climit=climit) | |
55 |
|
55 | |||
56 | @contextlib.contextmanager |
|
56 | @contextlib.contextmanager | |
57 | def flameprofile(ui, fp): |
|
57 | def flameprofile(ui, fp): | |
58 | try: |
|
58 | try: | |
59 | from flamegraph import flamegraph |
|
59 | from flamegraph import flamegraph | |
60 | except ImportError: |
|
60 | except ImportError: | |
61 | raise error.Abort(_( |
|
61 | raise error.Abort(_( | |
62 | 'flamegraph not available - install from ' |
|
62 | 'flamegraph not available - install from ' | |
63 | 'https://github.com/evanhempel/python-flamegraph')) |
|
63 | 'https://github.com/evanhempel/python-flamegraph')) | |
64 | # developer config: profiling.freq |
|
64 | # developer config: profiling.freq | |
65 | freq = ui.configint('profiling', 'freq', default=1000) |
|
65 | freq = ui.configint('profiling', 'freq', default=1000) | |
66 | filter_ = None |
|
66 | filter_ = None | |
67 | collapse_recursion = True |
|
67 | collapse_recursion = True | |
68 | thread = flamegraph.ProfileThread(fp, 1.0 / freq, |
|
68 | thread = flamegraph.ProfileThread(fp, 1.0 / freq, | |
69 | filter_, collapse_recursion) |
|
69 | filter_, collapse_recursion) | |
70 | start_time = time.clock() |
|
70 | start_time = time.clock() | |
71 | try: |
|
71 | try: | |
72 | thread.start() |
|
72 | thread.start() | |
73 | yield |
|
73 | yield | |
74 | finally: |
|
74 | finally: | |
75 | thread.stop() |
|
75 | thread.stop() | |
76 | thread.join() |
|
76 | thread.join() | |
77 | print('Collected %d stack frames (%d unique) in %2.2f seconds.' % ( |
|
77 | print('Collected %d stack frames (%d unique) in %2.2f seconds.' % ( | |
78 | time.clock() - start_time, thread.num_frames(), |
|
78 | time.clock() - start_time, thread.num_frames(), | |
79 | thread.num_frames(unique=True))) |
|
79 | thread.num_frames(unique=True))) | |
80 |
|
80 | |||
81 | @contextlib.contextmanager |
|
81 | @contextlib.contextmanager | |
82 | def statprofile(ui, fp): |
|
82 | def statprofile(ui, fp): | |
83 | try: |
|
83 | try: | |
84 | import statprof |
|
84 | import statprof | |
85 | except ImportError: |
|
85 | except ImportError: | |
86 | raise error.Abort(_( |
|
86 | raise error.Abort(_( | |
87 | 'statprof not available - install using "easy_install statprof"')) |
|
87 | 'statprof not available - install using "easy_install statprof"')) | |
88 |
|
88 | |||
89 | freq = ui.configint('profiling', 'freq', default=1000) |
|
89 | freq = ui.configint('profiling', 'freq', default=1000) | |
90 | if freq > 0: |
|
90 | if freq > 0: | |
91 | statprof.reset(freq) |
|
91 | statprof.reset(freq) | |
92 | else: |
|
92 | else: | |
93 | ui.warn(_("invalid sampling frequency '%s' - ignoring\n") % freq) |
|
93 | ui.warn(_("invalid sampling frequency '%s' - ignoring\n") % freq) | |
94 |
|
94 | |||
95 | statprof.start() |
|
95 | statprof.start() | |
96 | try: |
|
96 | try: | |
97 | yield |
|
97 | yield | |
98 | finally: |
|
98 | finally: | |
99 | statprof.stop() |
|
99 | statprof.stop() | |
100 | statprof.display(fp) |
|
100 | statprof.display(fp) | |
101 |
|
101 | |||
102 | @contextlib.contextmanager |
|
102 | @contextlib.contextmanager | |
103 | def profile(ui): |
|
103 | def profile(ui): | |
104 | """Start profiling. |
|
104 | """Start profiling. | |
105 |
|
105 | |||
106 | Profiling is active when the context manager is active. When the context |
|
106 | Profiling is active when the context manager is active. When the context | |
107 | manager exits, profiling results will be written to the configured output. |
|
107 | manager exits, profiling results will be written to the configured output. | |
108 | """ |
|
108 | """ | |
109 | profiler = os.getenv('HGPROF') |
|
109 | profiler = os.getenv('HGPROF') | |
110 | if profiler is None: |
|
110 | if profiler is None: | |
111 | profiler = ui.config('profiling', 'type', default='ls') |
|
111 | profiler = ui.config('profiling', 'type', default='ls') | |
112 | if profiler not in ('ls', 'stat', 'flame'): |
|
112 | if profiler not in ('ls', 'stat', 'flame'): | |
113 | ui.warn(_("unrecognized profiler '%s' - ignored\n") % profiler) |
|
113 | ui.warn(_("unrecognized profiler '%s' - ignored\n") % profiler) | |
114 | profiler = 'ls' |
|
114 | profiler = 'ls' | |
115 |
|
115 | |||
116 | output = ui.config('profiling', 'output') |
|
116 | output = ui.config('profiling', 'output') | |
117 |
|
117 | |||
118 | if output == 'blackbox': |
|
118 | if output == 'blackbox': | |
119 | fp = util.stringio() |
|
119 | fp = util.stringio() | |
120 | elif output: |
|
120 | elif output: | |
121 | path = ui.expandpath(output) |
|
121 | path = ui.expandpath(output) | |
122 | fp = open(path, 'wb') |
|
122 | fp = open(path, 'wb') | |
123 | else: |
|
123 | else: | |
124 | fp = sys.stderr |
|
124 | fp = sys.stderr | |
125 |
|
125 | |||
126 | try: |
|
126 | try: | |
127 | if profiler == 'ls': |
|
127 | if profiler == 'ls': | |
128 | proffn = lsprofile |
|
128 | proffn = lsprofile | |
129 | elif profiler == 'flame': |
|
129 | elif profiler == 'flame': | |
130 | proffn = flameprofile |
|
130 | proffn = flameprofile | |
131 | else: |
|
131 | else: | |
132 | proffn = statprofile |
|
132 | proffn = statprofile | |
133 |
|
133 | |||
134 | with proffn(ui, fp): |
|
134 | with proffn(ui, fp): | |
135 | yield |
|
135 | yield | |
136 |
|
136 | |||
137 | finally: |
|
137 | finally: | |
138 | if output: |
|
138 | if output: | |
139 | if output == 'blackbox': |
|
139 | if output == 'blackbox': | |
140 | val = 'Profile:\n%s' % fp.getvalue() |
|
140 | val = 'Profile:\n%s' % fp.getvalue() | |
141 | # ui.log treats the input as a format string, |
|
141 | # ui.log treats the input as a format string, | |
142 | # so we need to escape any % signs. |
|
142 | # so we need to escape any % signs. | |
143 | val = val.replace('%', '%%') |
|
143 | val = val.replace('%', '%%') | |
144 | ui.log('profile', val) |
|
144 | ui.log('profile', val) | |
145 | fp.close() |
|
145 | fp.close() | |
|
146 | ||||
|
147 | @contextlib.contextmanager | |||
|
148 | def maybeprofile(ui): | |||
|
149 | """Profile if enabled, else do nothing. | |||
|
150 | ||||
|
151 | This context manager can be used to optionally profile if profiling | |||
|
152 | is enabled. Otherwise, it does nothing. | |||
|
153 | ||||
|
154 | The purpose of this context manager is to make calling code simpler: | |||
|
155 | just use a single code path for calling into code you may want to profile | |||
|
156 | and this function determines whether to start profiling. | |||
|
157 | """ | |||
|
158 | if ui.configbool('profiling', 'enabled'): | |||
|
159 | with profile(ui): | |||
|
160 | yield | |||
|
161 | else: | |||
|
162 | yield |
@@ -1,179 +1,176 b'' | |||||
1 |
|
1 | |||
2 | $ cat << EOF > buggylocking.py |
|
2 | $ cat << EOF > buggylocking.py | |
3 | > """A small extension that tests our developer warnings |
|
3 | > """A small extension that tests our developer warnings | |
4 | > """ |
|
4 | > """ | |
5 | > |
|
5 | > | |
6 | > from mercurial import cmdutil, repair, revset |
|
6 | > from mercurial import cmdutil, repair, revset | |
7 | > |
|
7 | > | |
8 | > cmdtable = {} |
|
8 | > cmdtable = {} | |
9 | > command = cmdutil.command(cmdtable) |
|
9 | > command = cmdutil.command(cmdtable) | |
10 | > |
|
10 | > | |
11 | > @command('buggylocking', [], '') |
|
11 | > @command('buggylocking', [], '') | |
12 | > def buggylocking(ui, repo): |
|
12 | > def buggylocking(ui, repo): | |
13 | > lo = repo.lock() |
|
13 | > lo = repo.lock() | |
14 | > wl = repo.wlock() |
|
14 | > wl = repo.wlock() | |
15 | > wl.release() |
|
15 | > wl.release() | |
16 | > lo.release() |
|
16 | > lo.release() | |
17 | > |
|
17 | > | |
18 | > @command('buggytransaction', [], '') |
|
18 | > @command('buggytransaction', [], '') | |
19 | > def buggylocking(ui, repo): |
|
19 | > def buggylocking(ui, repo): | |
20 | > tr = repo.transaction('buggy') |
|
20 | > tr = repo.transaction('buggy') | |
21 | > # make sure we rollback the transaction as we don't want to rely on the__del__ |
|
21 | > # make sure we rollback the transaction as we don't want to rely on the__del__ | |
22 | > tr.release() |
|
22 | > tr.release() | |
23 | > |
|
23 | > | |
24 | > @command('properlocking', [], '') |
|
24 | > @command('properlocking', [], '') | |
25 | > def properlocking(ui, repo): |
|
25 | > def properlocking(ui, repo): | |
26 | > """check that reentrance is fine""" |
|
26 | > """check that reentrance is fine""" | |
27 | > wl = repo.wlock() |
|
27 | > wl = repo.wlock() | |
28 | > lo = repo.lock() |
|
28 | > lo = repo.lock() | |
29 | > tr = repo.transaction('proper') |
|
29 | > tr = repo.transaction('proper') | |
30 | > tr2 = repo.transaction('proper') |
|
30 | > tr2 = repo.transaction('proper') | |
31 | > lo2 = repo.lock() |
|
31 | > lo2 = repo.lock() | |
32 | > wl2 = repo.wlock() |
|
32 | > wl2 = repo.wlock() | |
33 | > wl2.release() |
|
33 | > wl2.release() | |
34 | > lo2.release() |
|
34 | > lo2.release() | |
35 | > tr2.close() |
|
35 | > tr2.close() | |
36 | > tr.close() |
|
36 | > tr.close() | |
37 | > lo.release() |
|
37 | > lo.release() | |
38 | > wl.release() |
|
38 | > wl.release() | |
39 | > |
|
39 | > | |
40 | > @command('nowaitlocking', [], '') |
|
40 | > @command('nowaitlocking', [], '') | |
41 | > def nowaitlocking(ui, repo): |
|
41 | > def nowaitlocking(ui, repo): | |
42 | > lo = repo.lock() |
|
42 | > lo = repo.lock() | |
43 | > wl = repo.wlock(wait=False) |
|
43 | > wl = repo.wlock(wait=False) | |
44 | > wl.release() |
|
44 | > wl.release() | |
45 | > lo.release() |
|
45 | > lo.release() | |
46 | > |
|
46 | > | |
47 | > @command('stripintr', [], '') |
|
47 | > @command('stripintr', [], '') | |
48 | > def stripintr(ui, repo): |
|
48 | > def stripintr(ui, repo): | |
49 | > lo = repo.lock() |
|
49 | > lo = repo.lock() | |
50 | > tr = repo.transaction('foobar') |
|
50 | > tr = repo.transaction('foobar') | |
51 | > try: |
|
51 | > try: | |
52 | > repair.strip(repo.ui, repo, [repo['.'].node()]) |
|
52 | > repair.strip(repo.ui, repo, [repo['.'].node()]) | |
53 | > finally: |
|
53 | > finally: | |
54 | > lo.release() |
|
54 | > lo.release() | |
55 | > @command('oldanddeprecated', [], '') |
|
55 | > @command('oldanddeprecated', [], '') | |
56 | > def oldanddeprecated(ui, repo): |
|
56 | > def oldanddeprecated(ui, repo): | |
57 | > """test deprecation warning API""" |
|
57 | > """test deprecation warning API""" | |
58 | > def foobar(ui): |
|
58 | > def foobar(ui): | |
59 | > ui.deprecwarn('foorbar is deprecated, go shopping', '42.1337') |
|
59 | > ui.deprecwarn('foorbar is deprecated, go shopping', '42.1337') | |
60 | > foobar(ui) |
|
60 | > foobar(ui) | |
61 | > |
|
61 | > | |
62 | > def oldstylerevset(repo, subset, x): |
|
62 | > def oldstylerevset(repo, subset, x): | |
63 | > return list(subset) |
|
63 | > return list(subset) | |
64 | > |
|
64 | > | |
65 | > revset.symbols['oldstyle'] = oldstylerevset |
|
65 | > revset.symbols['oldstyle'] = oldstylerevset | |
66 | > EOF |
|
66 | > EOF | |
67 |
|
67 | |||
68 | $ cat << EOF >> $HGRCPATH |
|
68 | $ cat << EOF >> $HGRCPATH | |
69 | > [extensions] |
|
69 | > [extensions] | |
70 | > buggylocking=$TESTTMP/buggylocking.py |
|
70 | > buggylocking=$TESTTMP/buggylocking.py | |
71 | > mock=$TESTDIR/mockblackbox.py |
|
71 | > mock=$TESTDIR/mockblackbox.py | |
72 | > blackbox= |
|
72 | > blackbox= | |
73 | > [devel] |
|
73 | > [devel] | |
74 | > all-warnings=1 |
|
74 | > all-warnings=1 | |
75 | > EOF |
|
75 | > EOF | |
76 |
|
76 | |||
77 | $ hg init lock-checker |
|
77 | $ hg init lock-checker | |
78 | $ cd lock-checker |
|
78 | $ cd lock-checker | |
79 | $ hg buggylocking |
|
79 | $ hg buggylocking | |
80 | devel-warn: "wlock" acquired after "lock" at: $TESTTMP/buggylocking.py:* (buggylocking) (glob) |
|
80 | devel-warn: "wlock" acquired after "lock" at: $TESTTMP/buggylocking.py:* (buggylocking) (glob) | |
81 | $ cat << EOF >> $HGRCPATH |
|
81 | $ cat << EOF >> $HGRCPATH | |
82 | > [devel] |
|
82 | > [devel] | |
83 | > all=0 |
|
83 | > all=0 | |
84 | > check-locks=1 |
|
84 | > check-locks=1 | |
85 | > EOF |
|
85 | > EOF | |
86 | $ hg buggylocking |
|
86 | $ hg buggylocking | |
87 | devel-warn: "wlock" acquired after "lock" at: $TESTTMP/buggylocking.py:* (buggylocking) (glob) |
|
87 | devel-warn: "wlock" acquired after "lock" at: $TESTTMP/buggylocking.py:* (buggylocking) (glob) | |
88 | $ hg buggylocking --traceback |
|
88 | $ hg buggylocking --traceback | |
89 | devel-warn: "wlock" acquired after "lock" at: |
|
89 | devel-warn: "wlock" acquired after "lock" at: | |
90 | */hg:* in * (glob) |
|
90 | */hg:* in * (glob) | |
91 | */mercurial/dispatch.py:* in run (glob) |
|
91 | */mercurial/dispatch.py:* in run (glob) | |
92 | */mercurial/dispatch.py:* in dispatch (glob) |
|
92 | */mercurial/dispatch.py:* in dispatch (glob) | |
93 | */mercurial/dispatch.py:* in _runcatch (glob) |
|
93 | */mercurial/dispatch.py:* in _runcatch (glob) | |
94 | */mercurial/dispatch.py:* in callcatch (glob) |
|
94 | */mercurial/dispatch.py:* in callcatch (glob) | |
95 | */mercurial/dispatch.py:* in _runcatchfunc (glob) |
|
95 | */mercurial/dispatch.py:* in _runcatchfunc (glob) | |
96 | */mercurial/dispatch.py:* in _dispatch (glob) |
|
96 | */mercurial/dispatch.py:* in _dispatch (glob) | |
97 | */mercurial/dispatch.py:* in runcommand (glob) |
|
97 | */mercurial/dispatch.py:* in runcommand (glob) | |
98 | */mercurial/dispatch.py:* in _runcommand (glob) |
|
98 | */mercurial/dispatch.py:* in _runcommand (glob) | |
99 | */mercurial/dispatch.py:* in checkargs (glob) |
|
|||
100 | */mercurial/dispatch.py:* in <lambda> (glob) |
|
99 | */mercurial/dispatch.py:* in <lambda> (glob) | |
101 | */mercurial/util.py:* in check (glob) |
|
100 | */mercurial/util.py:* in check (glob) | |
102 | $TESTTMP/buggylocking.py:* in buggylocking (glob) |
|
101 | $TESTTMP/buggylocking.py:* in buggylocking (glob) | |
103 | $ hg properlocking |
|
102 | $ hg properlocking | |
104 | $ hg nowaitlocking |
|
103 | $ hg nowaitlocking | |
105 |
|
104 | |||
106 | $ echo a > a |
|
105 | $ echo a > a | |
107 | $ hg add a |
|
106 | $ hg add a | |
108 | $ hg commit -m a |
|
107 | $ hg commit -m a | |
109 | $ hg stripintr |
|
108 | $ hg stripintr | |
110 | saved backup bundle to $TESTTMP/lock-checker/.hg/strip-backup/*-backup.hg (glob) |
|
109 | saved backup bundle to $TESTTMP/lock-checker/.hg/strip-backup/*-backup.hg (glob) | |
111 | abort: programming error: cannot strip from inside a transaction |
|
110 | abort: programming error: cannot strip from inside a transaction | |
112 | (contact your extension maintainer) |
|
111 | (contact your extension maintainer) | |
113 | [255] |
|
112 | [255] | |
114 |
|
113 | |||
115 | $ hg log -r "oldstyle()" -T '{rev}\n' |
|
114 | $ hg log -r "oldstyle()" -T '{rev}\n' | |
116 | devel-warn: revset "oldstyle" uses list instead of smartset |
|
115 | devel-warn: revset "oldstyle" uses list instead of smartset | |
117 | (compatibility will be dropped after Mercurial-3.9, update your code.) at: *mercurial/revset.py:* (mfunc) (glob) |
|
116 | (compatibility will be dropped after Mercurial-3.9, update your code.) at: *mercurial/revset.py:* (mfunc) (glob) | |
118 | 0 |
|
117 | 0 | |
119 | $ hg oldanddeprecated |
|
118 | $ hg oldanddeprecated | |
120 | devel-warn: foorbar is deprecated, go shopping |
|
119 | devel-warn: foorbar is deprecated, go shopping | |
121 | (compatibility will be dropped after Mercurial-42.1337, update your code.) at: $TESTTMP/buggylocking.py:* (oldanddeprecated) (glob) |
|
120 | (compatibility will be dropped after Mercurial-42.1337, update your code.) at: $TESTTMP/buggylocking.py:* (oldanddeprecated) (glob) | |
122 |
|
121 | |||
123 | $ hg oldanddeprecated --traceback |
|
122 | $ hg oldanddeprecated --traceback | |
124 | devel-warn: foorbar is deprecated, go shopping |
|
123 | devel-warn: foorbar is deprecated, go shopping | |
125 | (compatibility will be dropped after Mercurial-42.1337, update your code.) at: |
|
124 | (compatibility will be dropped after Mercurial-42.1337, update your code.) at: | |
126 | */hg:* in <module> (glob) |
|
125 | */hg:* in <module> (glob) | |
127 | */mercurial/dispatch.py:* in run (glob) |
|
126 | */mercurial/dispatch.py:* in run (glob) | |
128 | */mercurial/dispatch.py:* in dispatch (glob) |
|
127 | */mercurial/dispatch.py:* in dispatch (glob) | |
129 | */mercurial/dispatch.py:* in _runcatch (glob) |
|
128 | */mercurial/dispatch.py:* in _runcatch (glob) | |
130 | */mercurial/dispatch.py:* in callcatch (glob) |
|
129 | */mercurial/dispatch.py:* in callcatch (glob) | |
131 | */mercurial/dispatch.py:* in _runcatchfunc (glob) |
|
130 | */mercurial/dispatch.py:* in _runcatchfunc (glob) | |
132 | */mercurial/dispatch.py:* in _dispatch (glob) |
|
131 | */mercurial/dispatch.py:* in _dispatch (glob) | |
133 | */mercurial/dispatch.py:* in runcommand (glob) |
|
132 | */mercurial/dispatch.py:* in runcommand (glob) | |
134 | */mercurial/dispatch.py:* in _runcommand (glob) |
|
133 | */mercurial/dispatch.py:* in _runcommand (glob) | |
135 | */mercurial/dispatch.py:* in checkargs (glob) |
|
|||
136 | */mercurial/dispatch.py:* in <lambda> (glob) |
|
134 | */mercurial/dispatch.py:* in <lambda> (glob) | |
137 | */mercurial/util.py:* in check (glob) |
|
135 | */mercurial/util.py:* in check (glob) | |
138 | $TESTTMP/buggylocking.py:* in oldanddeprecated (glob) |
|
136 | $TESTTMP/buggylocking.py:* in oldanddeprecated (glob) | |
139 | $ hg blackbox -l 9 |
|
137 | $ hg blackbox -l 9 | |
140 | 1970/01/01 00:00:00 bob @cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b (5000)> devel-warn: revset "oldstyle" uses list instead of smartset |
|
138 | 1970/01/01 00:00:00 bob @cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b (5000)> devel-warn: revset "oldstyle" uses list instead of smartset | |
141 | (compatibility will be dropped after Mercurial-3.9, update your code.) at: *mercurial/revset.py:* (mfunc) (glob) |
|
139 | (compatibility will be dropped after Mercurial-3.9, update your code.) at: *mercurial/revset.py:* (mfunc) (glob) | |
142 | 1970/01/01 00:00:00 bob @cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b (5000)> log -r oldstyle() -T {rev}\n exited 0 after * seconds (glob) |
|
140 | 1970/01/01 00:00:00 bob @cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b (5000)> log -r oldstyle() -T {rev}\n exited 0 after * seconds (glob) | |
143 | 1970/01/01 00:00:00 bob @cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b (5000)> oldanddeprecated |
|
141 | 1970/01/01 00:00:00 bob @cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b (5000)> oldanddeprecated | |
144 | 1970/01/01 00:00:00 bob @cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b (5000)> devel-warn: foorbar is deprecated, go shopping |
|
142 | 1970/01/01 00:00:00 bob @cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b (5000)> devel-warn: foorbar is deprecated, go shopping | |
145 | (compatibility will be dropped after Mercurial-42.1337, update your code.) at: $TESTTMP/buggylocking.py:* (oldanddeprecated) (glob) |
|
143 | (compatibility will be dropped after Mercurial-42.1337, update your code.) at: $TESTTMP/buggylocking.py:* (oldanddeprecated) (glob) | |
146 | 1970/01/01 00:00:00 bob @cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b (5000)> oldanddeprecated exited 0 after * seconds (glob) |
|
144 | 1970/01/01 00:00:00 bob @cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b (5000)> oldanddeprecated exited 0 after * seconds (glob) | |
147 | 1970/01/01 00:00:00 bob @cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b (5000)> oldanddeprecated --traceback |
|
145 | 1970/01/01 00:00:00 bob @cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b (5000)> oldanddeprecated --traceback | |
148 | 1970/01/01 00:00:00 bob @cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b (5000)> devel-warn: foorbar is deprecated, go shopping |
|
146 | 1970/01/01 00:00:00 bob @cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b (5000)> devel-warn: foorbar is deprecated, go shopping | |
149 | (compatibility will be dropped after Mercurial-42.1337, update your code.) at: |
|
147 | (compatibility will be dropped after Mercurial-42.1337, update your code.) at: | |
150 | */hg:* in <module> (glob) |
|
148 | */hg:* in <module> (glob) | |
151 | */mercurial/dispatch.py:* in run (glob) |
|
149 | */mercurial/dispatch.py:* in run (glob) | |
152 | */mercurial/dispatch.py:* in dispatch (glob) |
|
150 | */mercurial/dispatch.py:* in dispatch (glob) | |
153 | */mercurial/dispatch.py:* in _runcatch (glob) |
|
151 | */mercurial/dispatch.py:* in _runcatch (glob) | |
154 | */mercurial/dispatch.py:* in callcatch (glob) |
|
152 | */mercurial/dispatch.py:* in callcatch (glob) | |
155 | */mercurial/dispatch.py:* in _runcatchfunc (glob) |
|
153 | */mercurial/dispatch.py:* in _runcatchfunc (glob) | |
156 | */mercurial/dispatch.py:* in _dispatch (glob) |
|
154 | */mercurial/dispatch.py:* in _dispatch (glob) | |
157 | */mercurial/dispatch.py:* in runcommand (glob) |
|
155 | */mercurial/dispatch.py:* in runcommand (glob) | |
158 | */mercurial/dispatch.py:* in _runcommand (glob) |
|
156 | */mercurial/dispatch.py:* in _runcommand (glob) | |
159 | */mercurial/dispatch.py:* in checkargs (glob) |
|
|||
160 | */mercurial/dispatch.py:* in <lambda> (glob) |
|
157 | */mercurial/dispatch.py:* in <lambda> (glob) | |
161 | */mercurial/util.py:* in check (glob) |
|
158 | */mercurial/util.py:* in check (glob) | |
162 | $TESTTMP/buggylocking.py:* in oldanddeprecated (glob) |
|
159 | $TESTTMP/buggylocking.py:* in oldanddeprecated (glob) | |
163 | 1970/01/01 00:00:00 bob @cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b (5000)> oldanddeprecated --traceback exited 0 after * seconds (glob) |
|
160 | 1970/01/01 00:00:00 bob @cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b (5000)> oldanddeprecated --traceback exited 0 after * seconds (glob) | |
164 | 1970/01/01 00:00:00 bob @cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b (5000)> blackbox -l 9 |
|
161 | 1970/01/01 00:00:00 bob @cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b (5000)> blackbox -l 9 | |
165 |
|
162 | |||
166 | Test programming error failure: |
|
163 | Test programming error failure: | |
167 |
|
164 | |||
168 | $ hg buggytransaction 2>&1 | egrep -v '^ ' |
|
165 | $ hg buggytransaction 2>&1 | egrep -v '^ ' | |
169 | ** Unknown exception encountered with possibly-broken third-party extension buggylocking |
|
166 | ** Unknown exception encountered with possibly-broken third-party extension buggylocking | |
170 | ** which supports versions unknown of Mercurial. |
|
167 | ** which supports versions unknown of Mercurial. | |
171 | ** Please disable buggylocking and try your action again. |
|
168 | ** Please disable buggylocking and try your action again. | |
172 | ** If that fixes the bug please report it to the extension author. |
|
169 | ** If that fixes the bug please report it to the extension author. | |
173 | ** Python * (glob) |
|
170 | ** Python * (glob) | |
174 | ** Mercurial Distributed SCM (*) (glob) |
|
171 | ** Mercurial Distributed SCM (*) (glob) | |
175 | ** Extensions loaded: * (glob) |
|
172 | ** Extensions loaded: * (glob) | |
176 | Traceback (most recent call last): |
|
173 | Traceback (most recent call last): | |
177 | RuntimeError: programming error: transaction requires locking |
|
174 | RuntimeError: programming error: transaction requires locking | |
178 |
|
175 | |||
179 | $ cd .. |
|
176 | $ cd .. |
General Comments 0
You need to be logged in to leave comments.
Login now