Show More
@@ -1,897 +1,901 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 i18n import _ |
|
8 | from i18n import _ | |
9 | import os, sys, atexit, signal, pdb, socket, errno, shlex, time, traceback, re |
|
9 | import os, sys, atexit, signal, pdb, socket, errno, shlex, time, traceback, re | |
10 | import util, commands, hg, fancyopts, extensions, hook, error |
|
10 | import util, commands, hg, fancyopts, extensions, hook, error | |
11 | import cmdutil, encoding |
|
11 | import cmdutil, encoding | |
12 | import ui as uimod |
|
12 | import ui as uimod | |
13 |
|
13 | |||
14 | class request(object): |
|
14 | class request(object): | |
15 | def __init__(self, args, ui=None, repo=None, fin=None, fout=None, |
|
15 | def __init__(self, args, ui=None, repo=None, fin=None, fout=None, | |
16 | ferr=None): |
|
16 | ferr=None): | |
17 | self.args = args |
|
17 | self.args = args | |
18 | self.ui = ui |
|
18 | self.ui = ui | |
19 | self.repo = repo |
|
19 | self.repo = repo | |
20 |
|
20 | |||
21 | # input/output/error streams |
|
21 | # input/output/error streams | |
22 | self.fin = fin |
|
22 | self.fin = fin | |
23 | self.fout = fout |
|
23 | self.fout = fout | |
24 | self.ferr = ferr |
|
24 | self.ferr = ferr | |
25 |
|
25 | |||
26 | def run(): |
|
26 | def run(): | |
27 | "run the command in sys.argv" |
|
27 | "run the command in sys.argv" | |
28 | sys.exit((dispatch(request(sys.argv[1:])) or 0) & 255) |
|
28 | sys.exit((dispatch(request(sys.argv[1:])) or 0) & 255) | |
29 |
|
29 | |||
30 | def dispatch(req): |
|
30 | def dispatch(req): | |
31 | "run the command specified in req.args" |
|
31 | "run the command specified in req.args" | |
32 | if req.ferr: |
|
32 | if req.ferr: | |
33 | ferr = req.ferr |
|
33 | ferr = req.ferr | |
34 | elif req.ui: |
|
34 | elif req.ui: | |
35 | ferr = req.ui.ferr |
|
35 | ferr = req.ui.ferr | |
36 | else: |
|
36 | else: | |
37 | ferr = sys.stderr |
|
37 | ferr = sys.stderr | |
38 |
|
38 | |||
39 | try: |
|
39 | try: | |
40 | if not req.ui: |
|
40 | if not req.ui: | |
41 | req.ui = uimod.ui() |
|
41 | req.ui = uimod.ui() | |
42 | if '--traceback' in req.args: |
|
42 | if '--traceback' in req.args: | |
43 | req.ui.setconfig('ui', 'traceback', 'on', '--traceback') |
|
43 | req.ui.setconfig('ui', 'traceback', 'on', '--traceback') | |
44 |
|
44 | |||
45 | # set ui streams from the request |
|
45 | # set ui streams from the request | |
46 | if req.fin: |
|
46 | if req.fin: | |
47 | req.ui.fin = req.fin |
|
47 | req.ui.fin = req.fin | |
48 | if req.fout: |
|
48 | if req.fout: | |
49 | req.ui.fout = req.fout |
|
49 | req.ui.fout = req.fout | |
50 | if req.ferr: |
|
50 | if req.ferr: | |
51 | req.ui.ferr = req.ferr |
|
51 | req.ui.ferr = req.ferr | |
52 | except util.Abort, inst: |
|
52 | except util.Abort, inst: | |
53 | ferr.write(_("abort: %s\n") % inst) |
|
53 | ferr.write(_("abort: %s\n") % inst) | |
54 | if inst.hint: |
|
54 | if inst.hint: | |
55 | ferr.write(_("(%s)\n") % inst.hint) |
|
55 | ferr.write(_("(%s)\n") % inst.hint) | |
56 | return -1 |
|
56 | return -1 | |
57 | except error.ParseError, inst: |
|
57 | except error.ParseError, inst: | |
58 | if len(inst.args) > 1: |
|
58 | if len(inst.args) > 1: | |
59 | ferr.write(_("hg: parse error at %s: %s\n") % |
|
59 | ferr.write(_("hg: parse error at %s: %s\n") % | |
60 | (inst.args[1], inst.args[0])) |
|
60 | (inst.args[1], inst.args[0])) | |
61 | else: |
|
61 | else: | |
62 | ferr.write(_("hg: parse error: %s\n") % inst.args[0]) |
|
62 | ferr.write(_("hg: parse error: %s\n") % inst.args[0]) | |
63 | return -1 |
|
63 | return -1 | |
64 |
|
64 | |||
65 | msg = ' '.join(' ' in a and repr(a) or a for a in req.args) |
|
65 | msg = ' '.join(' ' in a and repr(a) or a for a in req.args) | |
66 | starttime = time.time() |
|
66 | starttime = time.time() | |
67 | ret = None |
|
67 | ret = None | |
68 | try: |
|
68 | try: | |
69 | ret = _runcatch(req) |
|
69 | ret = _runcatch(req) | |
70 | return ret |
|
70 | return ret | |
71 | finally: |
|
71 | finally: | |
72 | duration = time.time() - starttime |
|
72 | duration = time.time() - starttime | |
73 | req.ui.log("commandfinish", "%s exited %s after %0.2f seconds\n", |
|
73 | req.ui.log("commandfinish", "%s exited %s after %0.2f seconds\n", | |
74 | msg, ret or 0, duration) |
|
74 | msg, ret or 0, duration) | |
75 |
|
75 | |||
76 | def _runcatch(req): |
|
76 | def _runcatch(req): | |
77 | def catchterm(*args): |
|
77 | def catchterm(*args): | |
78 | raise error.SignalInterrupt |
|
78 | raise error.SignalInterrupt | |
79 |
|
79 | |||
80 | ui = req.ui |
|
80 | ui = req.ui | |
81 | try: |
|
81 | try: | |
82 | for name in 'SIGBREAK', 'SIGHUP', 'SIGTERM': |
|
82 | for name in 'SIGBREAK', 'SIGHUP', 'SIGTERM': | |
83 | num = getattr(signal, name, None) |
|
83 | num = getattr(signal, name, None) | |
84 | if num: |
|
84 | if num: | |
85 | signal.signal(num, catchterm) |
|
85 | signal.signal(num, catchterm) | |
86 | except ValueError: |
|
86 | except ValueError: | |
87 | pass # happens if called in a thread |
|
87 | pass # happens if called in a thread | |
88 |
|
88 | |||
89 | try: |
|
89 | try: | |
90 | try: |
|
90 | try: | |
91 | debugger = 'pdb' |
|
91 | debugger = 'pdb' | |
92 | debugtrace = { |
|
92 | debugtrace = { | |
93 | 'pdb' : pdb.set_trace |
|
93 | 'pdb' : pdb.set_trace | |
94 | } |
|
94 | } | |
95 | debugmortem = { |
|
95 | debugmortem = { | |
96 | 'pdb' : pdb.post_mortem |
|
96 | 'pdb' : pdb.post_mortem | |
97 | } |
|
97 | } | |
98 |
|
98 | |||
99 | # read --config before doing anything else |
|
99 | # read --config before doing anything else | |
100 | # (e.g. to change trust settings for reading .hg/hgrc) |
|
100 | # (e.g. to change trust settings for reading .hg/hgrc) | |
101 | cfgs = _parseconfig(req.ui, _earlygetopt(['--config'], req.args)) |
|
101 | cfgs = _parseconfig(req.ui, _earlygetopt(['--config'], req.args)) | |
102 |
|
102 | |||
103 | if req.repo: |
|
103 | if req.repo: | |
104 | # copy configs that were passed on the cmdline (--config) to |
|
104 | # copy configs that were passed on the cmdline (--config) to | |
105 | # the repo ui |
|
105 | # the repo ui | |
106 | for sec, name, val in cfgs: |
|
106 | for sec, name, val in cfgs: | |
107 | req.repo.ui.setconfig(sec, name, val, source='--config') |
|
107 | req.repo.ui.setconfig(sec, name, val, source='--config') | |
108 |
|
108 | |||
109 | # if we are in HGPLAIN mode, then disable custom debugging |
|
109 | # if we are in HGPLAIN mode, then disable custom debugging | |
110 | debugger = ui.config("ui", "debugger") |
|
110 | debugger = ui.config("ui", "debugger") | |
|
111 | debugmod = pdb | |||
111 | if not debugger or ui.plain(): |
|
112 | if not debugger or ui.plain(): | |
112 | debugger = 'pdb' |
|
113 | debugger = 'pdb' | |
113 |
|
114 | elif '--debugger' in req.args: | ||
114 | try: |
|
115 | # This import can be slow for fancy debuggers, so only | |
115 | debugmod = __import__(debugger) |
|
116 | # do it when absolutely necessary, i.e. when actual | |
116 | except ImportError: |
|
117 | # debugging has been requested | |
117 |
|
|
118 | try: | |
|
119 | debugmod = __import__(debugger) | |||
|
120 | except ImportError: | |||
|
121 | pass # Leave debugmod = pdb | |||
118 |
|
122 | |||
119 | debugtrace[debugger] = debugmod.set_trace |
|
123 | debugtrace[debugger] = debugmod.set_trace | |
120 | debugmortem[debugger] = debugmod.post_mortem |
|
124 | debugmortem[debugger] = debugmod.post_mortem | |
121 |
|
125 | |||
122 | # enter the debugger before command execution |
|
126 | # enter the debugger before command execution | |
123 | if '--debugger' in req.args: |
|
127 | if '--debugger' in req.args: | |
124 | ui.warn(_("entering debugger - " |
|
128 | ui.warn(_("entering debugger - " | |
125 | "type c to continue starting hg or h for help\n")) |
|
129 | "type c to continue starting hg or h for help\n")) | |
126 |
|
130 | |||
127 | if (debugger != 'pdb' and |
|
131 | if (debugger != 'pdb' and | |
128 | debugtrace[debugger] == debugtrace['pdb']): |
|
132 | debugtrace[debugger] == debugtrace['pdb']): | |
129 | ui.warn(_("%s debugger specified " |
|
133 | ui.warn(_("%s debugger specified " | |
130 | "but its module was not found\n") % debugger) |
|
134 | "but its module was not found\n") % debugger) | |
131 |
|
135 | |||
132 | debugtrace[debugger]() |
|
136 | debugtrace[debugger]() | |
133 | try: |
|
137 | try: | |
134 | return _dispatch(req) |
|
138 | return _dispatch(req) | |
135 | finally: |
|
139 | finally: | |
136 | ui.flush() |
|
140 | ui.flush() | |
137 | except: # re-raises |
|
141 | except: # re-raises | |
138 | # enter the debugger when we hit an exception |
|
142 | # enter the debugger when we hit an exception | |
139 | if '--debugger' in req.args: |
|
143 | if '--debugger' in req.args: | |
140 | traceback.print_exc() |
|
144 | traceback.print_exc() | |
141 | debugmortem[debugger](sys.exc_info()[2]) |
|
145 | debugmortem[debugger](sys.exc_info()[2]) | |
142 | ui.traceback() |
|
146 | ui.traceback() | |
143 | raise |
|
147 | raise | |
144 |
|
148 | |||
145 | # Global exception handling, alphabetically |
|
149 | # Global exception handling, alphabetically | |
146 | # Mercurial-specific first, followed by built-in and library exceptions |
|
150 | # Mercurial-specific first, followed by built-in and library exceptions | |
147 | except error.AmbiguousCommand, inst: |
|
151 | except error.AmbiguousCommand, inst: | |
148 | ui.warn(_("hg: command '%s' is ambiguous:\n %s\n") % |
|
152 | ui.warn(_("hg: command '%s' is ambiguous:\n %s\n") % | |
149 | (inst.args[0], " ".join(inst.args[1]))) |
|
153 | (inst.args[0], " ".join(inst.args[1]))) | |
150 | except error.ParseError, inst: |
|
154 | except error.ParseError, inst: | |
151 | if len(inst.args) > 1: |
|
155 | if len(inst.args) > 1: | |
152 | ui.warn(_("hg: parse error at %s: %s\n") % |
|
156 | ui.warn(_("hg: parse error at %s: %s\n") % | |
153 | (inst.args[1], inst.args[0])) |
|
157 | (inst.args[1], inst.args[0])) | |
154 | else: |
|
158 | else: | |
155 | ui.warn(_("hg: parse error: %s\n") % inst.args[0]) |
|
159 | ui.warn(_("hg: parse error: %s\n") % inst.args[0]) | |
156 | return -1 |
|
160 | return -1 | |
157 | except error.LockHeld, inst: |
|
161 | except error.LockHeld, inst: | |
158 | if inst.errno == errno.ETIMEDOUT: |
|
162 | if inst.errno == errno.ETIMEDOUT: | |
159 | reason = _('timed out waiting for lock held by %s') % inst.locker |
|
163 | reason = _('timed out waiting for lock held by %s') % inst.locker | |
160 | else: |
|
164 | else: | |
161 | reason = _('lock held by %s') % inst.locker |
|
165 | reason = _('lock held by %s') % inst.locker | |
162 | ui.warn(_("abort: %s: %s\n") % (inst.desc or inst.filename, reason)) |
|
166 | ui.warn(_("abort: %s: %s\n") % (inst.desc or inst.filename, reason)) | |
163 | except error.LockUnavailable, inst: |
|
167 | except error.LockUnavailable, inst: | |
164 | ui.warn(_("abort: could not lock %s: %s\n") % |
|
168 | ui.warn(_("abort: could not lock %s: %s\n") % | |
165 | (inst.desc or inst.filename, inst.strerror)) |
|
169 | (inst.desc or inst.filename, inst.strerror)) | |
166 | except error.CommandError, inst: |
|
170 | except error.CommandError, inst: | |
167 | if inst.args[0]: |
|
171 | if inst.args[0]: | |
168 | ui.warn(_("hg %s: %s\n") % (inst.args[0], inst.args[1])) |
|
172 | ui.warn(_("hg %s: %s\n") % (inst.args[0], inst.args[1])) | |
169 | commands.help_(ui, inst.args[0], full=False, command=True) |
|
173 | commands.help_(ui, inst.args[0], full=False, command=True) | |
170 | else: |
|
174 | else: | |
171 | ui.warn(_("hg: %s\n") % inst.args[1]) |
|
175 | ui.warn(_("hg: %s\n") % inst.args[1]) | |
172 | commands.help_(ui, 'shortlist') |
|
176 | commands.help_(ui, 'shortlist') | |
173 | except error.OutOfBandError, inst: |
|
177 | except error.OutOfBandError, inst: | |
174 | ui.warn(_("abort: remote error:\n")) |
|
178 | ui.warn(_("abort: remote error:\n")) | |
175 | ui.warn(''.join(inst.args)) |
|
179 | ui.warn(''.join(inst.args)) | |
176 | except error.RepoError, inst: |
|
180 | except error.RepoError, inst: | |
177 | ui.warn(_("abort: %s!\n") % inst) |
|
181 | ui.warn(_("abort: %s!\n") % inst) | |
178 | if inst.hint: |
|
182 | if inst.hint: | |
179 | ui.warn(_("(%s)\n") % inst.hint) |
|
183 | ui.warn(_("(%s)\n") % inst.hint) | |
180 | except error.ResponseError, inst: |
|
184 | except error.ResponseError, inst: | |
181 | ui.warn(_("abort: %s") % inst.args[0]) |
|
185 | ui.warn(_("abort: %s") % inst.args[0]) | |
182 | if not isinstance(inst.args[1], basestring): |
|
186 | if not isinstance(inst.args[1], basestring): | |
183 | ui.warn(" %r\n" % (inst.args[1],)) |
|
187 | ui.warn(" %r\n" % (inst.args[1],)) | |
184 | elif not inst.args[1]: |
|
188 | elif not inst.args[1]: | |
185 | ui.warn(_(" empty string\n")) |
|
189 | ui.warn(_(" empty string\n")) | |
186 | else: |
|
190 | else: | |
187 | ui.warn("\n%r\n" % util.ellipsis(inst.args[1])) |
|
191 | ui.warn("\n%r\n" % util.ellipsis(inst.args[1])) | |
188 | except error.RevlogError, inst: |
|
192 | except error.RevlogError, inst: | |
189 | ui.warn(_("abort: %s!\n") % inst) |
|
193 | ui.warn(_("abort: %s!\n") % inst) | |
190 | except error.SignalInterrupt: |
|
194 | except error.SignalInterrupt: | |
191 | ui.warn(_("killed!\n")) |
|
195 | ui.warn(_("killed!\n")) | |
192 | except error.UnknownCommand, inst: |
|
196 | except error.UnknownCommand, inst: | |
193 | ui.warn(_("hg: unknown command '%s'\n") % inst.args[0]) |
|
197 | ui.warn(_("hg: unknown command '%s'\n") % inst.args[0]) | |
194 | try: |
|
198 | try: | |
195 | # check if the command is in a disabled extension |
|
199 | # check if the command is in a disabled extension | |
196 | # (but don't check for extensions themselves) |
|
200 | # (but don't check for extensions themselves) | |
197 | commands.help_(ui, inst.args[0], unknowncmd=True) |
|
201 | commands.help_(ui, inst.args[0], unknowncmd=True) | |
198 | except error.UnknownCommand: |
|
202 | except error.UnknownCommand: | |
199 | commands.help_(ui, 'shortlist') |
|
203 | commands.help_(ui, 'shortlist') | |
200 | except error.InterventionRequired, inst: |
|
204 | except error.InterventionRequired, inst: | |
201 | ui.warn("%s\n" % inst) |
|
205 | ui.warn("%s\n" % inst) | |
202 | return 1 |
|
206 | return 1 | |
203 | except util.Abort, inst: |
|
207 | except util.Abort, inst: | |
204 | ui.warn(_("abort: %s\n") % inst) |
|
208 | ui.warn(_("abort: %s\n") % inst) | |
205 | if inst.hint: |
|
209 | if inst.hint: | |
206 | ui.warn(_("(%s)\n") % inst.hint) |
|
210 | ui.warn(_("(%s)\n") % inst.hint) | |
207 | except ImportError, inst: |
|
211 | except ImportError, inst: | |
208 | ui.warn(_("abort: %s!\n") % inst) |
|
212 | ui.warn(_("abort: %s!\n") % inst) | |
209 | m = str(inst).split()[-1] |
|
213 | m = str(inst).split()[-1] | |
210 | if m in "mpatch bdiff".split(): |
|
214 | if m in "mpatch bdiff".split(): | |
211 | ui.warn(_("(did you forget to compile extensions?)\n")) |
|
215 | ui.warn(_("(did you forget to compile extensions?)\n")) | |
212 | elif m in "zlib".split(): |
|
216 | elif m in "zlib".split(): | |
213 | ui.warn(_("(is your Python install correct?)\n")) |
|
217 | ui.warn(_("(is your Python install correct?)\n")) | |
214 | except IOError, inst: |
|
218 | except IOError, inst: | |
215 | if util.safehasattr(inst, "code"): |
|
219 | if util.safehasattr(inst, "code"): | |
216 | ui.warn(_("abort: %s\n") % inst) |
|
220 | ui.warn(_("abort: %s\n") % inst) | |
217 | elif util.safehasattr(inst, "reason"): |
|
221 | elif util.safehasattr(inst, "reason"): | |
218 | try: # usually it is in the form (errno, strerror) |
|
222 | try: # usually it is in the form (errno, strerror) | |
219 | reason = inst.reason.args[1] |
|
223 | reason = inst.reason.args[1] | |
220 | except (AttributeError, IndexError): |
|
224 | except (AttributeError, IndexError): | |
221 | # it might be anything, for example a string |
|
225 | # it might be anything, for example a string | |
222 | reason = inst.reason |
|
226 | reason = inst.reason | |
223 | ui.warn(_("abort: error: %s\n") % reason) |
|
227 | ui.warn(_("abort: error: %s\n") % reason) | |
224 | elif util.safehasattr(inst, "args") and inst.args[0] == errno.EPIPE: |
|
228 | elif util.safehasattr(inst, "args") and inst.args[0] == errno.EPIPE: | |
225 | if ui.debugflag: |
|
229 | if ui.debugflag: | |
226 | ui.warn(_("broken pipe\n")) |
|
230 | ui.warn(_("broken pipe\n")) | |
227 | elif getattr(inst, "strerror", None): |
|
231 | elif getattr(inst, "strerror", None): | |
228 | if getattr(inst, "filename", None): |
|
232 | if getattr(inst, "filename", None): | |
229 | ui.warn(_("abort: %s: %s\n") % (inst.strerror, inst.filename)) |
|
233 | ui.warn(_("abort: %s: %s\n") % (inst.strerror, inst.filename)) | |
230 | else: |
|
234 | else: | |
231 | ui.warn(_("abort: %s\n") % inst.strerror) |
|
235 | ui.warn(_("abort: %s\n") % inst.strerror) | |
232 | else: |
|
236 | else: | |
233 | raise |
|
237 | raise | |
234 | except OSError, inst: |
|
238 | except OSError, inst: | |
235 | if getattr(inst, "filename", None) is not None: |
|
239 | if getattr(inst, "filename", None) is not None: | |
236 | ui.warn(_("abort: %s: '%s'\n") % (inst.strerror, inst.filename)) |
|
240 | ui.warn(_("abort: %s: '%s'\n") % (inst.strerror, inst.filename)) | |
237 | else: |
|
241 | else: | |
238 | ui.warn(_("abort: %s\n") % inst.strerror) |
|
242 | ui.warn(_("abort: %s\n") % inst.strerror) | |
239 | except KeyboardInterrupt: |
|
243 | except KeyboardInterrupt: | |
240 | try: |
|
244 | try: | |
241 | ui.warn(_("interrupted!\n")) |
|
245 | ui.warn(_("interrupted!\n")) | |
242 | except IOError, inst: |
|
246 | except IOError, inst: | |
243 | if inst.errno == errno.EPIPE: |
|
247 | if inst.errno == errno.EPIPE: | |
244 | if ui.debugflag: |
|
248 | if ui.debugflag: | |
245 | ui.warn(_("\nbroken pipe\n")) |
|
249 | ui.warn(_("\nbroken pipe\n")) | |
246 | else: |
|
250 | else: | |
247 | raise |
|
251 | raise | |
248 | except MemoryError: |
|
252 | except MemoryError: | |
249 | ui.warn(_("abort: out of memory\n")) |
|
253 | ui.warn(_("abort: out of memory\n")) | |
250 | except SystemExit, inst: |
|
254 | except SystemExit, inst: | |
251 | # Commands shouldn't sys.exit directly, but give a return code. |
|
255 | # Commands shouldn't sys.exit directly, but give a return code. | |
252 | # Just in case catch this and and pass exit code to caller. |
|
256 | # Just in case catch this and and pass exit code to caller. | |
253 | return inst.code |
|
257 | return inst.code | |
254 | except socket.error, inst: |
|
258 | except socket.error, inst: | |
255 | ui.warn(_("abort: %s\n") % inst.args[-1]) |
|
259 | ui.warn(_("abort: %s\n") % inst.args[-1]) | |
256 | except: # re-raises |
|
260 | except: # re-raises | |
257 | myver = util.version() |
|
261 | myver = util.version() | |
258 | # For compatibility checking, we discard the portion of the hg |
|
262 | # For compatibility checking, we discard the portion of the hg | |
259 | # version after the + on the assumption that if a "normal |
|
263 | # version after the + on the assumption that if a "normal | |
260 | # user" is running a build with a + in it the packager |
|
264 | # user" is running a build with a + in it the packager | |
261 | # probably built from fairly close to a tag and anyone with a |
|
265 | # probably built from fairly close to a tag and anyone with a | |
262 | # 'make local' copy of hg (where the version number can be out |
|
266 | # 'make local' copy of hg (where the version number can be out | |
263 | # of date) will be clueful enough to notice the implausible |
|
267 | # of date) will be clueful enough to notice the implausible | |
264 | # version number and try updating. |
|
268 | # version number and try updating. | |
265 | compare = myver.split('+')[0] |
|
269 | compare = myver.split('+')[0] | |
266 | ct = tuplever(compare) |
|
270 | ct = tuplever(compare) | |
267 | worst = None, ct, '' |
|
271 | worst = None, ct, '' | |
268 | for name, mod in extensions.extensions(): |
|
272 | for name, mod in extensions.extensions(): | |
269 | testedwith = getattr(mod, 'testedwith', '') |
|
273 | testedwith = getattr(mod, 'testedwith', '') | |
270 | report = getattr(mod, 'buglink', _('the extension author.')) |
|
274 | report = getattr(mod, 'buglink', _('the extension author.')) | |
271 | if not testedwith.strip(): |
|
275 | if not testedwith.strip(): | |
272 | # We found an untested extension. It's likely the culprit. |
|
276 | # We found an untested extension. It's likely the culprit. | |
273 | worst = name, 'unknown', report |
|
277 | worst = name, 'unknown', report | |
274 | break |
|
278 | break | |
275 | if compare not in testedwith.split() and testedwith != 'internal': |
|
279 | if compare not in testedwith.split() and testedwith != 'internal': | |
276 | tested = [tuplever(v) for v in testedwith.split()] |
|
280 | tested = [tuplever(v) for v in testedwith.split()] | |
277 | lower = [t for t in tested if t < ct] |
|
281 | lower = [t for t in tested if t < ct] | |
278 | nearest = max(lower or tested) |
|
282 | nearest = max(lower or tested) | |
279 | if worst[0] is None or nearest < worst[1]: |
|
283 | if worst[0] is None or nearest < worst[1]: | |
280 | worst = name, nearest, report |
|
284 | worst = name, nearest, report | |
281 | if worst[0] is not None: |
|
285 | if worst[0] is not None: | |
282 | name, testedwith, report = worst |
|
286 | name, testedwith, report = worst | |
283 | if not isinstance(testedwith, str): |
|
287 | if not isinstance(testedwith, str): | |
284 | testedwith = '.'.join([str(c) for c in testedwith]) |
|
288 | testedwith = '.'.join([str(c) for c in testedwith]) | |
285 | warning = (_('** Unknown exception encountered with ' |
|
289 | warning = (_('** Unknown exception encountered with ' | |
286 | 'possibly-broken third-party extension %s\n' |
|
290 | 'possibly-broken third-party extension %s\n' | |
287 | '** which supports versions %s of Mercurial.\n' |
|
291 | '** which supports versions %s of Mercurial.\n' | |
288 | '** Please disable %s and try your action again.\n' |
|
292 | '** Please disable %s and try your action again.\n' | |
289 | '** If that fixes the bug please report it to %s\n') |
|
293 | '** If that fixes the bug please report it to %s\n') | |
290 | % (name, testedwith, name, report)) |
|
294 | % (name, testedwith, name, report)) | |
291 | else: |
|
295 | else: | |
292 | warning = (_("** unknown exception encountered, " |
|
296 | warning = (_("** unknown exception encountered, " | |
293 | "please report by visiting\n") + |
|
297 | "please report by visiting\n") + | |
294 | _("** http://mercurial.selenic.com/wiki/BugTracker\n")) |
|
298 | _("** http://mercurial.selenic.com/wiki/BugTracker\n")) | |
295 | warning += ((_("** Python %s\n") % sys.version.replace('\n', '')) + |
|
299 | warning += ((_("** Python %s\n") % sys.version.replace('\n', '')) + | |
296 | (_("** Mercurial Distributed SCM (version %s)\n") % myver) + |
|
300 | (_("** Mercurial Distributed SCM (version %s)\n") % myver) + | |
297 | (_("** Extensions loaded: %s\n") % |
|
301 | (_("** Extensions loaded: %s\n") % | |
298 | ", ".join([x[0] for x in extensions.extensions()]))) |
|
302 | ", ".join([x[0] for x in extensions.extensions()]))) | |
299 | ui.log("commandexception", "%s\n%s\n", warning, traceback.format_exc()) |
|
303 | ui.log("commandexception", "%s\n%s\n", warning, traceback.format_exc()) | |
300 | ui.warn(warning) |
|
304 | ui.warn(warning) | |
301 | raise |
|
305 | raise | |
302 |
|
306 | |||
303 | return -1 |
|
307 | return -1 | |
304 |
|
308 | |||
305 | def tuplever(v): |
|
309 | def tuplever(v): | |
306 | try: |
|
310 | try: | |
307 | return tuple([int(i) for i in v.split('.')]) |
|
311 | return tuple([int(i) for i in v.split('.')]) | |
308 | except ValueError: |
|
312 | except ValueError: | |
309 | return tuple() |
|
313 | return tuple() | |
310 |
|
314 | |||
311 | def aliasargs(fn, givenargs): |
|
315 | def aliasargs(fn, givenargs): | |
312 | args = getattr(fn, 'args', []) |
|
316 | args = getattr(fn, 'args', []) | |
313 | if args: |
|
317 | if args: | |
314 | cmd = ' '.join(map(util.shellquote, args)) |
|
318 | cmd = ' '.join(map(util.shellquote, args)) | |
315 |
|
319 | |||
316 | nums = [] |
|
320 | nums = [] | |
317 | def replacer(m): |
|
321 | def replacer(m): | |
318 | num = int(m.group(1)) - 1 |
|
322 | num = int(m.group(1)) - 1 | |
319 | nums.append(num) |
|
323 | nums.append(num) | |
320 | if num < len(givenargs): |
|
324 | if num < len(givenargs): | |
321 | return givenargs[num] |
|
325 | return givenargs[num] | |
322 | raise util.Abort(_('too few arguments for command alias')) |
|
326 | raise util.Abort(_('too few arguments for command alias')) | |
323 | cmd = re.sub(r'\$(\d+|\$)', replacer, cmd) |
|
327 | cmd = re.sub(r'\$(\d+|\$)', replacer, cmd) | |
324 | givenargs = [x for i, x in enumerate(givenargs) |
|
328 | givenargs = [x for i, x in enumerate(givenargs) | |
325 | if i not in nums] |
|
329 | if i not in nums] | |
326 | args = shlex.split(cmd) |
|
330 | args = shlex.split(cmd) | |
327 | return args + givenargs |
|
331 | return args + givenargs | |
328 |
|
332 | |||
329 | class cmdalias(object): |
|
333 | class cmdalias(object): | |
330 | def __init__(self, name, definition, cmdtable): |
|
334 | def __init__(self, name, definition, cmdtable): | |
331 | self.name = self.cmd = name |
|
335 | self.name = self.cmd = name | |
332 | self.cmdname = '' |
|
336 | self.cmdname = '' | |
333 | self.definition = definition |
|
337 | self.definition = definition | |
334 | self.args = [] |
|
338 | self.args = [] | |
335 | self.opts = [] |
|
339 | self.opts = [] | |
336 | self.help = '' |
|
340 | self.help = '' | |
337 | self.norepo = True |
|
341 | self.norepo = True | |
338 | self.optionalrepo = False |
|
342 | self.optionalrepo = False | |
339 | self.badalias = False |
|
343 | self.badalias = False | |
340 |
|
344 | |||
341 | try: |
|
345 | try: | |
342 | aliases, entry = cmdutil.findcmd(self.name, cmdtable) |
|
346 | aliases, entry = cmdutil.findcmd(self.name, cmdtable) | |
343 | for alias, e in cmdtable.iteritems(): |
|
347 | for alias, e in cmdtable.iteritems(): | |
344 | if e is entry: |
|
348 | if e is entry: | |
345 | self.cmd = alias |
|
349 | self.cmd = alias | |
346 | break |
|
350 | break | |
347 | self.shadows = True |
|
351 | self.shadows = True | |
348 | except error.UnknownCommand: |
|
352 | except error.UnknownCommand: | |
349 | self.shadows = False |
|
353 | self.shadows = False | |
350 |
|
354 | |||
351 | if not self.definition: |
|
355 | if not self.definition: | |
352 | def fn(ui, *args): |
|
356 | def fn(ui, *args): | |
353 | ui.warn(_("no definition for alias '%s'\n") % self.name) |
|
357 | ui.warn(_("no definition for alias '%s'\n") % self.name) | |
354 | return 1 |
|
358 | return 1 | |
355 | self.fn = fn |
|
359 | self.fn = fn | |
356 | self.badalias = True |
|
360 | self.badalias = True | |
357 | return |
|
361 | return | |
358 |
|
362 | |||
359 | if self.definition.startswith('!'): |
|
363 | if self.definition.startswith('!'): | |
360 | self.shell = True |
|
364 | self.shell = True | |
361 | def fn(ui, *args): |
|
365 | def fn(ui, *args): | |
362 | env = {'HG_ARGS': ' '.join((self.name,) + args)} |
|
366 | env = {'HG_ARGS': ' '.join((self.name,) + args)} | |
363 | def _checkvar(m): |
|
367 | def _checkvar(m): | |
364 | if m.groups()[0] == '$': |
|
368 | if m.groups()[0] == '$': | |
365 | return m.group() |
|
369 | return m.group() | |
366 | elif int(m.groups()[0]) <= len(args): |
|
370 | elif int(m.groups()[0]) <= len(args): | |
367 | return m.group() |
|
371 | return m.group() | |
368 | else: |
|
372 | else: | |
369 | ui.debug("No argument found for substitution " |
|
373 | ui.debug("No argument found for substitution " | |
370 | "of %i variable in alias '%s' definition." |
|
374 | "of %i variable in alias '%s' definition." | |
371 | % (int(m.groups()[0]), self.name)) |
|
375 | % (int(m.groups()[0]), self.name)) | |
372 | return '' |
|
376 | return '' | |
373 | cmd = re.sub(r'\$(\d+|\$)', _checkvar, self.definition[1:]) |
|
377 | cmd = re.sub(r'\$(\d+|\$)', _checkvar, self.definition[1:]) | |
374 | replace = dict((str(i + 1), arg) for i, arg in enumerate(args)) |
|
378 | replace = dict((str(i + 1), arg) for i, arg in enumerate(args)) | |
375 | replace['0'] = self.name |
|
379 | replace['0'] = self.name | |
376 | replace['@'] = ' '.join(args) |
|
380 | replace['@'] = ' '.join(args) | |
377 | cmd = util.interpolate(r'\$', replace, cmd, escape_prefix=True) |
|
381 | cmd = util.interpolate(r'\$', replace, cmd, escape_prefix=True) | |
378 | return util.system(cmd, environ=env, out=ui.fout) |
|
382 | return util.system(cmd, environ=env, out=ui.fout) | |
379 | self.fn = fn |
|
383 | self.fn = fn | |
380 | return |
|
384 | return | |
381 |
|
385 | |||
382 | args = shlex.split(self.definition) |
|
386 | args = shlex.split(self.definition) | |
383 | self.cmdname = cmd = args.pop(0) |
|
387 | self.cmdname = cmd = args.pop(0) | |
384 | args = map(util.expandpath, args) |
|
388 | args = map(util.expandpath, args) | |
385 |
|
389 | |||
386 | for invalidarg in ("--cwd", "-R", "--repository", "--repo", "--config"): |
|
390 | for invalidarg in ("--cwd", "-R", "--repository", "--repo", "--config"): | |
387 | if _earlygetopt([invalidarg], args): |
|
391 | if _earlygetopt([invalidarg], args): | |
388 | def fn(ui, *args): |
|
392 | def fn(ui, *args): | |
389 | ui.warn(_("error in definition for alias '%s': %s may only " |
|
393 | ui.warn(_("error in definition for alias '%s': %s may only " | |
390 | "be given on the command line\n") |
|
394 | "be given on the command line\n") | |
391 | % (self.name, invalidarg)) |
|
395 | % (self.name, invalidarg)) | |
392 | return 1 |
|
396 | return 1 | |
393 |
|
397 | |||
394 | self.fn = fn |
|
398 | self.fn = fn | |
395 | self.badalias = True |
|
399 | self.badalias = True | |
396 | return |
|
400 | return | |
397 |
|
401 | |||
398 | try: |
|
402 | try: | |
399 | tableentry = cmdutil.findcmd(cmd, cmdtable, False)[1] |
|
403 | tableentry = cmdutil.findcmd(cmd, cmdtable, False)[1] | |
400 | if len(tableentry) > 2: |
|
404 | if len(tableentry) > 2: | |
401 | self.fn, self.opts, self.help = tableentry |
|
405 | self.fn, self.opts, self.help = tableentry | |
402 | else: |
|
406 | else: | |
403 | self.fn, self.opts = tableentry |
|
407 | self.fn, self.opts = tableentry | |
404 |
|
408 | |||
405 | self.args = aliasargs(self.fn, args) |
|
409 | self.args = aliasargs(self.fn, args) | |
406 | if cmd not in commands.norepo.split(' '): |
|
410 | if cmd not in commands.norepo.split(' '): | |
407 | self.norepo = False |
|
411 | self.norepo = False | |
408 | if cmd in commands.optionalrepo.split(' '): |
|
412 | if cmd in commands.optionalrepo.split(' '): | |
409 | self.optionalrepo = True |
|
413 | self.optionalrepo = True | |
410 | if self.help.startswith("hg " + cmd): |
|
414 | if self.help.startswith("hg " + cmd): | |
411 | # drop prefix in old-style help lines so hg shows the alias |
|
415 | # drop prefix in old-style help lines so hg shows the alias | |
412 | self.help = self.help[4 + len(cmd):] |
|
416 | self.help = self.help[4 + len(cmd):] | |
413 | self.__doc__ = self.fn.__doc__ |
|
417 | self.__doc__ = self.fn.__doc__ | |
414 |
|
418 | |||
415 | except error.UnknownCommand: |
|
419 | except error.UnknownCommand: | |
416 | def fn(ui, *args): |
|
420 | def fn(ui, *args): | |
417 | ui.warn(_("alias '%s' resolves to unknown command '%s'\n") \ |
|
421 | ui.warn(_("alias '%s' resolves to unknown command '%s'\n") \ | |
418 | % (self.name, cmd)) |
|
422 | % (self.name, cmd)) | |
419 | try: |
|
423 | try: | |
420 | # check if the command is in a disabled extension |
|
424 | # check if the command is in a disabled extension | |
421 | commands.help_(ui, cmd, unknowncmd=True) |
|
425 | commands.help_(ui, cmd, unknowncmd=True) | |
422 | except error.UnknownCommand: |
|
426 | except error.UnknownCommand: | |
423 | pass |
|
427 | pass | |
424 | return 1 |
|
428 | return 1 | |
425 | self.fn = fn |
|
429 | self.fn = fn | |
426 | self.badalias = True |
|
430 | self.badalias = True | |
427 | except error.AmbiguousCommand: |
|
431 | except error.AmbiguousCommand: | |
428 | def fn(ui, *args): |
|
432 | def fn(ui, *args): | |
429 | ui.warn(_("alias '%s' resolves to ambiguous command '%s'\n") \ |
|
433 | ui.warn(_("alias '%s' resolves to ambiguous command '%s'\n") \ | |
430 | % (self.name, cmd)) |
|
434 | % (self.name, cmd)) | |
431 | return 1 |
|
435 | return 1 | |
432 | self.fn = fn |
|
436 | self.fn = fn | |
433 | self.badalias = True |
|
437 | self.badalias = True | |
434 |
|
438 | |||
435 | def __call__(self, ui, *args, **opts): |
|
439 | def __call__(self, ui, *args, **opts): | |
436 | if self.shadows: |
|
440 | if self.shadows: | |
437 | ui.debug("alias '%s' shadows command '%s'\n" % |
|
441 | ui.debug("alias '%s' shadows command '%s'\n" % | |
438 | (self.name, self.cmdname)) |
|
442 | (self.name, self.cmdname)) | |
439 |
|
443 | |||
440 | if util.safehasattr(self, 'shell'): |
|
444 | if util.safehasattr(self, 'shell'): | |
441 | return self.fn(ui, *args, **opts) |
|
445 | return self.fn(ui, *args, **opts) | |
442 | else: |
|
446 | else: | |
443 | try: |
|
447 | try: | |
444 | util.checksignature(self.fn)(ui, *args, **opts) |
|
448 | util.checksignature(self.fn)(ui, *args, **opts) | |
445 | except error.SignatureError: |
|
449 | except error.SignatureError: | |
446 | args = ' '.join([self.cmdname] + self.args) |
|
450 | args = ' '.join([self.cmdname] + self.args) | |
447 | ui.debug("alias '%s' expands to '%s'\n" % (self.name, args)) |
|
451 | ui.debug("alias '%s' expands to '%s'\n" % (self.name, args)) | |
448 | raise |
|
452 | raise | |
449 |
|
453 | |||
450 | def addaliases(ui, cmdtable): |
|
454 | def addaliases(ui, cmdtable): | |
451 | # aliases are processed after extensions have been loaded, so they |
|
455 | # aliases are processed after extensions have been loaded, so they | |
452 | # may use extension commands. Aliases can also use other alias definitions, |
|
456 | # may use extension commands. Aliases can also use other alias definitions, | |
453 | # but only if they have been defined prior to the current definition. |
|
457 | # but only if they have been defined prior to the current definition. | |
454 | for alias, definition in ui.configitems('alias'): |
|
458 | for alias, definition in ui.configitems('alias'): | |
455 | aliasdef = cmdalias(alias, definition, cmdtable) |
|
459 | aliasdef = cmdalias(alias, definition, cmdtable) | |
456 |
|
460 | |||
457 | try: |
|
461 | try: | |
458 | olddef = cmdtable[aliasdef.cmd][0] |
|
462 | olddef = cmdtable[aliasdef.cmd][0] | |
459 | if olddef.definition == aliasdef.definition: |
|
463 | if olddef.definition == aliasdef.definition: | |
460 | continue |
|
464 | continue | |
461 | except (KeyError, AttributeError): |
|
465 | except (KeyError, AttributeError): | |
462 | # definition might not exist or it might not be a cmdalias |
|
466 | # definition might not exist or it might not be a cmdalias | |
463 | pass |
|
467 | pass | |
464 |
|
468 | |||
465 | cmdtable[aliasdef.name] = (aliasdef, aliasdef.opts, aliasdef.help) |
|
469 | cmdtable[aliasdef.name] = (aliasdef, aliasdef.opts, aliasdef.help) | |
466 | if aliasdef.norepo: |
|
470 | if aliasdef.norepo: | |
467 | commands.norepo += ' %s' % alias |
|
471 | commands.norepo += ' %s' % alias | |
468 | if aliasdef.optionalrepo: |
|
472 | if aliasdef.optionalrepo: | |
469 | commands.optionalrepo += ' %s' % alias |
|
473 | commands.optionalrepo += ' %s' % alias | |
470 |
|
474 | |||
471 | def _parse(ui, args): |
|
475 | def _parse(ui, args): | |
472 | options = {} |
|
476 | options = {} | |
473 | cmdoptions = {} |
|
477 | cmdoptions = {} | |
474 |
|
478 | |||
475 | try: |
|
479 | try: | |
476 | args = fancyopts.fancyopts(args, commands.globalopts, options) |
|
480 | args = fancyopts.fancyopts(args, commands.globalopts, options) | |
477 | except fancyopts.getopt.GetoptError, inst: |
|
481 | except fancyopts.getopt.GetoptError, inst: | |
478 | raise error.CommandError(None, inst) |
|
482 | raise error.CommandError(None, inst) | |
479 |
|
483 | |||
480 | if args: |
|
484 | if args: | |
481 | cmd, args = args[0], args[1:] |
|
485 | cmd, args = args[0], args[1:] | |
482 | aliases, entry = cmdutil.findcmd(cmd, commands.table, |
|
486 | aliases, entry = cmdutil.findcmd(cmd, commands.table, | |
483 | ui.configbool("ui", "strict")) |
|
487 | ui.configbool("ui", "strict")) | |
484 | cmd = aliases[0] |
|
488 | cmd = aliases[0] | |
485 | args = aliasargs(entry[0], args) |
|
489 | args = aliasargs(entry[0], args) | |
486 | defaults = ui.config("defaults", cmd) |
|
490 | defaults = ui.config("defaults", cmd) | |
487 | if defaults: |
|
491 | if defaults: | |
488 | args = map(util.expandpath, shlex.split(defaults)) + args |
|
492 | args = map(util.expandpath, shlex.split(defaults)) + args | |
489 | c = list(entry[1]) |
|
493 | c = list(entry[1]) | |
490 | else: |
|
494 | else: | |
491 | cmd = None |
|
495 | cmd = None | |
492 | c = [] |
|
496 | c = [] | |
493 |
|
497 | |||
494 | # combine global options into local |
|
498 | # combine global options into local | |
495 | for o in commands.globalopts: |
|
499 | for o in commands.globalopts: | |
496 | c.append((o[0], o[1], options[o[1]], o[3])) |
|
500 | c.append((o[0], o[1], options[o[1]], o[3])) | |
497 |
|
501 | |||
498 | try: |
|
502 | try: | |
499 | args = fancyopts.fancyopts(args, c, cmdoptions, True) |
|
503 | args = fancyopts.fancyopts(args, c, cmdoptions, True) | |
500 | except fancyopts.getopt.GetoptError, inst: |
|
504 | except fancyopts.getopt.GetoptError, inst: | |
501 | raise error.CommandError(cmd, inst) |
|
505 | raise error.CommandError(cmd, inst) | |
502 |
|
506 | |||
503 | # separate global options back out |
|
507 | # separate global options back out | |
504 | for o in commands.globalopts: |
|
508 | for o in commands.globalopts: | |
505 | n = o[1] |
|
509 | n = o[1] | |
506 | options[n] = cmdoptions[n] |
|
510 | options[n] = cmdoptions[n] | |
507 | del cmdoptions[n] |
|
511 | del cmdoptions[n] | |
508 |
|
512 | |||
509 | return (cmd, cmd and entry[0] or None, args, options, cmdoptions) |
|
513 | return (cmd, cmd and entry[0] or None, args, options, cmdoptions) | |
510 |
|
514 | |||
511 | def _parseconfig(ui, config): |
|
515 | def _parseconfig(ui, config): | |
512 | """parse the --config options from the command line""" |
|
516 | """parse the --config options from the command line""" | |
513 | configs = [] |
|
517 | configs = [] | |
514 |
|
518 | |||
515 | for cfg in config: |
|
519 | for cfg in config: | |
516 | try: |
|
520 | try: | |
517 | name, value = cfg.split('=', 1) |
|
521 | name, value = cfg.split('=', 1) | |
518 | section, name = name.split('.', 1) |
|
522 | section, name = name.split('.', 1) | |
519 | if not section or not name: |
|
523 | if not section or not name: | |
520 | raise IndexError |
|
524 | raise IndexError | |
521 | ui.setconfig(section, name, value, '--config') |
|
525 | ui.setconfig(section, name, value, '--config') | |
522 | configs.append((section, name, value)) |
|
526 | configs.append((section, name, value)) | |
523 | except (IndexError, ValueError): |
|
527 | except (IndexError, ValueError): | |
524 | raise util.Abort(_('malformed --config option: %r ' |
|
528 | raise util.Abort(_('malformed --config option: %r ' | |
525 | '(use --config section.name=value)') % cfg) |
|
529 | '(use --config section.name=value)') % cfg) | |
526 |
|
530 | |||
527 | return configs |
|
531 | return configs | |
528 |
|
532 | |||
529 | def _earlygetopt(aliases, args): |
|
533 | def _earlygetopt(aliases, args): | |
530 | """Return list of values for an option (or aliases). |
|
534 | """Return list of values for an option (or aliases). | |
531 |
|
535 | |||
532 | The values are listed in the order they appear in args. |
|
536 | The values are listed in the order they appear in args. | |
533 | The options and values are removed from args. |
|
537 | The options and values are removed from args. | |
534 |
|
538 | |||
535 | >>> args = ['x', '--cwd', 'foo', 'y'] |
|
539 | >>> args = ['x', '--cwd', 'foo', 'y'] | |
536 | >>> _earlygetopt(['--cwd'], args), args |
|
540 | >>> _earlygetopt(['--cwd'], args), args | |
537 | (['foo'], ['x', 'y']) |
|
541 | (['foo'], ['x', 'y']) | |
538 |
|
542 | |||
539 | >>> args = ['x', '--cwd=bar', 'y'] |
|
543 | >>> args = ['x', '--cwd=bar', 'y'] | |
540 | >>> _earlygetopt(['--cwd'], args), args |
|
544 | >>> _earlygetopt(['--cwd'], args), args | |
541 | (['bar'], ['x', 'y']) |
|
545 | (['bar'], ['x', 'y']) | |
542 |
|
546 | |||
543 | >>> args = ['x', '-R', 'foo', 'y'] |
|
547 | >>> args = ['x', '-R', 'foo', 'y'] | |
544 | >>> _earlygetopt(['-R'], args), args |
|
548 | >>> _earlygetopt(['-R'], args), args | |
545 | (['foo'], ['x', 'y']) |
|
549 | (['foo'], ['x', 'y']) | |
546 |
|
550 | |||
547 | >>> args = ['x', '-Rbar', 'y'] |
|
551 | >>> args = ['x', '-Rbar', 'y'] | |
548 | >>> _earlygetopt(['-R'], args), args |
|
552 | >>> _earlygetopt(['-R'], args), args | |
549 | (['bar'], ['x', 'y']) |
|
553 | (['bar'], ['x', 'y']) | |
550 | """ |
|
554 | """ | |
551 | try: |
|
555 | try: | |
552 | argcount = args.index("--") |
|
556 | argcount = args.index("--") | |
553 | except ValueError: |
|
557 | except ValueError: | |
554 | argcount = len(args) |
|
558 | argcount = len(args) | |
555 | shortopts = [opt for opt in aliases if len(opt) == 2] |
|
559 | shortopts = [opt for opt in aliases if len(opt) == 2] | |
556 | values = [] |
|
560 | values = [] | |
557 | pos = 0 |
|
561 | pos = 0 | |
558 | while pos < argcount: |
|
562 | while pos < argcount: | |
559 | fullarg = arg = args[pos] |
|
563 | fullarg = arg = args[pos] | |
560 | equals = arg.find('=') |
|
564 | equals = arg.find('=') | |
561 | if equals > -1: |
|
565 | if equals > -1: | |
562 | arg = arg[:equals] |
|
566 | arg = arg[:equals] | |
563 | if arg in aliases: |
|
567 | if arg in aliases: | |
564 | del args[pos] |
|
568 | del args[pos] | |
565 | if equals > -1: |
|
569 | if equals > -1: | |
566 | values.append(fullarg[equals + 1:]) |
|
570 | values.append(fullarg[equals + 1:]) | |
567 | argcount -= 1 |
|
571 | argcount -= 1 | |
568 | else: |
|
572 | else: | |
569 | if pos + 1 >= argcount: |
|
573 | if pos + 1 >= argcount: | |
570 | # ignore and let getopt report an error if there is no value |
|
574 | # ignore and let getopt report an error if there is no value | |
571 | break |
|
575 | break | |
572 | values.append(args.pop(pos)) |
|
576 | values.append(args.pop(pos)) | |
573 | argcount -= 2 |
|
577 | argcount -= 2 | |
574 | elif arg[:2] in shortopts: |
|
578 | elif arg[:2] in shortopts: | |
575 | # short option can have no following space, e.g. hg log -Rfoo |
|
579 | # short option can have no following space, e.g. hg log -Rfoo | |
576 | values.append(args.pop(pos)[2:]) |
|
580 | values.append(args.pop(pos)[2:]) | |
577 | argcount -= 1 |
|
581 | argcount -= 1 | |
578 | else: |
|
582 | else: | |
579 | pos += 1 |
|
583 | pos += 1 | |
580 | return values |
|
584 | return values | |
581 |
|
585 | |||
582 | def runcommand(lui, repo, cmd, fullargs, ui, options, d, cmdpats, cmdoptions): |
|
586 | def runcommand(lui, repo, cmd, fullargs, ui, options, d, cmdpats, cmdoptions): | |
583 | # run pre-hook, and abort if it fails |
|
587 | # run pre-hook, and abort if it fails | |
584 | hook.hook(lui, repo, "pre-%s" % cmd, True, args=" ".join(fullargs), |
|
588 | hook.hook(lui, repo, "pre-%s" % cmd, True, args=" ".join(fullargs), | |
585 | pats=cmdpats, opts=cmdoptions) |
|
589 | pats=cmdpats, opts=cmdoptions) | |
586 | ret = _runcommand(ui, options, cmd, d) |
|
590 | ret = _runcommand(ui, options, cmd, d) | |
587 | # run post-hook, passing command result |
|
591 | # run post-hook, passing command result | |
588 | hook.hook(lui, repo, "post-%s" % cmd, False, args=" ".join(fullargs), |
|
592 | hook.hook(lui, repo, "post-%s" % cmd, False, args=" ".join(fullargs), | |
589 | result=ret, pats=cmdpats, opts=cmdoptions) |
|
593 | result=ret, pats=cmdpats, opts=cmdoptions) | |
590 | return ret |
|
594 | return ret | |
591 |
|
595 | |||
592 | def _getlocal(ui, rpath): |
|
596 | def _getlocal(ui, rpath): | |
593 | """Return (path, local ui object) for the given target path. |
|
597 | """Return (path, local ui object) for the given target path. | |
594 |
|
598 | |||
595 | Takes paths in [cwd]/.hg/hgrc into account." |
|
599 | Takes paths in [cwd]/.hg/hgrc into account." | |
596 | """ |
|
600 | """ | |
597 | try: |
|
601 | try: | |
598 | wd = os.getcwd() |
|
602 | wd = os.getcwd() | |
599 | except OSError, e: |
|
603 | except OSError, e: | |
600 | raise util.Abort(_("error getting current working directory: %s") % |
|
604 | raise util.Abort(_("error getting current working directory: %s") % | |
601 | e.strerror) |
|
605 | e.strerror) | |
602 | path = cmdutil.findrepo(wd) or "" |
|
606 | path = cmdutil.findrepo(wd) or "" | |
603 | if not path: |
|
607 | if not path: | |
604 | lui = ui |
|
608 | lui = ui | |
605 | else: |
|
609 | else: | |
606 | lui = ui.copy() |
|
610 | lui = ui.copy() | |
607 | lui.readconfig(os.path.join(path, ".hg", "hgrc"), path) |
|
611 | lui.readconfig(os.path.join(path, ".hg", "hgrc"), path) | |
608 |
|
612 | |||
609 | if rpath and rpath[-1]: |
|
613 | if rpath and rpath[-1]: | |
610 | path = lui.expandpath(rpath[-1]) |
|
614 | path = lui.expandpath(rpath[-1]) | |
611 | lui = ui.copy() |
|
615 | lui = ui.copy() | |
612 | lui.readconfig(os.path.join(path, ".hg", "hgrc"), path) |
|
616 | lui.readconfig(os.path.join(path, ".hg", "hgrc"), path) | |
613 |
|
617 | |||
614 | return path, lui |
|
618 | return path, lui | |
615 |
|
619 | |||
616 | def _checkshellalias(lui, ui, args): |
|
620 | def _checkshellalias(lui, ui, args): | |
617 | options = {} |
|
621 | options = {} | |
618 |
|
622 | |||
619 | try: |
|
623 | try: | |
620 | args = fancyopts.fancyopts(args, commands.globalopts, options) |
|
624 | args = fancyopts.fancyopts(args, commands.globalopts, options) | |
621 | except fancyopts.getopt.GetoptError: |
|
625 | except fancyopts.getopt.GetoptError: | |
622 | return |
|
626 | return | |
623 |
|
627 | |||
624 | if not args: |
|
628 | if not args: | |
625 | return |
|
629 | return | |
626 |
|
630 | |||
627 | norepo = commands.norepo |
|
631 | norepo = commands.norepo | |
628 | optionalrepo = commands.optionalrepo |
|
632 | optionalrepo = commands.optionalrepo | |
629 | def restorecommands(): |
|
633 | def restorecommands(): | |
630 | commands.norepo = norepo |
|
634 | commands.norepo = norepo | |
631 | commands.optionalrepo = optionalrepo |
|
635 | commands.optionalrepo = optionalrepo | |
632 |
|
636 | |||
633 | cmdtable = commands.table.copy() |
|
637 | cmdtable = commands.table.copy() | |
634 | addaliases(lui, cmdtable) |
|
638 | addaliases(lui, cmdtable) | |
635 |
|
639 | |||
636 | cmd = args[0] |
|
640 | cmd = args[0] | |
637 | try: |
|
641 | try: | |
638 | aliases, entry = cmdutil.findcmd(cmd, cmdtable) |
|
642 | aliases, entry = cmdutil.findcmd(cmd, cmdtable) | |
639 | except (error.AmbiguousCommand, error.UnknownCommand): |
|
643 | except (error.AmbiguousCommand, error.UnknownCommand): | |
640 | restorecommands() |
|
644 | restorecommands() | |
641 | return |
|
645 | return | |
642 |
|
646 | |||
643 | cmd = aliases[0] |
|
647 | cmd = aliases[0] | |
644 | fn = entry[0] |
|
648 | fn = entry[0] | |
645 |
|
649 | |||
646 | if cmd and util.safehasattr(fn, 'shell'): |
|
650 | if cmd and util.safehasattr(fn, 'shell'): | |
647 | d = lambda: fn(ui, *args[1:]) |
|
651 | d = lambda: fn(ui, *args[1:]) | |
648 | return lambda: runcommand(lui, None, cmd, args[:1], ui, options, d, |
|
652 | return lambda: runcommand(lui, None, cmd, args[:1], ui, options, d, | |
649 | [], {}) |
|
653 | [], {}) | |
650 |
|
654 | |||
651 | restorecommands() |
|
655 | restorecommands() | |
652 |
|
656 | |||
653 | _loaded = set() |
|
657 | _loaded = set() | |
654 | def _dispatch(req): |
|
658 | def _dispatch(req): | |
655 | args = req.args |
|
659 | args = req.args | |
656 | ui = req.ui |
|
660 | ui = req.ui | |
657 |
|
661 | |||
658 | # check for cwd |
|
662 | # check for cwd | |
659 | cwd = _earlygetopt(['--cwd'], args) |
|
663 | cwd = _earlygetopt(['--cwd'], args) | |
660 | if cwd: |
|
664 | if cwd: | |
661 | os.chdir(cwd[-1]) |
|
665 | os.chdir(cwd[-1]) | |
662 |
|
666 | |||
663 | rpath = _earlygetopt(["-R", "--repository", "--repo"], args) |
|
667 | rpath = _earlygetopt(["-R", "--repository", "--repo"], args) | |
664 | path, lui = _getlocal(ui, rpath) |
|
668 | path, lui = _getlocal(ui, rpath) | |
665 |
|
669 | |||
666 | # Now that we're operating in the right directory/repository with |
|
670 | # Now that we're operating in the right directory/repository with | |
667 | # the right config settings, check for shell aliases |
|
671 | # the right config settings, check for shell aliases | |
668 | shellaliasfn = _checkshellalias(lui, ui, args) |
|
672 | shellaliasfn = _checkshellalias(lui, ui, args) | |
669 | if shellaliasfn: |
|
673 | if shellaliasfn: | |
670 | return shellaliasfn() |
|
674 | return shellaliasfn() | |
671 |
|
675 | |||
672 | # Configure extensions in phases: uisetup, extsetup, cmdtable, and |
|
676 | # Configure extensions in phases: uisetup, extsetup, cmdtable, and | |
673 | # reposetup. Programs like TortoiseHg will call _dispatch several |
|
677 | # reposetup. Programs like TortoiseHg will call _dispatch several | |
674 | # times so we keep track of configured extensions in _loaded. |
|
678 | # times so we keep track of configured extensions in _loaded. | |
675 | extensions.loadall(lui) |
|
679 | extensions.loadall(lui) | |
676 | exts = [ext for ext in extensions.extensions() if ext[0] not in _loaded] |
|
680 | exts = [ext for ext in extensions.extensions() if ext[0] not in _loaded] | |
677 | # Propagate any changes to lui.__class__ by extensions |
|
681 | # Propagate any changes to lui.__class__ by extensions | |
678 | ui.__class__ = lui.__class__ |
|
682 | ui.__class__ = lui.__class__ | |
679 |
|
683 | |||
680 | # (uisetup and extsetup are handled in extensions.loadall) |
|
684 | # (uisetup and extsetup are handled in extensions.loadall) | |
681 |
|
685 | |||
682 | for name, module in exts: |
|
686 | for name, module in exts: | |
683 | cmdtable = getattr(module, 'cmdtable', {}) |
|
687 | cmdtable = getattr(module, 'cmdtable', {}) | |
684 | overrides = [cmd for cmd in cmdtable if cmd in commands.table] |
|
688 | overrides = [cmd for cmd in cmdtable if cmd in commands.table] | |
685 | if overrides: |
|
689 | if overrides: | |
686 | ui.warn(_("extension '%s' overrides commands: %s\n") |
|
690 | ui.warn(_("extension '%s' overrides commands: %s\n") | |
687 | % (name, " ".join(overrides))) |
|
691 | % (name, " ".join(overrides))) | |
688 | commands.table.update(cmdtable) |
|
692 | commands.table.update(cmdtable) | |
689 | _loaded.add(name) |
|
693 | _loaded.add(name) | |
690 |
|
694 | |||
691 | # (reposetup is handled in hg.repository) |
|
695 | # (reposetup is handled in hg.repository) | |
692 |
|
696 | |||
693 | addaliases(lui, commands.table) |
|
697 | addaliases(lui, commands.table) | |
694 |
|
698 | |||
695 | # check for fallback encoding |
|
699 | # check for fallback encoding | |
696 | fallback = lui.config('ui', 'fallbackencoding') |
|
700 | fallback = lui.config('ui', 'fallbackencoding') | |
697 | if fallback: |
|
701 | if fallback: | |
698 | encoding.fallbackencoding = fallback |
|
702 | encoding.fallbackencoding = fallback | |
699 |
|
703 | |||
700 | fullargs = args |
|
704 | fullargs = args | |
701 | cmd, func, args, options, cmdoptions = _parse(lui, args) |
|
705 | cmd, func, args, options, cmdoptions = _parse(lui, args) | |
702 |
|
706 | |||
703 | if options["config"]: |
|
707 | if options["config"]: | |
704 | raise util.Abort(_("option --config may not be abbreviated!")) |
|
708 | raise util.Abort(_("option --config may not be abbreviated!")) | |
705 | if options["cwd"]: |
|
709 | if options["cwd"]: | |
706 | raise util.Abort(_("option --cwd may not be abbreviated!")) |
|
710 | raise util.Abort(_("option --cwd may not be abbreviated!")) | |
707 | if options["repository"]: |
|
711 | if options["repository"]: | |
708 | raise util.Abort(_( |
|
712 | raise util.Abort(_( | |
709 | "option -R has to be separated from other options (e.g. not -qR) " |
|
713 | "option -R has to be separated from other options (e.g. not -qR) " | |
710 | "and --repository may only be abbreviated as --repo!")) |
|
714 | "and --repository may only be abbreviated as --repo!")) | |
711 |
|
715 | |||
712 | if options["encoding"]: |
|
716 | if options["encoding"]: | |
713 | encoding.encoding = options["encoding"] |
|
717 | encoding.encoding = options["encoding"] | |
714 | if options["encodingmode"]: |
|
718 | if options["encodingmode"]: | |
715 | encoding.encodingmode = options["encodingmode"] |
|
719 | encoding.encodingmode = options["encodingmode"] | |
716 | if options["time"]: |
|
720 | if options["time"]: | |
717 | def get_times(): |
|
721 | def get_times(): | |
718 | t = os.times() |
|
722 | t = os.times() | |
719 | if t[4] == 0.0: # Windows leaves this as zero, so use time.clock() |
|
723 | if t[4] == 0.0: # Windows leaves this as zero, so use time.clock() | |
720 | t = (t[0], t[1], t[2], t[3], time.clock()) |
|
724 | t = (t[0], t[1], t[2], t[3], time.clock()) | |
721 | return t |
|
725 | return t | |
722 | s = get_times() |
|
726 | s = get_times() | |
723 | def print_time(): |
|
727 | def print_time(): | |
724 | t = get_times() |
|
728 | t = get_times() | |
725 | ui.warn(_("time: real %.3f secs (user %.3f+%.3f sys %.3f+%.3f)\n") % |
|
729 | ui.warn(_("time: real %.3f secs (user %.3f+%.3f sys %.3f+%.3f)\n") % | |
726 | (t[4]-s[4], t[0]-s[0], t[2]-s[2], t[1]-s[1], t[3]-s[3])) |
|
730 | (t[4]-s[4], t[0]-s[0], t[2]-s[2], t[1]-s[1], t[3]-s[3])) | |
727 | atexit.register(print_time) |
|
731 | atexit.register(print_time) | |
728 |
|
732 | |||
729 | uis = set([ui, lui]) |
|
733 | uis = set([ui, lui]) | |
730 |
|
734 | |||
731 | if req.repo: |
|
735 | if req.repo: | |
732 | uis.add(req.repo.ui) |
|
736 | uis.add(req.repo.ui) | |
733 |
|
737 | |||
734 | if options['verbose'] or options['debug'] or options['quiet']: |
|
738 | if options['verbose'] or options['debug'] or options['quiet']: | |
735 | for opt in ('verbose', 'debug', 'quiet'): |
|
739 | for opt in ('verbose', 'debug', 'quiet'): | |
736 | val = str(bool(options[opt])) |
|
740 | val = str(bool(options[opt])) | |
737 | for ui_ in uis: |
|
741 | for ui_ in uis: | |
738 | ui_.setconfig('ui', opt, val, '--' + opt) |
|
742 | ui_.setconfig('ui', opt, val, '--' + opt) | |
739 |
|
743 | |||
740 | if options['traceback']: |
|
744 | if options['traceback']: | |
741 | for ui_ in uis: |
|
745 | for ui_ in uis: | |
742 | ui_.setconfig('ui', 'traceback', 'on', '--traceback') |
|
746 | ui_.setconfig('ui', 'traceback', 'on', '--traceback') | |
743 |
|
747 | |||
744 | if options['noninteractive']: |
|
748 | if options['noninteractive']: | |
745 | for ui_ in uis: |
|
749 | for ui_ in uis: | |
746 | ui_.setconfig('ui', 'interactive', 'off', '-y') |
|
750 | ui_.setconfig('ui', 'interactive', 'off', '-y') | |
747 |
|
751 | |||
748 | if cmdoptions.get('insecure', False): |
|
752 | if cmdoptions.get('insecure', False): | |
749 | for ui_ in uis: |
|
753 | for ui_ in uis: | |
750 | ui_.setconfig('web', 'cacerts', '', '--insecure') |
|
754 | ui_.setconfig('web', 'cacerts', '', '--insecure') | |
751 |
|
755 | |||
752 | if options['version']: |
|
756 | if options['version']: | |
753 | return commands.version_(ui) |
|
757 | return commands.version_(ui) | |
754 | if options['help']: |
|
758 | if options['help']: | |
755 | return commands.help_(ui, cmd) |
|
759 | return commands.help_(ui, cmd) | |
756 | elif not cmd: |
|
760 | elif not cmd: | |
757 | return commands.help_(ui, 'shortlist') |
|
761 | return commands.help_(ui, 'shortlist') | |
758 |
|
762 | |||
759 | repo = None |
|
763 | repo = None | |
760 | cmdpats = args[:] |
|
764 | cmdpats = args[:] | |
761 | if cmd not in commands.norepo.split(): |
|
765 | if cmd not in commands.norepo.split(): | |
762 | # use the repo from the request only if we don't have -R |
|
766 | # use the repo from the request only if we don't have -R | |
763 | if not rpath and not cwd: |
|
767 | if not rpath and not cwd: | |
764 | repo = req.repo |
|
768 | repo = req.repo | |
765 |
|
769 | |||
766 | if repo: |
|
770 | if repo: | |
767 | # set the descriptors of the repo ui to those of ui |
|
771 | # set the descriptors of the repo ui to those of ui | |
768 | repo.ui.fin = ui.fin |
|
772 | repo.ui.fin = ui.fin | |
769 | repo.ui.fout = ui.fout |
|
773 | repo.ui.fout = ui.fout | |
770 | repo.ui.ferr = ui.ferr |
|
774 | repo.ui.ferr = ui.ferr | |
771 | else: |
|
775 | else: | |
772 | try: |
|
776 | try: | |
773 | repo = hg.repository(ui, path=path) |
|
777 | repo = hg.repository(ui, path=path) | |
774 | if not repo.local(): |
|
778 | if not repo.local(): | |
775 | raise util.Abort(_("repository '%s' is not local") % path) |
|
779 | raise util.Abort(_("repository '%s' is not local") % path) | |
776 | repo.ui.setconfig("bundle", "mainreporoot", repo.root, 'repo') |
|
780 | repo.ui.setconfig("bundle", "mainreporoot", repo.root, 'repo') | |
777 | except error.RequirementError: |
|
781 | except error.RequirementError: | |
778 | raise |
|
782 | raise | |
779 | except error.RepoError: |
|
783 | except error.RepoError: | |
780 | if cmd not in commands.optionalrepo.split(): |
|
784 | if cmd not in commands.optionalrepo.split(): | |
781 | if (cmd in commands.inferrepo.split() and |
|
785 | if (cmd in commands.inferrepo.split() and | |
782 | args and not path): # try to infer -R from command args |
|
786 | args and not path): # try to infer -R from command args | |
783 | repos = map(cmdutil.findrepo, args) |
|
787 | repos = map(cmdutil.findrepo, args) | |
784 | guess = repos[0] |
|
788 | guess = repos[0] | |
785 | if guess and repos.count(guess) == len(repos): |
|
789 | if guess and repos.count(guess) == len(repos): | |
786 | req.args = ['--repository', guess] + fullargs |
|
790 | req.args = ['--repository', guess] + fullargs | |
787 | return _dispatch(req) |
|
791 | return _dispatch(req) | |
788 | if not path: |
|
792 | if not path: | |
789 | raise error.RepoError(_("no repository found in '%s'" |
|
793 | raise error.RepoError(_("no repository found in '%s'" | |
790 | " (.hg not found)") |
|
794 | " (.hg not found)") | |
791 | % os.getcwd()) |
|
795 | % os.getcwd()) | |
792 | raise |
|
796 | raise | |
793 | if repo: |
|
797 | if repo: | |
794 | ui = repo.ui |
|
798 | ui = repo.ui | |
795 | if options['hidden']: |
|
799 | if options['hidden']: | |
796 | repo = repo.unfiltered() |
|
800 | repo = repo.unfiltered() | |
797 | args.insert(0, repo) |
|
801 | args.insert(0, repo) | |
798 | elif rpath: |
|
802 | elif rpath: | |
799 | ui.warn(_("warning: --repository ignored\n")) |
|
803 | ui.warn(_("warning: --repository ignored\n")) | |
800 |
|
804 | |||
801 | msg = ' '.join(' ' in a and repr(a) or a for a in fullargs) |
|
805 | msg = ' '.join(' ' in a and repr(a) or a for a in fullargs) | |
802 | ui.log("command", '%s\n', msg) |
|
806 | ui.log("command", '%s\n', msg) | |
803 | d = lambda: util.checksignature(func)(ui, *args, **cmdoptions) |
|
807 | d = lambda: util.checksignature(func)(ui, *args, **cmdoptions) | |
804 | try: |
|
808 | try: | |
805 | return runcommand(lui, repo, cmd, fullargs, ui, options, d, |
|
809 | return runcommand(lui, repo, cmd, fullargs, ui, options, d, | |
806 | cmdpats, cmdoptions) |
|
810 | cmdpats, cmdoptions) | |
807 | finally: |
|
811 | finally: | |
808 | if repo and repo != req.repo: |
|
812 | if repo and repo != req.repo: | |
809 | repo.close() |
|
813 | repo.close() | |
810 |
|
814 | |||
811 | def lsprofile(ui, func, fp): |
|
815 | def lsprofile(ui, func, fp): | |
812 | format = ui.config('profiling', 'format', default='text') |
|
816 | format = ui.config('profiling', 'format', default='text') | |
813 | field = ui.config('profiling', 'sort', default='inlinetime') |
|
817 | field = ui.config('profiling', 'sort', default='inlinetime') | |
814 | limit = ui.configint('profiling', 'limit', default=30) |
|
818 | limit = ui.configint('profiling', 'limit', default=30) | |
815 | climit = ui.configint('profiling', 'nested', default=5) |
|
819 | climit = ui.configint('profiling', 'nested', default=5) | |
816 |
|
820 | |||
817 | if format not in ['text', 'kcachegrind']: |
|
821 | if format not in ['text', 'kcachegrind']: | |
818 | ui.warn(_("unrecognized profiling format '%s'" |
|
822 | ui.warn(_("unrecognized profiling format '%s'" | |
819 | " - Ignored\n") % format) |
|
823 | " - Ignored\n") % format) | |
820 | format = 'text' |
|
824 | format = 'text' | |
821 |
|
825 | |||
822 | try: |
|
826 | try: | |
823 | from mercurial import lsprof |
|
827 | from mercurial import lsprof | |
824 | except ImportError: |
|
828 | except ImportError: | |
825 | raise util.Abort(_( |
|
829 | raise util.Abort(_( | |
826 | 'lsprof not available - install from ' |
|
830 | 'lsprof not available - install from ' | |
827 | 'http://codespeak.net/svn/user/arigo/hack/misc/lsprof/')) |
|
831 | 'http://codespeak.net/svn/user/arigo/hack/misc/lsprof/')) | |
828 | p = lsprof.Profiler() |
|
832 | p = lsprof.Profiler() | |
829 | p.enable(subcalls=True) |
|
833 | p.enable(subcalls=True) | |
830 | try: |
|
834 | try: | |
831 | return func() |
|
835 | return func() | |
832 | finally: |
|
836 | finally: | |
833 | p.disable() |
|
837 | p.disable() | |
834 |
|
838 | |||
835 | if format == 'kcachegrind': |
|
839 | if format == 'kcachegrind': | |
836 | import lsprofcalltree |
|
840 | import lsprofcalltree | |
837 | calltree = lsprofcalltree.KCacheGrind(p) |
|
841 | calltree = lsprofcalltree.KCacheGrind(p) | |
838 | calltree.output(fp) |
|
842 | calltree.output(fp) | |
839 | else: |
|
843 | else: | |
840 | # format == 'text' |
|
844 | # format == 'text' | |
841 | stats = lsprof.Stats(p.getstats()) |
|
845 | stats = lsprof.Stats(p.getstats()) | |
842 | stats.sort(field) |
|
846 | stats.sort(field) | |
843 | stats.pprint(limit=limit, file=fp, climit=climit) |
|
847 | stats.pprint(limit=limit, file=fp, climit=climit) | |
844 |
|
848 | |||
845 | def statprofile(ui, func, fp): |
|
849 | def statprofile(ui, func, fp): | |
846 | try: |
|
850 | try: | |
847 | import statprof |
|
851 | import statprof | |
848 | except ImportError: |
|
852 | except ImportError: | |
849 | raise util.Abort(_( |
|
853 | raise util.Abort(_( | |
850 | 'statprof not available - install using "easy_install statprof"')) |
|
854 | 'statprof not available - install using "easy_install statprof"')) | |
851 |
|
855 | |||
852 | freq = ui.configint('profiling', 'freq', default=1000) |
|
856 | freq = ui.configint('profiling', 'freq', default=1000) | |
853 | if freq > 0: |
|
857 | if freq > 0: | |
854 | statprof.reset(freq) |
|
858 | statprof.reset(freq) | |
855 | else: |
|
859 | else: | |
856 | ui.warn(_("invalid sampling frequency '%s' - ignoring\n") % freq) |
|
860 | ui.warn(_("invalid sampling frequency '%s' - ignoring\n") % freq) | |
857 |
|
861 | |||
858 | statprof.start() |
|
862 | statprof.start() | |
859 | try: |
|
863 | try: | |
860 | return func() |
|
864 | return func() | |
861 | finally: |
|
865 | finally: | |
862 | statprof.stop() |
|
866 | statprof.stop() | |
863 | statprof.display(fp) |
|
867 | statprof.display(fp) | |
864 |
|
868 | |||
865 | def _runcommand(ui, options, cmd, cmdfunc): |
|
869 | def _runcommand(ui, options, cmd, cmdfunc): | |
866 | def checkargs(): |
|
870 | def checkargs(): | |
867 | try: |
|
871 | try: | |
868 | return cmdfunc() |
|
872 | return cmdfunc() | |
869 | except error.SignatureError: |
|
873 | except error.SignatureError: | |
870 | raise error.CommandError(cmd, _("invalid arguments")) |
|
874 | raise error.CommandError(cmd, _("invalid arguments")) | |
871 |
|
875 | |||
872 | if options['profile']: |
|
876 | if options['profile']: | |
873 | profiler = os.getenv('HGPROF') |
|
877 | profiler = os.getenv('HGPROF') | |
874 | if profiler is None: |
|
878 | if profiler is None: | |
875 | profiler = ui.config('profiling', 'type', default='ls') |
|
879 | profiler = ui.config('profiling', 'type', default='ls') | |
876 | if profiler not in ('ls', 'stat'): |
|
880 | if profiler not in ('ls', 'stat'): | |
877 | ui.warn(_("unrecognized profiler '%s' - ignored\n") % profiler) |
|
881 | ui.warn(_("unrecognized profiler '%s' - ignored\n") % profiler) | |
878 | profiler = 'ls' |
|
882 | profiler = 'ls' | |
879 |
|
883 | |||
880 | output = ui.config('profiling', 'output') |
|
884 | output = ui.config('profiling', 'output') | |
881 |
|
885 | |||
882 | if output: |
|
886 | if output: | |
883 | path = ui.expandpath(output) |
|
887 | path = ui.expandpath(output) | |
884 | fp = open(path, 'wb') |
|
888 | fp = open(path, 'wb') | |
885 | else: |
|
889 | else: | |
886 | fp = sys.stderr |
|
890 | fp = sys.stderr | |
887 |
|
891 | |||
888 | try: |
|
892 | try: | |
889 | if profiler == 'ls': |
|
893 | if profiler == 'ls': | |
890 | return lsprofile(ui, checkargs, fp) |
|
894 | return lsprofile(ui, checkargs, fp) | |
891 | else: |
|
895 | else: | |
892 | return statprofile(ui, checkargs, fp) |
|
896 | return statprofile(ui, checkargs, fp) | |
893 | finally: |
|
897 | finally: | |
894 | if output: |
|
898 | if output: | |
895 | fp.close() |
|
899 | fp.close() | |
896 | else: |
|
900 | else: | |
897 | return checkargs() |
|
901 | return checkargs() |
@@ -1,649 +1,651 b'' | |||||
1 | # hg.py - repository classes for mercurial |
|
1 | # hg.py - repository classes for mercurial | |
2 | # |
|
2 | # | |
3 | # Copyright 2005-2007 Matt Mackall <mpm@selenic.com> |
|
3 | # Copyright 2005-2007 Matt Mackall <mpm@selenic.com> | |
4 | # Copyright 2006 Vadim Gelfer <vadim.gelfer@gmail.com> |
|
4 | # Copyright 2006 Vadim Gelfer <vadim.gelfer@gmail.com> | |
5 | # |
|
5 | # | |
6 | # This software may be used and distributed according to the terms of the |
|
6 | # This software may be used and distributed according to the terms of the | |
7 | # GNU General Public License version 2 or any later version. |
|
7 | # GNU General Public License version 2 or any later version. | |
8 |
|
8 | |||
9 | from i18n import _ |
|
9 | from i18n import _ | |
10 | from lock import release |
|
10 | from lock import release | |
11 | from node import hex, nullid |
|
11 | from node import hex, nullid | |
12 | import localrepo, bundlerepo, unionrepo, httppeer, sshpeer, statichttprepo |
|
12 | import localrepo, bundlerepo, unionrepo, httppeer, sshpeer, statichttprepo | |
13 | import bookmarks, lock, util, extensions, error, node, scmutil, phases, url |
|
13 | import bookmarks, lock, util, extensions, error, node, scmutil, phases, url | |
14 | import cmdutil, discovery |
|
14 | import cmdutil, discovery | |
15 | import merge as mergemod |
|
15 | import merge as mergemod | |
16 | import verify as verifymod |
|
16 | import verify as verifymod | |
17 | import errno, os, shutil |
|
17 | import errno, os, shutil | |
18 |
|
18 | |||
19 | def _local(path): |
|
19 | def _local(path): | |
20 | path = util.expandpath(util.urllocalpath(path)) |
|
20 | path = util.expandpath(util.urllocalpath(path)) | |
21 | return (os.path.isfile(path) and bundlerepo or localrepo) |
|
21 | return (os.path.isfile(path) and bundlerepo or localrepo) | |
22 |
|
22 | |||
23 | def addbranchrevs(lrepo, other, branches, revs): |
|
23 | def addbranchrevs(lrepo, other, branches, revs): | |
24 | peer = other.peer() # a courtesy to callers using a localrepo for other |
|
24 | peer = other.peer() # a courtesy to callers using a localrepo for other | |
25 | hashbranch, branches = branches |
|
25 | hashbranch, branches = branches | |
26 | if not hashbranch and not branches: |
|
26 | if not hashbranch and not branches: | |
27 | return revs or None, revs and revs[0] or None |
|
27 | return revs or None, revs and revs[0] or None | |
28 | revs = revs and list(revs) or [] |
|
28 | revs = revs and list(revs) or [] | |
29 | if not peer.capable('branchmap'): |
|
29 | if not peer.capable('branchmap'): | |
30 | if branches: |
|
30 | if branches: | |
31 | raise util.Abort(_("remote branch lookup not supported")) |
|
31 | raise util.Abort(_("remote branch lookup not supported")) | |
32 | revs.append(hashbranch) |
|
32 | revs.append(hashbranch) | |
33 | return revs, revs[0] |
|
33 | return revs, revs[0] | |
34 | branchmap = peer.branchmap() |
|
34 | branchmap = peer.branchmap() | |
35 |
|
35 | |||
36 | def primary(branch): |
|
36 | def primary(branch): | |
37 | if branch == '.': |
|
37 | if branch == '.': | |
38 | if not lrepo: |
|
38 | if not lrepo: | |
39 | raise util.Abort(_("dirstate branch not accessible")) |
|
39 | raise util.Abort(_("dirstate branch not accessible")) | |
40 | branch = lrepo.dirstate.branch() |
|
40 | branch = lrepo.dirstate.branch() | |
41 | if branch in branchmap: |
|
41 | if branch in branchmap: | |
42 | revs.extend(node.hex(r) for r in reversed(branchmap[branch])) |
|
42 | revs.extend(node.hex(r) for r in reversed(branchmap[branch])) | |
43 | return True |
|
43 | return True | |
44 | else: |
|
44 | else: | |
45 | return False |
|
45 | return False | |
46 |
|
46 | |||
47 | for branch in branches: |
|
47 | for branch in branches: | |
48 | if not primary(branch): |
|
48 | if not primary(branch): | |
49 | raise error.RepoLookupError(_("unknown branch '%s'") % branch) |
|
49 | raise error.RepoLookupError(_("unknown branch '%s'") % branch) | |
50 | if hashbranch: |
|
50 | if hashbranch: | |
51 | if not primary(hashbranch): |
|
51 | if not primary(hashbranch): | |
52 | revs.append(hashbranch) |
|
52 | revs.append(hashbranch) | |
53 | return revs, revs[0] |
|
53 | return revs, revs[0] | |
54 |
|
54 | |||
55 | def parseurl(path, branches=None): |
|
55 | def parseurl(path, branches=None): | |
56 | '''parse url#branch, returning (url, (branch, branches))''' |
|
56 | '''parse url#branch, returning (url, (branch, branches))''' | |
57 |
|
57 | |||
58 | u = util.url(path) |
|
58 | u = util.url(path) | |
59 | branch = None |
|
59 | branch = None | |
60 | if u.fragment: |
|
60 | if u.fragment: | |
61 | branch = u.fragment |
|
61 | branch = u.fragment | |
62 | u.fragment = None |
|
62 | u.fragment = None | |
63 | return str(u), (branch, branches or []) |
|
63 | return str(u), (branch, branches or []) | |
64 |
|
64 | |||
65 | schemes = { |
|
65 | schemes = { | |
66 | 'bundle': bundlerepo, |
|
66 | 'bundle': bundlerepo, | |
67 | 'union': unionrepo, |
|
67 | 'union': unionrepo, | |
68 | 'file': _local, |
|
68 | 'file': _local, | |
69 | 'http': httppeer, |
|
69 | 'http': httppeer, | |
70 | 'https': httppeer, |
|
70 | 'https': httppeer, | |
71 | 'ssh': sshpeer, |
|
71 | 'ssh': sshpeer, | |
72 | 'static-http': statichttprepo, |
|
72 | 'static-http': statichttprepo, | |
73 | } |
|
73 | } | |
74 |
|
74 | |||
75 | def _peerlookup(path): |
|
75 | def _peerlookup(path): | |
76 | u = util.url(path) |
|
76 | u = util.url(path) | |
77 | scheme = u.scheme or 'file' |
|
77 | scheme = u.scheme or 'file' | |
78 | thing = schemes.get(scheme) or schemes['file'] |
|
78 | thing = schemes.get(scheme) or schemes['file'] | |
79 | try: |
|
79 | try: | |
80 | return thing(path) |
|
80 | return thing(path) | |
81 | except TypeError: |
|
81 | except TypeError: | |
82 | return thing |
|
82 | return thing | |
83 |
|
83 | |||
84 | def islocal(repo): |
|
84 | def islocal(repo): | |
85 | '''return true if repo (or path pointing to repo) is local''' |
|
85 | '''return true if repo (or path pointing to repo) is local''' | |
86 | if isinstance(repo, str): |
|
86 | if isinstance(repo, str): | |
87 | try: |
|
87 | try: | |
88 | return _peerlookup(repo).islocal(repo) |
|
88 | return _peerlookup(repo).islocal(repo) | |
89 | except AttributeError: |
|
89 | except AttributeError: | |
90 | return False |
|
90 | return False | |
91 | return repo.local() |
|
91 | return repo.local() | |
92 |
|
92 | |||
93 | def openpath(ui, path): |
|
93 | def openpath(ui, path): | |
94 | '''open path with open if local, url.open if remote''' |
|
94 | '''open path with open if local, url.open if remote''' | |
95 | pathurl = util.url(path, parsequery=False, parsefragment=False) |
|
95 | pathurl = util.url(path, parsequery=False, parsefragment=False) | |
96 | if pathurl.islocal(): |
|
96 | if pathurl.islocal(): | |
97 | return util.posixfile(pathurl.localpath(), 'rb') |
|
97 | return util.posixfile(pathurl.localpath(), 'rb') | |
98 | else: |
|
98 | else: | |
99 | return url.open(ui, path) |
|
99 | return url.open(ui, path) | |
100 |
|
100 | |||
101 | def _peerorrepo(ui, path, create=False): |
|
101 | def _peerorrepo(ui, path, create=False): | |
102 | """return a repository object for the specified path""" |
|
102 | """return a repository object for the specified path""" | |
103 | obj = _peerlookup(path).instance(ui, path, create) |
|
103 | obj = _peerlookup(path).instance(ui, path, create) | |
104 | ui = getattr(obj, "ui", ui) |
|
104 | ui = getattr(obj, "ui", ui) | |
105 | for name, module in extensions.extensions(ui): |
|
105 | for name, module in extensions.extensions(ui): | |
106 | hook = getattr(module, 'reposetup', None) |
|
106 | hook = getattr(module, 'reposetup', None) | |
107 | if hook: |
|
107 | if hook: | |
108 | hook(ui, obj) |
|
108 | hook(ui, obj) | |
109 | return obj |
|
109 | return obj | |
110 |
|
110 | |||
111 | def repository(ui, path='', create=False): |
|
111 | def repository(ui, path='', create=False): | |
112 | """return a repository object for the specified path""" |
|
112 | """return a repository object for the specified path""" | |
113 | peer = _peerorrepo(ui, path, create) |
|
113 | peer = _peerorrepo(ui, path, create) | |
114 | repo = peer.local() |
|
114 | repo = peer.local() | |
115 | if not repo: |
|
115 | if not repo: | |
116 | raise util.Abort(_("repository '%s' is not local") % |
|
116 | raise util.Abort(_("repository '%s' is not local") % | |
117 | (path or peer.url())) |
|
117 | (path or peer.url())) | |
118 | return repo.filtered('visible') |
|
118 | return repo.filtered('visible') | |
119 |
|
119 | |||
120 | def peer(uiorrepo, opts, path, create=False): |
|
120 | def peer(uiorrepo, opts, path, create=False): | |
121 | '''return a repository peer for the specified path''' |
|
121 | '''return a repository peer for the specified path''' | |
122 | rui = remoteui(uiorrepo, opts) |
|
122 | rui = remoteui(uiorrepo, opts) | |
123 | return _peerorrepo(rui, path, create).peer() |
|
123 | return _peerorrepo(rui, path, create).peer() | |
124 |
|
124 | |||
125 | def defaultdest(source): |
|
125 | def defaultdest(source): | |
126 | '''return default destination of clone if none is given |
|
126 | '''return default destination of clone if none is given | |
127 |
|
127 | |||
128 | >>> defaultdest('foo') |
|
128 | >>> defaultdest('foo') | |
129 | 'foo' |
|
129 | 'foo' | |
130 | >>> defaultdest('/foo/bar') |
|
130 | >>> defaultdest('/foo/bar') | |
131 | 'bar' |
|
131 | 'bar' | |
132 | >>> defaultdest('/') |
|
132 | >>> defaultdest('/') | |
133 | '' |
|
133 | '' | |
134 | >>> defaultdest('') |
|
134 | >>> defaultdest('') | |
135 | '' |
|
135 | '' | |
136 | >>> defaultdest('http://example.org/') |
|
136 | >>> defaultdest('http://example.org/') | |
137 | '' |
|
137 | '' | |
138 | >>> defaultdest('http://example.org/foo/') |
|
138 | >>> defaultdest('http://example.org/foo/') | |
139 | 'foo' |
|
139 | 'foo' | |
140 | ''' |
|
140 | ''' | |
141 | path = util.url(source).path |
|
141 | path = util.url(source).path | |
142 | if not path: |
|
142 | if not path: | |
143 | return '' |
|
143 | return '' | |
144 | return os.path.basename(os.path.normpath(path)) |
|
144 | return os.path.basename(os.path.normpath(path)) | |
145 |
|
145 | |||
146 | def share(ui, source, dest=None, update=True): |
|
146 | def share(ui, source, dest=None, update=True): | |
147 | '''create a shared repository''' |
|
147 | '''create a shared repository''' | |
148 |
|
148 | |||
149 | if not islocal(source): |
|
149 | if not islocal(source): | |
150 | raise util.Abort(_('can only share local repositories')) |
|
150 | raise util.Abort(_('can only share local repositories')) | |
151 |
|
151 | |||
152 | if not dest: |
|
152 | if not dest: | |
153 | dest = defaultdest(source) |
|
153 | dest = defaultdest(source) | |
154 | else: |
|
154 | else: | |
155 | dest = ui.expandpath(dest) |
|
155 | dest = ui.expandpath(dest) | |
156 |
|
156 | |||
157 | if isinstance(source, str): |
|
157 | if isinstance(source, str): | |
158 | origsource = ui.expandpath(source) |
|
158 | origsource = ui.expandpath(source) | |
159 | source, branches = parseurl(origsource) |
|
159 | source, branches = parseurl(origsource) | |
160 | srcrepo = repository(ui, source) |
|
160 | srcrepo = repository(ui, source) | |
161 | rev, checkout = addbranchrevs(srcrepo, srcrepo, branches, None) |
|
161 | rev, checkout = addbranchrevs(srcrepo, srcrepo, branches, None) | |
162 | else: |
|
162 | else: | |
163 | srcrepo = source.local() |
|
163 | srcrepo = source.local() | |
164 | origsource = source = srcrepo.url() |
|
164 | origsource = source = srcrepo.url() | |
165 | checkout = None |
|
165 | checkout = None | |
166 |
|
166 | |||
167 | sharedpath = srcrepo.sharedpath # if our source is already sharing |
|
167 | sharedpath = srcrepo.sharedpath # if our source is already sharing | |
168 |
|
168 | |||
169 | root = os.path.realpath(dest) |
|
169 | root = os.path.realpath(dest) | |
170 | roothg = os.path.join(root, '.hg') |
|
170 | roothg = os.path.join(root, '.hg') | |
171 |
|
171 | |||
172 | if os.path.exists(roothg): |
|
172 | if os.path.exists(roothg): | |
173 | raise util.Abort(_('destination already exists')) |
|
173 | raise util.Abort(_('destination already exists')) | |
174 |
|
174 | |||
175 | if not os.path.isdir(root): |
|
175 | if not os.path.isdir(root): | |
176 | os.mkdir(root) |
|
176 | os.mkdir(root) | |
177 | util.makedir(roothg, notindexed=True) |
|
177 | util.makedir(roothg, notindexed=True) | |
178 |
|
178 | |||
179 | requirements = '' |
|
179 | requirements = '' | |
180 | try: |
|
180 | try: | |
181 | requirements = srcrepo.opener.read('requires') |
|
181 | requirements = srcrepo.opener.read('requires') | |
182 | except IOError, inst: |
|
182 | except IOError, inst: | |
183 | if inst.errno != errno.ENOENT: |
|
183 | if inst.errno != errno.ENOENT: | |
184 | raise |
|
184 | raise | |
185 |
|
185 | |||
186 | requirements += 'shared\n' |
|
186 | requirements += 'shared\n' | |
187 | util.writefile(os.path.join(roothg, 'requires'), requirements) |
|
187 | util.writefile(os.path.join(roothg, 'requires'), requirements) | |
188 | util.writefile(os.path.join(roothg, 'sharedpath'), sharedpath) |
|
188 | util.writefile(os.path.join(roothg, 'sharedpath'), sharedpath) | |
189 |
|
189 | |||
190 | r = repository(ui, root) |
|
190 | r = repository(ui, root) | |
191 |
|
191 | |||
192 | default = srcrepo.ui.config('paths', 'default') |
|
192 | default = srcrepo.ui.config('paths', 'default') | |
193 | if default: |
|
193 | if default: | |
194 | fp = r.opener("hgrc", "w", text=True) |
|
194 | fp = r.opener("hgrc", "w", text=True) | |
195 | fp.write("[paths]\n") |
|
195 | fp.write("[paths]\n") | |
196 | fp.write("default = %s\n" % default) |
|
196 | fp.write("default = %s\n" % default) | |
197 | fp.close() |
|
197 | fp.close() | |
198 |
|
198 | |||
199 | if update: |
|
199 | if update: | |
200 | r.ui.status(_("updating working directory\n")) |
|
200 | r.ui.status(_("updating working directory\n")) | |
201 | if update is not True: |
|
201 | if update is not True: | |
202 | checkout = update |
|
202 | checkout = update | |
203 | for test in (checkout, 'default', 'tip'): |
|
203 | for test in (checkout, 'default', 'tip'): | |
204 | if test is None: |
|
204 | if test is None: | |
205 | continue |
|
205 | continue | |
206 | try: |
|
206 | try: | |
207 | uprev = r.lookup(test) |
|
207 | uprev = r.lookup(test) | |
208 | break |
|
208 | break | |
209 | except error.RepoLookupError: |
|
209 | except error.RepoLookupError: | |
210 | continue |
|
210 | continue | |
211 | _update(r, uprev) |
|
211 | _update(r, uprev) | |
212 |
|
212 | |||
213 | def copystore(ui, srcrepo, destpath): |
|
213 | def copystore(ui, srcrepo, destpath): | |
214 | '''copy files from store of srcrepo in destpath |
|
214 | '''copy files from store of srcrepo in destpath | |
215 |
|
215 | |||
216 | returns destlock |
|
216 | returns destlock | |
217 | ''' |
|
217 | ''' | |
218 | destlock = None |
|
218 | destlock = None | |
219 | try: |
|
219 | try: | |
220 | hardlink = None |
|
220 | hardlink = None | |
221 | num = 0 |
|
221 | num = 0 | |
222 | srcpublishing = srcrepo.ui.configbool('phases', 'publish', True) |
|
222 | srcpublishing = srcrepo.ui.configbool('phases', 'publish', True) | |
223 | srcvfs = scmutil.vfs(srcrepo.sharedpath) |
|
223 | srcvfs = scmutil.vfs(srcrepo.sharedpath) | |
224 | dstvfs = scmutil.vfs(destpath) |
|
224 | dstvfs = scmutil.vfs(destpath) | |
225 | for f in srcrepo.store.copylist(): |
|
225 | for f in srcrepo.store.copylist(): | |
226 | if srcpublishing and f.endswith('phaseroots'): |
|
226 | if srcpublishing and f.endswith('phaseroots'): | |
227 | continue |
|
227 | continue | |
228 | dstbase = os.path.dirname(f) |
|
228 | dstbase = os.path.dirname(f) | |
229 | if dstbase and not dstvfs.exists(dstbase): |
|
229 | if dstbase and not dstvfs.exists(dstbase): | |
230 | dstvfs.mkdir(dstbase) |
|
230 | dstvfs.mkdir(dstbase) | |
231 | if srcvfs.exists(f): |
|
231 | if srcvfs.exists(f): | |
232 | if f.endswith('data'): |
|
232 | if f.endswith('data'): | |
|
233 | # 'dstbase' may be empty (e.g. revlog format 0) | |||
|
234 | lockfile = os.path.join(dstbase, "lock") | |||
233 | # lock to avoid premature writing to the target |
|
235 | # lock to avoid premature writing to the target | |
234 |
destlock = lock.lock(dstvfs, |
|
236 | destlock = lock.lock(dstvfs, lockfile) | |
235 | hardlink, n = util.copyfiles(srcvfs.join(f), dstvfs.join(f), |
|
237 | hardlink, n = util.copyfiles(srcvfs.join(f), dstvfs.join(f), | |
236 | hardlink) |
|
238 | hardlink) | |
237 | num += n |
|
239 | num += n | |
238 | if hardlink: |
|
240 | if hardlink: | |
239 | ui.debug("linked %d files\n" % num) |
|
241 | ui.debug("linked %d files\n" % num) | |
240 | else: |
|
242 | else: | |
241 | ui.debug("copied %d files\n" % num) |
|
243 | ui.debug("copied %d files\n" % num) | |
242 | return destlock |
|
244 | return destlock | |
243 | except: # re-raises |
|
245 | except: # re-raises | |
244 | release(destlock) |
|
246 | release(destlock) | |
245 | raise |
|
247 | raise | |
246 |
|
248 | |||
247 | def clone(ui, peeropts, source, dest=None, pull=False, rev=None, |
|
249 | def clone(ui, peeropts, source, dest=None, pull=False, rev=None, | |
248 | update=True, stream=False, branch=None): |
|
250 | update=True, stream=False, branch=None): | |
249 | """Make a copy of an existing repository. |
|
251 | """Make a copy of an existing repository. | |
250 |
|
252 | |||
251 | Create a copy of an existing repository in a new directory. The |
|
253 | Create a copy of an existing repository in a new directory. The | |
252 | source and destination are URLs, as passed to the repository |
|
254 | source and destination are URLs, as passed to the repository | |
253 | function. Returns a pair of repository peers, the source and |
|
255 | function. Returns a pair of repository peers, the source and | |
254 | newly created destination. |
|
256 | newly created destination. | |
255 |
|
257 | |||
256 | The location of the source is added to the new repository's |
|
258 | The location of the source is added to the new repository's | |
257 | .hg/hgrc file, as the default to be used for future pulls and |
|
259 | .hg/hgrc file, as the default to be used for future pulls and | |
258 | pushes. |
|
260 | pushes. | |
259 |
|
261 | |||
260 | If an exception is raised, the partly cloned/updated destination |
|
262 | If an exception is raised, the partly cloned/updated destination | |
261 | repository will be deleted. |
|
263 | repository will be deleted. | |
262 |
|
264 | |||
263 | Arguments: |
|
265 | Arguments: | |
264 |
|
266 | |||
265 | source: repository object or URL |
|
267 | source: repository object or URL | |
266 |
|
268 | |||
267 | dest: URL of destination repository to create (defaults to base |
|
269 | dest: URL of destination repository to create (defaults to base | |
268 | name of source repository) |
|
270 | name of source repository) | |
269 |
|
271 | |||
270 | pull: always pull from source repository, even in local case |
|
272 | pull: always pull from source repository, even in local case | |
271 |
|
273 | |||
272 | stream: stream raw data uncompressed from repository (fast over |
|
274 | stream: stream raw data uncompressed from repository (fast over | |
273 | LAN, slow over WAN) |
|
275 | LAN, slow over WAN) | |
274 |
|
276 | |||
275 | rev: revision to clone up to (implies pull=True) |
|
277 | rev: revision to clone up to (implies pull=True) | |
276 |
|
278 | |||
277 | update: update working directory after clone completes, if |
|
279 | update: update working directory after clone completes, if | |
278 | destination is local repository (True means update to default rev, |
|
280 | destination is local repository (True means update to default rev, | |
279 | anything else is treated as a revision) |
|
281 | anything else is treated as a revision) | |
280 |
|
282 | |||
281 | branch: branches to clone |
|
283 | branch: branches to clone | |
282 | """ |
|
284 | """ | |
283 |
|
285 | |||
284 | if isinstance(source, str): |
|
286 | if isinstance(source, str): | |
285 | origsource = ui.expandpath(source) |
|
287 | origsource = ui.expandpath(source) | |
286 | source, branch = parseurl(origsource, branch) |
|
288 | source, branch = parseurl(origsource, branch) | |
287 | srcpeer = peer(ui, peeropts, source) |
|
289 | srcpeer = peer(ui, peeropts, source) | |
288 | else: |
|
290 | else: | |
289 | srcpeer = source.peer() # in case we were called with a localrepo |
|
291 | srcpeer = source.peer() # in case we were called with a localrepo | |
290 | branch = (None, branch or []) |
|
292 | branch = (None, branch or []) | |
291 | origsource = source = srcpeer.url() |
|
293 | origsource = source = srcpeer.url() | |
292 | rev, checkout = addbranchrevs(srcpeer, srcpeer, branch, rev) |
|
294 | rev, checkout = addbranchrevs(srcpeer, srcpeer, branch, rev) | |
293 |
|
295 | |||
294 | if dest is None: |
|
296 | if dest is None: | |
295 | dest = defaultdest(source) |
|
297 | dest = defaultdest(source) | |
296 | if dest: |
|
298 | if dest: | |
297 | ui.status(_("destination directory: %s\n") % dest) |
|
299 | ui.status(_("destination directory: %s\n") % dest) | |
298 | else: |
|
300 | else: | |
299 | dest = ui.expandpath(dest) |
|
301 | dest = ui.expandpath(dest) | |
300 |
|
302 | |||
301 | dest = util.urllocalpath(dest) |
|
303 | dest = util.urllocalpath(dest) | |
302 | source = util.urllocalpath(source) |
|
304 | source = util.urllocalpath(source) | |
303 |
|
305 | |||
304 | if not dest: |
|
306 | if not dest: | |
305 | raise util.Abort(_("empty destination path is not valid")) |
|
307 | raise util.Abort(_("empty destination path is not valid")) | |
306 | if os.path.exists(dest): |
|
308 | if os.path.exists(dest): | |
307 | if not os.path.isdir(dest): |
|
309 | if not os.path.isdir(dest): | |
308 | raise util.Abort(_("destination '%s' already exists") % dest) |
|
310 | raise util.Abort(_("destination '%s' already exists") % dest) | |
309 | elif os.listdir(dest): |
|
311 | elif os.listdir(dest): | |
310 | raise util.Abort(_("destination '%s' is not empty") % dest) |
|
312 | raise util.Abort(_("destination '%s' is not empty") % dest) | |
311 |
|
313 | |||
312 | srclock = destlock = cleandir = None |
|
314 | srclock = destlock = cleandir = None | |
313 | srcrepo = srcpeer.local() |
|
315 | srcrepo = srcpeer.local() | |
314 | try: |
|
316 | try: | |
315 | abspath = origsource |
|
317 | abspath = origsource | |
316 | if islocal(origsource): |
|
318 | if islocal(origsource): | |
317 | abspath = os.path.abspath(util.urllocalpath(origsource)) |
|
319 | abspath = os.path.abspath(util.urllocalpath(origsource)) | |
318 |
|
320 | |||
319 | if islocal(dest): |
|
321 | if islocal(dest): | |
320 | cleandir = dest |
|
322 | cleandir = dest | |
321 |
|
323 | |||
322 | copy = False |
|
324 | copy = False | |
323 | if (srcrepo and srcrepo.cancopy() and islocal(dest) |
|
325 | if (srcrepo and srcrepo.cancopy() and islocal(dest) | |
324 | and not phases.hassecret(srcrepo)): |
|
326 | and not phases.hassecret(srcrepo)): | |
325 | copy = not pull and not rev |
|
327 | copy = not pull and not rev | |
326 |
|
328 | |||
327 | if copy: |
|
329 | if copy: | |
328 | try: |
|
330 | try: | |
329 | # we use a lock here because if we race with commit, we |
|
331 | # we use a lock here because if we race with commit, we | |
330 | # can end up with extra data in the cloned revlogs that's |
|
332 | # can end up with extra data in the cloned revlogs that's | |
331 | # not pointed to by changesets, thus causing verify to |
|
333 | # not pointed to by changesets, thus causing verify to | |
332 | # fail |
|
334 | # fail | |
333 | srclock = srcrepo.lock(wait=False) |
|
335 | srclock = srcrepo.lock(wait=False) | |
334 | except error.LockError: |
|
336 | except error.LockError: | |
335 | copy = False |
|
337 | copy = False | |
336 |
|
338 | |||
337 | if copy: |
|
339 | if copy: | |
338 | srcrepo.hook('preoutgoing', throw=True, source='clone') |
|
340 | srcrepo.hook('preoutgoing', throw=True, source='clone') | |
339 | hgdir = os.path.realpath(os.path.join(dest, ".hg")) |
|
341 | hgdir = os.path.realpath(os.path.join(dest, ".hg")) | |
340 | if not os.path.exists(dest): |
|
342 | if not os.path.exists(dest): | |
341 | os.mkdir(dest) |
|
343 | os.mkdir(dest) | |
342 | else: |
|
344 | else: | |
343 | # only clean up directories we create ourselves |
|
345 | # only clean up directories we create ourselves | |
344 | cleandir = hgdir |
|
346 | cleandir = hgdir | |
345 | try: |
|
347 | try: | |
346 | destpath = hgdir |
|
348 | destpath = hgdir | |
347 | util.makedir(destpath, notindexed=True) |
|
349 | util.makedir(destpath, notindexed=True) | |
348 | except OSError, inst: |
|
350 | except OSError, inst: | |
349 | if inst.errno == errno.EEXIST: |
|
351 | if inst.errno == errno.EEXIST: | |
350 | cleandir = None |
|
352 | cleandir = None | |
351 | raise util.Abort(_("destination '%s' already exists") |
|
353 | raise util.Abort(_("destination '%s' already exists") | |
352 | % dest) |
|
354 | % dest) | |
353 | raise |
|
355 | raise | |
354 |
|
356 | |||
355 | destlock = copystore(ui, srcrepo, destpath) |
|
357 | destlock = copystore(ui, srcrepo, destpath) | |
356 |
|
358 | |||
357 | # Recomputing branch cache might be slow on big repos, |
|
359 | # Recomputing branch cache might be slow on big repos, | |
358 | # so just copy it |
|
360 | # so just copy it | |
359 | dstcachedir = os.path.join(destpath, 'cache') |
|
361 | dstcachedir = os.path.join(destpath, 'cache') | |
360 | srcbranchcache = srcrepo.sjoin('cache/branch2') |
|
362 | srcbranchcache = srcrepo.sjoin('cache/branch2') | |
361 | dstbranchcache = os.path.join(dstcachedir, 'branch2') |
|
363 | dstbranchcache = os.path.join(dstcachedir, 'branch2') | |
362 | if os.path.exists(srcbranchcache): |
|
364 | if os.path.exists(srcbranchcache): | |
363 | if not os.path.exists(dstcachedir): |
|
365 | if not os.path.exists(dstcachedir): | |
364 | os.mkdir(dstcachedir) |
|
366 | os.mkdir(dstcachedir) | |
365 | util.copyfile(srcbranchcache, dstbranchcache) |
|
367 | util.copyfile(srcbranchcache, dstbranchcache) | |
366 |
|
368 | |||
367 | # we need to re-init the repo after manually copying the data |
|
369 | # we need to re-init the repo after manually copying the data | |
368 | # into it |
|
370 | # into it | |
369 | destpeer = peer(srcrepo, peeropts, dest) |
|
371 | destpeer = peer(srcrepo, peeropts, dest) | |
370 | srcrepo.hook('outgoing', source='clone', |
|
372 | srcrepo.hook('outgoing', source='clone', | |
371 | node=node.hex(node.nullid)) |
|
373 | node=node.hex(node.nullid)) | |
372 | else: |
|
374 | else: | |
373 | try: |
|
375 | try: | |
374 | destpeer = peer(srcrepo or ui, peeropts, dest, create=True) |
|
376 | destpeer = peer(srcrepo or ui, peeropts, dest, create=True) | |
375 | # only pass ui when no srcrepo |
|
377 | # only pass ui when no srcrepo | |
376 | except OSError, inst: |
|
378 | except OSError, inst: | |
377 | if inst.errno == errno.EEXIST: |
|
379 | if inst.errno == errno.EEXIST: | |
378 | cleandir = None |
|
380 | cleandir = None | |
379 | raise util.Abort(_("destination '%s' already exists") |
|
381 | raise util.Abort(_("destination '%s' already exists") | |
380 | % dest) |
|
382 | % dest) | |
381 | raise |
|
383 | raise | |
382 |
|
384 | |||
383 | revs = None |
|
385 | revs = None | |
384 | if rev: |
|
386 | if rev: | |
385 | if not srcpeer.capable('lookup'): |
|
387 | if not srcpeer.capable('lookup'): | |
386 | raise util.Abort(_("src repository does not support " |
|
388 | raise util.Abort(_("src repository does not support " | |
387 | "revision lookup and so doesn't " |
|
389 | "revision lookup and so doesn't " | |
388 | "support clone by revision")) |
|
390 | "support clone by revision")) | |
389 | revs = [srcpeer.lookup(r) for r in rev] |
|
391 | revs = [srcpeer.lookup(r) for r in rev] | |
390 | checkout = revs[0] |
|
392 | checkout = revs[0] | |
391 | if destpeer.local(): |
|
393 | if destpeer.local(): | |
392 | destpeer.local().clone(srcpeer, heads=revs, stream=stream) |
|
394 | destpeer.local().clone(srcpeer, heads=revs, stream=stream) | |
393 | elif srcrepo: |
|
395 | elif srcrepo: | |
394 | srcrepo.push(destpeer, revs=revs) |
|
396 | srcrepo.push(destpeer, revs=revs) | |
395 | else: |
|
397 | else: | |
396 | raise util.Abort(_("clone from remote to remote not supported")) |
|
398 | raise util.Abort(_("clone from remote to remote not supported")) | |
397 |
|
399 | |||
398 | cleandir = None |
|
400 | cleandir = None | |
399 |
|
401 | |||
400 | # clone all bookmarks except divergent ones |
|
402 | # clone all bookmarks except divergent ones | |
401 | destrepo = destpeer.local() |
|
403 | destrepo = destpeer.local() | |
402 | if destrepo and srcpeer.capable("pushkey"): |
|
404 | if destrepo and srcpeer.capable("pushkey"): | |
403 | rb = srcpeer.listkeys('bookmarks') |
|
405 | rb = srcpeer.listkeys('bookmarks') | |
404 | marks = destrepo._bookmarks |
|
406 | marks = destrepo._bookmarks | |
405 | for k, n in rb.iteritems(): |
|
407 | for k, n in rb.iteritems(): | |
406 | try: |
|
408 | try: | |
407 | m = destrepo.lookup(n) |
|
409 | m = destrepo.lookup(n) | |
408 | marks[k] = m |
|
410 | marks[k] = m | |
409 | except error.RepoLookupError: |
|
411 | except error.RepoLookupError: | |
410 | pass |
|
412 | pass | |
411 | if rb: |
|
413 | if rb: | |
412 | marks.write() |
|
414 | marks.write() | |
413 | elif srcrepo and destpeer.capable("pushkey"): |
|
415 | elif srcrepo and destpeer.capable("pushkey"): | |
414 | for k, n in srcrepo._bookmarks.iteritems(): |
|
416 | for k, n in srcrepo._bookmarks.iteritems(): | |
415 | destpeer.pushkey('bookmarks', k, '', hex(n)) |
|
417 | destpeer.pushkey('bookmarks', k, '', hex(n)) | |
416 |
|
418 | |||
417 | if destrepo: |
|
419 | if destrepo: | |
418 | fp = destrepo.opener("hgrc", "w", text=True) |
|
420 | fp = destrepo.opener("hgrc", "w", text=True) | |
419 | fp.write("[paths]\n") |
|
421 | fp.write("[paths]\n") | |
420 | u = util.url(abspath) |
|
422 | u = util.url(abspath) | |
421 | u.passwd = None |
|
423 | u.passwd = None | |
422 | defaulturl = str(u) |
|
424 | defaulturl = str(u) | |
423 | fp.write("default = %s\n" % defaulturl) |
|
425 | fp.write("default = %s\n" % defaulturl) | |
424 | fp.close() |
|
426 | fp.close() | |
425 |
|
427 | |||
426 | destrepo.ui.setconfig('paths', 'default', defaulturl, 'clone') |
|
428 | destrepo.ui.setconfig('paths', 'default', defaulturl, 'clone') | |
427 |
|
429 | |||
428 | if update: |
|
430 | if update: | |
429 | if update is not True: |
|
431 | if update is not True: | |
430 | checkout = srcpeer.lookup(update) |
|
432 | checkout = srcpeer.lookup(update) | |
431 | uprev = None |
|
433 | uprev = None | |
432 | status = None |
|
434 | status = None | |
433 | if checkout is not None: |
|
435 | if checkout is not None: | |
434 | try: |
|
436 | try: | |
435 | uprev = destrepo.lookup(checkout) |
|
437 | uprev = destrepo.lookup(checkout) | |
436 | except error.RepoLookupError: |
|
438 | except error.RepoLookupError: | |
437 | pass |
|
439 | pass | |
438 | if uprev is None: |
|
440 | if uprev is None: | |
439 | try: |
|
441 | try: | |
440 | uprev = destrepo._bookmarks['@'] |
|
442 | uprev = destrepo._bookmarks['@'] | |
441 | update = '@' |
|
443 | update = '@' | |
442 | bn = destrepo[uprev].branch() |
|
444 | bn = destrepo[uprev].branch() | |
443 | if bn == 'default': |
|
445 | if bn == 'default': | |
444 | status = _("updating to bookmark @\n") |
|
446 | status = _("updating to bookmark @\n") | |
445 | else: |
|
447 | else: | |
446 | status = _("updating to bookmark @ on branch %s\n" |
|
448 | status = _("updating to bookmark @ on branch %s\n" | |
447 | % bn) |
|
449 | % bn) | |
448 | except KeyError: |
|
450 | except KeyError: | |
449 | try: |
|
451 | try: | |
450 | uprev = destrepo.branchtip('default') |
|
452 | uprev = destrepo.branchtip('default') | |
451 | except error.RepoLookupError: |
|
453 | except error.RepoLookupError: | |
452 | uprev = destrepo.lookup('tip') |
|
454 | uprev = destrepo.lookup('tip') | |
453 | if not status: |
|
455 | if not status: | |
454 | bn = destrepo[uprev].branch() |
|
456 | bn = destrepo[uprev].branch() | |
455 | status = _("updating to branch %s\n") % bn |
|
457 | status = _("updating to branch %s\n") % bn | |
456 | destrepo.ui.status(status) |
|
458 | destrepo.ui.status(status) | |
457 | _update(destrepo, uprev) |
|
459 | _update(destrepo, uprev) | |
458 | if update in destrepo._bookmarks: |
|
460 | if update in destrepo._bookmarks: | |
459 | bookmarks.setcurrent(destrepo, update) |
|
461 | bookmarks.setcurrent(destrepo, update) | |
460 | finally: |
|
462 | finally: | |
461 | release(srclock, destlock) |
|
463 | release(srclock, destlock) | |
462 | if cleandir is not None: |
|
464 | if cleandir is not None: | |
463 | shutil.rmtree(cleandir, True) |
|
465 | shutil.rmtree(cleandir, True) | |
464 | if srcpeer is not None: |
|
466 | if srcpeer is not None: | |
465 | srcpeer.close() |
|
467 | srcpeer.close() | |
466 | return srcpeer, destpeer |
|
468 | return srcpeer, destpeer | |
467 |
|
469 | |||
468 | def _showstats(repo, stats): |
|
470 | def _showstats(repo, stats): | |
469 | repo.ui.status(_("%d files updated, %d files merged, " |
|
471 | repo.ui.status(_("%d files updated, %d files merged, " | |
470 | "%d files removed, %d files unresolved\n") % stats) |
|
472 | "%d files removed, %d files unresolved\n") % stats) | |
471 |
|
473 | |||
472 | def updaterepo(repo, node, overwrite): |
|
474 | def updaterepo(repo, node, overwrite): | |
473 | """Update the working directory to node. |
|
475 | """Update the working directory to node. | |
474 |
|
476 | |||
475 | When overwrite is set, changes are clobbered, merged else |
|
477 | When overwrite is set, changes are clobbered, merged else | |
476 |
|
478 | |||
477 | returns stats (see pydoc mercurial.merge.applyupdates)""" |
|
479 | returns stats (see pydoc mercurial.merge.applyupdates)""" | |
478 | return mergemod.update(repo, node, False, overwrite, None) |
|
480 | return mergemod.update(repo, node, False, overwrite, None) | |
479 |
|
481 | |||
480 | def update(repo, node): |
|
482 | def update(repo, node): | |
481 | """update the working directory to node, merging linear changes""" |
|
483 | """update the working directory to node, merging linear changes""" | |
482 | stats = updaterepo(repo, node, False) |
|
484 | stats = updaterepo(repo, node, False) | |
483 | _showstats(repo, stats) |
|
485 | _showstats(repo, stats) | |
484 | if stats[3]: |
|
486 | if stats[3]: | |
485 | repo.ui.status(_("use 'hg resolve' to retry unresolved file merges\n")) |
|
487 | repo.ui.status(_("use 'hg resolve' to retry unresolved file merges\n")) | |
486 | return stats[3] > 0 |
|
488 | return stats[3] > 0 | |
487 |
|
489 | |||
488 | # naming conflict in clone() |
|
490 | # naming conflict in clone() | |
489 | _update = update |
|
491 | _update = update | |
490 |
|
492 | |||
491 | def clean(repo, node, show_stats=True): |
|
493 | def clean(repo, node, show_stats=True): | |
492 | """forcibly switch the working directory to node, clobbering changes""" |
|
494 | """forcibly switch the working directory to node, clobbering changes""" | |
493 | stats = updaterepo(repo, node, True) |
|
495 | stats = updaterepo(repo, node, True) | |
494 | util.unlinkpath(repo.join('graftstate'), ignoremissing=True) |
|
496 | util.unlinkpath(repo.join('graftstate'), ignoremissing=True) | |
495 | if show_stats: |
|
497 | if show_stats: | |
496 | _showstats(repo, stats) |
|
498 | _showstats(repo, stats) | |
497 | return stats[3] > 0 |
|
499 | return stats[3] > 0 | |
498 |
|
500 | |||
499 | def merge(repo, node, force=None, remind=True): |
|
501 | def merge(repo, node, force=None, remind=True): | |
500 | """Branch merge with node, resolving changes. Return true if any |
|
502 | """Branch merge with node, resolving changes. Return true if any | |
501 | unresolved conflicts.""" |
|
503 | unresolved conflicts.""" | |
502 | stats = mergemod.update(repo, node, True, force, False) |
|
504 | stats = mergemod.update(repo, node, True, force, False) | |
503 | _showstats(repo, stats) |
|
505 | _showstats(repo, stats) | |
504 | if stats[3]: |
|
506 | if stats[3]: | |
505 | repo.ui.status(_("use 'hg resolve' to retry unresolved file merges " |
|
507 | repo.ui.status(_("use 'hg resolve' to retry unresolved file merges " | |
506 | "or 'hg update -C .' to abandon\n")) |
|
508 | "or 'hg update -C .' to abandon\n")) | |
507 | elif remind: |
|
509 | elif remind: | |
508 | repo.ui.status(_("(branch merge, don't forget to commit)\n")) |
|
510 | repo.ui.status(_("(branch merge, don't forget to commit)\n")) | |
509 | return stats[3] > 0 |
|
511 | return stats[3] > 0 | |
510 |
|
512 | |||
511 | def _incoming(displaychlist, subreporecurse, ui, repo, source, |
|
513 | def _incoming(displaychlist, subreporecurse, ui, repo, source, | |
512 | opts, buffered=False): |
|
514 | opts, buffered=False): | |
513 | """ |
|
515 | """ | |
514 | Helper for incoming / gincoming. |
|
516 | Helper for incoming / gincoming. | |
515 | displaychlist gets called with |
|
517 | displaychlist gets called with | |
516 | (remoterepo, incomingchangesetlist, displayer) parameters, |
|
518 | (remoterepo, incomingchangesetlist, displayer) parameters, | |
517 | and is supposed to contain only code that can't be unified. |
|
519 | and is supposed to contain only code that can't be unified. | |
518 | """ |
|
520 | """ | |
519 | source, branches = parseurl(ui.expandpath(source), opts.get('branch')) |
|
521 | source, branches = parseurl(ui.expandpath(source), opts.get('branch')) | |
520 | other = peer(repo, opts, source) |
|
522 | other = peer(repo, opts, source) | |
521 | ui.status(_('comparing with %s\n') % util.hidepassword(source)) |
|
523 | ui.status(_('comparing with %s\n') % util.hidepassword(source)) | |
522 | revs, checkout = addbranchrevs(repo, other, branches, opts.get('rev')) |
|
524 | revs, checkout = addbranchrevs(repo, other, branches, opts.get('rev')) | |
523 |
|
525 | |||
524 | if revs: |
|
526 | if revs: | |
525 | revs = [other.lookup(rev) for rev in revs] |
|
527 | revs = [other.lookup(rev) for rev in revs] | |
526 | other, chlist, cleanupfn = bundlerepo.getremotechanges(ui, repo, other, |
|
528 | other, chlist, cleanupfn = bundlerepo.getremotechanges(ui, repo, other, | |
527 | revs, opts["bundle"], opts["force"]) |
|
529 | revs, opts["bundle"], opts["force"]) | |
528 | try: |
|
530 | try: | |
529 | if not chlist: |
|
531 | if not chlist: | |
530 | ui.status(_("no changes found\n")) |
|
532 | ui.status(_("no changes found\n")) | |
531 | return subreporecurse() |
|
533 | return subreporecurse() | |
532 |
|
534 | |||
533 | displayer = cmdutil.show_changeset(ui, other, opts, buffered) |
|
535 | displayer = cmdutil.show_changeset(ui, other, opts, buffered) | |
534 | displaychlist(other, chlist, displayer) |
|
536 | displaychlist(other, chlist, displayer) | |
535 | displayer.close() |
|
537 | displayer.close() | |
536 | finally: |
|
538 | finally: | |
537 | cleanupfn() |
|
539 | cleanupfn() | |
538 | subreporecurse() |
|
540 | subreporecurse() | |
539 | return 0 # exit code is zero since we found incoming changes |
|
541 | return 0 # exit code is zero since we found incoming changes | |
540 |
|
542 | |||
541 | def incoming(ui, repo, source, opts): |
|
543 | def incoming(ui, repo, source, opts): | |
542 | def subreporecurse(): |
|
544 | def subreporecurse(): | |
543 | ret = 1 |
|
545 | ret = 1 | |
544 | if opts.get('subrepos'): |
|
546 | if opts.get('subrepos'): | |
545 | ctx = repo[None] |
|
547 | ctx = repo[None] | |
546 | for subpath in sorted(ctx.substate): |
|
548 | for subpath in sorted(ctx.substate): | |
547 | sub = ctx.sub(subpath) |
|
549 | sub = ctx.sub(subpath) | |
548 | ret = min(ret, sub.incoming(ui, source, opts)) |
|
550 | ret = min(ret, sub.incoming(ui, source, opts)) | |
549 | return ret |
|
551 | return ret | |
550 |
|
552 | |||
551 | def display(other, chlist, displayer): |
|
553 | def display(other, chlist, displayer): | |
552 | limit = cmdutil.loglimit(opts) |
|
554 | limit = cmdutil.loglimit(opts) | |
553 | if opts.get('newest_first'): |
|
555 | if opts.get('newest_first'): | |
554 | chlist.reverse() |
|
556 | chlist.reverse() | |
555 | count = 0 |
|
557 | count = 0 | |
556 | for n in chlist: |
|
558 | for n in chlist: | |
557 | if limit is not None and count >= limit: |
|
559 | if limit is not None and count >= limit: | |
558 | break |
|
560 | break | |
559 | parents = [p for p in other.changelog.parents(n) if p != nullid] |
|
561 | parents = [p for p in other.changelog.parents(n) if p != nullid] | |
560 | if opts.get('no_merges') and len(parents) == 2: |
|
562 | if opts.get('no_merges') and len(parents) == 2: | |
561 | continue |
|
563 | continue | |
562 | count += 1 |
|
564 | count += 1 | |
563 | displayer.show(other[n]) |
|
565 | displayer.show(other[n]) | |
564 | return _incoming(display, subreporecurse, ui, repo, source, opts) |
|
566 | return _incoming(display, subreporecurse, ui, repo, source, opts) | |
565 |
|
567 | |||
566 | def _outgoing(ui, repo, dest, opts): |
|
568 | def _outgoing(ui, repo, dest, opts): | |
567 | dest = ui.expandpath(dest or 'default-push', dest or 'default') |
|
569 | dest = ui.expandpath(dest or 'default-push', dest or 'default') | |
568 | dest, branches = parseurl(dest, opts.get('branch')) |
|
570 | dest, branches = parseurl(dest, opts.get('branch')) | |
569 | ui.status(_('comparing with %s\n') % util.hidepassword(dest)) |
|
571 | ui.status(_('comparing with %s\n') % util.hidepassword(dest)) | |
570 | revs, checkout = addbranchrevs(repo, repo, branches, opts.get('rev')) |
|
572 | revs, checkout = addbranchrevs(repo, repo, branches, opts.get('rev')) | |
571 | if revs: |
|
573 | if revs: | |
572 | revs = [repo.lookup(rev) for rev in scmutil.revrange(repo, revs)] |
|
574 | revs = [repo.lookup(rev) for rev in scmutil.revrange(repo, revs)] | |
573 |
|
575 | |||
574 | other = peer(repo, opts, dest) |
|
576 | other = peer(repo, opts, dest) | |
575 | outgoing = discovery.findcommonoutgoing(repo.unfiltered(), other, revs, |
|
577 | outgoing = discovery.findcommonoutgoing(repo.unfiltered(), other, revs, | |
576 | force=opts.get('force')) |
|
578 | force=opts.get('force')) | |
577 | o = outgoing.missing |
|
579 | o = outgoing.missing | |
578 | if not o: |
|
580 | if not o: | |
579 | scmutil.nochangesfound(repo.ui, repo, outgoing.excluded) |
|
581 | scmutil.nochangesfound(repo.ui, repo, outgoing.excluded) | |
580 | return None |
|
582 | return None | |
581 | return o |
|
583 | return o | |
582 |
|
584 | |||
583 | def outgoing(ui, repo, dest, opts): |
|
585 | def outgoing(ui, repo, dest, opts): | |
584 | def recurse(): |
|
586 | def recurse(): | |
585 | ret = 1 |
|
587 | ret = 1 | |
586 | if opts.get('subrepos'): |
|
588 | if opts.get('subrepos'): | |
587 | ctx = repo[None] |
|
589 | ctx = repo[None] | |
588 | for subpath in sorted(ctx.substate): |
|
590 | for subpath in sorted(ctx.substate): | |
589 | sub = ctx.sub(subpath) |
|
591 | sub = ctx.sub(subpath) | |
590 | ret = min(ret, sub.outgoing(ui, dest, opts)) |
|
592 | ret = min(ret, sub.outgoing(ui, dest, opts)) | |
591 | return ret |
|
593 | return ret | |
592 |
|
594 | |||
593 | limit = cmdutil.loglimit(opts) |
|
595 | limit = cmdutil.loglimit(opts) | |
594 | o = _outgoing(ui, repo, dest, opts) |
|
596 | o = _outgoing(ui, repo, dest, opts) | |
595 | if o is None: |
|
597 | if o is None: | |
596 | return recurse() |
|
598 | return recurse() | |
597 |
|
599 | |||
598 | if opts.get('newest_first'): |
|
600 | if opts.get('newest_first'): | |
599 | o.reverse() |
|
601 | o.reverse() | |
600 | displayer = cmdutil.show_changeset(ui, repo, opts) |
|
602 | displayer = cmdutil.show_changeset(ui, repo, opts) | |
601 | count = 0 |
|
603 | count = 0 | |
602 | for n in o: |
|
604 | for n in o: | |
603 | if limit is not None and count >= limit: |
|
605 | if limit is not None and count >= limit: | |
604 | break |
|
606 | break | |
605 | parents = [p for p in repo.changelog.parents(n) if p != nullid] |
|
607 | parents = [p for p in repo.changelog.parents(n) if p != nullid] | |
606 | if opts.get('no_merges') and len(parents) == 2: |
|
608 | if opts.get('no_merges') and len(parents) == 2: | |
607 | continue |
|
609 | continue | |
608 | count += 1 |
|
610 | count += 1 | |
609 | displayer.show(repo[n]) |
|
611 | displayer.show(repo[n]) | |
610 | displayer.close() |
|
612 | displayer.close() | |
611 | recurse() |
|
613 | recurse() | |
612 | return 0 # exit code is zero since we found outgoing changes |
|
614 | return 0 # exit code is zero since we found outgoing changes | |
613 |
|
615 | |||
614 | def revert(repo, node, choose): |
|
616 | def revert(repo, node, choose): | |
615 | """revert changes to revision in node without updating dirstate""" |
|
617 | """revert changes to revision in node without updating dirstate""" | |
616 | return mergemod.update(repo, node, False, True, choose)[3] > 0 |
|
618 | return mergemod.update(repo, node, False, True, choose)[3] > 0 | |
617 |
|
619 | |||
618 | def verify(repo): |
|
620 | def verify(repo): | |
619 | """verify the consistency of a repository""" |
|
621 | """verify the consistency of a repository""" | |
620 | return verifymod.verify(repo) |
|
622 | return verifymod.verify(repo) | |
621 |
|
623 | |||
622 | def remoteui(src, opts): |
|
624 | def remoteui(src, opts): | |
623 | 'build a remote ui from ui or repo and opts' |
|
625 | 'build a remote ui from ui or repo and opts' | |
624 | if util.safehasattr(src, 'baseui'): # looks like a repository |
|
626 | if util.safehasattr(src, 'baseui'): # looks like a repository | |
625 | dst = src.baseui.copy() # drop repo-specific config |
|
627 | dst = src.baseui.copy() # drop repo-specific config | |
626 | src = src.ui # copy target options from repo |
|
628 | src = src.ui # copy target options from repo | |
627 | else: # assume it's a global ui object |
|
629 | else: # assume it's a global ui object | |
628 | dst = src.copy() # keep all global options |
|
630 | dst = src.copy() # keep all global options | |
629 |
|
631 | |||
630 | # copy ssh-specific options |
|
632 | # copy ssh-specific options | |
631 | for o in 'ssh', 'remotecmd': |
|
633 | for o in 'ssh', 'remotecmd': | |
632 | v = opts.get(o) or src.config('ui', o) |
|
634 | v = opts.get(o) or src.config('ui', o) | |
633 | if v: |
|
635 | if v: | |
634 | dst.setconfig("ui", o, v, 'copied') |
|
636 | dst.setconfig("ui", o, v, 'copied') | |
635 |
|
637 | |||
636 | # copy bundle-specific options |
|
638 | # copy bundle-specific options | |
637 | r = src.config('bundle', 'mainreporoot') |
|
639 | r = src.config('bundle', 'mainreporoot') | |
638 | if r: |
|
640 | if r: | |
639 | dst.setconfig('bundle', 'mainreporoot', r, 'copied') |
|
641 | dst.setconfig('bundle', 'mainreporoot', r, 'copied') | |
640 |
|
642 | |||
641 | # copy selected local settings to the remote ui |
|
643 | # copy selected local settings to the remote ui | |
642 | for sect in ('auth', 'hostfingerprints', 'http_proxy'): |
|
644 | for sect in ('auth', 'hostfingerprints', 'http_proxy'): | |
643 | for key, val in src.configitems(sect): |
|
645 | for key, val in src.configitems(sect): | |
644 | dst.setconfig(sect, key, val, 'copied') |
|
646 | dst.setconfig(sect, key, val, 'copied') | |
645 | v = src.config('web', 'cacerts') |
|
647 | v = src.config('web', 'cacerts') | |
646 | if v: |
|
648 | if v: | |
647 | dst.setconfig('web', 'cacerts', util.expandpath(v), 'copied') |
|
649 | dst.setconfig('web', 'cacerts', util.expandpath(v), 'copied') | |
648 |
|
650 | |||
649 | return dst |
|
651 | return dst |
@@ -1,2845 +1,2849 b'' | |||||
1 | # revset.py - revision set queries for mercurial |
|
1 | # revset.py - revision set queries for mercurial | |
2 | # |
|
2 | # | |
3 | # Copyright 2010 Matt Mackall <mpm@selenic.com> |
|
3 | # Copyright 2010 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 | import re |
|
8 | import re | |
9 | import parser, util, error, discovery, hbisect, phases |
|
9 | import parser, util, error, discovery, hbisect, phases | |
10 | import node |
|
10 | import node | |
11 | import heapq |
|
11 | import heapq | |
12 | import match as matchmod |
|
12 | import match as matchmod | |
13 | import ancestor as ancestormod |
|
13 | import ancestor as ancestormod | |
14 | from i18n import _ |
|
14 | from i18n import _ | |
15 | import encoding |
|
15 | import encoding | |
16 | import obsolete as obsmod |
|
16 | import obsolete as obsmod | |
17 | import pathutil |
|
17 | import pathutil | |
18 | import repoview |
|
18 | import repoview | |
19 |
|
19 | |||
20 | def _revancestors(repo, revs, followfirst): |
|
20 | def _revancestors(repo, revs, followfirst): | |
21 | """Like revlog.ancestors(), but supports followfirst.""" |
|
21 | """Like revlog.ancestors(), but supports followfirst.""" | |
22 | cut = followfirst and 1 or None |
|
22 | cut = followfirst and 1 or None | |
23 | cl = repo.changelog |
|
23 | cl = repo.changelog | |
24 |
|
24 | |||
25 | def iterate(): |
|
25 | def iterate(): | |
26 | revqueue, revsnode = None, None |
|
26 | revqueue, revsnode = None, None | |
27 | h = [] |
|
27 | h = [] | |
28 |
|
28 | |||
29 | revs.descending() |
|
29 | revs.descending() | |
30 | revqueue = util.deque(revs) |
|
30 | revqueue = util.deque(revs) | |
31 | if revqueue: |
|
31 | if revqueue: | |
32 | revsnode = revqueue.popleft() |
|
32 | revsnode = revqueue.popleft() | |
33 | heapq.heappush(h, -revsnode) |
|
33 | heapq.heappush(h, -revsnode) | |
34 |
|
34 | |||
35 | seen = set([node.nullrev]) |
|
35 | seen = set([node.nullrev]) | |
36 | while h: |
|
36 | while h: | |
37 | current = -heapq.heappop(h) |
|
37 | current = -heapq.heappop(h) | |
38 | if current not in seen: |
|
38 | if current not in seen: | |
39 | if revsnode and current == revsnode: |
|
39 | if revsnode and current == revsnode: | |
40 | if revqueue: |
|
40 | if revqueue: | |
41 | revsnode = revqueue.popleft() |
|
41 | revsnode = revqueue.popleft() | |
42 | heapq.heappush(h, -revsnode) |
|
42 | heapq.heappush(h, -revsnode) | |
43 | seen.add(current) |
|
43 | seen.add(current) | |
44 | yield current |
|
44 | yield current | |
45 | for parent in cl.parentrevs(current)[:cut]: |
|
45 | for parent in cl.parentrevs(current)[:cut]: | |
46 | if parent != node.nullrev: |
|
46 | if parent != node.nullrev: | |
47 | heapq.heappush(h, -parent) |
|
47 | heapq.heappush(h, -parent) | |
48 |
|
48 | |||
49 | return _descgeneratorset(iterate()) |
|
49 | return _descgeneratorset(iterate()) | |
50 |
|
50 | |||
51 | def _revdescendants(repo, revs, followfirst): |
|
51 | def _revdescendants(repo, revs, followfirst): | |
52 | """Like revlog.descendants() but supports followfirst.""" |
|
52 | """Like revlog.descendants() but supports followfirst.""" | |
53 | cut = followfirst and 1 or None |
|
53 | cut = followfirst and 1 or None | |
54 |
|
54 | |||
55 | def iterate(): |
|
55 | def iterate(): | |
56 | cl = repo.changelog |
|
56 | cl = repo.changelog | |
57 | first = min(revs) |
|
57 | first = min(revs) | |
58 | nullrev = node.nullrev |
|
58 | nullrev = node.nullrev | |
59 | if first == nullrev: |
|
59 | if first == nullrev: | |
60 | # Are there nodes with a null first parent and a non-null |
|
60 | # Are there nodes with a null first parent and a non-null | |
61 | # second one? Maybe. Do we care? Probably not. |
|
61 | # second one? Maybe. Do we care? Probably not. | |
62 | for i in cl: |
|
62 | for i in cl: | |
63 | yield i |
|
63 | yield i | |
64 | else: |
|
64 | else: | |
65 | seen = set(revs) |
|
65 | seen = set(revs) | |
66 | for i in cl.revs(first + 1): |
|
66 | for i in cl.revs(first + 1): | |
67 | for x in cl.parentrevs(i)[:cut]: |
|
67 | for x in cl.parentrevs(i)[:cut]: | |
68 | if x != nullrev and x in seen: |
|
68 | if x != nullrev and x in seen: | |
69 | seen.add(i) |
|
69 | seen.add(i) | |
70 | yield i |
|
70 | yield i | |
71 | break |
|
71 | break | |
72 |
|
72 | |||
73 | return _ascgeneratorset(iterate()) |
|
73 | return _ascgeneratorset(iterate()) | |
74 |
|
74 | |||
75 | def _revsbetween(repo, roots, heads): |
|
75 | def _revsbetween(repo, roots, heads): | |
76 | """Return all paths between roots and heads, inclusive of both endpoint |
|
76 | """Return all paths between roots and heads, inclusive of both endpoint | |
77 | sets.""" |
|
77 | sets.""" | |
78 | if not roots: |
|
78 | if not roots: | |
79 | return baseset([]) |
|
79 | return baseset([]) | |
80 | parentrevs = repo.changelog.parentrevs |
|
80 | parentrevs = repo.changelog.parentrevs | |
81 | visit = baseset(heads) |
|
81 | visit = baseset(heads) | |
82 | reachable = set() |
|
82 | reachable = set() | |
83 | seen = {} |
|
83 | seen = {} | |
84 | minroot = min(roots) |
|
84 | minroot = min(roots) | |
85 | roots = set(roots) |
|
85 | roots = set(roots) | |
86 | # open-code the post-order traversal due to the tiny size of |
|
86 | # open-code the post-order traversal due to the tiny size of | |
87 | # sys.getrecursionlimit() |
|
87 | # sys.getrecursionlimit() | |
88 | while visit: |
|
88 | while visit: | |
89 | rev = visit.pop() |
|
89 | rev = visit.pop() | |
90 | if rev in roots: |
|
90 | if rev in roots: | |
91 | reachable.add(rev) |
|
91 | reachable.add(rev) | |
92 | parents = parentrevs(rev) |
|
92 | parents = parentrevs(rev) | |
93 | seen[rev] = parents |
|
93 | seen[rev] = parents | |
94 | for parent in parents: |
|
94 | for parent in parents: | |
95 | if parent >= minroot and parent not in seen: |
|
95 | if parent >= minroot and parent not in seen: | |
96 | visit.append(parent) |
|
96 | visit.append(parent) | |
97 | if not reachable: |
|
97 | if not reachable: | |
98 | return baseset([]) |
|
98 | return baseset([]) | |
99 | for rev in sorted(seen): |
|
99 | for rev in sorted(seen): | |
100 | for parent in seen[rev]: |
|
100 | for parent in seen[rev]: | |
101 | if parent in reachable: |
|
101 | if parent in reachable: | |
102 | reachable.add(rev) |
|
102 | reachable.add(rev) | |
103 | return baseset(sorted(reachable)) |
|
103 | return baseset(sorted(reachable)) | |
104 |
|
104 | |||
105 | elements = { |
|
105 | elements = { | |
106 | "(": (20, ("group", 1, ")"), ("func", 1, ")")), |
|
106 | "(": (20, ("group", 1, ")"), ("func", 1, ")")), | |
107 | "~": (18, None, ("ancestor", 18)), |
|
107 | "~": (18, None, ("ancestor", 18)), | |
108 | "^": (18, None, ("parent", 18), ("parentpost", 18)), |
|
108 | "^": (18, None, ("parent", 18), ("parentpost", 18)), | |
109 | "-": (5, ("negate", 19), ("minus", 5)), |
|
109 | "-": (5, ("negate", 19), ("minus", 5)), | |
110 | "::": (17, ("dagrangepre", 17), ("dagrange", 17), |
|
110 | "::": (17, ("dagrangepre", 17), ("dagrange", 17), | |
111 | ("dagrangepost", 17)), |
|
111 | ("dagrangepost", 17)), | |
112 | "..": (17, ("dagrangepre", 17), ("dagrange", 17), |
|
112 | "..": (17, ("dagrangepre", 17), ("dagrange", 17), | |
113 | ("dagrangepost", 17)), |
|
113 | ("dagrangepost", 17)), | |
114 | ":": (15, ("rangepre", 15), ("range", 15), ("rangepost", 15)), |
|
114 | ":": (15, ("rangepre", 15), ("range", 15), ("rangepost", 15)), | |
115 | "not": (10, ("not", 10)), |
|
115 | "not": (10, ("not", 10)), | |
116 | "!": (10, ("not", 10)), |
|
116 | "!": (10, ("not", 10)), | |
117 | "and": (5, None, ("and", 5)), |
|
117 | "and": (5, None, ("and", 5)), | |
118 | "&": (5, None, ("and", 5)), |
|
118 | "&": (5, None, ("and", 5)), | |
119 | "or": (4, None, ("or", 4)), |
|
119 | "or": (4, None, ("or", 4)), | |
120 | "|": (4, None, ("or", 4)), |
|
120 | "|": (4, None, ("or", 4)), | |
121 | "+": (4, None, ("or", 4)), |
|
121 | "+": (4, None, ("or", 4)), | |
122 | ",": (2, None, ("list", 2)), |
|
122 | ",": (2, None, ("list", 2)), | |
123 | ")": (0, None, None), |
|
123 | ")": (0, None, None), | |
124 | "symbol": (0, ("symbol",), None), |
|
124 | "symbol": (0, ("symbol",), None), | |
125 | "string": (0, ("string",), None), |
|
125 | "string": (0, ("string",), None), | |
126 | "end": (0, None, None), |
|
126 | "end": (0, None, None), | |
127 | } |
|
127 | } | |
128 |
|
128 | |||
129 | keywords = set(['and', 'or', 'not']) |
|
129 | keywords = set(['and', 'or', 'not']) | |
130 |
|
130 | |||
131 | def tokenize(program, lookup=None): |
|
131 | def tokenize(program, lookup=None): | |
132 | ''' |
|
132 | ''' | |
133 | Parse a revset statement into a stream of tokens |
|
133 | Parse a revset statement into a stream of tokens | |
134 |
|
134 | |||
135 | Check that @ is a valid unquoted token character (issue3686): |
|
135 | Check that @ is a valid unquoted token character (issue3686): | |
136 | >>> list(tokenize("@::")) |
|
136 | >>> list(tokenize("@::")) | |
137 | [('symbol', '@', 0), ('::', None, 1), ('end', None, 3)] |
|
137 | [('symbol', '@', 0), ('::', None, 1), ('end', None, 3)] | |
138 |
|
138 | |||
139 | ''' |
|
139 | ''' | |
140 |
|
140 | |||
141 | pos, l = 0, len(program) |
|
141 | pos, l = 0, len(program) | |
142 | while pos < l: |
|
142 | while pos < l: | |
143 | c = program[pos] |
|
143 | c = program[pos] | |
144 | if c.isspace(): # skip inter-token whitespace |
|
144 | if c.isspace(): # skip inter-token whitespace | |
145 | pass |
|
145 | pass | |
146 | elif c == ':' and program[pos:pos + 2] == '::': # look ahead carefully |
|
146 | elif c == ':' and program[pos:pos + 2] == '::': # look ahead carefully | |
147 | yield ('::', None, pos) |
|
147 | yield ('::', None, pos) | |
148 | pos += 1 # skip ahead |
|
148 | pos += 1 # skip ahead | |
149 | elif c == '.' and program[pos:pos + 2] == '..': # look ahead carefully |
|
149 | elif c == '.' and program[pos:pos + 2] == '..': # look ahead carefully | |
150 | yield ('..', None, pos) |
|
150 | yield ('..', None, pos) | |
151 | pos += 1 # skip ahead |
|
151 | pos += 1 # skip ahead | |
152 | elif c in "():,-|&+!~^": # handle simple operators |
|
152 | elif c in "():,-|&+!~^": # handle simple operators | |
153 | yield (c, None, pos) |
|
153 | yield (c, None, pos) | |
154 | elif (c in '"\'' or c == 'r' and |
|
154 | elif (c in '"\'' or c == 'r' and | |
155 | program[pos:pos + 2] in ("r'", 'r"')): # handle quoted strings |
|
155 | program[pos:pos + 2] in ("r'", 'r"')): # handle quoted strings | |
156 | if c == 'r': |
|
156 | if c == 'r': | |
157 | pos += 1 |
|
157 | pos += 1 | |
158 | c = program[pos] |
|
158 | c = program[pos] | |
159 | decode = lambda x: x |
|
159 | decode = lambda x: x | |
160 | else: |
|
160 | else: | |
161 | decode = lambda x: x.decode('string-escape') |
|
161 | decode = lambda x: x.decode('string-escape') | |
162 | pos += 1 |
|
162 | pos += 1 | |
163 | s = pos |
|
163 | s = pos | |
164 | while pos < l: # find closing quote |
|
164 | while pos < l: # find closing quote | |
165 | d = program[pos] |
|
165 | d = program[pos] | |
166 | if d == '\\': # skip over escaped characters |
|
166 | if d == '\\': # skip over escaped characters | |
167 | pos += 2 |
|
167 | pos += 2 | |
168 | continue |
|
168 | continue | |
169 | if d == c: |
|
169 | if d == c: | |
170 | yield ('string', decode(program[s:pos]), s) |
|
170 | yield ('string', decode(program[s:pos]), s) | |
171 | break |
|
171 | break | |
172 | pos += 1 |
|
172 | pos += 1 | |
173 | else: |
|
173 | else: | |
174 | raise error.ParseError(_("unterminated string"), s) |
|
174 | raise error.ParseError(_("unterminated string"), s) | |
175 | # gather up a symbol/keyword |
|
175 | # gather up a symbol/keyword | |
176 | elif c.isalnum() or c in '._@' or ord(c) > 127: |
|
176 | elif c.isalnum() or c in '._@' or ord(c) > 127: | |
177 | s = pos |
|
177 | s = pos | |
178 | pos += 1 |
|
178 | pos += 1 | |
179 | while pos < l: # find end of symbol |
|
179 | while pos < l: # find end of symbol | |
180 | d = program[pos] |
|
180 | d = program[pos] | |
181 | if not (d.isalnum() or d in "-._/@" or ord(d) > 127): |
|
181 | if not (d.isalnum() or d in "-._/@" or ord(d) > 127): | |
182 | break |
|
182 | break | |
183 | if d == '.' and program[pos - 1] == '.': # special case for .. |
|
183 | if d == '.' and program[pos - 1] == '.': # special case for .. | |
184 | pos -= 1 |
|
184 | pos -= 1 | |
185 | break |
|
185 | break | |
186 | pos += 1 |
|
186 | pos += 1 | |
187 | sym = program[s:pos] |
|
187 | sym = program[s:pos] | |
188 | if sym in keywords: # operator keywords |
|
188 | if sym in keywords: # operator keywords | |
189 | yield (sym, None, s) |
|
189 | yield (sym, None, s) | |
190 | elif '-' in sym: |
|
190 | elif '-' in sym: | |
191 | # some jerk gave us foo-bar-baz, try to check if it's a symbol |
|
191 | # some jerk gave us foo-bar-baz, try to check if it's a symbol | |
192 | if lookup and lookup(sym): |
|
192 | if lookup and lookup(sym): | |
193 | # looks like a real symbol |
|
193 | # looks like a real symbol | |
194 | yield ('symbol', sym, s) |
|
194 | yield ('symbol', sym, s) | |
195 | else: |
|
195 | else: | |
196 | # looks like an expression |
|
196 | # looks like an expression | |
197 | parts = sym.split('-') |
|
197 | parts = sym.split('-') | |
198 | for p in parts[:-1]: |
|
198 | for p in parts[:-1]: | |
199 | if p: # possible consecutive - |
|
199 | if p: # possible consecutive - | |
200 | yield ('symbol', p, s) |
|
200 | yield ('symbol', p, s) | |
201 | s += len(p) |
|
201 | s += len(p) | |
202 | yield ('-', None, pos) |
|
202 | yield ('-', None, pos) | |
203 | s += 1 |
|
203 | s += 1 | |
204 | if parts[-1]: # possible trailing - |
|
204 | if parts[-1]: # possible trailing - | |
205 | yield ('symbol', parts[-1], s) |
|
205 | yield ('symbol', parts[-1], s) | |
206 | else: |
|
206 | else: | |
207 | yield ('symbol', sym, s) |
|
207 | yield ('symbol', sym, s) | |
208 | pos -= 1 |
|
208 | pos -= 1 | |
209 | else: |
|
209 | else: | |
210 | raise error.ParseError(_("syntax error"), pos) |
|
210 | raise error.ParseError(_("syntax error"), pos) | |
211 | pos += 1 |
|
211 | pos += 1 | |
212 | yield ('end', None, pos) |
|
212 | yield ('end', None, pos) | |
213 |
|
213 | |||
214 | # helpers |
|
214 | # helpers | |
215 |
|
215 | |||
216 | def getstring(x, err): |
|
216 | def getstring(x, err): | |
217 | if x and (x[0] == 'string' or x[0] == 'symbol'): |
|
217 | if x and (x[0] == 'string' or x[0] == 'symbol'): | |
218 | return x[1] |
|
218 | return x[1] | |
219 | raise error.ParseError(err) |
|
219 | raise error.ParseError(err) | |
220 |
|
220 | |||
221 | def getlist(x): |
|
221 | def getlist(x): | |
222 | if not x: |
|
222 | if not x: | |
223 | return [] |
|
223 | return [] | |
224 | if x[0] == 'list': |
|
224 | if x[0] == 'list': | |
225 | return getlist(x[1]) + [x[2]] |
|
225 | return getlist(x[1]) + [x[2]] | |
226 | return [x] |
|
226 | return [x] | |
227 |
|
227 | |||
228 | def getargs(x, min, max, err): |
|
228 | def getargs(x, min, max, err): | |
229 | l = getlist(x) |
|
229 | l = getlist(x) | |
230 | if len(l) < min or (max >= 0 and len(l) > max): |
|
230 | if len(l) < min or (max >= 0 and len(l) > max): | |
231 | raise error.ParseError(err) |
|
231 | raise error.ParseError(err) | |
232 | return l |
|
232 | return l | |
233 |
|
233 | |||
234 | def getset(repo, subset, x): |
|
234 | def getset(repo, subset, x): | |
235 | if not x: |
|
235 | if not x: | |
236 | raise error.ParseError(_("missing argument")) |
|
236 | raise error.ParseError(_("missing argument")) | |
237 | s = methods[x[0]](repo, subset, *x[1:]) |
|
237 | s = methods[x[0]](repo, subset, *x[1:]) | |
238 | if util.safehasattr(s, 'set'): |
|
238 | if util.safehasattr(s, 'set'): | |
239 | return s |
|
239 | return s | |
240 | return baseset(s) |
|
240 | return baseset(s) | |
241 |
|
241 | |||
242 | def _getrevsource(repo, r): |
|
242 | def _getrevsource(repo, r): | |
243 | extra = repo[r].extra() |
|
243 | extra = repo[r].extra() | |
244 | for label in ('source', 'transplant_source', 'rebase_source'): |
|
244 | for label in ('source', 'transplant_source', 'rebase_source'): | |
245 | if label in extra: |
|
245 | if label in extra: | |
246 | try: |
|
246 | try: | |
247 | return repo[extra[label]].rev() |
|
247 | return repo[extra[label]].rev() | |
248 | except error.RepoLookupError: |
|
248 | except error.RepoLookupError: | |
249 | pass |
|
249 | pass | |
250 | return None |
|
250 | return None | |
251 |
|
251 | |||
252 | # operator methods |
|
252 | # operator methods | |
253 |
|
253 | |||
254 | def stringset(repo, subset, x): |
|
254 | def stringset(repo, subset, x): | |
255 | x = repo[x].rev() |
|
255 | x = repo[x].rev() | |
256 | if x == -1 and len(subset) == len(repo): |
|
256 | if x == -1 and len(subset) == len(repo): | |
257 | return baseset([-1]) |
|
257 | return baseset([-1]) | |
258 | if len(subset) == len(repo) or x in subset: |
|
258 | if len(subset) == len(repo) or x in subset: | |
259 | return baseset([x]) |
|
259 | return baseset([x]) | |
260 | return baseset([]) |
|
260 | return baseset([]) | |
261 |
|
261 | |||
262 | def symbolset(repo, subset, x): |
|
262 | def symbolset(repo, subset, x): | |
263 | if x in symbols: |
|
263 | if x in symbols: | |
264 | raise error.ParseError(_("can't use %s here") % x) |
|
264 | raise error.ParseError(_("can't use %s here") % x) | |
265 | return stringset(repo, subset, x) |
|
265 | return stringset(repo, subset, x) | |
266 |
|
266 | |||
267 | def rangeset(repo, subset, x, y): |
|
267 | def rangeset(repo, subset, x, y): | |
268 | cl = baseset(repo.changelog) |
|
268 | cl = baseset(repo.changelog) | |
269 | m = getset(repo, cl, x) |
|
269 | m = getset(repo, cl, x) | |
270 | n = getset(repo, cl, y) |
|
270 | n = getset(repo, cl, y) | |
271 |
|
271 | |||
272 | if not m or not n: |
|
272 | if not m or not n: | |
273 | return baseset([]) |
|
273 | return baseset([]) | |
274 | m, n = m[0], n[-1] |
|
274 | m, n = m[0], n[-1] | |
275 |
|
275 | |||
276 | if m < n: |
|
276 | if m < n: | |
277 | r = spanset(repo, m, n + 1) |
|
277 | r = spanset(repo, m, n + 1) | |
278 | else: |
|
278 | else: | |
279 | r = spanset(repo, m, n - 1) |
|
279 | r = spanset(repo, m, n - 1) | |
280 | return r & subset |
|
280 | return r & subset | |
281 |
|
281 | |||
282 | def dagrange(repo, subset, x, y): |
|
282 | def dagrange(repo, subset, x, y): | |
283 | r = spanset(repo) |
|
283 | r = spanset(repo) | |
284 | xs = _revsbetween(repo, getset(repo, r, x), getset(repo, r, y)) |
|
284 | xs = _revsbetween(repo, getset(repo, r, x), getset(repo, r, y)) | |
285 | s = subset.set() |
|
285 | s = subset.set() | |
286 | return xs.filter(lambda r: r in s) |
|
286 | return xs.filter(lambda r: r in s) | |
287 |
|
287 | |||
288 | def andset(repo, subset, x, y): |
|
288 | def andset(repo, subset, x, y): | |
289 | return getset(repo, getset(repo, subset, x), y) |
|
289 | return getset(repo, getset(repo, subset, x), y) | |
290 |
|
290 | |||
291 | def orset(repo, subset, x, y): |
|
291 | def orset(repo, subset, x, y): | |
292 | xl = getset(repo, subset, x) |
|
292 | xl = getset(repo, subset, x) | |
293 | yl = getset(repo, subset - xl, y) |
|
293 | yl = getset(repo, subset - xl, y) | |
294 | return xl + yl |
|
294 | return xl + yl | |
295 |
|
295 | |||
296 | def notset(repo, subset, x): |
|
296 | def notset(repo, subset, x): | |
297 | return subset - getset(repo, subset, x) |
|
297 | return subset - getset(repo, subset, x) | |
298 |
|
298 | |||
299 | def listset(repo, subset, a, b): |
|
299 | def listset(repo, subset, a, b): | |
300 | raise error.ParseError(_("can't use a list in this context")) |
|
300 | raise error.ParseError(_("can't use a list in this context")) | |
301 |
|
301 | |||
302 | def func(repo, subset, a, b): |
|
302 | def func(repo, subset, a, b): | |
303 | if a[0] == 'symbol' and a[1] in symbols: |
|
303 | if a[0] == 'symbol' and a[1] in symbols: | |
304 | return symbols[a[1]](repo, subset, b) |
|
304 | return symbols[a[1]](repo, subset, b) | |
305 | raise error.ParseError(_("not a function: %s") % a[1]) |
|
305 | raise error.ParseError(_("not a function: %s") % a[1]) | |
306 |
|
306 | |||
307 | # functions |
|
307 | # functions | |
308 |
|
308 | |||
309 | def adds(repo, subset, x): |
|
309 | def adds(repo, subset, x): | |
310 | """``adds(pattern)`` |
|
310 | """``adds(pattern)`` | |
311 | Changesets that add a file matching pattern. |
|
311 | Changesets that add a file matching pattern. | |
312 |
|
312 | |||
313 | The pattern without explicit kind like ``glob:`` is expected to be |
|
313 | The pattern without explicit kind like ``glob:`` is expected to be | |
314 | relative to the current directory and match against a file or a |
|
314 | relative to the current directory and match against a file or a | |
315 | directory. |
|
315 | directory. | |
316 | """ |
|
316 | """ | |
317 | # i18n: "adds" is a keyword |
|
317 | # i18n: "adds" is a keyword | |
318 | pat = getstring(x, _("adds requires a pattern")) |
|
318 | pat = getstring(x, _("adds requires a pattern")) | |
319 | return checkstatus(repo, subset, pat, 1) |
|
319 | return checkstatus(repo, subset, pat, 1) | |
320 |
|
320 | |||
321 | def ancestor(repo, subset, x): |
|
321 | def ancestor(repo, subset, x): | |
322 | """``ancestor(*changeset)`` |
|
322 | """``ancestor(*changeset)`` | |
323 | Greatest common ancestor of the changesets. |
|
323 | Greatest common ancestor of the changesets. | |
324 |
|
324 | |||
325 | Accepts 0 or more changesets. |
|
325 | Accepts 0 or more changesets. | |
326 | Will return empty list when passed no args. |
|
326 | Will return empty list when passed no args. | |
327 | Greatest common ancestor of a single changeset is that changeset. |
|
327 | Greatest common ancestor of a single changeset is that changeset. | |
328 | """ |
|
328 | """ | |
329 | # i18n: "ancestor" is a keyword |
|
329 | # i18n: "ancestor" is a keyword | |
330 | l = getlist(x) |
|
330 | l = getlist(x) | |
331 | rl = spanset(repo) |
|
331 | rl = spanset(repo) | |
332 | anc = None |
|
332 | anc = None | |
333 |
|
333 | |||
334 | # (getset(repo, rl, i) for i in l) generates a list of lists |
|
334 | # (getset(repo, rl, i) for i in l) generates a list of lists | |
335 | rev = repo.changelog.rev |
|
335 | rev = repo.changelog.rev | |
336 | ancestor = repo.changelog.ancestor |
|
336 | ancestor = repo.changelog.ancestor | |
337 | node = repo.changelog.node |
|
337 | node = repo.changelog.node | |
338 | for revs in (getset(repo, rl, i) for i in l): |
|
338 | for revs in (getset(repo, rl, i) for i in l): | |
339 | for r in revs: |
|
339 | for r in revs: | |
340 | if anc is None: |
|
340 | if anc is None: | |
341 | anc = r |
|
341 | anc = r | |
342 | else: |
|
342 | else: | |
343 | anc = rev(ancestor(node(anc), node(r))) |
|
343 | anc = rev(ancestor(node(anc), node(r))) | |
344 |
|
344 | |||
345 | if anc is not None and anc in subset: |
|
345 | if anc is not None and anc in subset: | |
346 | return baseset([anc]) |
|
346 | return baseset([anc]) | |
347 | return baseset([]) |
|
347 | return baseset([]) | |
348 |
|
348 | |||
349 | def _ancestors(repo, subset, x, followfirst=False): |
|
349 | def _ancestors(repo, subset, x, followfirst=False): | |
350 | args = getset(repo, spanset(repo), x) |
|
350 | args = getset(repo, spanset(repo), x) | |
351 | if not args: |
|
351 | if not args: | |
352 | return baseset([]) |
|
352 | return baseset([]) | |
353 | s = _revancestors(repo, args, followfirst) |
|
353 | s = _revancestors(repo, args, followfirst) | |
354 | return subset.filter(lambda r: r in s) |
|
354 | return subset.filter(lambda r: r in s) | |
355 |
|
355 | |||
356 | def ancestors(repo, subset, x): |
|
356 | def ancestors(repo, subset, x): | |
357 | """``ancestors(set)`` |
|
357 | """``ancestors(set)`` | |
358 | Changesets that are ancestors of a changeset in set. |
|
358 | Changesets that are ancestors of a changeset in set. | |
359 | """ |
|
359 | """ | |
360 | return _ancestors(repo, subset, x) |
|
360 | return _ancestors(repo, subset, x) | |
361 |
|
361 | |||
362 | def _firstancestors(repo, subset, x): |
|
362 | def _firstancestors(repo, subset, x): | |
363 | # ``_firstancestors(set)`` |
|
363 | # ``_firstancestors(set)`` | |
364 | # Like ``ancestors(set)`` but follows only the first parents. |
|
364 | # Like ``ancestors(set)`` but follows only the first parents. | |
365 | return _ancestors(repo, subset, x, followfirst=True) |
|
365 | return _ancestors(repo, subset, x, followfirst=True) | |
366 |
|
366 | |||
367 | def ancestorspec(repo, subset, x, n): |
|
367 | def ancestorspec(repo, subset, x, n): | |
368 | """``set~n`` |
|
368 | """``set~n`` | |
369 | Changesets that are the Nth ancestor (first parents only) of a changeset |
|
369 | Changesets that are the Nth ancestor (first parents only) of a changeset | |
370 | in set. |
|
370 | in set. | |
371 | """ |
|
371 | """ | |
372 | try: |
|
372 | try: | |
373 | n = int(n[1]) |
|
373 | n = int(n[1]) | |
374 | except (TypeError, ValueError): |
|
374 | except (TypeError, ValueError): | |
375 | raise error.ParseError(_("~ expects a number")) |
|
375 | raise error.ParseError(_("~ expects a number")) | |
376 | ps = set() |
|
376 | ps = set() | |
377 | cl = repo.changelog |
|
377 | cl = repo.changelog | |
378 | for r in getset(repo, baseset(cl), x): |
|
378 | for r in getset(repo, baseset(cl), x): | |
379 | for i in range(n): |
|
379 | for i in range(n): | |
380 | r = cl.parentrevs(r)[0] |
|
380 | r = cl.parentrevs(r)[0] | |
381 | ps.add(r) |
|
381 | ps.add(r) | |
382 | return subset.filter(lambda r: r in ps) |
|
382 | return subset.filter(lambda r: r in ps) | |
383 |
|
383 | |||
384 | def author(repo, subset, x): |
|
384 | def author(repo, subset, x): | |
385 | """``author(string)`` |
|
385 | """``author(string)`` | |
386 | Alias for ``user(string)``. |
|
386 | Alias for ``user(string)``. | |
387 | """ |
|
387 | """ | |
388 | # i18n: "author" is a keyword |
|
388 | # i18n: "author" is a keyword | |
389 | n = encoding.lower(getstring(x, _("author requires a string"))) |
|
389 | n = encoding.lower(getstring(x, _("author requires a string"))) | |
390 | kind, pattern, matcher = _substringmatcher(n) |
|
390 | kind, pattern, matcher = _substringmatcher(n) | |
391 | return subset.filter(lambda x: matcher(encoding.lower(repo[x].user()))) |
|
391 | return subset.filter(lambda x: matcher(encoding.lower(repo[x].user()))) | |
392 |
|
392 | |||
393 | def only(repo, subset, x): |
|
393 | def only(repo, subset, x): | |
394 | """``only(set, [set])`` |
|
394 | """``only(set, [set])`` | |
395 | Changesets that are ancestors of the first set that are not ancestors |
|
395 | Changesets that are ancestors of the first set that are not ancestors | |
396 | of any other head in the repo. If a second set is specified, the result |
|
396 | of any other head in the repo. If a second set is specified, the result | |
397 | is ancestors of the first set that are not ancestors of the second set |
|
397 | is ancestors of the first set that are not ancestors of the second set | |
398 | (i.e. ::<set1> - ::<set2>). |
|
398 | (i.e. ::<set1> - ::<set2>). | |
399 | """ |
|
399 | """ | |
400 | cl = repo.changelog |
|
400 | cl = repo.changelog | |
401 | args = getargs(x, 1, 2, _('only takes one or two arguments')) |
|
401 | args = getargs(x, 1, 2, _('only takes one or two arguments')) | |
402 | include = getset(repo, spanset(repo), args[0]).set() |
|
402 | include = getset(repo, spanset(repo), args[0]).set() | |
403 | if len(args) == 1: |
|
403 | if len(args) == 1: | |
404 | descendants = set(_revdescendants(repo, include, False)) |
|
404 | descendants = set(_revdescendants(repo, include, False)) | |
405 | exclude = [rev for rev in cl.headrevs() |
|
405 | exclude = [rev for rev in cl.headrevs() | |
406 | if not rev in descendants and not rev in include] |
|
406 | if not rev in descendants and not rev in include] | |
407 | else: |
|
407 | else: | |
408 | exclude = getset(repo, spanset(repo), args[1]) |
|
408 | exclude = getset(repo, spanset(repo), args[1]) | |
409 |
|
409 | |||
410 | results = set(ancestormod.missingancestors(include, exclude, cl.parentrevs)) |
|
410 | results = set(ancestormod.missingancestors(include, exclude, cl.parentrevs)) | |
411 | return lazyset(subset, lambda x: x in results) |
|
411 | return lazyset(subset, lambda x: x in results) | |
412 |
|
412 | |||
413 | def bisect(repo, subset, x): |
|
413 | def bisect(repo, subset, x): | |
414 | """``bisect(string)`` |
|
414 | """``bisect(string)`` | |
415 | Changesets marked in the specified bisect status: |
|
415 | Changesets marked in the specified bisect status: | |
416 |
|
416 | |||
417 | - ``good``, ``bad``, ``skip``: csets explicitly marked as good/bad/skip |
|
417 | - ``good``, ``bad``, ``skip``: csets explicitly marked as good/bad/skip | |
418 | - ``goods``, ``bads`` : csets topologically good/bad |
|
418 | - ``goods``, ``bads`` : csets topologically good/bad | |
419 | - ``range`` : csets taking part in the bisection |
|
419 | - ``range`` : csets taking part in the bisection | |
420 | - ``pruned`` : csets that are goods, bads or skipped |
|
420 | - ``pruned`` : csets that are goods, bads or skipped | |
421 | - ``untested`` : csets whose fate is yet unknown |
|
421 | - ``untested`` : csets whose fate is yet unknown | |
422 | - ``ignored`` : csets ignored due to DAG topology |
|
422 | - ``ignored`` : csets ignored due to DAG topology | |
423 | - ``current`` : the cset currently being bisected |
|
423 | - ``current`` : the cset currently being bisected | |
424 | """ |
|
424 | """ | |
425 | # i18n: "bisect" is a keyword |
|
425 | # i18n: "bisect" is a keyword | |
426 | status = getstring(x, _("bisect requires a string")).lower() |
|
426 | status = getstring(x, _("bisect requires a string")).lower() | |
427 | state = set(hbisect.get(repo, status)) |
|
427 | state = set(hbisect.get(repo, status)) | |
428 | return subset.filter(lambda r: r in state) |
|
428 | return subset.filter(lambda r: r in state) | |
429 |
|
429 | |||
430 | # Backward-compatibility |
|
430 | # Backward-compatibility | |
431 | # - no help entry so that we do not advertise it any more |
|
431 | # - no help entry so that we do not advertise it any more | |
432 | def bisected(repo, subset, x): |
|
432 | def bisected(repo, subset, x): | |
433 | return bisect(repo, subset, x) |
|
433 | return bisect(repo, subset, x) | |
434 |
|
434 | |||
435 | def bookmark(repo, subset, x): |
|
435 | def bookmark(repo, subset, x): | |
436 | """``bookmark([name])`` |
|
436 | """``bookmark([name])`` | |
437 | The named bookmark or all bookmarks. |
|
437 | The named bookmark or all bookmarks. | |
438 |
|
438 | |||
439 | If `name` starts with `re:`, the remainder of the name is treated as |
|
439 | If `name` starts with `re:`, the remainder of the name is treated as | |
440 | a regular expression. To match a bookmark that actually starts with `re:`, |
|
440 | a regular expression. To match a bookmark that actually starts with `re:`, | |
441 | use the prefix `literal:`. |
|
441 | use the prefix `literal:`. | |
442 | """ |
|
442 | """ | |
443 | # i18n: "bookmark" is a keyword |
|
443 | # i18n: "bookmark" is a keyword | |
444 | args = getargs(x, 0, 1, _('bookmark takes one or no arguments')) |
|
444 | args = getargs(x, 0, 1, _('bookmark takes one or no arguments')) | |
445 | if args: |
|
445 | if args: | |
446 | bm = getstring(args[0], |
|
446 | bm = getstring(args[0], | |
447 | # i18n: "bookmark" is a keyword |
|
447 | # i18n: "bookmark" is a keyword | |
448 | _('the argument to bookmark must be a string')) |
|
448 | _('the argument to bookmark must be a string')) | |
449 | kind, pattern, matcher = _stringmatcher(bm) |
|
449 | kind, pattern, matcher = _stringmatcher(bm) | |
450 | if kind == 'literal': |
|
450 | if kind == 'literal': | |
451 | bmrev = repo._bookmarks.get(bm, None) |
|
451 | bmrev = repo._bookmarks.get(bm, None) | |
452 | if not bmrev: |
|
452 | if not bmrev: | |
453 | raise util.Abort(_("bookmark '%s' does not exist") % bm) |
|
453 | raise util.Abort(_("bookmark '%s' does not exist") % bm) | |
454 | bmrev = repo[bmrev].rev() |
|
454 | bmrev = repo[bmrev].rev() | |
455 | return subset.filter(lambda r: r == bmrev) |
|
455 | return subset.filter(lambda r: r == bmrev) | |
456 | else: |
|
456 | else: | |
457 | matchrevs = set() |
|
457 | matchrevs = set() | |
458 | for name, bmrev in repo._bookmarks.iteritems(): |
|
458 | for name, bmrev in repo._bookmarks.iteritems(): | |
459 | if matcher(name): |
|
459 | if matcher(name): | |
460 | matchrevs.add(bmrev) |
|
460 | matchrevs.add(bmrev) | |
461 | if not matchrevs: |
|
461 | if not matchrevs: | |
462 | raise util.Abort(_("no bookmarks exist that match '%s'") |
|
462 | raise util.Abort(_("no bookmarks exist that match '%s'") | |
463 | % pattern) |
|
463 | % pattern) | |
464 | bmrevs = set() |
|
464 | bmrevs = set() | |
465 | for bmrev in matchrevs: |
|
465 | for bmrev in matchrevs: | |
466 | bmrevs.add(repo[bmrev].rev()) |
|
466 | bmrevs.add(repo[bmrev].rev()) | |
467 | return subset & bmrevs |
|
467 | return subset & bmrevs | |
468 |
|
468 | |||
469 | bms = set([repo[r].rev() |
|
469 | bms = set([repo[r].rev() | |
470 | for r in repo._bookmarks.values()]) |
|
470 | for r in repo._bookmarks.values()]) | |
471 | return subset.filter(lambda r: r in bms) |
|
471 | return subset.filter(lambda r: r in bms) | |
472 |
|
472 | |||
473 | def branch(repo, subset, x): |
|
473 | def branch(repo, subset, x): | |
474 | """``branch(string or set)`` |
|
474 | """``branch(string or set)`` | |
475 | All changesets belonging to the given branch or the branches of the given |
|
475 | All changesets belonging to the given branch or the branches of the given | |
476 | changesets. |
|
476 | changesets. | |
477 |
|
477 | |||
478 | If `string` starts with `re:`, the remainder of the name is treated as |
|
478 | If `string` starts with `re:`, the remainder of the name is treated as | |
479 | a regular expression. To match a branch that actually starts with `re:`, |
|
479 | a regular expression. To match a branch that actually starts with `re:`, | |
480 | use the prefix `literal:`. |
|
480 | use the prefix `literal:`. | |
481 | """ |
|
481 | """ | |
482 | try: |
|
482 | try: | |
483 | b = getstring(x, '') |
|
483 | b = getstring(x, '') | |
484 | except error.ParseError: |
|
484 | except error.ParseError: | |
485 | # not a string, but another revspec, e.g. tip() |
|
485 | # not a string, but another revspec, e.g. tip() | |
486 | pass |
|
486 | pass | |
487 | else: |
|
487 | else: | |
488 | kind, pattern, matcher = _stringmatcher(b) |
|
488 | kind, pattern, matcher = _stringmatcher(b) | |
489 | if kind == 'literal': |
|
489 | if kind == 'literal': | |
490 | # note: falls through to the revspec case if no branch with |
|
490 | # note: falls through to the revspec case if no branch with | |
491 | # this name exists |
|
491 | # this name exists | |
492 | if pattern in repo.branchmap(): |
|
492 | if pattern in repo.branchmap(): | |
493 | return subset.filter(lambda r: matcher(repo[r].branch())) |
|
493 | return subset.filter(lambda r: matcher(repo[r].branch())) | |
494 | else: |
|
494 | else: | |
495 | return subset.filter(lambda r: matcher(repo[r].branch())) |
|
495 | return subset.filter(lambda r: matcher(repo[r].branch())) | |
496 |
|
496 | |||
497 | s = getset(repo, spanset(repo), x) |
|
497 | s = getset(repo, spanset(repo), x) | |
498 | b = set() |
|
498 | b = set() | |
499 | for r in s: |
|
499 | for r in s: | |
500 | b.add(repo[r].branch()) |
|
500 | b.add(repo[r].branch()) | |
501 | s = s.set() |
|
501 | s = s.set() | |
502 | return subset.filter(lambda r: r in s or repo[r].branch() in b) |
|
502 | return subset.filter(lambda r: r in s or repo[r].branch() in b) | |
503 |
|
503 | |||
504 | def bumped(repo, subset, x): |
|
504 | def bumped(repo, subset, x): | |
505 | """``bumped()`` |
|
505 | """``bumped()`` | |
506 | Mutable changesets marked as successors of public changesets. |
|
506 | Mutable changesets marked as successors of public changesets. | |
507 |
|
507 | |||
508 | Only non-public and non-obsolete changesets can be `bumped`. |
|
508 | Only non-public and non-obsolete changesets can be `bumped`. | |
509 | """ |
|
509 | """ | |
510 | # i18n: "bumped" is a keyword |
|
510 | # i18n: "bumped" is a keyword | |
511 | getargs(x, 0, 0, _("bumped takes no arguments")) |
|
511 | getargs(x, 0, 0, _("bumped takes no arguments")) | |
512 | bumped = obsmod.getrevs(repo, 'bumped') |
|
512 | bumped = obsmod.getrevs(repo, 'bumped') | |
513 | return subset & bumped |
|
513 | return subset & bumped | |
514 |
|
514 | |||
515 | def bundle(repo, subset, x): |
|
515 | def bundle(repo, subset, x): | |
516 | """``bundle()`` |
|
516 | """``bundle()`` | |
517 | Changesets in the bundle. |
|
517 | Changesets in the bundle. | |
518 |
|
518 | |||
519 | Bundle must be specified by the -R option.""" |
|
519 | Bundle must be specified by the -R option.""" | |
520 |
|
520 | |||
521 | try: |
|
521 | try: | |
522 | bundlerevs = repo.changelog.bundlerevs |
|
522 | bundlerevs = repo.changelog.bundlerevs | |
523 | except AttributeError: |
|
523 | except AttributeError: | |
524 | raise util.Abort(_("no bundle provided - specify with -R")) |
|
524 | raise util.Abort(_("no bundle provided - specify with -R")) | |
525 | return subset & bundlerevs |
|
525 | return subset & bundlerevs | |
526 |
|
526 | |||
527 | def checkstatus(repo, subset, pat, field): |
|
527 | def checkstatus(repo, subset, pat, field): | |
528 | hasset = matchmod.patkind(pat) == 'set' |
|
528 | hasset = matchmod.patkind(pat) == 'set' | |
529 |
|
529 | |||
530 | def matches(x): |
|
530 | def matches(x): | |
531 | m = None |
|
531 | m = None | |
532 | fname = None |
|
532 | fname = None | |
533 | c = repo[x] |
|
533 | c = repo[x] | |
534 | if not m or hasset: |
|
534 | if not m or hasset: | |
535 | m = matchmod.match(repo.root, repo.getcwd(), [pat], ctx=c) |
|
535 | m = matchmod.match(repo.root, repo.getcwd(), [pat], ctx=c) | |
536 | if not m.anypats() and len(m.files()) == 1: |
|
536 | if not m.anypats() and len(m.files()) == 1: | |
537 | fname = m.files()[0] |
|
537 | fname = m.files()[0] | |
538 | if fname is not None: |
|
538 | if fname is not None: | |
539 | if fname not in c.files(): |
|
539 | if fname not in c.files(): | |
540 | return False |
|
540 | return False | |
541 | else: |
|
541 | else: | |
542 | for f in c.files(): |
|
542 | for f in c.files(): | |
543 | if m(f): |
|
543 | if m(f): | |
544 | break |
|
544 | break | |
545 | else: |
|
545 | else: | |
546 | return False |
|
546 | return False | |
547 | files = repo.status(c.p1().node(), c.node())[field] |
|
547 | files = repo.status(c.p1().node(), c.node())[field] | |
548 | if fname is not None: |
|
548 | if fname is not None: | |
549 | if fname in files: |
|
549 | if fname in files: | |
550 | return True |
|
550 | return True | |
551 | else: |
|
551 | else: | |
552 | for f in files: |
|
552 | for f in files: | |
553 | if m(f): |
|
553 | if m(f): | |
554 | return True |
|
554 | return True | |
555 |
|
555 | |||
556 | return subset.filter(matches) |
|
556 | return subset.filter(matches) | |
557 |
|
557 | |||
558 | def _children(repo, narrow, parentset): |
|
558 | def _children(repo, narrow, parentset): | |
559 | cs = set() |
|
559 | cs = set() | |
560 | if not parentset: |
|
560 | if not parentset: | |
561 | return baseset(cs) |
|
561 | return baseset(cs) | |
562 | pr = repo.changelog.parentrevs |
|
562 | pr = repo.changelog.parentrevs | |
563 | minrev = min(parentset) |
|
563 | minrev = min(parentset) | |
564 | for r in narrow: |
|
564 | for r in narrow: | |
565 | if r <= minrev: |
|
565 | if r <= minrev: | |
566 | continue |
|
566 | continue | |
567 | for p in pr(r): |
|
567 | for p in pr(r): | |
568 | if p in parentset: |
|
568 | if p in parentset: | |
569 | cs.add(r) |
|
569 | cs.add(r) | |
570 | return baseset(cs) |
|
570 | return baseset(cs) | |
571 |
|
571 | |||
572 | def children(repo, subset, x): |
|
572 | def children(repo, subset, x): | |
573 | """``children(set)`` |
|
573 | """``children(set)`` | |
574 | Child changesets of changesets in set. |
|
574 | Child changesets of changesets in set. | |
575 | """ |
|
575 | """ | |
576 | s = getset(repo, baseset(repo), x).set() |
|
576 | s = getset(repo, baseset(repo), x).set() | |
577 | cs = _children(repo, subset, s) |
|
577 | cs = _children(repo, subset, s) | |
578 | return subset & cs |
|
578 | return subset & cs | |
579 |
|
579 | |||
580 | def closed(repo, subset, x): |
|
580 | def closed(repo, subset, x): | |
581 | """``closed()`` |
|
581 | """``closed()`` | |
582 | Changeset is closed. |
|
582 | Changeset is closed. | |
583 | """ |
|
583 | """ | |
584 | # i18n: "closed" is a keyword |
|
584 | # i18n: "closed" is a keyword | |
585 | getargs(x, 0, 0, _("closed takes no arguments")) |
|
585 | getargs(x, 0, 0, _("closed takes no arguments")) | |
586 | return subset.filter(lambda r: repo[r].closesbranch()) |
|
586 | return subset.filter(lambda r: repo[r].closesbranch()) | |
587 |
|
587 | |||
588 | def contains(repo, subset, x): |
|
588 | def contains(repo, subset, x): | |
589 | """``contains(pattern)`` |
|
589 | """``contains(pattern)`` | |
590 | Revision contains a file matching pattern. See :hg:`help patterns` |
|
590 | Revision contains a file matching pattern. See :hg:`help patterns` | |
591 | for information about file patterns. |
|
591 | for information about file patterns. | |
592 |
|
592 | |||
593 | The pattern without explicit kind like ``glob:`` is expected to be |
|
593 | The pattern without explicit kind like ``glob:`` is expected to be | |
594 | relative to the current directory and match against a file exactly |
|
594 | relative to the current directory and match against a file exactly | |
595 | for efficiency. |
|
595 | for efficiency. | |
596 | """ |
|
596 | """ | |
597 | # i18n: "contains" is a keyword |
|
597 | # i18n: "contains" is a keyword | |
598 | pat = getstring(x, _("contains requires a pattern")) |
|
598 | pat = getstring(x, _("contains requires a pattern")) | |
599 |
|
599 | |||
600 | def matches(x): |
|
600 | def matches(x): | |
601 | if not matchmod.patkind(pat): |
|
601 | if not matchmod.patkind(pat): | |
602 | pats = pathutil.canonpath(repo.root, repo.getcwd(), pat) |
|
602 | pats = pathutil.canonpath(repo.root, repo.getcwd(), pat) | |
603 | if pats in repo[x]: |
|
603 | if pats in repo[x]: | |
604 | return True |
|
604 | return True | |
605 | else: |
|
605 | else: | |
606 | c = repo[x] |
|
606 | c = repo[x] | |
607 | m = matchmod.match(repo.root, repo.getcwd(), [pat], ctx=c) |
|
607 | m = matchmod.match(repo.root, repo.getcwd(), [pat], ctx=c) | |
608 | for f in c.manifest(): |
|
608 | for f in c.manifest(): | |
609 | if m(f): |
|
609 | if m(f): | |
610 | return True |
|
610 | return True | |
611 | return False |
|
611 | return False | |
612 |
|
612 | |||
613 | return subset.filter(matches) |
|
613 | return subset.filter(matches) | |
614 |
|
614 | |||
615 | def converted(repo, subset, x): |
|
615 | def converted(repo, subset, x): | |
616 | """``converted([id])`` |
|
616 | """``converted([id])`` | |
617 | Changesets converted from the given identifier in the old repository if |
|
617 | Changesets converted from the given identifier in the old repository if | |
618 | present, or all converted changesets if no identifier is specified. |
|
618 | present, or all converted changesets if no identifier is specified. | |
619 | """ |
|
619 | """ | |
620 |
|
620 | |||
621 | # There is exactly no chance of resolving the revision, so do a simple |
|
621 | # There is exactly no chance of resolving the revision, so do a simple | |
622 | # string compare and hope for the best |
|
622 | # string compare and hope for the best | |
623 |
|
623 | |||
624 | rev = None |
|
624 | rev = None | |
625 | # i18n: "converted" is a keyword |
|
625 | # i18n: "converted" is a keyword | |
626 | l = getargs(x, 0, 1, _('converted takes one or no arguments')) |
|
626 | l = getargs(x, 0, 1, _('converted takes one or no arguments')) | |
627 | if l: |
|
627 | if l: | |
628 | # i18n: "converted" is a keyword |
|
628 | # i18n: "converted" is a keyword | |
629 | rev = getstring(l[0], _('converted requires a revision')) |
|
629 | rev = getstring(l[0], _('converted requires a revision')) | |
630 |
|
630 | |||
631 | def _matchvalue(r): |
|
631 | def _matchvalue(r): | |
632 | source = repo[r].extra().get('convert_revision', None) |
|
632 | source = repo[r].extra().get('convert_revision', None) | |
633 | return source is not None and (rev is None or source.startswith(rev)) |
|
633 | return source is not None and (rev is None or source.startswith(rev)) | |
634 |
|
634 | |||
635 | return subset.filter(lambda r: _matchvalue(r)) |
|
635 | return subset.filter(lambda r: _matchvalue(r)) | |
636 |
|
636 | |||
637 | def date(repo, subset, x): |
|
637 | def date(repo, subset, x): | |
638 | """``date(interval)`` |
|
638 | """``date(interval)`` | |
639 | Changesets within the interval, see :hg:`help dates`. |
|
639 | Changesets within the interval, see :hg:`help dates`. | |
640 | """ |
|
640 | """ | |
641 | # i18n: "date" is a keyword |
|
641 | # i18n: "date" is a keyword | |
642 | ds = getstring(x, _("date requires a string")) |
|
642 | ds = getstring(x, _("date requires a string")) | |
643 | dm = util.matchdate(ds) |
|
643 | dm = util.matchdate(ds) | |
644 | return subset.filter(lambda x: dm(repo[x].date()[0])) |
|
644 | return subset.filter(lambda x: dm(repo[x].date()[0])) | |
645 |
|
645 | |||
646 | def desc(repo, subset, x): |
|
646 | def desc(repo, subset, x): | |
647 | """``desc(string)`` |
|
647 | """``desc(string)`` | |
648 | Search commit message for string. The match is case-insensitive. |
|
648 | Search commit message for string. The match is case-insensitive. | |
649 | """ |
|
649 | """ | |
650 | # i18n: "desc" is a keyword |
|
650 | # i18n: "desc" is a keyword | |
651 | ds = encoding.lower(getstring(x, _("desc requires a string"))) |
|
651 | ds = encoding.lower(getstring(x, _("desc requires a string"))) | |
652 |
|
652 | |||
653 | def matches(x): |
|
653 | def matches(x): | |
654 | c = repo[x] |
|
654 | c = repo[x] | |
655 | return ds in encoding.lower(c.description()) |
|
655 | return ds in encoding.lower(c.description()) | |
656 |
|
656 | |||
657 | return subset.filter(matches) |
|
657 | return subset.filter(matches) | |
658 |
|
658 | |||
659 | def _descendants(repo, subset, x, followfirst=False): |
|
659 | def _descendants(repo, subset, x, followfirst=False): | |
660 | args = getset(repo, spanset(repo), x) |
|
660 | args = getset(repo, spanset(repo), x) | |
661 | if not args: |
|
661 | if not args: | |
662 | return baseset([]) |
|
662 | return baseset([]) | |
663 | s = _revdescendants(repo, args, followfirst) |
|
663 | s = _revdescendants(repo, args, followfirst) | |
664 | a = set(args) |
|
664 | a = set(args) | |
665 | return subset.filter(lambda r: r in s or r in a) |
|
665 | return subset.filter(lambda r: r in s or r in a) | |
666 |
|
666 | |||
667 | def descendants(repo, subset, x): |
|
667 | def descendants(repo, subset, x): | |
668 | """``descendants(set)`` |
|
668 | """``descendants(set)`` | |
669 | Changesets which are descendants of changesets in set. |
|
669 | Changesets which are descendants of changesets in set. | |
670 | """ |
|
670 | """ | |
671 | return _descendants(repo, subset, x) |
|
671 | return _descendants(repo, subset, x) | |
672 |
|
672 | |||
673 | def _firstdescendants(repo, subset, x): |
|
673 | def _firstdescendants(repo, subset, x): | |
674 | # ``_firstdescendants(set)`` |
|
674 | # ``_firstdescendants(set)`` | |
675 | # Like ``descendants(set)`` but follows only the first parents. |
|
675 | # Like ``descendants(set)`` but follows only the first parents. | |
676 | return _descendants(repo, subset, x, followfirst=True) |
|
676 | return _descendants(repo, subset, x, followfirst=True) | |
677 |
|
677 | |||
678 | def destination(repo, subset, x): |
|
678 | def destination(repo, subset, x): | |
679 | """``destination([set])`` |
|
679 | """``destination([set])`` | |
680 | Changesets that were created by a graft, transplant or rebase operation, |
|
680 | Changesets that were created by a graft, transplant or rebase operation, | |
681 | with the given revisions specified as the source. Omitting the optional set |
|
681 | with the given revisions specified as the source. Omitting the optional set | |
682 | is the same as passing all(). |
|
682 | is the same as passing all(). | |
683 | """ |
|
683 | """ | |
684 | if x is not None: |
|
684 | if x is not None: | |
685 | args = getset(repo, spanset(repo), x).set() |
|
685 | args = getset(repo, spanset(repo), x).set() | |
686 | else: |
|
686 | else: | |
687 | args = getall(repo, spanset(repo), x).set() |
|
687 | args = getall(repo, spanset(repo), x).set() | |
688 |
|
688 | |||
689 | dests = set() |
|
689 | dests = set() | |
690 |
|
690 | |||
691 | # subset contains all of the possible destinations that can be returned, so |
|
691 | # subset contains all of the possible destinations that can be returned, so | |
692 | # iterate over them and see if their source(s) were provided in the args. |
|
692 | # iterate over them and see if their source(s) were provided in the args. | |
693 | # Even if the immediate src of r is not in the args, src's source (or |
|
693 | # Even if the immediate src of r is not in the args, src's source (or | |
694 | # further back) may be. Scanning back further than the immediate src allows |
|
694 | # further back) may be. Scanning back further than the immediate src allows | |
695 | # transitive transplants and rebases to yield the same results as transitive |
|
695 | # transitive transplants and rebases to yield the same results as transitive | |
696 | # grafts. |
|
696 | # grafts. | |
697 | for r in subset: |
|
697 | for r in subset: | |
698 | src = _getrevsource(repo, r) |
|
698 | src = _getrevsource(repo, r) | |
699 | lineage = None |
|
699 | lineage = None | |
700 |
|
700 | |||
701 | while src is not None: |
|
701 | while src is not None: | |
702 | if lineage is None: |
|
702 | if lineage is None: | |
703 | lineage = list() |
|
703 | lineage = list() | |
704 |
|
704 | |||
705 | lineage.append(r) |
|
705 | lineage.append(r) | |
706 |
|
706 | |||
707 | # The visited lineage is a match if the current source is in the arg |
|
707 | # The visited lineage is a match if the current source is in the arg | |
708 | # set. Since every candidate dest is visited by way of iterating |
|
708 | # set. Since every candidate dest is visited by way of iterating | |
709 | # subset, any dests further back in the lineage will be tested by a |
|
709 | # subset, any dests further back in the lineage will be tested by a | |
710 | # different iteration over subset. Likewise, if the src was already |
|
710 | # different iteration over subset. Likewise, if the src was already | |
711 | # selected, the current lineage can be selected without going back |
|
711 | # selected, the current lineage can be selected without going back | |
712 | # further. |
|
712 | # further. | |
713 | if src in args or src in dests: |
|
713 | if src in args or src in dests: | |
714 | dests.update(lineage) |
|
714 | dests.update(lineage) | |
715 | break |
|
715 | break | |
716 |
|
716 | |||
717 | r = src |
|
717 | r = src | |
718 | src = _getrevsource(repo, r) |
|
718 | src = _getrevsource(repo, r) | |
719 |
|
719 | |||
720 | return subset.filter(lambda r: r in dests) |
|
720 | return subset.filter(lambda r: r in dests) | |
721 |
|
721 | |||
722 | def divergent(repo, subset, x): |
|
722 | def divergent(repo, subset, x): | |
723 | """``divergent()`` |
|
723 | """``divergent()`` | |
724 | Final successors of changesets with an alternative set of final successors. |
|
724 | Final successors of changesets with an alternative set of final successors. | |
725 | """ |
|
725 | """ | |
726 | # i18n: "divergent" is a keyword |
|
726 | # i18n: "divergent" is a keyword | |
727 | getargs(x, 0, 0, _("divergent takes no arguments")) |
|
727 | getargs(x, 0, 0, _("divergent takes no arguments")) | |
728 | divergent = obsmod.getrevs(repo, 'divergent') |
|
728 | divergent = obsmod.getrevs(repo, 'divergent') | |
729 | return subset.filter(lambda r: r in divergent) |
|
729 | return subset.filter(lambda r: r in divergent) | |
730 |
|
730 | |||
731 | def draft(repo, subset, x): |
|
731 | def draft(repo, subset, x): | |
732 | """``draft()`` |
|
732 | """``draft()`` | |
733 | Changeset in draft phase.""" |
|
733 | Changeset in draft phase.""" | |
734 | # i18n: "draft" is a keyword |
|
734 | # i18n: "draft" is a keyword | |
735 | getargs(x, 0, 0, _("draft takes no arguments")) |
|
735 | getargs(x, 0, 0, _("draft takes no arguments")) | |
736 | pc = repo._phasecache |
|
736 | pc = repo._phasecache | |
737 | return subset.filter(lambda r: pc.phase(repo, r) == phases.draft) |
|
737 | return subset.filter(lambda r: pc.phase(repo, r) == phases.draft) | |
738 |
|
738 | |||
739 | def extinct(repo, subset, x): |
|
739 | def extinct(repo, subset, x): | |
740 | """``extinct()`` |
|
740 | """``extinct()`` | |
741 | Obsolete changesets with obsolete descendants only. |
|
741 | Obsolete changesets with obsolete descendants only. | |
742 | """ |
|
742 | """ | |
743 | # i18n: "extinct" is a keyword |
|
743 | # i18n: "extinct" is a keyword | |
744 | getargs(x, 0, 0, _("extinct takes no arguments")) |
|
744 | getargs(x, 0, 0, _("extinct takes no arguments")) | |
745 | extincts = obsmod.getrevs(repo, 'extinct') |
|
745 | extincts = obsmod.getrevs(repo, 'extinct') | |
746 | return subset & extincts |
|
746 | return subset & extincts | |
747 |
|
747 | |||
748 | def extra(repo, subset, x): |
|
748 | def extra(repo, subset, x): | |
749 | """``extra(label, [value])`` |
|
749 | """``extra(label, [value])`` | |
750 | Changesets with the given label in the extra metadata, with the given |
|
750 | Changesets with the given label in the extra metadata, with the given | |
751 | optional value. |
|
751 | optional value. | |
752 |
|
752 | |||
753 | If `value` starts with `re:`, the remainder of the value is treated as |
|
753 | If `value` starts with `re:`, the remainder of the value is treated as | |
754 | a regular expression. To match a value that actually starts with `re:`, |
|
754 | a regular expression. To match a value that actually starts with `re:`, | |
755 | use the prefix `literal:`. |
|
755 | use the prefix `literal:`. | |
756 | """ |
|
756 | """ | |
757 |
|
757 | |||
758 | # i18n: "extra" is a keyword |
|
758 | # i18n: "extra" is a keyword | |
759 | l = getargs(x, 1, 2, _('extra takes at least 1 and at most 2 arguments')) |
|
759 | l = getargs(x, 1, 2, _('extra takes at least 1 and at most 2 arguments')) | |
760 | # i18n: "extra" is a keyword |
|
760 | # i18n: "extra" is a keyword | |
761 | label = getstring(l[0], _('first argument to extra must be a string')) |
|
761 | label = getstring(l[0], _('first argument to extra must be a string')) | |
762 | value = None |
|
762 | value = None | |
763 |
|
763 | |||
764 | if len(l) > 1: |
|
764 | if len(l) > 1: | |
765 | # i18n: "extra" is a keyword |
|
765 | # i18n: "extra" is a keyword | |
766 | value = getstring(l[1], _('second argument to extra must be a string')) |
|
766 | value = getstring(l[1], _('second argument to extra must be a string')) | |
767 | kind, value, matcher = _stringmatcher(value) |
|
767 | kind, value, matcher = _stringmatcher(value) | |
768 |
|
768 | |||
769 | def _matchvalue(r): |
|
769 | def _matchvalue(r): | |
770 | extra = repo[r].extra() |
|
770 | extra = repo[r].extra() | |
771 | return label in extra and (value is None or matcher(extra[label])) |
|
771 | return label in extra and (value is None or matcher(extra[label])) | |
772 |
|
772 | |||
773 | return subset.filter(lambda r: _matchvalue(r)) |
|
773 | return subset.filter(lambda r: _matchvalue(r)) | |
774 |
|
774 | |||
775 | def filelog(repo, subset, x): |
|
775 | def filelog(repo, subset, x): | |
776 | """``filelog(pattern)`` |
|
776 | """``filelog(pattern)`` | |
777 | Changesets connected to the specified filelog. |
|
777 | Changesets connected to the specified filelog. | |
778 |
|
778 | |||
779 | For performance reasons, ``filelog()`` does not show every changeset |
|
779 | For performance reasons, ``filelog()`` does not show every changeset | |
780 | that affects the requested file(s). See :hg:`help log` for details. For |
|
780 | that affects the requested file(s). See :hg:`help log` for details. For | |
781 | a slower, more accurate result, use ``file()``. |
|
781 | a slower, more accurate result, use ``file()``. | |
782 |
|
782 | |||
783 | The pattern without explicit kind like ``glob:`` is expected to be |
|
783 | The pattern without explicit kind like ``glob:`` is expected to be | |
784 | relative to the current directory and match against a file exactly |
|
784 | relative to the current directory and match against a file exactly | |
785 | for efficiency. |
|
785 | for efficiency. | |
786 | """ |
|
786 | """ | |
787 |
|
787 | |||
788 | # i18n: "filelog" is a keyword |
|
788 | # i18n: "filelog" is a keyword | |
789 | pat = getstring(x, _("filelog requires a pattern")) |
|
789 | pat = getstring(x, _("filelog requires a pattern")) | |
790 | s = set() |
|
790 | s = set() | |
791 |
|
791 | |||
792 | if not matchmod.patkind(pat): |
|
792 | if not matchmod.patkind(pat): | |
793 | f = pathutil.canonpath(repo.root, repo.getcwd(), pat) |
|
793 | f = pathutil.canonpath(repo.root, repo.getcwd(), pat) | |
794 | fl = repo.file(f) |
|
794 | fl = repo.file(f) | |
795 | for fr in fl: |
|
795 | for fr in fl: | |
796 | s.add(fl.linkrev(fr)) |
|
796 | s.add(fl.linkrev(fr)) | |
797 | else: |
|
797 | else: | |
798 | m = matchmod.match(repo.root, repo.getcwd(), [pat], ctx=repo[None]) |
|
798 | m = matchmod.match(repo.root, repo.getcwd(), [pat], ctx=repo[None]) | |
799 | for f in repo[None]: |
|
799 | for f in repo[None]: | |
800 | if m(f): |
|
800 | if m(f): | |
801 | fl = repo.file(f) |
|
801 | fl = repo.file(f) | |
802 | for fr in fl: |
|
802 | for fr in fl: | |
803 | s.add(fl.linkrev(fr)) |
|
803 | s.add(fl.linkrev(fr)) | |
804 |
|
804 | |||
805 | return subset.filter(lambda r: r in s) |
|
805 | return subset.filter(lambda r: r in s) | |
806 |
|
806 | |||
807 | def first(repo, subset, x): |
|
807 | def first(repo, subset, x): | |
808 | """``first(set, [n])`` |
|
808 | """``first(set, [n])`` | |
809 | An alias for limit(). |
|
809 | An alias for limit(). | |
810 | """ |
|
810 | """ | |
811 | return limit(repo, subset, x) |
|
811 | return limit(repo, subset, x) | |
812 |
|
812 | |||
813 | def _follow(repo, subset, x, name, followfirst=False): |
|
813 | def _follow(repo, subset, x, name, followfirst=False): | |
814 | l = getargs(x, 0, 1, _("%s takes no arguments or a filename") % name) |
|
814 | l = getargs(x, 0, 1, _("%s takes no arguments or a filename") % name) | |
815 | c = repo['.'] |
|
815 | c = repo['.'] | |
816 | if l: |
|
816 | if l: | |
817 | x = getstring(l[0], _("%s expected a filename") % name) |
|
817 | x = getstring(l[0], _("%s expected a filename") % name) | |
818 | if x in c: |
|
818 | if x in c: | |
819 | cx = c[x] |
|
819 | cx = c[x] | |
820 | s = set(ctx.rev() for ctx in cx.ancestors(followfirst=followfirst)) |
|
820 | s = set(ctx.rev() for ctx in cx.ancestors(followfirst=followfirst)) | |
821 | # include the revision responsible for the most recent version |
|
821 | # include the revision responsible for the most recent version | |
822 | s.add(cx.linkrev()) |
|
822 | s.add(cx.linkrev()) | |
823 | else: |
|
823 | else: | |
824 | return baseset([]) |
|
824 | return baseset([]) | |
825 | else: |
|
825 | else: | |
826 | s = _revancestors(repo, baseset([c.rev()]), followfirst) |
|
826 | s = _revancestors(repo, baseset([c.rev()]), followfirst) | |
827 |
|
827 | |||
828 | return subset.filter(lambda r: r in s) |
|
828 | return subset.filter(lambda r: r in s) | |
829 |
|
829 | |||
830 | def follow(repo, subset, x): |
|
830 | def follow(repo, subset, x): | |
831 | """``follow([file])`` |
|
831 | """``follow([file])`` | |
832 | An alias for ``::.`` (ancestors of the working copy's first parent). |
|
832 | An alias for ``::.`` (ancestors of the working copy's first parent). | |
833 | If a filename is specified, the history of the given file is followed, |
|
833 | If a filename is specified, the history of the given file is followed, | |
834 | including copies. |
|
834 | including copies. | |
835 | """ |
|
835 | """ | |
836 | return _follow(repo, subset, x, 'follow') |
|
836 | return _follow(repo, subset, x, 'follow') | |
837 |
|
837 | |||
838 | def _followfirst(repo, subset, x): |
|
838 | def _followfirst(repo, subset, x): | |
839 | # ``followfirst([file])`` |
|
839 | # ``followfirst([file])`` | |
840 | # Like ``follow([file])`` but follows only the first parent of |
|
840 | # Like ``follow([file])`` but follows only the first parent of | |
841 | # every revision or file revision. |
|
841 | # every revision or file revision. | |
842 | return _follow(repo, subset, x, '_followfirst', followfirst=True) |
|
842 | return _follow(repo, subset, x, '_followfirst', followfirst=True) | |
843 |
|
843 | |||
844 | def getall(repo, subset, x): |
|
844 | def getall(repo, subset, x): | |
845 | """``all()`` |
|
845 | """``all()`` | |
846 | All changesets, the same as ``0:tip``. |
|
846 | All changesets, the same as ``0:tip``. | |
847 | """ |
|
847 | """ | |
848 | # i18n: "all" is a keyword |
|
848 | # i18n: "all" is a keyword | |
849 | getargs(x, 0, 0, _("all takes no arguments")) |
|
849 | getargs(x, 0, 0, _("all takes no arguments")) | |
850 | return subset |
|
850 | return subset | |
851 |
|
851 | |||
852 | def grep(repo, subset, x): |
|
852 | def grep(repo, subset, x): | |
853 | """``grep(regex)`` |
|
853 | """``grep(regex)`` | |
854 | Like ``keyword(string)`` but accepts a regex. Use ``grep(r'...')`` |
|
854 | Like ``keyword(string)`` but accepts a regex. Use ``grep(r'...')`` | |
855 | to ensure special escape characters are handled correctly. Unlike |
|
855 | to ensure special escape characters are handled correctly. Unlike | |
856 | ``keyword(string)``, the match is case-sensitive. |
|
856 | ``keyword(string)``, the match is case-sensitive. | |
857 | """ |
|
857 | """ | |
858 | try: |
|
858 | try: | |
859 | # i18n: "grep" is a keyword |
|
859 | # i18n: "grep" is a keyword | |
860 | gr = re.compile(getstring(x, _("grep requires a string"))) |
|
860 | gr = re.compile(getstring(x, _("grep requires a string"))) | |
861 | except re.error, e: |
|
861 | except re.error, e: | |
862 | raise error.ParseError(_('invalid match pattern: %s') % e) |
|
862 | raise error.ParseError(_('invalid match pattern: %s') % e) | |
863 |
|
863 | |||
864 | def matches(x): |
|
864 | def matches(x): | |
865 | c = repo[x] |
|
865 | c = repo[x] | |
866 | for e in c.files() + [c.user(), c.description()]: |
|
866 | for e in c.files() + [c.user(), c.description()]: | |
867 | if gr.search(e): |
|
867 | if gr.search(e): | |
868 | return True |
|
868 | return True | |
869 | return False |
|
869 | return False | |
870 |
|
870 | |||
871 | return subset.filter(matches) |
|
871 | return subset.filter(matches) | |
872 |
|
872 | |||
873 | def _matchfiles(repo, subset, x): |
|
873 | def _matchfiles(repo, subset, x): | |
874 | # _matchfiles takes a revset list of prefixed arguments: |
|
874 | # _matchfiles takes a revset list of prefixed arguments: | |
875 | # |
|
875 | # | |
876 | # [p:foo, i:bar, x:baz] |
|
876 | # [p:foo, i:bar, x:baz] | |
877 | # |
|
877 | # | |
878 | # builds a match object from them and filters subset. Allowed |
|
878 | # builds a match object from them and filters subset. Allowed | |
879 | # prefixes are 'p:' for regular patterns, 'i:' for include |
|
879 | # prefixes are 'p:' for regular patterns, 'i:' for include | |
880 | # patterns and 'x:' for exclude patterns. Use 'r:' prefix to pass |
|
880 | # patterns and 'x:' for exclude patterns. Use 'r:' prefix to pass | |
881 | # a revision identifier, or the empty string to reference the |
|
881 | # a revision identifier, or the empty string to reference the | |
882 | # working directory, from which the match object is |
|
882 | # working directory, from which the match object is | |
883 | # initialized. Use 'd:' to set the default matching mode, default |
|
883 | # initialized. Use 'd:' to set the default matching mode, default | |
884 | # to 'glob'. At most one 'r:' and 'd:' argument can be passed. |
|
884 | # to 'glob'. At most one 'r:' and 'd:' argument can be passed. | |
885 |
|
885 | |||
886 | # i18n: "_matchfiles" is a keyword |
|
886 | # i18n: "_matchfiles" is a keyword | |
887 | l = getargs(x, 1, -1, _("_matchfiles requires at least one argument")) |
|
887 | l = getargs(x, 1, -1, _("_matchfiles requires at least one argument")) | |
888 | pats, inc, exc = [], [], [] |
|
888 | pats, inc, exc = [], [], [] | |
889 | hasset = False |
|
889 | hasset = False | |
890 | rev, default = None, None |
|
890 | rev, default = None, None | |
891 | for arg in l: |
|
891 | for arg in l: | |
892 | # i18n: "_matchfiles" is a keyword |
|
892 | # i18n: "_matchfiles" is a keyword | |
893 | s = getstring(arg, _("_matchfiles requires string arguments")) |
|
893 | s = getstring(arg, _("_matchfiles requires string arguments")) | |
894 | prefix, value = s[:2], s[2:] |
|
894 | prefix, value = s[:2], s[2:] | |
895 | if prefix == 'p:': |
|
895 | if prefix == 'p:': | |
896 | pats.append(value) |
|
896 | pats.append(value) | |
897 | elif prefix == 'i:': |
|
897 | elif prefix == 'i:': | |
898 | inc.append(value) |
|
898 | inc.append(value) | |
899 | elif prefix == 'x:': |
|
899 | elif prefix == 'x:': | |
900 | exc.append(value) |
|
900 | exc.append(value) | |
901 | elif prefix == 'r:': |
|
901 | elif prefix == 'r:': | |
902 | if rev is not None: |
|
902 | if rev is not None: | |
903 | # i18n: "_matchfiles" is a keyword |
|
903 | # i18n: "_matchfiles" is a keyword | |
904 | raise error.ParseError(_('_matchfiles expected at most one ' |
|
904 | raise error.ParseError(_('_matchfiles expected at most one ' | |
905 | 'revision')) |
|
905 | 'revision')) | |
906 | rev = value |
|
906 | rev = value | |
907 | elif prefix == 'd:': |
|
907 | elif prefix == 'd:': | |
908 | if default is not None: |
|
908 | if default is not None: | |
909 | # i18n: "_matchfiles" is a keyword |
|
909 | # i18n: "_matchfiles" is a keyword | |
910 | raise error.ParseError(_('_matchfiles expected at most one ' |
|
910 | raise error.ParseError(_('_matchfiles expected at most one ' | |
911 | 'default mode')) |
|
911 | 'default mode')) | |
912 | default = value |
|
912 | default = value | |
913 | else: |
|
913 | else: | |
914 | # i18n: "_matchfiles" is a keyword |
|
914 | # i18n: "_matchfiles" is a keyword | |
915 | raise error.ParseError(_('invalid _matchfiles prefix: %s') % prefix) |
|
915 | raise error.ParseError(_('invalid _matchfiles prefix: %s') % prefix) | |
916 | if not hasset and matchmod.patkind(value) == 'set': |
|
916 | if not hasset and matchmod.patkind(value) == 'set': | |
917 | hasset = True |
|
917 | hasset = True | |
918 | if not default: |
|
918 | if not default: | |
919 | default = 'glob' |
|
919 | default = 'glob' | |
920 |
|
920 | |||
921 | def matches(x): |
|
921 | def matches(x): | |
922 | m = None |
|
922 | m = None | |
923 | c = repo[x] |
|
923 | c = repo[x] | |
924 | if not m or (hasset and rev is None): |
|
924 | if not m or (hasset and rev is None): | |
925 | ctx = c |
|
925 | ctx = c | |
926 | if rev is not None: |
|
926 | if rev is not None: | |
927 | ctx = repo[rev or None] |
|
927 | ctx = repo[rev or None] | |
928 | m = matchmod.match(repo.root, repo.getcwd(), pats, include=inc, |
|
928 | m = matchmod.match(repo.root, repo.getcwd(), pats, include=inc, | |
929 | exclude=exc, ctx=ctx, default=default) |
|
929 | exclude=exc, ctx=ctx, default=default) | |
930 | for f in c.files(): |
|
930 | for f in c.files(): | |
931 | if m(f): |
|
931 | if m(f): | |
932 | return True |
|
932 | return True | |
933 | return False |
|
933 | return False | |
934 |
|
934 | |||
935 | return subset.filter(matches) |
|
935 | return subset.filter(matches) | |
936 |
|
936 | |||
937 | def hasfile(repo, subset, x): |
|
937 | def hasfile(repo, subset, x): | |
938 | """``file(pattern)`` |
|
938 | """``file(pattern)`` | |
939 | Changesets affecting files matched by pattern. |
|
939 | Changesets affecting files matched by pattern. | |
940 |
|
940 | |||
941 | For a faster but less accurate result, consider using ``filelog()`` |
|
941 | For a faster but less accurate result, consider using ``filelog()`` | |
942 | instead. |
|
942 | instead. | |
943 |
|
943 | |||
944 | This predicate uses ``glob:`` as the default kind of pattern. |
|
944 | This predicate uses ``glob:`` as the default kind of pattern. | |
945 | """ |
|
945 | """ | |
946 | # i18n: "file" is a keyword |
|
946 | # i18n: "file" is a keyword | |
947 | pat = getstring(x, _("file requires a pattern")) |
|
947 | pat = getstring(x, _("file requires a pattern")) | |
948 | return _matchfiles(repo, subset, ('string', 'p:' + pat)) |
|
948 | return _matchfiles(repo, subset, ('string', 'p:' + pat)) | |
949 |
|
949 | |||
950 | def head(repo, subset, x): |
|
950 | def head(repo, subset, x): | |
951 | """``head()`` |
|
951 | """``head()`` | |
952 | Changeset is a named branch head. |
|
952 | Changeset is a named branch head. | |
953 | """ |
|
953 | """ | |
954 | # i18n: "head" is a keyword |
|
954 | # i18n: "head" is a keyword | |
955 | getargs(x, 0, 0, _("head takes no arguments")) |
|
955 | getargs(x, 0, 0, _("head takes no arguments")) | |
956 | hs = set() |
|
956 | hs = set() | |
957 | for b, ls in repo.branchmap().iteritems(): |
|
957 | for b, ls in repo.branchmap().iteritems(): | |
958 | hs.update(repo[h].rev() for h in ls) |
|
958 | hs.update(repo[h].rev() for h in ls) | |
959 | return baseset(hs).filter(subset.__contains__) |
|
959 | return baseset(hs).filter(subset.__contains__) | |
960 |
|
960 | |||
961 | def heads(repo, subset, x): |
|
961 | def heads(repo, subset, x): | |
962 | """``heads(set)`` |
|
962 | """``heads(set)`` | |
963 | Members of set with no children in set. |
|
963 | Members of set with no children in set. | |
964 | """ |
|
964 | """ | |
965 | s = getset(repo, subset, x) |
|
965 | s = getset(repo, subset, x) | |
966 | ps = parents(repo, subset, x) |
|
966 | ps = parents(repo, subset, x) | |
967 | return s - ps |
|
967 | return s - ps | |
968 |
|
968 | |||
969 | def hidden(repo, subset, x): |
|
969 | def hidden(repo, subset, x): | |
970 | """``hidden()`` |
|
970 | """``hidden()`` | |
971 | Hidden changesets. |
|
971 | Hidden changesets. | |
972 | """ |
|
972 | """ | |
973 | # i18n: "hidden" is a keyword |
|
973 | # i18n: "hidden" is a keyword | |
974 | getargs(x, 0, 0, _("hidden takes no arguments")) |
|
974 | getargs(x, 0, 0, _("hidden takes no arguments")) | |
975 | hiddenrevs = repoview.filterrevs(repo, 'visible') |
|
975 | hiddenrevs = repoview.filterrevs(repo, 'visible') | |
976 | return subset & hiddenrevs |
|
976 | return subset & hiddenrevs | |
977 |
|
977 | |||
978 | def keyword(repo, subset, x): |
|
978 | def keyword(repo, subset, x): | |
979 | """``keyword(string)`` |
|
979 | """``keyword(string)`` | |
980 | Search commit message, user name, and names of changed files for |
|
980 | Search commit message, user name, and names of changed files for | |
981 | string. The match is case-insensitive. |
|
981 | string. The match is case-insensitive. | |
982 | """ |
|
982 | """ | |
983 | # i18n: "keyword" is a keyword |
|
983 | # i18n: "keyword" is a keyword | |
984 | kw = encoding.lower(getstring(x, _("keyword requires a string"))) |
|
984 | kw = encoding.lower(getstring(x, _("keyword requires a string"))) | |
985 |
|
985 | |||
986 | def matches(r): |
|
986 | def matches(r): | |
987 | c = repo[r] |
|
987 | c = repo[r] | |
988 | return util.any(kw in encoding.lower(t) for t in c.files() + [c.user(), |
|
988 | return util.any(kw in encoding.lower(t) for t in c.files() + [c.user(), | |
989 | c.description()]) |
|
989 | c.description()]) | |
990 |
|
990 | |||
991 | return subset.filter(matches) |
|
991 | return subset.filter(matches) | |
992 |
|
992 | |||
993 | def limit(repo, subset, x): |
|
993 | def limit(repo, subset, x): | |
994 | """``limit(set, [n])`` |
|
994 | """``limit(set, [n])`` | |
995 | First n members of set, defaulting to 1. |
|
995 | First n members of set, defaulting to 1. | |
996 | """ |
|
996 | """ | |
997 | # i18n: "limit" is a keyword |
|
997 | # i18n: "limit" is a keyword | |
998 | l = getargs(x, 1, 2, _("limit requires one or two arguments")) |
|
998 | l = getargs(x, 1, 2, _("limit requires one or two arguments")) | |
999 | try: |
|
999 | try: | |
1000 | lim = 1 |
|
1000 | lim = 1 | |
1001 | if len(l) == 2: |
|
1001 | if len(l) == 2: | |
1002 | # i18n: "limit" is a keyword |
|
1002 | # i18n: "limit" is a keyword | |
1003 | lim = int(getstring(l[1], _("limit requires a number"))) |
|
1003 | lim = int(getstring(l[1], _("limit requires a number"))) | |
1004 | except (TypeError, ValueError): |
|
1004 | except (TypeError, ValueError): | |
1005 | # i18n: "limit" is a keyword |
|
1005 | # i18n: "limit" is a keyword | |
1006 | raise error.ParseError(_("limit expects a number")) |
|
1006 | raise error.ParseError(_("limit expects a number")) | |
1007 | ss = subset.set() |
|
1007 | ss = subset.set() | |
1008 | os = getset(repo, spanset(repo), l[0]) |
|
1008 | os = getset(repo, spanset(repo), l[0]) | |
1009 | bs = baseset([]) |
|
1009 | bs = baseset([]) | |
1010 | it = iter(os) |
|
1010 | it = iter(os) | |
1011 | for x in xrange(lim): |
|
1011 | for x in xrange(lim): | |
1012 | try: |
|
1012 | try: | |
1013 | y = it.next() |
|
1013 | y = it.next() | |
1014 | if y in ss: |
|
1014 | if y in ss: | |
1015 | bs.append(y) |
|
1015 | bs.append(y) | |
1016 | except (StopIteration): |
|
1016 | except (StopIteration): | |
1017 | break |
|
1017 | break | |
1018 | return bs |
|
1018 | return bs | |
1019 |
|
1019 | |||
1020 | def last(repo, subset, x): |
|
1020 | def last(repo, subset, x): | |
1021 | """``last(set, [n])`` |
|
1021 | """``last(set, [n])`` | |
1022 | Last n members of set, defaulting to 1. |
|
1022 | Last n members of set, defaulting to 1. | |
1023 | """ |
|
1023 | """ | |
1024 | # i18n: "last" is a keyword |
|
1024 | # i18n: "last" is a keyword | |
1025 | l = getargs(x, 1, 2, _("last requires one or two arguments")) |
|
1025 | l = getargs(x, 1, 2, _("last requires one or two arguments")) | |
1026 | try: |
|
1026 | try: | |
1027 | lim = 1 |
|
1027 | lim = 1 | |
1028 | if len(l) == 2: |
|
1028 | if len(l) == 2: | |
1029 | # i18n: "last" is a keyword |
|
1029 | # i18n: "last" is a keyword | |
1030 | lim = int(getstring(l[1], _("last requires a number"))) |
|
1030 | lim = int(getstring(l[1], _("last requires a number"))) | |
1031 | except (TypeError, ValueError): |
|
1031 | except (TypeError, ValueError): | |
1032 | # i18n: "last" is a keyword |
|
1032 | # i18n: "last" is a keyword | |
1033 | raise error.ParseError(_("last expects a number")) |
|
1033 | raise error.ParseError(_("last expects a number")) | |
1034 | ss = subset.set() |
|
1034 | ss = subset.set() | |
1035 | os = getset(repo, spanset(repo), l[0]) |
|
1035 | os = getset(repo, spanset(repo), l[0]) | |
1036 | os.reverse() |
|
1036 | os.reverse() | |
1037 | bs = baseset([]) |
|
1037 | bs = baseset([]) | |
1038 | it = iter(os) |
|
1038 | it = iter(os) | |
1039 | for x in xrange(lim): |
|
1039 | for x in xrange(lim): | |
1040 | try: |
|
1040 | try: | |
1041 | y = it.next() |
|
1041 | y = it.next() | |
1042 | if y in ss: |
|
1042 | if y in ss: | |
1043 | bs.append(y) |
|
1043 | bs.append(y) | |
1044 | except (StopIteration): |
|
1044 | except (StopIteration): | |
1045 | break |
|
1045 | break | |
1046 | return bs |
|
1046 | return bs | |
1047 |
|
1047 | |||
1048 | def maxrev(repo, subset, x): |
|
1048 | def maxrev(repo, subset, x): | |
1049 | """``max(set)`` |
|
1049 | """``max(set)`` | |
1050 | Changeset with highest revision number in set. |
|
1050 | Changeset with highest revision number in set. | |
1051 | """ |
|
1051 | """ | |
1052 | os = getset(repo, spanset(repo), x) |
|
1052 | os = getset(repo, spanset(repo), x) | |
1053 | if os: |
|
1053 | if os: | |
1054 | m = os.max() |
|
1054 | m = os.max() | |
1055 | if m in subset: |
|
1055 | if m in subset: | |
1056 | return baseset([m]) |
|
1056 | return baseset([m]) | |
1057 | return baseset([]) |
|
1057 | return baseset([]) | |
1058 |
|
1058 | |||
1059 | def merge(repo, subset, x): |
|
1059 | def merge(repo, subset, x): | |
1060 | """``merge()`` |
|
1060 | """``merge()`` | |
1061 | Changeset is a merge changeset. |
|
1061 | Changeset is a merge changeset. | |
1062 | """ |
|
1062 | """ | |
1063 | # i18n: "merge" is a keyword |
|
1063 | # i18n: "merge" is a keyword | |
1064 | getargs(x, 0, 0, _("merge takes no arguments")) |
|
1064 | getargs(x, 0, 0, _("merge takes no arguments")) | |
1065 | cl = repo.changelog |
|
1065 | cl = repo.changelog | |
1066 | return subset.filter(lambda r: cl.parentrevs(r)[1] != -1) |
|
1066 | return subset.filter(lambda r: cl.parentrevs(r)[1] != -1) | |
1067 |
|
1067 | |||
1068 | def branchpoint(repo, subset, x): |
|
1068 | def branchpoint(repo, subset, x): | |
1069 | """``branchpoint()`` |
|
1069 | """``branchpoint()`` | |
1070 | Changesets with more than one child. |
|
1070 | Changesets with more than one child. | |
1071 | """ |
|
1071 | """ | |
1072 | # i18n: "branchpoint" is a keyword |
|
1072 | # i18n: "branchpoint" is a keyword | |
1073 | getargs(x, 0, 0, _("branchpoint takes no arguments")) |
|
1073 | getargs(x, 0, 0, _("branchpoint takes no arguments")) | |
1074 | cl = repo.changelog |
|
1074 | cl = repo.changelog | |
1075 | if not subset: |
|
1075 | if not subset: | |
1076 | return baseset([]) |
|
1076 | return baseset([]) | |
1077 | baserev = min(subset) |
|
1077 | baserev = min(subset) | |
1078 | parentscount = [0]*(len(repo) - baserev) |
|
1078 | parentscount = [0]*(len(repo) - baserev) | |
1079 | for r in cl.revs(start=baserev + 1): |
|
1079 | for r in cl.revs(start=baserev + 1): | |
1080 | for p in cl.parentrevs(r): |
|
1080 | for p in cl.parentrevs(r): | |
1081 | if p >= baserev: |
|
1081 | if p >= baserev: | |
1082 | parentscount[p - baserev] += 1 |
|
1082 | parentscount[p - baserev] += 1 | |
1083 | return subset.filter(lambda r: parentscount[r - baserev] > 1) |
|
1083 | return subset.filter(lambda r: parentscount[r - baserev] > 1) | |
1084 |
|
1084 | |||
1085 | def minrev(repo, subset, x): |
|
1085 | def minrev(repo, subset, x): | |
1086 | """``min(set)`` |
|
1086 | """``min(set)`` | |
1087 | Changeset with lowest revision number in set. |
|
1087 | Changeset with lowest revision number in set. | |
1088 | """ |
|
1088 | """ | |
1089 | os = getset(repo, spanset(repo), x) |
|
1089 | os = getset(repo, spanset(repo), x) | |
1090 | if os: |
|
1090 | if os: | |
1091 | m = os.min() |
|
1091 | m = os.min() | |
1092 | if m in subset: |
|
1092 | if m in subset: | |
1093 | return baseset([m]) |
|
1093 | return baseset([m]) | |
1094 | return baseset([]) |
|
1094 | return baseset([]) | |
1095 |
|
1095 | |||
1096 | def _missingancestors(repo, subset, x): |
|
1096 | def _missingancestors(repo, subset, x): | |
1097 | # i18n: "_missingancestors" is a keyword |
|
1097 | # i18n: "_missingancestors" is a keyword | |
1098 | revs, bases = getargs(x, 2, 2, |
|
1098 | revs, bases = getargs(x, 2, 2, | |
1099 | _("_missingancestors requires two arguments")) |
|
1099 | _("_missingancestors requires two arguments")) | |
1100 | rs = baseset(repo) |
|
1100 | rs = baseset(repo) | |
1101 | revs = getset(repo, rs, revs) |
|
1101 | revs = getset(repo, rs, revs) | |
1102 | bases = getset(repo, rs, bases) |
|
1102 | bases = getset(repo, rs, bases) | |
1103 | missing = set(repo.changelog.findmissingrevs(bases, revs)) |
|
1103 | missing = set(repo.changelog.findmissingrevs(bases, revs)) | |
1104 | return baseset([r for r in subset if r in missing]) |
|
1104 | return baseset([r for r in subset if r in missing]) | |
1105 |
|
1105 | |||
1106 | def modifies(repo, subset, x): |
|
1106 | def modifies(repo, subset, x): | |
1107 | """``modifies(pattern)`` |
|
1107 | """``modifies(pattern)`` | |
1108 | Changesets modifying files matched by pattern. |
|
1108 | Changesets modifying files matched by pattern. | |
1109 |
|
1109 | |||
1110 | The pattern without explicit kind like ``glob:`` is expected to be |
|
1110 | The pattern without explicit kind like ``glob:`` is expected to be | |
1111 | relative to the current directory and match against a file or a |
|
1111 | relative to the current directory and match against a file or a | |
1112 | directory. |
|
1112 | directory. | |
1113 | """ |
|
1113 | """ | |
1114 | # i18n: "modifies" is a keyword |
|
1114 | # i18n: "modifies" is a keyword | |
1115 | pat = getstring(x, _("modifies requires a pattern")) |
|
1115 | pat = getstring(x, _("modifies requires a pattern")) | |
1116 | return checkstatus(repo, subset, pat, 0) |
|
1116 | return checkstatus(repo, subset, pat, 0) | |
1117 |
|
1117 | |||
1118 | def node_(repo, subset, x): |
|
1118 | def node_(repo, subset, x): | |
1119 | """``id(string)`` |
|
1119 | """``id(string)`` | |
1120 | Revision non-ambiguously specified by the given hex string prefix. |
|
1120 | Revision non-ambiguously specified by the given hex string prefix. | |
1121 | """ |
|
1121 | """ | |
1122 | # i18n: "id" is a keyword |
|
1122 | # i18n: "id" is a keyword | |
1123 | l = getargs(x, 1, 1, _("id requires one argument")) |
|
1123 | l = getargs(x, 1, 1, _("id requires one argument")) | |
1124 | # i18n: "id" is a keyword |
|
1124 | # i18n: "id" is a keyword | |
1125 | n = getstring(l[0], _("id requires a string")) |
|
1125 | n = getstring(l[0], _("id requires a string")) | |
1126 | if len(n) == 40: |
|
1126 | if len(n) == 40: | |
1127 | rn = repo[n].rev() |
|
1127 | rn = repo[n].rev() | |
1128 | else: |
|
1128 | else: | |
1129 | rn = None |
|
1129 | rn = None | |
1130 | pm = repo.changelog._partialmatch(n) |
|
1130 | pm = repo.changelog._partialmatch(n) | |
1131 | if pm is not None: |
|
1131 | if pm is not None: | |
1132 | rn = repo.changelog.rev(pm) |
|
1132 | rn = repo.changelog.rev(pm) | |
1133 |
|
1133 | |||
1134 | return subset.filter(lambda r: r == rn) |
|
1134 | return subset.filter(lambda r: r == rn) | |
1135 |
|
1135 | |||
1136 | def obsolete(repo, subset, x): |
|
1136 | def obsolete(repo, subset, x): | |
1137 | """``obsolete()`` |
|
1137 | """``obsolete()`` | |
1138 | Mutable changeset with a newer version.""" |
|
1138 | Mutable changeset with a newer version.""" | |
1139 | # i18n: "obsolete" is a keyword |
|
1139 | # i18n: "obsolete" is a keyword | |
1140 | getargs(x, 0, 0, _("obsolete takes no arguments")) |
|
1140 | getargs(x, 0, 0, _("obsolete takes no arguments")) | |
1141 | obsoletes = obsmod.getrevs(repo, 'obsolete') |
|
1141 | obsoletes = obsmod.getrevs(repo, 'obsolete') | |
1142 | return subset & obsoletes |
|
1142 | return subset & obsoletes | |
1143 |
|
1143 | |||
1144 | def origin(repo, subset, x): |
|
1144 | def origin(repo, subset, x): | |
1145 | """``origin([set])`` |
|
1145 | """``origin([set])`` | |
1146 | Changesets that were specified as a source for the grafts, transplants or |
|
1146 | Changesets that were specified as a source for the grafts, transplants or | |
1147 | rebases that created the given revisions. Omitting the optional set is the |
|
1147 | rebases that created the given revisions. Omitting the optional set is the | |
1148 | same as passing all(). If a changeset created by these operations is itself |
|
1148 | same as passing all(). If a changeset created by these operations is itself | |
1149 | specified as a source for one of these operations, only the source changeset |
|
1149 | specified as a source for one of these operations, only the source changeset | |
1150 | for the first operation is selected. |
|
1150 | for the first operation is selected. | |
1151 | """ |
|
1151 | """ | |
1152 | if x is not None: |
|
1152 | if x is not None: | |
1153 | args = getset(repo, spanset(repo), x).set() |
|
1153 | args = getset(repo, spanset(repo), x).set() | |
1154 | else: |
|
1154 | else: | |
1155 | args = getall(repo, spanset(repo), x).set() |
|
1155 | args = getall(repo, spanset(repo), x).set() | |
1156 |
|
1156 | |||
1157 | def _firstsrc(rev): |
|
1157 | def _firstsrc(rev): | |
1158 | src = _getrevsource(repo, rev) |
|
1158 | src = _getrevsource(repo, rev) | |
1159 | if src is None: |
|
1159 | if src is None: | |
1160 | return None |
|
1160 | return None | |
1161 |
|
1161 | |||
1162 | while True: |
|
1162 | while True: | |
1163 | prev = _getrevsource(repo, src) |
|
1163 | prev = _getrevsource(repo, src) | |
1164 |
|
1164 | |||
1165 | if prev is None: |
|
1165 | if prev is None: | |
1166 | return src |
|
1166 | return src | |
1167 | src = prev |
|
1167 | src = prev | |
1168 |
|
1168 | |||
1169 | o = set([_firstsrc(r) for r in args]) |
|
1169 | o = set([_firstsrc(r) for r in args]) | |
1170 | return subset.filter(lambda r: r in o) |
|
1170 | return subset.filter(lambda r: r in o) | |
1171 |
|
1171 | |||
1172 | def outgoing(repo, subset, x): |
|
1172 | def outgoing(repo, subset, x): | |
1173 | """``outgoing([path])`` |
|
1173 | """``outgoing([path])`` | |
1174 | Changesets not found in the specified destination repository, or the |
|
1174 | Changesets not found in the specified destination repository, or the | |
1175 | default push location. |
|
1175 | default push location. | |
1176 | """ |
|
1176 | """ | |
1177 | import hg # avoid start-up nasties |
|
1177 | import hg # avoid start-up nasties | |
1178 | # i18n: "outgoing" is a keyword |
|
1178 | # i18n: "outgoing" is a keyword | |
1179 | l = getargs(x, 0, 1, _("outgoing takes one or no arguments")) |
|
1179 | l = getargs(x, 0, 1, _("outgoing takes one or no arguments")) | |
1180 | # i18n: "outgoing" is a keyword |
|
1180 | # i18n: "outgoing" is a keyword | |
1181 | dest = l and getstring(l[0], _("outgoing requires a repository path")) or '' |
|
1181 | dest = l and getstring(l[0], _("outgoing requires a repository path")) or '' | |
1182 | dest = repo.ui.expandpath(dest or 'default-push', dest or 'default') |
|
1182 | dest = repo.ui.expandpath(dest or 'default-push', dest or 'default') | |
1183 | dest, branches = hg.parseurl(dest) |
|
1183 | dest, branches = hg.parseurl(dest) | |
1184 | revs, checkout = hg.addbranchrevs(repo, repo, branches, []) |
|
1184 | revs, checkout = hg.addbranchrevs(repo, repo, branches, []) | |
1185 | if revs: |
|
1185 | if revs: | |
1186 | revs = [repo.lookup(rev) for rev in revs] |
|
1186 | revs = [repo.lookup(rev) for rev in revs] | |
1187 | other = hg.peer(repo, {}, dest) |
|
1187 | other = hg.peer(repo, {}, dest) | |
1188 | repo.ui.pushbuffer() |
|
1188 | repo.ui.pushbuffer() | |
1189 | outgoing = discovery.findcommonoutgoing(repo, other, onlyheads=revs) |
|
1189 | outgoing = discovery.findcommonoutgoing(repo, other, onlyheads=revs) | |
1190 | repo.ui.popbuffer() |
|
1190 | repo.ui.popbuffer() | |
1191 | cl = repo.changelog |
|
1191 | cl = repo.changelog | |
1192 | o = set([cl.rev(r) for r in outgoing.missing]) |
|
1192 | o = set([cl.rev(r) for r in outgoing.missing]) | |
1193 | return subset.filter(lambda r: r in o) |
|
1193 | return subset.filter(lambda r: r in o) | |
1194 |
|
1194 | |||
1195 | def p1(repo, subset, x): |
|
1195 | def p1(repo, subset, x): | |
1196 | """``p1([set])`` |
|
1196 | """``p1([set])`` | |
1197 | First parent of changesets in set, or the working directory. |
|
1197 | First parent of changesets in set, or the working directory. | |
1198 | """ |
|
1198 | """ | |
1199 | if x is None: |
|
1199 | if x is None: | |
1200 | p = repo[x].p1().rev() |
|
1200 | p = repo[x].p1().rev() | |
1201 | return subset.filter(lambda r: r == p) |
|
1201 | return subset.filter(lambda r: r == p) | |
1202 |
|
1202 | |||
1203 | ps = set() |
|
1203 | ps = set() | |
1204 | cl = repo.changelog |
|
1204 | cl = repo.changelog | |
1205 | for r in getset(repo, spanset(repo), x): |
|
1205 | for r in getset(repo, spanset(repo), x): | |
1206 | ps.add(cl.parentrevs(r)[0]) |
|
1206 | ps.add(cl.parentrevs(r)[0]) | |
1207 | return subset & ps |
|
1207 | return subset & ps | |
1208 |
|
1208 | |||
1209 | def p2(repo, subset, x): |
|
1209 | def p2(repo, subset, x): | |
1210 | """``p2([set])`` |
|
1210 | """``p2([set])`` | |
1211 | Second parent of changesets in set, or the working directory. |
|
1211 | Second parent of changesets in set, or the working directory. | |
1212 | """ |
|
1212 | """ | |
1213 | if x is None: |
|
1213 | if x is None: | |
1214 | ps = repo[x].parents() |
|
1214 | ps = repo[x].parents() | |
1215 | try: |
|
1215 | try: | |
1216 | p = ps[1].rev() |
|
1216 | p = ps[1].rev() | |
1217 | return subset.filter(lambda r: r == p) |
|
1217 | return subset.filter(lambda r: r == p) | |
1218 | except IndexError: |
|
1218 | except IndexError: | |
1219 | return baseset([]) |
|
1219 | return baseset([]) | |
1220 |
|
1220 | |||
1221 | ps = set() |
|
1221 | ps = set() | |
1222 | cl = repo.changelog |
|
1222 | cl = repo.changelog | |
1223 | for r in getset(repo, spanset(repo), x): |
|
1223 | for r in getset(repo, spanset(repo), x): | |
1224 | ps.add(cl.parentrevs(r)[1]) |
|
1224 | ps.add(cl.parentrevs(r)[1]) | |
1225 | return subset & ps |
|
1225 | return subset & ps | |
1226 |
|
1226 | |||
1227 | def parents(repo, subset, x): |
|
1227 | def parents(repo, subset, x): | |
1228 | """``parents([set])`` |
|
1228 | """``parents([set])`` | |
1229 | The set of all parents for all changesets in set, or the working directory. |
|
1229 | The set of all parents for all changesets in set, or the working directory. | |
1230 | """ |
|
1230 | """ | |
1231 | if x is None: |
|
1231 | if x is None: | |
1232 | ps = tuple(p.rev() for p in repo[x].parents()) |
|
1232 | ps = tuple(p.rev() for p in repo[x].parents()) | |
1233 | return subset & ps |
|
1233 | return subset & ps | |
1234 |
|
1234 | |||
1235 | ps = set() |
|
1235 | ps = set() | |
1236 | cl = repo.changelog |
|
1236 | cl = repo.changelog | |
1237 | for r in getset(repo, spanset(repo), x): |
|
1237 | for r in getset(repo, spanset(repo), x): | |
1238 | ps.update(cl.parentrevs(r)) |
|
1238 | ps.update(cl.parentrevs(r)) | |
1239 | return subset & ps |
|
1239 | return subset & ps | |
1240 |
|
1240 | |||
1241 | def parentspec(repo, subset, x, n): |
|
1241 | def parentspec(repo, subset, x, n): | |
1242 | """``set^0`` |
|
1242 | """``set^0`` | |
1243 | The set. |
|
1243 | The set. | |
1244 | ``set^1`` (or ``set^``), ``set^2`` |
|
1244 | ``set^1`` (or ``set^``), ``set^2`` | |
1245 | First or second parent, respectively, of all changesets in set. |
|
1245 | First or second parent, respectively, of all changesets in set. | |
1246 | """ |
|
1246 | """ | |
1247 | try: |
|
1247 | try: | |
1248 | n = int(n[1]) |
|
1248 | n = int(n[1]) | |
1249 | if n not in (0, 1, 2): |
|
1249 | if n not in (0, 1, 2): | |
1250 | raise ValueError |
|
1250 | raise ValueError | |
1251 | except (TypeError, ValueError): |
|
1251 | except (TypeError, ValueError): | |
1252 | raise error.ParseError(_("^ expects a number 0, 1, or 2")) |
|
1252 | raise error.ParseError(_("^ expects a number 0, 1, or 2")) | |
1253 | ps = set() |
|
1253 | ps = set() | |
1254 | cl = repo.changelog |
|
1254 | cl = repo.changelog | |
1255 | for r in getset(repo, baseset(cl), x): |
|
1255 | for r in getset(repo, baseset(cl), x): | |
1256 | if n == 0: |
|
1256 | if n == 0: | |
1257 | ps.add(r) |
|
1257 | ps.add(r) | |
1258 | elif n == 1: |
|
1258 | elif n == 1: | |
1259 | ps.add(cl.parentrevs(r)[0]) |
|
1259 | ps.add(cl.parentrevs(r)[0]) | |
1260 | elif n == 2: |
|
1260 | elif n == 2: | |
1261 | parents = cl.parentrevs(r) |
|
1261 | parents = cl.parentrevs(r) | |
1262 | if len(parents) > 1: |
|
1262 | if len(parents) > 1: | |
1263 | ps.add(parents[1]) |
|
1263 | ps.add(parents[1]) | |
1264 | return subset & ps |
|
1264 | return subset & ps | |
1265 |
|
1265 | |||
1266 | def present(repo, subset, x): |
|
1266 | def present(repo, subset, x): | |
1267 | """``present(set)`` |
|
1267 | """``present(set)`` | |
1268 | An empty set, if any revision in set isn't found; otherwise, |
|
1268 | An empty set, if any revision in set isn't found; otherwise, | |
1269 | all revisions in set. |
|
1269 | all revisions in set. | |
1270 |
|
1270 | |||
1271 | If any of specified revisions is not present in the local repository, |
|
1271 | If any of specified revisions is not present in the local repository, | |
1272 | the query is normally aborted. But this predicate allows the query |
|
1272 | the query is normally aborted. But this predicate allows the query | |
1273 | to continue even in such cases. |
|
1273 | to continue even in such cases. | |
1274 | """ |
|
1274 | """ | |
1275 | try: |
|
1275 | try: | |
1276 | return getset(repo, subset, x) |
|
1276 | return getset(repo, subset, x) | |
1277 | except error.RepoLookupError: |
|
1277 | except error.RepoLookupError: | |
1278 | return baseset([]) |
|
1278 | return baseset([]) | |
1279 |
|
1279 | |||
1280 | def public(repo, subset, x): |
|
1280 | def public(repo, subset, x): | |
1281 | """``public()`` |
|
1281 | """``public()`` | |
1282 | Changeset in public phase.""" |
|
1282 | Changeset in public phase.""" | |
1283 | # i18n: "public" is a keyword |
|
1283 | # i18n: "public" is a keyword | |
1284 | getargs(x, 0, 0, _("public takes no arguments")) |
|
1284 | getargs(x, 0, 0, _("public takes no arguments")) | |
1285 | pc = repo._phasecache |
|
1285 | pc = repo._phasecache | |
1286 | return subset.filter(lambda r: pc.phase(repo, r) == phases.public) |
|
1286 | return subset.filter(lambda r: pc.phase(repo, r) == phases.public) | |
1287 |
|
1287 | |||
1288 | def remote(repo, subset, x): |
|
1288 | def remote(repo, subset, x): | |
1289 | """``remote([id [,path]])`` |
|
1289 | """``remote([id [,path]])`` | |
1290 | Local revision that corresponds to the given identifier in a |
|
1290 | Local revision that corresponds to the given identifier in a | |
1291 | remote repository, if present. Here, the '.' identifier is a |
|
1291 | remote repository, if present. Here, the '.' identifier is a | |
1292 | synonym for the current local branch. |
|
1292 | synonym for the current local branch. | |
1293 | """ |
|
1293 | """ | |
1294 |
|
1294 | |||
1295 | import hg # avoid start-up nasties |
|
1295 | import hg # avoid start-up nasties | |
1296 | # i18n: "remote" is a keyword |
|
1296 | # i18n: "remote" is a keyword | |
1297 | l = getargs(x, 0, 2, _("remote takes one, two or no arguments")) |
|
1297 | l = getargs(x, 0, 2, _("remote takes one, two or no arguments")) | |
1298 |
|
1298 | |||
1299 | q = '.' |
|
1299 | q = '.' | |
1300 | if len(l) > 0: |
|
1300 | if len(l) > 0: | |
1301 | # i18n: "remote" is a keyword |
|
1301 | # i18n: "remote" is a keyword | |
1302 | q = getstring(l[0], _("remote requires a string id")) |
|
1302 | q = getstring(l[0], _("remote requires a string id")) | |
1303 | if q == '.': |
|
1303 | if q == '.': | |
1304 | q = repo['.'].branch() |
|
1304 | q = repo['.'].branch() | |
1305 |
|
1305 | |||
1306 | dest = '' |
|
1306 | dest = '' | |
1307 | if len(l) > 1: |
|
1307 | if len(l) > 1: | |
1308 | # i18n: "remote" is a keyword |
|
1308 | # i18n: "remote" is a keyword | |
1309 | dest = getstring(l[1], _("remote requires a repository path")) |
|
1309 | dest = getstring(l[1], _("remote requires a repository path")) | |
1310 | dest = repo.ui.expandpath(dest or 'default') |
|
1310 | dest = repo.ui.expandpath(dest or 'default') | |
1311 | dest, branches = hg.parseurl(dest) |
|
1311 | dest, branches = hg.parseurl(dest) | |
1312 | revs, checkout = hg.addbranchrevs(repo, repo, branches, []) |
|
1312 | revs, checkout = hg.addbranchrevs(repo, repo, branches, []) | |
1313 | if revs: |
|
1313 | if revs: | |
1314 | revs = [repo.lookup(rev) for rev in revs] |
|
1314 | revs = [repo.lookup(rev) for rev in revs] | |
1315 | other = hg.peer(repo, {}, dest) |
|
1315 | other = hg.peer(repo, {}, dest) | |
1316 | n = other.lookup(q) |
|
1316 | n = other.lookup(q) | |
1317 | if n in repo: |
|
1317 | if n in repo: | |
1318 | r = repo[n].rev() |
|
1318 | r = repo[n].rev() | |
1319 | if r in subset: |
|
1319 | if r in subset: | |
1320 | return baseset([r]) |
|
1320 | return baseset([r]) | |
1321 | return baseset([]) |
|
1321 | return baseset([]) | |
1322 |
|
1322 | |||
1323 | def removes(repo, subset, x): |
|
1323 | def removes(repo, subset, x): | |
1324 | """``removes(pattern)`` |
|
1324 | """``removes(pattern)`` | |
1325 | Changesets which remove files matching pattern. |
|
1325 | Changesets which remove files matching pattern. | |
1326 |
|
1326 | |||
1327 | The pattern without explicit kind like ``glob:`` is expected to be |
|
1327 | The pattern without explicit kind like ``glob:`` is expected to be | |
1328 | relative to the current directory and match against a file or a |
|
1328 | relative to the current directory and match against a file or a | |
1329 | directory. |
|
1329 | directory. | |
1330 | """ |
|
1330 | """ | |
1331 | # i18n: "removes" is a keyword |
|
1331 | # i18n: "removes" is a keyword | |
1332 | pat = getstring(x, _("removes requires a pattern")) |
|
1332 | pat = getstring(x, _("removes requires a pattern")) | |
1333 | return checkstatus(repo, subset, pat, 2) |
|
1333 | return checkstatus(repo, subset, pat, 2) | |
1334 |
|
1334 | |||
1335 | def rev(repo, subset, x): |
|
1335 | def rev(repo, subset, x): | |
1336 | """``rev(number)`` |
|
1336 | """``rev(number)`` | |
1337 | Revision with the given numeric identifier. |
|
1337 | Revision with the given numeric identifier. | |
1338 | """ |
|
1338 | """ | |
1339 | # i18n: "rev" is a keyword |
|
1339 | # i18n: "rev" is a keyword | |
1340 | l = getargs(x, 1, 1, _("rev requires one argument")) |
|
1340 | l = getargs(x, 1, 1, _("rev requires one argument")) | |
1341 | try: |
|
1341 | try: | |
1342 | # i18n: "rev" is a keyword |
|
1342 | # i18n: "rev" is a keyword | |
1343 | l = int(getstring(l[0], _("rev requires a number"))) |
|
1343 | l = int(getstring(l[0], _("rev requires a number"))) | |
1344 | except (TypeError, ValueError): |
|
1344 | except (TypeError, ValueError): | |
1345 | # i18n: "rev" is a keyword |
|
1345 | # i18n: "rev" is a keyword | |
1346 | raise error.ParseError(_("rev expects a number")) |
|
1346 | raise error.ParseError(_("rev expects a number")) | |
1347 | return subset.filter(lambda r: r == l) |
|
1347 | return subset.filter(lambda r: r == l) | |
1348 |
|
1348 | |||
1349 | def matching(repo, subset, x): |
|
1349 | def matching(repo, subset, x): | |
1350 | """``matching(revision [, field])`` |
|
1350 | """``matching(revision [, field])`` | |
1351 | Changesets in which a given set of fields match the set of fields in the |
|
1351 | Changesets in which a given set of fields match the set of fields in the | |
1352 | selected revision or set. |
|
1352 | selected revision or set. | |
1353 |
|
1353 | |||
1354 | To match more than one field pass the list of fields to match separated |
|
1354 | To match more than one field pass the list of fields to match separated | |
1355 | by spaces (e.g. ``author description``). |
|
1355 | by spaces (e.g. ``author description``). | |
1356 |
|
1356 | |||
1357 | Valid fields are most regular revision fields and some special fields. |
|
1357 | Valid fields are most regular revision fields and some special fields. | |
1358 |
|
1358 | |||
1359 | Regular revision fields are ``description``, ``author``, ``branch``, |
|
1359 | Regular revision fields are ``description``, ``author``, ``branch``, | |
1360 | ``date``, ``files``, ``phase``, ``parents``, ``substate``, ``user`` |
|
1360 | ``date``, ``files``, ``phase``, ``parents``, ``substate``, ``user`` | |
1361 | and ``diff``. |
|
1361 | and ``diff``. | |
1362 | Note that ``author`` and ``user`` are synonyms. ``diff`` refers to the |
|
1362 | Note that ``author`` and ``user`` are synonyms. ``diff`` refers to the | |
1363 | contents of the revision. Two revisions matching their ``diff`` will |
|
1363 | contents of the revision. Two revisions matching their ``diff`` will | |
1364 | also match their ``files``. |
|
1364 | also match their ``files``. | |
1365 |
|
1365 | |||
1366 | Special fields are ``summary`` and ``metadata``: |
|
1366 | Special fields are ``summary`` and ``metadata``: | |
1367 | ``summary`` matches the first line of the description. |
|
1367 | ``summary`` matches the first line of the description. | |
1368 | ``metadata`` is equivalent to matching ``description user date`` |
|
1368 | ``metadata`` is equivalent to matching ``description user date`` | |
1369 | (i.e. it matches the main metadata fields). |
|
1369 | (i.e. it matches the main metadata fields). | |
1370 |
|
1370 | |||
1371 | ``metadata`` is the default field which is used when no fields are |
|
1371 | ``metadata`` is the default field which is used when no fields are | |
1372 | specified. You can match more than one field at a time. |
|
1372 | specified. You can match more than one field at a time. | |
1373 | """ |
|
1373 | """ | |
1374 | # i18n: "matching" is a keyword |
|
1374 | # i18n: "matching" is a keyword | |
1375 | l = getargs(x, 1, 2, _("matching takes 1 or 2 arguments")) |
|
1375 | l = getargs(x, 1, 2, _("matching takes 1 or 2 arguments")) | |
1376 |
|
1376 | |||
1377 | revs = getset(repo, baseset(repo.changelog), l[0]) |
|
1377 | revs = getset(repo, baseset(repo.changelog), l[0]) | |
1378 |
|
1378 | |||
1379 | fieldlist = ['metadata'] |
|
1379 | fieldlist = ['metadata'] | |
1380 | if len(l) > 1: |
|
1380 | if len(l) > 1: | |
1381 | fieldlist = getstring(l[1], |
|
1381 | fieldlist = getstring(l[1], | |
1382 | # i18n: "matching" is a keyword |
|
1382 | # i18n: "matching" is a keyword | |
1383 | _("matching requires a string " |
|
1383 | _("matching requires a string " | |
1384 | "as its second argument")).split() |
|
1384 | "as its second argument")).split() | |
1385 |
|
1385 | |||
1386 | # Make sure that there are no repeated fields, |
|
1386 | # Make sure that there are no repeated fields, | |
1387 | # expand the 'special' 'metadata' field type |
|
1387 | # expand the 'special' 'metadata' field type | |
1388 | # and check the 'files' whenever we check the 'diff' |
|
1388 | # and check the 'files' whenever we check the 'diff' | |
1389 | fields = [] |
|
1389 | fields = [] | |
1390 | for field in fieldlist: |
|
1390 | for field in fieldlist: | |
1391 | if field == 'metadata': |
|
1391 | if field == 'metadata': | |
1392 | fields += ['user', 'description', 'date'] |
|
1392 | fields += ['user', 'description', 'date'] | |
1393 | elif field == 'diff': |
|
1393 | elif field == 'diff': | |
1394 | # a revision matching the diff must also match the files |
|
1394 | # a revision matching the diff must also match the files | |
1395 | # since matching the diff is very costly, make sure to |
|
1395 | # since matching the diff is very costly, make sure to | |
1396 | # also match the files first |
|
1396 | # also match the files first | |
1397 | fields += ['files', 'diff'] |
|
1397 | fields += ['files', 'diff'] | |
1398 | else: |
|
1398 | else: | |
1399 | if field == 'author': |
|
1399 | if field == 'author': | |
1400 | field = 'user' |
|
1400 | field = 'user' | |
1401 | fields.append(field) |
|
1401 | fields.append(field) | |
1402 | fields = set(fields) |
|
1402 | fields = set(fields) | |
1403 | if 'summary' in fields and 'description' in fields: |
|
1403 | if 'summary' in fields and 'description' in fields: | |
1404 | # If a revision matches its description it also matches its summary |
|
1404 | # If a revision matches its description it also matches its summary | |
1405 | fields.discard('summary') |
|
1405 | fields.discard('summary') | |
1406 |
|
1406 | |||
1407 | # We may want to match more than one field |
|
1407 | # We may want to match more than one field | |
1408 | # Not all fields take the same amount of time to be matched |
|
1408 | # Not all fields take the same amount of time to be matched | |
1409 | # Sort the selected fields in order of increasing matching cost |
|
1409 | # Sort the selected fields in order of increasing matching cost | |
1410 | fieldorder = ['phase', 'parents', 'user', 'date', 'branch', 'summary', |
|
1410 | fieldorder = ['phase', 'parents', 'user', 'date', 'branch', 'summary', | |
1411 | 'files', 'description', 'substate', 'diff'] |
|
1411 | 'files', 'description', 'substate', 'diff'] | |
1412 | def fieldkeyfunc(f): |
|
1412 | def fieldkeyfunc(f): | |
1413 | try: |
|
1413 | try: | |
1414 | return fieldorder.index(f) |
|
1414 | return fieldorder.index(f) | |
1415 | except ValueError: |
|
1415 | except ValueError: | |
1416 | # assume an unknown field is very costly |
|
1416 | # assume an unknown field is very costly | |
1417 | return len(fieldorder) |
|
1417 | return len(fieldorder) | |
1418 | fields = list(fields) |
|
1418 | fields = list(fields) | |
1419 | fields.sort(key=fieldkeyfunc) |
|
1419 | fields.sort(key=fieldkeyfunc) | |
1420 |
|
1420 | |||
1421 | # Each field will be matched with its own "getfield" function |
|
1421 | # Each field will be matched with its own "getfield" function | |
1422 | # which will be added to the getfieldfuncs array of functions |
|
1422 | # which will be added to the getfieldfuncs array of functions | |
1423 | getfieldfuncs = [] |
|
1423 | getfieldfuncs = [] | |
1424 | _funcs = { |
|
1424 | _funcs = { | |
1425 | 'user': lambda r: repo[r].user(), |
|
1425 | 'user': lambda r: repo[r].user(), | |
1426 | 'branch': lambda r: repo[r].branch(), |
|
1426 | 'branch': lambda r: repo[r].branch(), | |
1427 | 'date': lambda r: repo[r].date(), |
|
1427 | 'date': lambda r: repo[r].date(), | |
1428 | 'description': lambda r: repo[r].description(), |
|
1428 | 'description': lambda r: repo[r].description(), | |
1429 | 'files': lambda r: repo[r].files(), |
|
1429 | 'files': lambda r: repo[r].files(), | |
1430 | 'parents': lambda r: repo[r].parents(), |
|
1430 | 'parents': lambda r: repo[r].parents(), | |
1431 | 'phase': lambda r: repo[r].phase(), |
|
1431 | 'phase': lambda r: repo[r].phase(), | |
1432 | 'substate': lambda r: repo[r].substate, |
|
1432 | 'substate': lambda r: repo[r].substate, | |
1433 | 'summary': lambda r: repo[r].description().splitlines()[0], |
|
1433 | 'summary': lambda r: repo[r].description().splitlines()[0], | |
1434 | 'diff': lambda r: list(repo[r].diff(git=True),) |
|
1434 | 'diff': lambda r: list(repo[r].diff(git=True),) | |
1435 | } |
|
1435 | } | |
1436 | for info in fields: |
|
1436 | for info in fields: | |
1437 | getfield = _funcs.get(info, None) |
|
1437 | getfield = _funcs.get(info, None) | |
1438 | if getfield is None: |
|
1438 | if getfield is None: | |
1439 | raise error.ParseError( |
|
1439 | raise error.ParseError( | |
1440 | # i18n: "matching" is a keyword |
|
1440 | # i18n: "matching" is a keyword | |
1441 | _("unexpected field name passed to matching: %s") % info) |
|
1441 | _("unexpected field name passed to matching: %s") % info) | |
1442 | getfieldfuncs.append(getfield) |
|
1442 | getfieldfuncs.append(getfield) | |
1443 | # convert the getfield array of functions into a "getinfo" function |
|
1443 | # convert the getfield array of functions into a "getinfo" function | |
1444 | # which returns an array of field values (or a single value if there |
|
1444 | # which returns an array of field values (or a single value if there | |
1445 | # is only one field to match) |
|
1445 | # is only one field to match) | |
1446 | getinfo = lambda r: [f(r) for f in getfieldfuncs] |
|
1446 | getinfo = lambda r: [f(r) for f in getfieldfuncs] | |
1447 |
|
1447 | |||
1448 | def matches(x): |
|
1448 | def matches(x): | |
1449 | for rev in revs: |
|
1449 | for rev in revs: | |
1450 | target = getinfo(rev) |
|
1450 | target = getinfo(rev) | |
1451 | match = True |
|
1451 | match = True | |
1452 | for n, f in enumerate(getfieldfuncs): |
|
1452 | for n, f in enumerate(getfieldfuncs): | |
1453 | if target[n] != f(x): |
|
1453 | if target[n] != f(x): | |
1454 | match = False |
|
1454 | match = False | |
1455 | if match: |
|
1455 | if match: | |
1456 | return True |
|
1456 | return True | |
1457 | return False |
|
1457 | return False | |
1458 |
|
1458 | |||
1459 | return subset.filter(matches) |
|
1459 | return subset.filter(matches) | |
1460 |
|
1460 | |||
1461 | def reverse(repo, subset, x): |
|
1461 | def reverse(repo, subset, x): | |
1462 | """``reverse(set)`` |
|
1462 | """``reverse(set)`` | |
1463 | Reverse order of set. |
|
1463 | Reverse order of set. | |
1464 | """ |
|
1464 | """ | |
1465 | l = getset(repo, subset, x) |
|
1465 | l = getset(repo, subset, x) | |
1466 | l.reverse() |
|
1466 | l.reverse() | |
1467 | return l |
|
1467 | return l | |
1468 |
|
1468 | |||
1469 | def roots(repo, subset, x): |
|
1469 | def roots(repo, subset, x): | |
1470 | """``roots(set)`` |
|
1470 | """``roots(set)`` | |
1471 | Changesets in set with no parent changeset in set. |
|
1471 | Changesets in set with no parent changeset in set. | |
1472 | """ |
|
1472 | """ | |
1473 | s = getset(repo, baseset(repo.changelog), x).set() |
|
1473 | s = getset(repo, baseset(repo.changelog), x).set() | |
1474 | subset = baseset([r for r in subset if r in s]) |
|
1474 | subset = baseset([r for r in subset if r in s]) | |
1475 | cs = _children(repo, subset, s) |
|
1475 | cs = _children(repo, subset, s) | |
1476 | return subset - cs |
|
1476 | return subset - cs | |
1477 |
|
1477 | |||
1478 | def secret(repo, subset, x): |
|
1478 | def secret(repo, subset, x): | |
1479 | """``secret()`` |
|
1479 | """``secret()`` | |
1480 | Changeset in secret phase.""" |
|
1480 | Changeset in secret phase.""" | |
1481 | # i18n: "secret" is a keyword |
|
1481 | # i18n: "secret" is a keyword | |
1482 | getargs(x, 0, 0, _("secret takes no arguments")) |
|
1482 | getargs(x, 0, 0, _("secret takes no arguments")) | |
1483 | pc = repo._phasecache |
|
1483 | pc = repo._phasecache | |
1484 | return subset.filter(lambda x: pc.phase(repo, x) == phases.secret) |
|
1484 | return subset.filter(lambda x: pc.phase(repo, x) == phases.secret) | |
1485 |
|
1485 | |||
1486 | def sort(repo, subset, x): |
|
1486 | def sort(repo, subset, x): | |
1487 | """``sort(set[, [-]key...])`` |
|
1487 | """``sort(set[, [-]key...])`` | |
1488 | Sort set by keys. The default sort order is ascending, specify a key |
|
1488 | Sort set by keys. The default sort order is ascending, specify a key | |
1489 | as ``-key`` to sort in descending order. |
|
1489 | as ``-key`` to sort in descending order. | |
1490 |
|
1490 | |||
1491 | The keys can be: |
|
1491 | The keys can be: | |
1492 |
|
1492 | |||
1493 | - ``rev`` for the revision number, |
|
1493 | - ``rev`` for the revision number, | |
1494 | - ``branch`` for the branch name, |
|
1494 | - ``branch`` for the branch name, | |
1495 | - ``desc`` for the commit message (description), |
|
1495 | - ``desc`` for the commit message (description), | |
1496 | - ``user`` for user name (``author`` can be used as an alias), |
|
1496 | - ``user`` for user name (``author`` can be used as an alias), | |
1497 | - ``date`` for the commit date |
|
1497 | - ``date`` for the commit date | |
1498 | """ |
|
1498 | """ | |
1499 | # i18n: "sort" is a keyword |
|
1499 | # i18n: "sort" is a keyword | |
1500 | l = getargs(x, 1, 2, _("sort requires one or two arguments")) |
|
1500 | l = getargs(x, 1, 2, _("sort requires one or two arguments")) | |
1501 | keys = "rev" |
|
1501 | keys = "rev" | |
1502 | if len(l) == 2: |
|
1502 | if len(l) == 2: | |
1503 | # i18n: "sort" is a keyword |
|
1503 | # i18n: "sort" is a keyword | |
1504 | keys = getstring(l[1], _("sort spec must be a string")) |
|
1504 | keys = getstring(l[1], _("sort spec must be a string")) | |
1505 |
|
1505 | |||
1506 | s = l[0] |
|
1506 | s = l[0] | |
1507 | keys = keys.split() |
|
1507 | keys = keys.split() | |
1508 | l = [] |
|
1508 | l = [] | |
1509 | def invert(s): |
|
1509 | def invert(s): | |
1510 | return "".join(chr(255 - ord(c)) for c in s) |
|
1510 | return "".join(chr(255 - ord(c)) for c in s) | |
1511 | revs = getset(repo, subset, s) |
|
1511 | revs = getset(repo, subset, s) | |
1512 | if keys == ["rev"]: |
|
1512 | if keys == ["rev"]: | |
1513 | revs.sort() |
|
1513 | revs.sort() | |
1514 | return revs |
|
1514 | return revs | |
1515 | elif keys == ["-rev"]: |
|
1515 | elif keys == ["-rev"]: | |
1516 | revs.sort(reverse=True) |
|
1516 | revs.sort(reverse=True) | |
1517 | return revs |
|
1517 | return revs | |
1518 | for r in revs: |
|
1518 | for r in revs: | |
1519 | c = repo[r] |
|
1519 | c = repo[r] | |
1520 | e = [] |
|
1520 | e = [] | |
1521 | for k in keys: |
|
1521 | for k in keys: | |
1522 | if k == 'rev': |
|
1522 | if k == 'rev': | |
1523 | e.append(r) |
|
1523 | e.append(r) | |
1524 | elif k == '-rev': |
|
1524 | elif k == '-rev': | |
1525 | e.append(-r) |
|
1525 | e.append(-r) | |
1526 | elif k == 'branch': |
|
1526 | elif k == 'branch': | |
1527 | e.append(c.branch()) |
|
1527 | e.append(c.branch()) | |
1528 | elif k == '-branch': |
|
1528 | elif k == '-branch': | |
1529 | e.append(invert(c.branch())) |
|
1529 | e.append(invert(c.branch())) | |
1530 | elif k == 'desc': |
|
1530 | elif k == 'desc': | |
1531 | e.append(c.description()) |
|
1531 | e.append(c.description()) | |
1532 | elif k == '-desc': |
|
1532 | elif k == '-desc': | |
1533 | e.append(invert(c.description())) |
|
1533 | e.append(invert(c.description())) | |
1534 | elif k in 'user author': |
|
1534 | elif k in 'user author': | |
1535 | e.append(c.user()) |
|
1535 | e.append(c.user()) | |
1536 | elif k in '-user -author': |
|
1536 | elif k in '-user -author': | |
1537 | e.append(invert(c.user())) |
|
1537 | e.append(invert(c.user())) | |
1538 | elif k == 'date': |
|
1538 | elif k == 'date': | |
1539 | e.append(c.date()[0]) |
|
1539 | e.append(c.date()[0]) | |
1540 | elif k == '-date': |
|
1540 | elif k == '-date': | |
1541 | e.append(-c.date()[0]) |
|
1541 | e.append(-c.date()[0]) | |
1542 | else: |
|
1542 | else: | |
1543 | raise error.ParseError(_("unknown sort key %r") % k) |
|
1543 | raise error.ParseError(_("unknown sort key %r") % k) | |
1544 | e.append(r) |
|
1544 | e.append(r) | |
1545 | l.append(e) |
|
1545 | l.append(e) | |
1546 | l.sort() |
|
1546 | l.sort() | |
1547 | return baseset([e[-1] for e in l]) |
|
1547 | return baseset([e[-1] for e in l]) | |
1548 |
|
1548 | |||
1549 | def _stringmatcher(pattern): |
|
1549 | def _stringmatcher(pattern): | |
1550 | """ |
|
1550 | """ | |
1551 | accepts a string, possibly starting with 're:' or 'literal:' prefix. |
|
1551 | accepts a string, possibly starting with 're:' or 'literal:' prefix. | |
1552 | returns the matcher name, pattern, and matcher function. |
|
1552 | returns the matcher name, pattern, and matcher function. | |
1553 | missing or unknown prefixes are treated as literal matches. |
|
1553 | missing or unknown prefixes are treated as literal matches. | |
1554 |
|
1554 | |||
1555 | helper for tests: |
|
1555 | helper for tests: | |
1556 | >>> def test(pattern, *tests): |
|
1556 | >>> def test(pattern, *tests): | |
1557 | ... kind, pattern, matcher = _stringmatcher(pattern) |
|
1557 | ... kind, pattern, matcher = _stringmatcher(pattern) | |
1558 | ... return (kind, pattern, [bool(matcher(t)) for t in tests]) |
|
1558 | ... return (kind, pattern, [bool(matcher(t)) for t in tests]) | |
1559 |
|
1559 | |||
1560 | exact matching (no prefix): |
|
1560 | exact matching (no prefix): | |
1561 | >>> test('abcdefg', 'abc', 'def', 'abcdefg') |
|
1561 | >>> test('abcdefg', 'abc', 'def', 'abcdefg') | |
1562 | ('literal', 'abcdefg', [False, False, True]) |
|
1562 | ('literal', 'abcdefg', [False, False, True]) | |
1563 |
|
1563 | |||
1564 | regex matching ('re:' prefix) |
|
1564 | regex matching ('re:' prefix) | |
1565 | >>> test('re:a.+b', 'nomatch', 'fooadef', 'fooadefbar') |
|
1565 | >>> test('re:a.+b', 'nomatch', 'fooadef', 'fooadefbar') | |
1566 | ('re', 'a.+b', [False, False, True]) |
|
1566 | ('re', 'a.+b', [False, False, True]) | |
1567 |
|
1567 | |||
1568 | force exact matches ('literal:' prefix) |
|
1568 | force exact matches ('literal:' prefix) | |
1569 | >>> test('literal:re:foobar', 'foobar', 're:foobar') |
|
1569 | >>> test('literal:re:foobar', 'foobar', 're:foobar') | |
1570 | ('literal', 're:foobar', [False, True]) |
|
1570 | ('literal', 're:foobar', [False, True]) | |
1571 |
|
1571 | |||
1572 | unknown prefixes are ignored and treated as literals |
|
1572 | unknown prefixes are ignored and treated as literals | |
1573 | >>> test('foo:bar', 'foo', 'bar', 'foo:bar') |
|
1573 | >>> test('foo:bar', 'foo', 'bar', 'foo:bar') | |
1574 | ('literal', 'foo:bar', [False, False, True]) |
|
1574 | ('literal', 'foo:bar', [False, False, True]) | |
1575 | """ |
|
1575 | """ | |
1576 | if pattern.startswith('re:'): |
|
1576 | if pattern.startswith('re:'): | |
1577 | pattern = pattern[3:] |
|
1577 | pattern = pattern[3:] | |
1578 | try: |
|
1578 | try: | |
1579 | regex = re.compile(pattern) |
|
1579 | regex = re.compile(pattern) | |
1580 | except re.error, e: |
|
1580 | except re.error, e: | |
1581 | raise error.ParseError(_('invalid regular expression: %s') |
|
1581 | raise error.ParseError(_('invalid regular expression: %s') | |
1582 | % e) |
|
1582 | % e) | |
1583 | return 're', pattern, regex.search |
|
1583 | return 're', pattern, regex.search | |
1584 | elif pattern.startswith('literal:'): |
|
1584 | elif pattern.startswith('literal:'): | |
1585 | pattern = pattern[8:] |
|
1585 | pattern = pattern[8:] | |
1586 | return 'literal', pattern, pattern.__eq__ |
|
1586 | return 'literal', pattern, pattern.__eq__ | |
1587 |
|
1587 | |||
1588 | def _substringmatcher(pattern): |
|
1588 | def _substringmatcher(pattern): | |
1589 | kind, pattern, matcher = _stringmatcher(pattern) |
|
1589 | kind, pattern, matcher = _stringmatcher(pattern) | |
1590 | if kind == 'literal': |
|
1590 | if kind == 'literal': | |
1591 | matcher = lambda s: pattern in s |
|
1591 | matcher = lambda s: pattern in s | |
1592 | return kind, pattern, matcher |
|
1592 | return kind, pattern, matcher | |
1593 |
|
1593 | |||
1594 | def tag(repo, subset, x): |
|
1594 | def tag(repo, subset, x): | |
1595 | """``tag([name])`` |
|
1595 | """``tag([name])`` | |
1596 | The specified tag by name, or all tagged revisions if no name is given. |
|
1596 | The specified tag by name, or all tagged revisions if no name is given. | |
|
1597 | ||||
|
1598 | If `name` starts with `re:`, the remainder of the name is treated as | |||
|
1599 | a regular expression. To match a tag that actually starts with `re:`, | |||
|
1600 | use the prefix `literal:`. | |||
1597 | """ |
|
1601 | """ | |
1598 | # i18n: "tag" is a keyword |
|
1602 | # i18n: "tag" is a keyword | |
1599 | args = getargs(x, 0, 1, _("tag takes one or no arguments")) |
|
1603 | args = getargs(x, 0, 1, _("tag takes one or no arguments")) | |
1600 | cl = repo.changelog |
|
1604 | cl = repo.changelog | |
1601 | if args: |
|
1605 | if args: | |
1602 | pattern = getstring(args[0], |
|
1606 | pattern = getstring(args[0], | |
1603 | # i18n: "tag" is a keyword |
|
1607 | # i18n: "tag" is a keyword | |
1604 | _('the argument to tag must be a string')) |
|
1608 | _('the argument to tag must be a string')) | |
1605 | kind, pattern, matcher = _stringmatcher(pattern) |
|
1609 | kind, pattern, matcher = _stringmatcher(pattern) | |
1606 | if kind == 'literal': |
|
1610 | if kind == 'literal': | |
1607 | # avoid resolving all tags |
|
1611 | # avoid resolving all tags | |
1608 | tn = repo._tagscache.tags.get(pattern, None) |
|
1612 | tn = repo._tagscache.tags.get(pattern, None) | |
1609 | if tn is None: |
|
1613 | if tn is None: | |
1610 | raise util.Abort(_("tag '%s' does not exist") % pattern) |
|
1614 | raise util.Abort(_("tag '%s' does not exist") % pattern) | |
1611 | s = set([repo[tn].rev()]) |
|
1615 | s = set([repo[tn].rev()]) | |
1612 | else: |
|
1616 | else: | |
1613 | s = set([cl.rev(n) for t, n in repo.tagslist() if matcher(t)]) |
|
1617 | s = set([cl.rev(n) for t, n in repo.tagslist() if matcher(t)]) | |
1614 | else: |
|
1618 | else: | |
1615 | s = set([cl.rev(n) for t, n in repo.tagslist() if t != 'tip']) |
|
1619 | s = set([cl.rev(n) for t, n in repo.tagslist() if t != 'tip']) | |
1616 | return subset & s |
|
1620 | return subset & s | |
1617 |
|
1621 | |||
1618 | def tagged(repo, subset, x): |
|
1622 | def tagged(repo, subset, x): | |
1619 | return tag(repo, subset, x) |
|
1623 | return tag(repo, subset, x) | |
1620 |
|
1624 | |||
1621 | def unstable(repo, subset, x): |
|
1625 | def unstable(repo, subset, x): | |
1622 | """``unstable()`` |
|
1626 | """``unstable()`` | |
1623 | Non-obsolete changesets with obsolete ancestors. |
|
1627 | Non-obsolete changesets with obsolete ancestors. | |
1624 | """ |
|
1628 | """ | |
1625 | # i18n: "unstable" is a keyword |
|
1629 | # i18n: "unstable" is a keyword | |
1626 | getargs(x, 0, 0, _("unstable takes no arguments")) |
|
1630 | getargs(x, 0, 0, _("unstable takes no arguments")) | |
1627 | unstables = obsmod.getrevs(repo, 'unstable') |
|
1631 | unstables = obsmod.getrevs(repo, 'unstable') | |
1628 | return subset & unstables |
|
1632 | return subset & unstables | |
1629 |
|
1633 | |||
1630 |
|
1634 | |||
1631 | def user(repo, subset, x): |
|
1635 | def user(repo, subset, x): | |
1632 | """``user(string)`` |
|
1636 | """``user(string)`` | |
1633 | User name contains string. The match is case-insensitive. |
|
1637 | User name contains string. The match is case-insensitive. | |
1634 |
|
1638 | |||
1635 | If `string` starts with `re:`, the remainder of the string is treated as |
|
1639 | If `string` starts with `re:`, the remainder of the string is treated as | |
1636 | a regular expression. To match a user that actually contains `re:`, use |
|
1640 | a regular expression. To match a user that actually contains `re:`, use | |
1637 | the prefix `literal:`. |
|
1641 | the prefix `literal:`. | |
1638 | """ |
|
1642 | """ | |
1639 | return author(repo, subset, x) |
|
1643 | return author(repo, subset, x) | |
1640 |
|
1644 | |||
1641 | # for internal use |
|
1645 | # for internal use | |
1642 | def _list(repo, subset, x): |
|
1646 | def _list(repo, subset, x): | |
1643 | s = getstring(x, "internal error") |
|
1647 | s = getstring(x, "internal error") | |
1644 | if not s: |
|
1648 | if not s: | |
1645 | return baseset([]) |
|
1649 | return baseset([]) | |
1646 | ls = [repo[r].rev() for r in s.split('\0')] |
|
1650 | ls = [repo[r].rev() for r in s.split('\0')] | |
1647 | s = subset.set() |
|
1651 | s = subset.set() | |
1648 | return baseset([r for r in ls if r in s]) |
|
1652 | return baseset([r for r in ls if r in s]) | |
1649 |
|
1653 | |||
1650 | # for internal use |
|
1654 | # for internal use | |
1651 | def _intlist(repo, subset, x): |
|
1655 | def _intlist(repo, subset, x): | |
1652 | s = getstring(x, "internal error") |
|
1656 | s = getstring(x, "internal error") | |
1653 | if not s: |
|
1657 | if not s: | |
1654 | return baseset([]) |
|
1658 | return baseset([]) | |
1655 | ls = [int(r) for r in s.split('\0')] |
|
1659 | ls = [int(r) for r in s.split('\0')] | |
1656 | s = subset.set() |
|
1660 | s = subset.set() | |
1657 | return baseset([r for r in ls if r in s]) |
|
1661 | return baseset([r for r in ls if r in s]) | |
1658 |
|
1662 | |||
1659 | # for internal use |
|
1663 | # for internal use | |
1660 | def _hexlist(repo, subset, x): |
|
1664 | def _hexlist(repo, subset, x): | |
1661 | s = getstring(x, "internal error") |
|
1665 | s = getstring(x, "internal error") | |
1662 | if not s: |
|
1666 | if not s: | |
1663 | return baseset([]) |
|
1667 | return baseset([]) | |
1664 | cl = repo.changelog |
|
1668 | cl = repo.changelog | |
1665 | ls = [cl.rev(node.bin(r)) for r in s.split('\0')] |
|
1669 | ls = [cl.rev(node.bin(r)) for r in s.split('\0')] | |
1666 | s = subset.set() |
|
1670 | s = subset.set() | |
1667 | return baseset([r for r in ls if r in s]) |
|
1671 | return baseset([r for r in ls if r in s]) | |
1668 |
|
1672 | |||
1669 | symbols = { |
|
1673 | symbols = { | |
1670 | "adds": adds, |
|
1674 | "adds": adds, | |
1671 | "all": getall, |
|
1675 | "all": getall, | |
1672 | "ancestor": ancestor, |
|
1676 | "ancestor": ancestor, | |
1673 | "ancestors": ancestors, |
|
1677 | "ancestors": ancestors, | |
1674 | "_firstancestors": _firstancestors, |
|
1678 | "_firstancestors": _firstancestors, | |
1675 | "author": author, |
|
1679 | "author": author, | |
1676 | "only": only, |
|
1680 | "only": only, | |
1677 | "bisect": bisect, |
|
1681 | "bisect": bisect, | |
1678 | "bisected": bisected, |
|
1682 | "bisected": bisected, | |
1679 | "bookmark": bookmark, |
|
1683 | "bookmark": bookmark, | |
1680 | "branch": branch, |
|
1684 | "branch": branch, | |
1681 | "branchpoint": branchpoint, |
|
1685 | "branchpoint": branchpoint, | |
1682 | "bumped": bumped, |
|
1686 | "bumped": bumped, | |
1683 | "bundle": bundle, |
|
1687 | "bundle": bundle, | |
1684 | "children": children, |
|
1688 | "children": children, | |
1685 | "closed": closed, |
|
1689 | "closed": closed, | |
1686 | "contains": contains, |
|
1690 | "contains": contains, | |
1687 | "converted": converted, |
|
1691 | "converted": converted, | |
1688 | "date": date, |
|
1692 | "date": date, | |
1689 | "desc": desc, |
|
1693 | "desc": desc, | |
1690 | "descendants": descendants, |
|
1694 | "descendants": descendants, | |
1691 | "_firstdescendants": _firstdescendants, |
|
1695 | "_firstdescendants": _firstdescendants, | |
1692 | "destination": destination, |
|
1696 | "destination": destination, | |
1693 | "divergent": divergent, |
|
1697 | "divergent": divergent, | |
1694 | "draft": draft, |
|
1698 | "draft": draft, | |
1695 | "extinct": extinct, |
|
1699 | "extinct": extinct, | |
1696 | "extra": extra, |
|
1700 | "extra": extra, | |
1697 | "file": hasfile, |
|
1701 | "file": hasfile, | |
1698 | "filelog": filelog, |
|
1702 | "filelog": filelog, | |
1699 | "first": first, |
|
1703 | "first": first, | |
1700 | "follow": follow, |
|
1704 | "follow": follow, | |
1701 | "_followfirst": _followfirst, |
|
1705 | "_followfirst": _followfirst, | |
1702 | "grep": grep, |
|
1706 | "grep": grep, | |
1703 | "head": head, |
|
1707 | "head": head, | |
1704 | "heads": heads, |
|
1708 | "heads": heads, | |
1705 | "hidden": hidden, |
|
1709 | "hidden": hidden, | |
1706 | "id": node_, |
|
1710 | "id": node_, | |
1707 | "keyword": keyword, |
|
1711 | "keyword": keyword, | |
1708 | "last": last, |
|
1712 | "last": last, | |
1709 | "limit": limit, |
|
1713 | "limit": limit, | |
1710 | "_matchfiles": _matchfiles, |
|
1714 | "_matchfiles": _matchfiles, | |
1711 | "max": maxrev, |
|
1715 | "max": maxrev, | |
1712 | "merge": merge, |
|
1716 | "merge": merge, | |
1713 | "min": minrev, |
|
1717 | "min": minrev, | |
1714 | "_missingancestors": _missingancestors, |
|
1718 | "_missingancestors": _missingancestors, | |
1715 | "modifies": modifies, |
|
1719 | "modifies": modifies, | |
1716 | "obsolete": obsolete, |
|
1720 | "obsolete": obsolete, | |
1717 | "origin": origin, |
|
1721 | "origin": origin, | |
1718 | "outgoing": outgoing, |
|
1722 | "outgoing": outgoing, | |
1719 | "p1": p1, |
|
1723 | "p1": p1, | |
1720 | "p2": p2, |
|
1724 | "p2": p2, | |
1721 | "parents": parents, |
|
1725 | "parents": parents, | |
1722 | "present": present, |
|
1726 | "present": present, | |
1723 | "public": public, |
|
1727 | "public": public, | |
1724 | "remote": remote, |
|
1728 | "remote": remote, | |
1725 | "removes": removes, |
|
1729 | "removes": removes, | |
1726 | "rev": rev, |
|
1730 | "rev": rev, | |
1727 | "reverse": reverse, |
|
1731 | "reverse": reverse, | |
1728 | "roots": roots, |
|
1732 | "roots": roots, | |
1729 | "sort": sort, |
|
1733 | "sort": sort, | |
1730 | "secret": secret, |
|
1734 | "secret": secret, | |
1731 | "matching": matching, |
|
1735 | "matching": matching, | |
1732 | "tag": tag, |
|
1736 | "tag": tag, | |
1733 | "tagged": tagged, |
|
1737 | "tagged": tagged, | |
1734 | "user": user, |
|
1738 | "user": user, | |
1735 | "unstable": unstable, |
|
1739 | "unstable": unstable, | |
1736 | "_list": _list, |
|
1740 | "_list": _list, | |
1737 | "_intlist": _intlist, |
|
1741 | "_intlist": _intlist, | |
1738 | "_hexlist": _hexlist, |
|
1742 | "_hexlist": _hexlist, | |
1739 | } |
|
1743 | } | |
1740 |
|
1744 | |||
1741 | # symbols which can't be used for a DoS attack for any given input |
|
1745 | # symbols which can't be used for a DoS attack for any given input | |
1742 | # (e.g. those which accept regexes as plain strings shouldn't be included) |
|
1746 | # (e.g. those which accept regexes as plain strings shouldn't be included) | |
1743 | # functions that just return a lot of changesets (like all) don't count here |
|
1747 | # functions that just return a lot of changesets (like all) don't count here | |
1744 | safesymbols = set([ |
|
1748 | safesymbols = set([ | |
1745 | "adds", |
|
1749 | "adds", | |
1746 | "all", |
|
1750 | "all", | |
1747 | "ancestor", |
|
1751 | "ancestor", | |
1748 | "ancestors", |
|
1752 | "ancestors", | |
1749 | "_firstancestors", |
|
1753 | "_firstancestors", | |
1750 | "author", |
|
1754 | "author", | |
1751 | "bisect", |
|
1755 | "bisect", | |
1752 | "bisected", |
|
1756 | "bisected", | |
1753 | "bookmark", |
|
1757 | "bookmark", | |
1754 | "branch", |
|
1758 | "branch", | |
1755 | "branchpoint", |
|
1759 | "branchpoint", | |
1756 | "bumped", |
|
1760 | "bumped", | |
1757 | "bundle", |
|
1761 | "bundle", | |
1758 | "children", |
|
1762 | "children", | |
1759 | "closed", |
|
1763 | "closed", | |
1760 | "converted", |
|
1764 | "converted", | |
1761 | "date", |
|
1765 | "date", | |
1762 | "desc", |
|
1766 | "desc", | |
1763 | "descendants", |
|
1767 | "descendants", | |
1764 | "_firstdescendants", |
|
1768 | "_firstdescendants", | |
1765 | "destination", |
|
1769 | "destination", | |
1766 | "divergent", |
|
1770 | "divergent", | |
1767 | "draft", |
|
1771 | "draft", | |
1768 | "extinct", |
|
1772 | "extinct", | |
1769 | "extra", |
|
1773 | "extra", | |
1770 | "file", |
|
1774 | "file", | |
1771 | "filelog", |
|
1775 | "filelog", | |
1772 | "first", |
|
1776 | "first", | |
1773 | "follow", |
|
1777 | "follow", | |
1774 | "_followfirst", |
|
1778 | "_followfirst", | |
1775 | "head", |
|
1779 | "head", | |
1776 | "heads", |
|
1780 | "heads", | |
1777 | "hidden", |
|
1781 | "hidden", | |
1778 | "id", |
|
1782 | "id", | |
1779 | "keyword", |
|
1783 | "keyword", | |
1780 | "last", |
|
1784 | "last", | |
1781 | "limit", |
|
1785 | "limit", | |
1782 | "_matchfiles", |
|
1786 | "_matchfiles", | |
1783 | "max", |
|
1787 | "max", | |
1784 | "merge", |
|
1788 | "merge", | |
1785 | "min", |
|
1789 | "min", | |
1786 | "_missingancestors", |
|
1790 | "_missingancestors", | |
1787 | "modifies", |
|
1791 | "modifies", | |
1788 | "obsolete", |
|
1792 | "obsolete", | |
1789 | "origin", |
|
1793 | "origin", | |
1790 | "outgoing", |
|
1794 | "outgoing", | |
1791 | "p1", |
|
1795 | "p1", | |
1792 | "p2", |
|
1796 | "p2", | |
1793 | "parents", |
|
1797 | "parents", | |
1794 | "present", |
|
1798 | "present", | |
1795 | "public", |
|
1799 | "public", | |
1796 | "remote", |
|
1800 | "remote", | |
1797 | "removes", |
|
1801 | "removes", | |
1798 | "rev", |
|
1802 | "rev", | |
1799 | "reverse", |
|
1803 | "reverse", | |
1800 | "roots", |
|
1804 | "roots", | |
1801 | "sort", |
|
1805 | "sort", | |
1802 | "secret", |
|
1806 | "secret", | |
1803 | "matching", |
|
1807 | "matching", | |
1804 | "tag", |
|
1808 | "tag", | |
1805 | "tagged", |
|
1809 | "tagged", | |
1806 | "user", |
|
1810 | "user", | |
1807 | "unstable", |
|
1811 | "unstable", | |
1808 | "_list", |
|
1812 | "_list", | |
1809 | "_intlist", |
|
1813 | "_intlist", | |
1810 | "_hexlist", |
|
1814 | "_hexlist", | |
1811 | ]) |
|
1815 | ]) | |
1812 |
|
1816 | |||
1813 | methods = { |
|
1817 | methods = { | |
1814 | "range": rangeset, |
|
1818 | "range": rangeset, | |
1815 | "dagrange": dagrange, |
|
1819 | "dagrange": dagrange, | |
1816 | "string": stringset, |
|
1820 | "string": stringset, | |
1817 | "symbol": symbolset, |
|
1821 | "symbol": symbolset, | |
1818 | "and": andset, |
|
1822 | "and": andset, | |
1819 | "or": orset, |
|
1823 | "or": orset, | |
1820 | "not": notset, |
|
1824 | "not": notset, | |
1821 | "list": listset, |
|
1825 | "list": listset, | |
1822 | "func": func, |
|
1826 | "func": func, | |
1823 | "ancestor": ancestorspec, |
|
1827 | "ancestor": ancestorspec, | |
1824 | "parent": parentspec, |
|
1828 | "parent": parentspec, | |
1825 | "parentpost": p1, |
|
1829 | "parentpost": p1, | |
1826 | } |
|
1830 | } | |
1827 |
|
1831 | |||
1828 | def optimize(x, small): |
|
1832 | def optimize(x, small): | |
1829 | if x is None: |
|
1833 | if x is None: | |
1830 | return 0, x |
|
1834 | return 0, x | |
1831 |
|
1835 | |||
1832 | smallbonus = 1 |
|
1836 | smallbonus = 1 | |
1833 | if small: |
|
1837 | if small: | |
1834 | smallbonus = .5 |
|
1838 | smallbonus = .5 | |
1835 |
|
1839 | |||
1836 | op = x[0] |
|
1840 | op = x[0] | |
1837 | if op == 'minus': |
|
1841 | if op == 'minus': | |
1838 | return optimize(('and', x[1], ('not', x[2])), small) |
|
1842 | return optimize(('and', x[1], ('not', x[2])), small) | |
1839 | elif op == 'dagrangepre': |
|
1843 | elif op == 'dagrangepre': | |
1840 | return optimize(('func', ('symbol', 'ancestors'), x[1]), small) |
|
1844 | return optimize(('func', ('symbol', 'ancestors'), x[1]), small) | |
1841 | elif op == 'dagrangepost': |
|
1845 | elif op == 'dagrangepost': | |
1842 | return optimize(('func', ('symbol', 'descendants'), x[1]), small) |
|
1846 | return optimize(('func', ('symbol', 'descendants'), x[1]), small) | |
1843 | elif op == 'rangepre': |
|
1847 | elif op == 'rangepre': | |
1844 | return optimize(('range', ('string', '0'), x[1]), small) |
|
1848 | return optimize(('range', ('string', '0'), x[1]), small) | |
1845 | elif op == 'rangepost': |
|
1849 | elif op == 'rangepost': | |
1846 | return optimize(('range', x[1], ('string', 'tip')), small) |
|
1850 | return optimize(('range', x[1], ('string', 'tip')), small) | |
1847 | elif op == 'negate': |
|
1851 | elif op == 'negate': | |
1848 | return optimize(('string', |
|
1852 | return optimize(('string', | |
1849 | '-' + getstring(x[1], _("can't negate that"))), small) |
|
1853 | '-' + getstring(x[1], _("can't negate that"))), small) | |
1850 | elif op in 'string symbol negate': |
|
1854 | elif op in 'string symbol negate': | |
1851 | return smallbonus, x # single revisions are small |
|
1855 | return smallbonus, x # single revisions are small | |
1852 | elif op == 'and': |
|
1856 | elif op == 'and': | |
1853 | wa, ta = optimize(x[1], True) |
|
1857 | wa, ta = optimize(x[1], True) | |
1854 | wb, tb = optimize(x[2], True) |
|
1858 | wb, tb = optimize(x[2], True) | |
1855 |
|
1859 | |||
1856 | # (::x and not ::y)/(not ::y and ::x) have a fast path |
|
1860 | # (::x and not ::y)/(not ::y and ::x) have a fast path | |
1857 | def ismissingancestors(revs, bases): |
|
1861 | def ismissingancestors(revs, bases): | |
1858 | return ( |
|
1862 | return ( | |
1859 | revs[0] == 'func' |
|
1863 | revs[0] == 'func' | |
1860 | and getstring(revs[1], _('not a symbol')) == 'ancestors' |
|
1864 | and getstring(revs[1], _('not a symbol')) == 'ancestors' | |
1861 | and bases[0] == 'not' |
|
1865 | and bases[0] == 'not' | |
1862 | and bases[1][0] == 'func' |
|
1866 | and bases[1][0] == 'func' | |
1863 | and getstring(bases[1][1], _('not a symbol')) == 'ancestors') |
|
1867 | and getstring(bases[1][1], _('not a symbol')) == 'ancestors') | |
1864 |
|
1868 | |||
1865 | w = min(wa, wb) |
|
1869 | w = min(wa, wb) | |
1866 | if ismissingancestors(ta, tb): |
|
1870 | if ismissingancestors(ta, tb): | |
1867 | return w, ('func', ('symbol', '_missingancestors'), |
|
1871 | return w, ('func', ('symbol', '_missingancestors'), | |
1868 | ('list', ta[2], tb[1][2])) |
|
1872 | ('list', ta[2], tb[1][2])) | |
1869 | if ismissingancestors(tb, ta): |
|
1873 | if ismissingancestors(tb, ta): | |
1870 | return w, ('func', ('symbol', '_missingancestors'), |
|
1874 | return w, ('func', ('symbol', '_missingancestors'), | |
1871 | ('list', tb[2], ta[1][2])) |
|
1875 | ('list', tb[2], ta[1][2])) | |
1872 |
|
1876 | |||
1873 | if wa > wb: |
|
1877 | if wa > wb: | |
1874 | return w, (op, tb, ta) |
|
1878 | return w, (op, tb, ta) | |
1875 | return w, (op, ta, tb) |
|
1879 | return w, (op, ta, tb) | |
1876 | elif op == 'or': |
|
1880 | elif op == 'or': | |
1877 | wa, ta = optimize(x[1], False) |
|
1881 | wa, ta = optimize(x[1], False) | |
1878 | wb, tb = optimize(x[2], False) |
|
1882 | wb, tb = optimize(x[2], False) | |
1879 | if wb < wa: |
|
1883 | if wb < wa: | |
1880 | wb, wa = wa, wb |
|
1884 | wb, wa = wa, wb | |
1881 | return max(wa, wb), (op, ta, tb) |
|
1885 | return max(wa, wb), (op, ta, tb) | |
1882 | elif op == 'not': |
|
1886 | elif op == 'not': | |
1883 | o = optimize(x[1], not small) |
|
1887 | o = optimize(x[1], not small) | |
1884 | return o[0], (op, o[1]) |
|
1888 | return o[0], (op, o[1]) | |
1885 | elif op == 'parentpost': |
|
1889 | elif op == 'parentpost': | |
1886 | o = optimize(x[1], small) |
|
1890 | o = optimize(x[1], small) | |
1887 | return o[0], (op, o[1]) |
|
1891 | return o[0], (op, o[1]) | |
1888 | elif op == 'group': |
|
1892 | elif op == 'group': | |
1889 | return optimize(x[1], small) |
|
1893 | return optimize(x[1], small) | |
1890 | elif op in 'dagrange range list parent ancestorspec': |
|
1894 | elif op in 'dagrange range list parent ancestorspec': | |
1891 | if op == 'parent': |
|
1895 | if op == 'parent': | |
1892 | # x^:y means (x^) : y, not x ^ (:y) |
|
1896 | # x^:y means (x^) : y, not x ^ (:y) | |
1893 | post = ('parentpost', x[1]) |
|
1897 | post = ('parentpost', x[1]) | |
1894 | if x[2][0] == 'dagrangepre': |
|
1898 | if x[2][0] == 'dagrangepre': | |
1895 | return optimize(('dagrange', post, x[2][1]), small) |
|
1899 | return optimize(('dagrange', post, x[2][1]), small) | |
1896 | elif x[2][0] == 'rangepre': |
|
1900 | elif x[2][0] == 'rangepre': | |
1897 | return optimize(('range', post, x[2][1]), small) |
|
1901 | return optimize(('range', post, x[2][1]), small) | |
1898 |
|
1902 | |||
1899 | wa, ta = optimize(x[1], small) |
|
1903 | wa, ta = optimize(x[1], small) | |
1900 | wb, tb = optimize(x[2], small) |
|
1904 | wb, tb = optimize(x[2], small) | |
1901 | return wa + wb, (op, ta, tb) |
|
1905 | return wa + wb, (op, ta, tb) | |
1902 | elif op == 'func': |
|
1906 | elif op == 'func': | |
1903 | f = getstring(x[1], _("not a symbol")) |
|
1907 | f = getstring(x[1], _("not a symbol")) | |
1904 | wa, ta = optimize(x[2], small) |
|
1908 | wa, ta = optimize(x[2], small) | |
1905 | if f in ("author branch closed date desc file grep keyword " |
|
1909 | if f in ("author branch closed date desc file grep keyword " | |
1906 | "outgoing user"): |
|
1910 | "outgoing user"): | |
1907 | w = 10 # slow |
|
1911 | w = 10 # slow | |
1908 | elif f in "modifies adds removes": |
|
1912 | elif f in "modifies adds removes": | |
1909 | w = 30 # slower |
|
1913 | w = 30 # slower | |
1910 | elif f == "contains": |
|
1914 | elif f == "contains": | |
1911 | w = 100 # very slow |
|
1915 | w = 100 # very slow | |
1912 | elif f == "ancestor": |
|
1916 | elif f == "ancestor": | |
1913 | w = 1 * smallbonus |
|
1917 | w = 1 * smallbonus | |
1914 | elif f in "reverse limit first": |
|
1918 | elif f in "reverse limit first": | |
1915 | w = 0 |
|
1919 | w = 0 | |
1916 | elif f in "sort": |
|
1920 | elif f in "sort": | |
1917 | w = 10 # assume most sorts look at changelog |
|
1921 | w = 10 # assume most sorts look at changelog | |
1918 | else: |
|
1922 | else: | |
1919 | w = 1 |
|
1923 | w = 1 | |
1920 | return w + wa, (op, x[1], ta) |
|
1924 | return w + wa, (op, x[1], ta) | |
1921 | return 1, x |
|
1925 | return 1, x | |
1922 |
|
1926 | |||
1923 | _aliasarg = ('func', ('symbol', '_aliasarg')) |
|
1927 | _aliasarg = ('func', ('symbol', '_aliasarg')) | |
1924 | def _getaliasarg(tree): |
|
1928 | def _getaliasarg(tree): | |
1925 | """If tree matches ('func', ('symbol', '_aliasarg'), ('string', X)) |
|
1929 | """If tree matches ('func', ('symbol', '_aliasarg'), ('string', X)) | |
1926 | return X, None otherwise. |
|
1930 | return X, None otherwise. | |
1927 | """ |
|
1931 | """ | |
1928 | if (len(tree) == 3 and tree[:2] == _aliasarg |
|
1932 | if (len(tree) == 3 and tree[:2] == _aliasarg | |
1929 | and tree[2][0] == 'string'): |
|
1933 | and tree[2][0] == 'string'): | |
1930 | return tree[2][1] |
|
1934 | return tree[2][1] | |
1931 | return None |
|
1935 | return None | |
1932 |
|
1936 | |||
1933 | def _checkaliasarg(tree, known=None): |
|
1937 | def _checkaliasarg(tree, known=None): | |
1934 | """Check tree contains no _aliasarg construct or only ones which |
|
1938 | """Check tree contains no _aliasarg construct or only ones which | |
1935 | value is in known. Used to avoid alias placeholders injection. |
|
1939 | value is in known. Used to avoid alias placeholders injection. | |
1936 | """ |
|
1940 | """ | |
1937 | if isinstance(tree, tuple): |
|
1941 | if isinstance(tree, tuple): | |
1938 | arg = _getaliasarg(tree) |
|
1942 | arg = _getaliasarg(tree) | |
1939 | if arg is not None and (not known or arg not in known): |
|
1943 | if arg is not None and (not known or arg not in known): | |
1940 | raise error.ParseError(_("not a function: %s") % '_aliasarg') |
|
1944 | raise error.ParseError(_("not a function: %s") % '_aliasarg') | |
1941 | for t in tree: |
|
1945 | for t in tree: | |
1942 | _checkaliasarg(t, known) |
|
1946 | _checkaliasarg(t, known) | |
1943 |
|
1947 | |||
1944 | class revsetalias(object): |
|
1948 | class revsetalias(object): | |
1945 | funcre = re.compile('^([^(]+)\(([^)]+)\)$') |
|
1949 | funcre = re.compile('^([^(]+)\(([^)]+)\)$') | |
1946 | args = None |
|
1950 | args = None | |
1947 |
|
1951 | |||
1948 | def __init__(self, name, value): |
|
1952 | def __init__(self, name, value): | |
1949 | '''Aliases like: |
|
1953 | '''Aliases like: | |
1950 |
|
1954 | |||
1951 | h = heads(default) |
|
1955 | h = heads(default) | |
1952 | b($1) = ancestors($1) - ancestors(default) |
|
1956 | b($1) = ancestors($1) - ancestors(default) | |
1953 | ''' |
|
1957 | ''' | |
1954 | m = self.funcre.search(name) |
|
1958 | m = self.funcre.search(name) | |
1955 | if m: |
|
1959 | if m: | |
1956 | self.name = m.group(1) |
|
1960 | self.name = m.group(1) | |
1957 | self.tree = ('func', ('symbol', m.group(1))) |
|
1961 | self.tree = ('func', ('symbol', m.group(1))) | |
1958 | self.args = [x.strip() for x in m.group(2).split(',')] |
|
1962 | self.args = [x.strip() for x in m.group(2).split(',')] | |
1959 | for arg in self.args: |
|
1963 | for arg in self.args: | |
1960 | # _aliasarg() is an unknown symbol only used separate |
|
1964 | # _aliasarg() is an unknown symbol only used separate | |
1961 | # alias argument placeholders from regular strings. |
|
1965 | # alias argument placeholders from regular strings. | |
1962 | value = value.replace(arg, '_aliasarg(%r)' % (arg,)) |
|
1966 | value = value.replace(arg, '_aliasarg(%r)' % (arg,)) | |
1963 | else: |
|
1967 | else: | |
1964 | self.name = name |
|
1968 | self.name = name | |
1965 | self.tree = ('symbol', name) |
|
1969 | self.tree = ('symbol', name) | |
1966 |
|
1970 | |||
1967 | self.replacement, pos = parse(value) |
|
1971 | self.replacement, pos = parse(value) | |
1968 | if pos != len(value): |
|
1972 | if pos != len(value): | |
1969 | raise error.ParseError(_('invalid token'), pos) |
|
1973 | raise error.ParseError(_('invalid token'), pos) | |
1970 | # Check for placeholder injection |
|
1974 | # Check for placeholder injection | |
1971 | _checkaliasarg(self.replacement, self.args) |
|
1975 | _checkaliasarg(self.replacement, self.args) | |
1972 |
|
1976 | |||
1973 | def _getalias(aliases, tree): |
|
1977 | def _getalias(aliases, tree): | |
1974 | """If tree looks like an unexpanded alias, return it. Return None |
|
1978 | """If tree looks like an unexpanded alias, return it. Return None | |
1975 | otherwise. |
|
1979 | otherwise. | |
1976 | """ |
|
1980 | """ | |
1977 | if isinstance(tree, tuple) and tree: |
|
1981 | if isinstance(tree, tuple) and tree: | |
1978 | if tree[0] == 'symbol' and len(tree) == 2: |
|
1982 | if tree[0] == 'symbol' and len(tree) == 2: | |
1979 | name = tree[1] |
|
1983 | name = tree[1] | |
1980 | alias = aliases.get(name) |
|
1984 | alias = aliases.get(name) | |
1981 | if alias and alias.args is None and alias.tree == tree: |
|
1985 | if alias and alias.args is None and alias.tree == tree: | |
1982 | return alias |
|
1986 | return alias | |
1983 | if tree[0] == 'func' and len(tree) > 1: |
|
1987 | if tree[0] == 'func' and len(tree) > 1: | |
1984 | if tree[1][0] == 'symbol' and len(tree[1]) == 2: |
|
1988 | if tree[1][0] == 'symbol' and len(tree[1]) == 2: | |
1985 | name = tree[1][1] |
|
1989 | name = tree[1][1] | |
1986 | alias = aliases.get(name) |
|
1990 | alias = aliases.get(name) | |
1987 | if alias and alias.args is not None and alias.tree == tree[:2]: |
|
1991 | if alias and alias.args is not None and alias.tree == tree[:2]: | |
1988 | return alias |
|
1992 | return alias | |
1989 | return None |
|
1993 | return None | |
1990 |
|
1994 | |||
1991 | def _expandargs(tree, args): |
|
1995 | def _expandargs(tree, args): | |
1992 | """Replace _aliasarg instances with the substitution value of the |
|
1996 | """Replace _aliasarg instances with the substitution value of the | |
1993 | same name in args, recursively. |
|
1997 | same name in args, recursively. | |
1994 | """ |
|
1998 | """ | |
1995 | if not tree or not isinstance(tree, tuple): |
|
1999 | if not tree or not isinstance(tree, tuple): | |
1996 | return tree |
|
2000 | return tree | |
1997 | arg = _getaliasarg(tree) |
|
2001 | arg = _getaliasarg(tree) | |
1998 | if arg is not None: |
|
2002 | if arg is not None: | |
1999 | return args[arg] |
|
2003 | return args[arg] | |
2000 | return tuple(_expandargs(t, args) for t in tree) |
|
2004 | return tuple(_expandargs(t, args) for t in tree) | |
2001 |
|
2005 | |||
2002 | def _expandaliases(aliases, tree, expanding, cache): |
|
2006 | def _expandaliases(aliases, tree, expanding, cache): | |
2003 | """Expand aliases in tree, recursively. |
|
2007 | """Expand aliases in tree, recursively. | |
2004 |
|
2008 | |||
2005 | 'aliases' is a dictionary mapping user defined aliases to |
|
2009 | 'aliases' is a dictionary mapping user defined aliases to | |
2006 | revsetalias objects. |
|
2010 | revsetalias objects. | |
2007 | """ |
|
2011 | """ | |
2008 | if not isinstance(tree, tuple): |
|
2012 | if not isinstance(tree, tuple): | |
2009 | # Do not expand raw strings |
|
2013 | # Do not expand raw strings | |
2010 | return tree |
|
2014 | return tree | |
2011 | alias = _getalias(aliases, tree) |
|
2015 | alias = _getalias(aliases, tree) | |
2012 | if alias is not None: |
|
2016 | if alias is not None: | |
2013 | if alias in expanding: |
|
2017 | if alias in expanding: | |
2014 | raise error.ParseError(_('infinite expansion of revset alias "%s" ' |
|
2018 | raise error.ParseError(_('infinite expansion of revset alias "%s" ' | |
2015 | 'detected') % alias.name) |
|
2019 | 'detected') % alias.name) | |
2016 | expanding.append(alias) |
|
2020 | expanding.append(alias) | |
2017 | if alias.name not in cache: |
|
2021 | if alias.name not in cache: | |
2018 | cache[alias.name] = _expandaliases(aliases, alias.replacement, |
|
2022 | cache[alias.name] = _expandaliases(aliases, alias.replacement, | |
2019 | expanding, cache) |
|
2023 | expanding, cache) | |
2020 | result = cache[alias.name] |
|
2024 | result = cache[alias.name] | |
2021 | expanding.pop() |
|
2025 | expanding.pop() | |
2022 | if alias.args is not None: |
|
2026 | if alias.args is not None: | |
2023 | l = getlist(tree[2]) |
|
2027 | l = getlist(tree[2]) | |
2024 | if len(l) != len(alias.args): |
|
2028 | if len(l) != len(alias.args): | |
2025 | raise error.ParseError( |
|
2029 | raise error.ParseError( | |
2026 | _('invalid number of arguments: %s') % len(l)) |
|
2030 | _('invalid number of arguments: %s') % len(l)) | |
2027 | l = [_expandaliases(aliases, a, [], cache) for a in l] |
|
2031 | l = [_expandaliases(aliases, a, [], cache) for a in l] | |
2028 | result = _expandargs(result, dict(zip(alias.args, l))) |
|
2032 | result = _expandargs(result, dict(zip(alias.args, l))) | |
2029 | else: |
|
2033 | else: | |
2030 | result = tuple(_expandaliases(aliases, t, expanding, cache) |
|
2034 | result = tuple(_expandaliases(aliases, t, expanding, cache) | |
2031 | for t in tree) |
|
2035 | for t in tree) | |
2032 | return result |
|
2036 | return result | |
2033 |
|
2037 | |||
2034 | def findaliases(ui, tree): |
|
2038 | def findaliases(ui, tree): | |
2035 | _checkaliasarg(tree) |
|
2039 | _checkaliasarg(tree) | |
2036 | aliases = {} |
|
2040 | aliases = {} | |
2037 | for k, v in ui.configitems('revsetalias'): |
|
2041 | for k, v in ui.configitems('revsetalias'): | |
2038 | alias = revsetalias(k, v) |
|
2042 | alias = revsetalias(k, v) | |
2039 | aliases[alias.name] = alias |
|
2043 | aliases[alias.name] = alias | |
2040 | return _expandaliases(aliases, tree, [], {}) |
|
2044 | return _expandaliases(aliases, tree, [], {}) | |
2041 |
|
2045 | |||
2042 | def parse(spec, lookup=None): |
|
2046 | def parse(spec, lookup=None): | |
2043 | p = parser.parser(tokenize, elements) |
|
2047 | p = parser.parser(tokenize, elements) | |
2044 | return p.parse(spec, lookup=lookup) |
|
2048 | return p.parse(spec, lookup=lookup) | |
2045 |
|
2049 | |||
2046 | def match(ui, spec, repo=None): |
|
2050 | def match(ui, spec, repo=None): | |
2047 | if not spec: |
|
2051 | if not spec: | |
2048 | raise error.ParseError(_("empty query")) |
|
2052 | raise error.ParseError(_("empty query")) | |
2049 | lookup = None |
|
2053 | lookup = None | |
2050 | if repo: |
|
2054 | if repo: | |
2051 | lookup = repo.__contains__ |
|
2055 | lookup = repo.__contains__ | |
2052 | tree, pos = parse(spec, lookup) |
|
2056 | tree, pos = parse(spec, lookup) | |
2053 | if (pos != len(spec)): |
|
2057 | if (pos != len(spec)): | |
2054 | raise error.ParseError(_("invalid token"), pos) |
|
2058 | raise error.ParseError(_("invalid token"), pos) | |
2055 | if ui: |
|
2059 | if ui: | |
2056 | tree = findaliases(ui, tree) |
|
2060 | tree = findaliases(ui, tree) | |
2057 | weight, tree = optimize(tree, True) |
|
2061 | weight, tree = optimize(tree, True) | |
2058 | def mfunc(repo, subset): |
|
2062 | def mfunc(repo, subset): | |
2059 | if util.safehasattr(subset, 'set'): |
|
2063 | if util.safehasattr(subset, 'set'): | |
2060 | return getset(repo, subset, tree) |
|
2064 | return getset(repo, subset, tree) | |
2061 | return getset(repo, baseset(subset), tree) |
|
2065 | return getset(repo, baseset(subset), tree) | |
2062 | return mfunc |
|
2066 | return mfunc | |
2063 |
|
2067 | |||
2064 | def formatspec(expr, *args): |
|
2068 | def formatspec(expr, *args): | |
2065 | ''' |
|
2069 | ''' | |
2066 | This is a convenience function for using revsets internally, and |
|
2070 | This is a convenience function for using revsets internally, and | |
2067 | escapes arguments appropriately. Aliases are intentionally ignored |
|
2071 | escapes arguments appropriately. Aliases are intentionally ignored | |
2068 | so that intended expression behavior isn't accidentally subverted. |
|
2072 | so that intended expression behavior isn't accidentally subverted. | |
2069 |
|
2073 | |||
2070 | Supported arguments: |
|
2074 | Supported arguments: | |
2071 |
|
2075 | |||
2072 | %r = revset expression, parenthesized |
|
2076 | %r = revset expression, parenthesized | |
2073 | %d = int(arg), no quoting |
|
2077 | %d = int(arg), no quoting | |
2074 | %s = string(arg), escaped and single-quoted |
|
2078 | %s = string(arg), escaped and single-quoted | |
2075 | %b = arg.branch(), escaped and single-quoted |
|
2079 | %b = arg.branch(), escaped and single-quoted | |
2076 | %n = hex(arg), single-quoted |
|
2080 | %n = hex(arg), single-quoted | |
2077 | %% = a literal '%' |
|
2081 | %% = a literal '%' | |
2078 |
|
2082 | |||
2079 | Prefixing the type with 'l' specifies a parenthesized list of that type. |
|
2083 | Prefixing the type with 'l' specifies a parenthesized list of that type. | |
2080 |
|
2084 | |||
2081 | >>> formatspec('%r:: and %lr', '10 or 11', ("this()", "that()")) |
|
2085 | >>> formatspec('%r:: and %lr', '10 or 11', ("this()", "that()")) | |
2082 | '(10 or 11):: and ((this()) or (that()))' |
|
2086 | '(10 or 11):: and ((this()) or (that()))' | |
2083 | >>> formatspec('%d:: and not %d::', 10, 20) |
|
2087 | >>> formatspec('%d:: and not %d::', 10, 20) | |
2084 | '10:: and not 20::' |
|
2088 | '10:: and not 20::' | |
2085 | >>> formatspec('%ld or %ld', [], [1]) |
|
2089 | >>> formatspec('%ld or %ld', [], [1]) | |
2086 | "_list('') or 1" |
|
2090 | "_list('') or 1" | |
2087 | >>> formatspec('keyword(%s)', 'foo\\xe9') |
|
2091 | >>> formatspec('keyword(%s)', 'foo\\xe9') | |
2088 | "keyword('foo\\\\xe9')" |
|
2092 | "keyword('foo\\\\xe9')" | |
2089 | >>> b = lambda: 'default' |
|
2093 | >>> b = lambda: 'default' | |
2090 | >>> b.branch = b |
|
2094 | >>> b.branch = b | |
2091 | >>> formatspec('branch(%b)', b) |
|
2095 | >>> formatspec('branch(%b)', b) | |
2092 | "branch('default')" |
|
2096 | "branch('default')" | |
2093 | >>> formatspec('root(%ls)', ['a', 'b', 'c', 'd']) |
|
2097 | >>> formatspec('root(%ls)', ['a', 'b', 'c', 'd']) | |
2094 | "root(_list('a\\x00b\\x00c\\x00d'))" |
|
2098 | "root(_list('a\\x00b\\x00c\\x00d'))" | |
2095 | ''' |
|
2099 | ''' | |
2096 |
|
2100 | |||
2097 | def quote(s): |
|
2101 | def quote(s): | |
2098 | return repr(str(s)) |
|
2102 | return repr(str(s)) | |
2099 |
|
2103 | |||
2100 | def argtype(c, arg): |
|
2104 | def argtype(c, arg): | |
2101 | if c == 'd': |
|
2105 | if c == 'd': | |
2102 | return str(int(arg)) |
|
2106 | return str(int(arg)) | |
2103 | elif c == 's': |
|
2107 | elif c == 's': | |
2104 | return quote(arg) |
|
2108 | return quote(arg) | |
2105 | elif c == 'r': |
|
2109 | elif c == 'r': | |
2106 | parse(arg) # make sure syntax errors are confined |
|
2110 | parse(arg) # make sure syntax errors are confined | |
2107 | return '(%s)' % arg |
|
2111 | return '(%s)' % arg | |
2108 | elif c == 'n': |
|
2112 | elif c == 'n': | |
2109 | return quote(node.hex(arg)) |
|
2113 | return quote(node.hex(arg)) | |
2110 | elif c == 'b': |
|
2114 | elif c == 'b': | |
2111 | return quote(arg.branch()) |
|
2115 | return quote(arg.branch()) | |
2112 |
|
2116 | |||
2113 | def listexp(s, t): |
|
2117 | def listexp(s, t): | |
2114 | l = len(s) |
|
2118 | l = len(s) | |
2115 | if l == 0: |
|
2119 | if l == 0: | |
2116 | return "_list('')" |
|
2120 | return "_list('')" | |
2117 | elif l == 1: |
|
2121 | elif l == 1: | |
2118 | return argtype(t, s[0]) |
|
2122 | return argtype(t, s[0]) | |
2119 | elif t == 'd': |
|
2123 | elif t == 'd': | |
2120 | return "_intlist('%s')" % "\0".join(str(int(a)) for a in s) |
|
2124 | return "_intlist('%s')" % "\0".join(str(int(a)) for a in s) | |
2121 | elif t == 's': |
|
2125 | elif t == 's': | |
2122 | return "_list('%s')" % "\0".join(s) |
|
2126 | return "_list('%s')" % "\0".join(s) | |
2123 | elif t == 'n': |
|
2127 | elif t == 'n': | |
2124 | return "_hexlist('%s')" % "\0".join(node.hex(a) for a in s) |
|
2128 | return "_hexlist('%s')" % "\0".join(node.hex(a) for a in s) | |
2125 | elif t == 'b': |
|
2129 | elif t == 'b': | |
2126 | return "_list('%s')" % "\0".join(a.branch() for a in s) |
|
2130 | return "_list('%s')" % "\0".join(a.branch() for a in s) | |
2127 |
|
2131 | |||
2128 | m = l // 2 |
|
2132 | m = l // 2 | |
2129 | return '(%s or %s)' % (listexp(s[:m], t), listexp(s[m:], t)) |
|
2133 | return '(%s or %s)' % (listexp(s[:m], t), listexp(s[m:], t)) | |
2130 |
|
2134 | |||
2131 | ret = '' |
|
2135 | ret = '' | |
2132 | pos = 0 |
|
2136 | pos = 0 | |
2133 | arg = 0 |
|
2137 | arg = 0 | |
2134 | while pos < len(expr): |
|
2138 | while pos < len(expr): | |
2135 | c = expr[pos] |
|
2139 | c = expr[pos] | |
2136 | if c == '%': |
|
2140 | if c == '%': | |
2137 | pos += 1 |
|
2141 | pos += 1 | |
2138 | d = expr[pos] |
|
2142 | d = expr[pos] | |
2139 | if d == '%': |
|
2143 | if d == '%': | |
2140 | ret += d |
|
2144 | ret += d | |
2141 | elif d in 'dsnbr': |
|
2145 | elif d in 'dsnbr': | |
2142 | ret += argtype(d, args[arg]) |
|
2146 | ret += argtype(d, args[arg]) | |
2143 | arg += 1 |
|
2147 | arg += 1 | |
2144 | elif d == 'l': |
|
2148 | elif d == 'l': | |
2145 | # a list of some type |
|
2149 | # a list of some type | |
2146 | pos += 1 |
|
2150 | pos += 1 | |
2147 | d = expr[pos] |
|
2151 | d = expr[pos] | |
2148 | ret += listexp(list(args[arg]), d) |
|
2152 | ret += listexp(list(args[arg]), d) | |
2149 | arg += 1 |
|
2153 | arg += 1 | |
2150 | else: |
|
2154 | else: | |
2151 | raise util.Abort('unexpected revspec format character %s' % d) |
|
2155 | raise util.Abort('unexpected revspec format character %s' % d) | |
2152 | else: |
|
2156 | else: | |
2153 | ret += c |
|
2157 | ret += c | |
2154 | pos += 1 |
|
2158 | pos += 1 | |
2155 |
|
2159 | |||
2156 | return ret |
|
2160 | return ret | |
2157 |
|
2161 | |||
2158 | def prettyformat(tree): |
|
2162 | def prettyformat(tree): | |
2159 | def _prettyformat(tree, level, lines): |
|
2163 | def _prettyformat(tree, level, lines): | |
2160 | if not isinstance(tree, tuple) or tree[0] in ('string', 'symbol'): |
|
2164 | if not isinstance(tree, tuple) or tree[0] in ('string', 'symbol'): | |
2161 | lines.append((level, str(tree))) |
|
2165 | lines.append((level, str(tree))) | |
2162 | else: |
|
2166 | else: | |
2163 | lines.append((level, '(%s' % tree[0])) |
|
2167 | lines.append((level, '(%s' % tree[0])) | |
2164 | for s in tree[1:]: |
|
2168 | for s in tree[1:]: | |
2165 | _prettyformat(s, level + 1, lines) |
|
2169 | _prettyformat(s, level + 1, lines) | |
2166 | lines[-1:] = [(lines[-1][0], lines[-1][1] + ')')] |
|
2170 | lines[-1:] = [(lines[-1][0], lines[-1][1] + ')')] | |
2167 |
|
2171 | |||
2168 | lines = [] |
|
2172 | lines = [] | |
2169 | _prettyformat(tree, 0, lines) |
|
2173 | _prettyformat(tree, 0, lines) | |
2170 | output = '\n'.join((' '*l + s) for l, s in lines) |
|
2174 | output = '\n'.join((' '*l + s) for l, s in lines) | |
2171 | return output |
|
2175 | return output | |
2172 |
|
2176 | |||
2173 | def depth(tree): |
|
2177 | def depth(tree): | |
2174 | if isinstance(tree, tuple): |
|
2178 | if isinstance(tree, tuple): | |
2175 | return max(map(depth, tree)) + 1 |
|
2179 | return max(map(depth, tree)) + 1 | |
2176 | else: |
|
2180 | else: | |
2177 | return 0 |
|
2181 | return 0 | |
2178 |
|
2182 | |||
2179 | def funcsused(tree): |
|
2183 | def funcsused(tree): | |
2180 | if not isinstance(tree, tuple) or tree[0] in ('string', 'symbol'): |
|
2184 | if not isinstance(tree, tuple) or tree[0] in ('string', 'symbol'): | |
2181 | return set() |
|
2185 | return set() | |
2182 | else: |
|
2186 | else: | |
2183 | funcs = set() |
|
2187 | funcs = set() | |
2184 | for s in tree[1:]: |
|
2188 | for s in tree[1:]: | |
2185 | funcs |= funcsused(s) |
|
2189 | funcs |= funcsused(s) | |
2186 | if tree[0] == 'func': |
|
2190 | if tree[0] == 'func': | |
2187 | funcs.add(tree[1][1]) |
|
2191 | funcs.add(tree[1][1]) | |
2188 | return funcs |
|
2192 | return funcs | |
2189 |
|
2193 | |||
2190 | class baseset(list): |
|
2194 | class baseset(list): | |
2191 | """Basic data structure that represents a revset and contains the basic |
|
2195 | """Basic data structure that represents a revset and contains the basic | |
2192 | operation that it should be able to perform. |
|
2196 | operation that it should be able to perform. | |
2193 |
|
2197 | |||
2194 | Every method in this class should be implemented by any smartset class. |
|
2198 | Every method in this class should be implemented by any smartset class. | |
2195 | """ |
|
2199 | """ | |
2196 | def __init__(self, data=()): |
|
2200 | def __init__(self, data=()): | |
2197 | super(baseset, self).__init__(data) |
|
2201 | super(baseset, self).__init__(data) | |
2198 | self._set = None |
|
2202 | self._set = None | |
2199 |
|
2203 | |||
2200 | def ascending(self): |
|
2204 | def ascending(self): | |
2201 | """Sorts the set in ascending order (in place). |
|
2205 | """Sorts the set in ascending order (in place). | |
2202 |
|
2206 | |||
2203 | This is part of the mandatory API for smartset.""" |
|
2207 | This is part of the mandatory API for smartset.""" | |
2204 | self.sort() |
|
2208 | self.sort() | |
2205 |
|
2209 | |||
2206 | def descending(self): |
|
2210 | def descending(self): | |
2207 | """Sorts the set in descending order (in place). |
|
2211 | """Sorts the set in descending order (in place). | |
2208 |
|
2212 | |||
2209 | This is part of the mandatory API for smartset.""" |
|
2213 | This is part of the mandatory API for smartset.""" | |
2210 | self.sort(reverse=True) |
|
2214 | self.sort(reverse=True) | |
2211 |
|
2215 | |||
2212 | def min(self): |
|
2216 | def min(self): | |
2213 | return min(self) |
|
2217 | return min(self) | |
2214 |
|
2218 | |||
2215 | def max(self): |
|
2219 | def max(self): | |
2216 | return max(self) |
|
2220 | return max(self) | |
2217 |
|
2221 | |||
2218 | def set(self): |
|
2222 | def set(self): | |
2219 | """Returns a set or a smartset containing all the elements. |
|
2223 | """Returns a set or a smartset containing all the elements. | |
2220 |
|
2224 | |||
2221 | The returned structure should be the fastest option for membership |
|
2225 | The returned structure should be the fastest option for membership | |
2222 | testing. |
|
2226 | testing. | |
2223 |
|
2227 | |||
2224 | This is part of the mandatory API for smartset.""" |
|
2228 | This is part of the mandatory API for smartset.""" | |
2225 | if not self._set: |
|
2229 | if not self._set: | |
2226 | self._set = set(self) |
|
2230 | self._set = set(self) | |
2227 | return self._set |
|
2231 | return self._set | |
2228 |
|
2232 | |||
2229 | def __sub__(self, other): |
|
2233 | def __sub__(self, other): | |
2230 | """Returns a new object with the substraction of the two collections. |
|
2234 | """Returns a new object with the substraction of the two collections. | |
2231 |
|
2235 | |||
2232 | This is part of the mandatory API for smartset.""" |
|
2236 | This is part of the mandatory API for smartset.""" | |
2233 | if isinstance(other, baseset): |
|
2237 | if isinstance(other, baseset): | |
2234 | s = other.set() |
|
2238 | s = other.set() | |
2235 | else: |
|
2239 | else: | |
2236 | s = set(other) |
|
2240 | s = set(other) | |
2237 | return baseset(self.set() - s) |
|
2241 | return baseset(self.set() - s) | |
2238 |
|
2242 | |||
2239 | def __and__(self, other): |
|
2243 | def __and__(self, other): | |
2240 | """Returns a new object with the intersection of the two collections. |
|
2244 | """Returns a new object with the intersection of the two collections. | |
2241 |
|
2245 | |||
2242 | This is part of the mandatory API for smartset.""" |
|
2246 | This is part of the mandatory API for smartset.""" | |
2243 | if isinstance(other, baseset): |
|
2247 | if isinstance(other, baseset): | |
2244 | other = other.set() |
|
2248 | other = other.set() | |
2245 | return baseset([y for y in self if y in other]) |
|
2249 | return baseset([y for y in self if y in other]) | |
2246 |
|
2250 | |||
2247 | def __add__(self, other): |
|
2251 | def __add__(self, other): | |
2248 | """Returns a new object with the union of the two collections. |
|
2252 | """Returns a new object with the union of the two collections. | |
2249 |
|
2253 | |||
2250 | This is part of the mandatory API for smartset.""" |
|
2254 | This is part of the mandatory API for smartset.""" | |
2251 | s = self.set() |
|
2255 | s = self.set() | |
2252 | l = [r for r in other if r not in s] |
|
2256 | l = [r for r in other if r not in s] | |
2253 | return baseset(list(self) + l) |
|
2257 | return baseset(list(self) + l) | |
2254 |
|
2258 | |||
2255 | def isascending(self): |
|
2259 | def isascending(self): | |
2256 | """Returns True if the collection is ascending order, False if not. |
|
2260 | """Returns True if the collection is ascending order, False if not. | |
2257 |
|
2261 | |||
2258 | This is part of the mandatory API for smartset.""" |
|
2262 | This is part of the mandatory API for smartset.""" | |
2259 | return False |
|
2263 | return False | |
2260 |
|
2264 | |||
2261 | def isdescending(self): |
|
2265 | def isdescending(self): | |
2262 | """Returns True if the collection is descending order, False if not. |
|
2266 | """Returns True if the collection is descending order, False if not. | |
2263 |
|
2267 | |||
2264 | This is part of the mandatory API for smartset.""" |
|
2268 | This is part of the mandatory API for smartset.""" | |
2265 | return False |
|
2269 | return False | |
2266 |
|
2270 | |||
2267 | def filter(self, condition): |
|
2271 | def filter(self, condition): | |
2268 | """Returns this smartset filtered by condition as a new smartset. |
|
2272 | """Returns this smartset filtered by condition as a new smartset. | |
2269 |
|
2273 | |||
2270 | `condition` is a callable which takes a revision number and returns a |
|
2274 | `condition` is a callable which takes a revision number and returns a | |
2271 | boolean. |
|
2275 | boolean. | |
2272 |
|
2276 | |||
2273 | This is part of the mandatory API for smartset.""" |
|
2277 | This is part of the mandatory API for smartset.""" | |
2274 | return lazyset(self, condition) |
|
2278 | return lazyset(self, condition) | |
2275 |
|
2279 | |||
2276 | class _orderedsetmixin(object): |
|
2280 | class _orderedsetmixin(object): | |
2277 | """Mixin class with utility methods for smartsets |
|
2281 | """Mixin class with utility methods for smartsets | |
2278 |
|
2282 | |||
2279 | This should be extended by smartsets which have the isascending(), |
|
2283 | This should be extended by smartsets which have the isascending(), | |
2280 | isdescending() and reverse() methods""" |
|
2284 | isdescending() and reverse() methods""" | |
2281 |
|
2285 | |||
2282 | def _first(self): |
|
2286 | def _first(self): | |
2283 | """return the first revision in the set""" |
|
2287 | """return the first revision in the set""" | |
2284 | for r in self: |
|
2288 | for r in self: | |
2285 | return r |
|
2289 | return r | |
2286 | return None |
|
2290 | return None | |
2287 |
|
2291 | |||
2288 | def _last(self): |
|
2292 | def _last(self): | |
2289 | """return the last revision in the set""" |
|
2293 | """return the last revision in the set""" | |
2290 | self.reverse() |
|
2294 | self.reverse() | |
2291 | m = self._first() |
|
2295 | m = self._first() | |
2292 | self.reverse() |
|
2296 | self.reverse() | |
2293 | return m |
|
2297 | return m | |
2294 |
|
2298 | |||
2295 | def min(self): |
|
2299 | def min(self): | |
2296 | """return the smallest element in the set""" |
|
2300 | """return the smallest element in the set""" | |
2297 | if self.isascending(): |
|
2301 | if self.isascending(): | |
2298 | return self._first() |
|
2302 | return self._first() | |
2299 | return self._last() |
|
2303 | return self._last() | |
2300 |
|
2304 | |||
2301 | def max(self): |
|
2305 | def max(self): | |
2302 | """return the largest element in the set""" |
|
2306 | """return the largest element in the set""" | |
2303 | if self.isascending(): |
|
2307 | if self.isascending(): | |
2304 | return self._last() |
|
2308 | return self._last() | |
2305 | return self._first() |
|
2309 | return self._first() | |
2306 |
|
2310 | |||
2307 | class lazyset(object): |
|
2311 | class lazyset(object): | |
2308 | """Duck type for baseset class which iterates lazily over the revisions in |
|
2312 | """Duck type for baseset class which iterates lazily over the revisions in | |
2309 | the subset and contains a function which tests for membership in the |
|
2313 | the subset and contains a function which tests for membership in the | |
2310 | revset |
|
2314 | revset | |
2311 | """ |
|
2315 | """ | |
2312 | def __init__(self, subset, condition=lambda x: True): |
|
2316 | def __init__(self, subset, condition=lambda x: True): | |
2313 | """ |
|
2317 | """ | |
2314 | condition: a function that decide whether a revision in the subset |
|
2318 | condition: a function that decide whether a revision in the subset | |
2315 | belongs to the revset or not. |
|
2319 | belongs to the revset or not. | |
2316 | """ |
|
2320 | """ | |
2317 | self._subset = subset |
|
2321 | self._subset = subset | |
2318 | self._condition = condition |
|
2322 | self._condition = condition | |
2319 | self._cache = {} |
|
2323 | self._cache = {} | |
2320 |
|
2324 | |||
2321 | def ascending(self): |
|
2325 | def ascending(self): | |
2322 | self._subset.sort() |
|
2326 | self._subset.sort() | |
2323 |
|
2327 | |||
2324 | def descending(self): |
|
2328 | def descending(self): | |
2325 | self._subset.sort(reverse=True) |
|
2329 | self._subset.sort(reverse=True) | |
2326 |
|
2330 | |||
2327 | def min(self): |
|
2331 | def min(self): | |
2328 | return min(self) |
|
2332 | return min(self) | |
2329 |
|
2333 | |||
2330 | def max(self): |
|
2334 | def max(self): | |
2331 | return max(self) |
|
2335 | return max(self) | |
2332 |
|
2336 | |||
2333 | def __contains__(self, x): |
|
2337 | def __contains__(self, x): | |
2334 | c = self._cache |
|
2338 | c = self._cache | |
2335 | if x not in c: |
|
2339 | if x not in c: | |
2336 | c[x] = x in self._subset and self._condition(x) |
|
2340 | c[x] = x in self._subset and self._condition(x) | |
2337 | return c[x] |
|
2341 | return c[x] | |
2338 |
|
2342 | |||
2339 | def __iter__(self): |
|
2343 | def __iter__(self): | |
2340 | cond = self._condition |
|
2344 | cond = self._condition | |
2341 | for x in self._subset: |
|
2345 | for x in self._subset: | |
2342 | if cond(x): |
|
2346 | if cond(x): | |
2343 | yield x |
|
2347 | yield x | |
2344 |
|
2348 | |||
2345 | def __and__(self, x): |
|
2349 | def __and__(self, x): | |
2346 | return lazyset(self, lambda r: r in x) |
|
2350 | return lazyset(self, lambda r: r in x) | |
2347 |
|
2351 | |||
2348 | def __sub__(self, x): |
|
2352 | def __sub__(self, x): | |
2349 | return lazyset(self, lambda r: r not in x) |
|
2353 | return lazyset(self, lambda r: r not in x) | |
2350 |
|
2354 | |||
2351 | def __add__(self, x): |
|
2355 | def __add__(self, x): | |
2352 | return _addset(self, x) |
|
2356 | return _addset(self, x) | |
2353 |
|
2357 | |||
2354 | def __nonzero__(self): |
|
2358 | def __nonzero__(self): | |
2355 | for r in self: |
|
2359 | for r in self: | |
2356 | return True |
|
2360 | return True | |
2357 | return False |
|
2361 | return False | |
2358 |
|
2362 | |||
2359 | def __len__(self): |
|
2363 | def __len__(self): | |
2360 | # Basic implementation to be changed in future patches. |
|
2364 | # Basic implementation to be changed in future patches. | |
2361 | l = baseset([r for r in self]) |
|
2365 | l = baseset([r for r in self]) | |
2362 | return len(l) |
|
2366 | return len(l) | |
2363 |
|
2367 | |||
2364 | def __getitem__(self, x): |
|
2368 | def __getitem__(self, x): | |
2365 | # Basic implementation to be changed in future patches. |
|
2369 | # Basic implementation to be changed in future patches. | |
2366 | l = baseset([r for r in self]) |
|
2370 | l = baseset([r for r in self]) | |
2367 | return l[x] |
|
2371 | return l[x] | |
2368 |
|
2372 | |||
2369 | def sort(self, reverse=False): |
|
2373 | def sort(self, reverse=False): | |
2370 | if not util.safehasattr(self._subset, 'sort'): |
|
2374 | if not util.safehasattr(self._subset, 'sort'): | |
2371 | self._subset = baseset(self._subset) |
|
2375 | self._subset = baseset(self._subset) | |
2372 | self._subset.sort(reverse=reverse) |
|
2376 | self._subset.sort(reverse=reverse) | |
2373 |
|
2377 | |||
2374 | def reverse(self): |
|
2378 | def reverse(self): | |
2375 | self._subset.reverse() |
|
2379 | self._subset.reverse() | |
2376 |
|
2380 | |||
2377 | def set(self): |
|
2381 | def set(self): | |
2378 | return set([r for r in self]) |
|
2382 | return set([r for r in self]) | |
2379 |
|
2383 | |||
2380 | def isascending(self): |
|
2384 | def isascending(self): | |
2381 | return False |
|
2385 | return False | |
2382 |
|
2386 | |||
2383 | def isdescending(self): |
|
2387 | def isdescending(self): | |
2384 | return False |
|
2388 | return False | |
2385 |
|
2389 | |||
2386 | def filter(self, l): |
|
2390 | def filter(self, l): | |
2387 | return lazyset(self, l) |
|
2391 | return lazyset(self, l) | |
2388 |
|
2392 | |||
2389 | class orderedlazyset(_orderedsetmixin, lazyset): |
|
2393 | class orderedlazyset(_orderedsetmixin, lazyset): | |
2390 | """Subclass of lazyset which subset can be ordered either ascending or |
|
2394 | """Subclass of lazyset which subset can be ordered either ascending or | |
2391 | descendingly |
|
2395 | descendingly | |
2392 | """ |
|
2396 | """ | |
2393 | def __init__(self, subset, condition, ascending=True): |
|
2397 | def __init__(self, subset, condition, ascending=True): | |
2394 | super(orderedlazyset, self).__init__(subset, condition) |
|
2398 | super(orderedlazyset, self).__init__(subset, condition) | |
2395 | self._ascending = ascending |
|
2399 | self._ascending = ascending | |
2396 |
|
2400 | |||
2397 | def filter(self, l): |
|
2401 | def filter(self, l): | |
2398 | return orderedlazyset(self, l, ascending=self._ascending) |
|
2402 | return orderedlazyset(self, l, ascending=self._ascending) | |
2399 |
|
2403 | |||
2400 | def ascending(self): |
|
2404 | def ascending(self): | |
2401 | if not self._ascending: |
|
2405 | if not self._ascending: | |
2402 | self.reverse() |
|
2406 | self.reverse() | |
2403 |
|
2407 | |||
2404 | def descending(self): |
|
2408 | def descending(self): | |
2405 | if self._ascending: |
|
2409 | if self._ascending: | |
2406 | self.reverse() |
|
2410 | self.reverse() | |
2407 |
|
2411 | |||
2408 | def __and__(self, x): |
|
2412 | def __and__(self, x): | |
2409 | return orderedlazyset(self, lambda r: r in x, |
|
2413 | return orderedlazyset(self, lambda r: r in x, | |
2410 | ascending=self._ascending) |
|
2414 | ascending=self._ascending) | |
2411 |
|
2415 | |||
2412 | def __sub__(self, x): |
|
2416 | def __sub__(self, x): | |
2413 | return orderedlazyset(self, lambda r: r not in x, |
|
2417 | return orderedlazyset(self, lambda r: r not in x, | |
2414 | ascending=self._ascending) |
|
2418 | ascending=self._ascending) | |
2415 |
|
2419 | |||
2416 | def __add__(self, x): |
|
2420 | def __add__(self, x): | |
2417 | kwargs = {} |
|
2421 | kwargs = {} | |
2418 | if self.isascending() and x.isascending(): |
|
2422 | if self.isascending() and x.isascending(): | |
2419 | kwargs['ascending'] = True |
|
2423 | kwargs['ascending'] = True | |
2420 | if self.isdescending() and x.isdescending(): |
|
2424 | if self.isdescending() and x.isdescending(): | |
2421 | kwargs['ascending'] = False |
|
2425 | kwargs['ascending'] = False | |
2422 | return _addset(self, x, **kwargs) |
|
2426 | return _addset(self, x, **kwargs) | |
2423 |
|
2427 | |||
2424 | def sort(self, reverse=False): |
|
2428 | def sort(self, reverse=False): | |
2425 | if reverse: |
|
2429 | if reverse: | |
2426 | if self._ascending: |
|
2430 | if self._ascending: | |
2427 | self._subset.sort(reverse=reverse) |
|
2431 | self._subset.sort(reverse=reverse) | |
2428 | else: |
|
2432 | else: | |
2429 | if not self._ascending: |
|
2433 | if not self._ascending: | |
2430 | self._subset.sort(reverse=reverse) |
|
2434 | self._subset.sort(reverse=reverse) | |
2431 | self._ascending = not reverse |
|
2435 | self._ascending = not reverse | |
2432 |
|
2436 | |||
2433 | def isascending(self): |
|
2437 | def isascending(self): | |
2434 | return self._ascending |
|
2438 | return self._ascending | |
2435 |
|
2439 | |||
2436 | def isdescending(self): |
|
2440 | def isdescending(self): | |
2437 | return not self._ascending |
|
2441 | return not self._ascending | |
2438 |
|
2442 | |||
2439 | def reverse(self): |
|
2443 | def reverse(self): | |
2440 | self._subset.reverse() |
|
2444 | self._subset.reverse() | |
2441 | self._ascending = not self._ascending |
|
2445 | self._ascending = not self._ascending | |
2442 |
|
2446 | |||
2443 | class _addset(_orderedsetmixin): |
|
2447 | class _addset(_orderedsetmixin): | |
2444 | """Represent the addition of two sets |
|
2448 | """Represent the addition of two sets | |
2445 |
|
2449 | |||
2446 | Wrapper structure for lazily adding two structures without losing much |
|
2450 | Wrapper structure for lazily adding two structures without losing much | |
2447 | performance on the __contains__ method |
|
2451 | performance on the __contains__ method | |
2448 |
|
2452 | |||
2449 | If the ascending attribute is set, that means the two structures are |
|
2453 | If the ascending attribute is set, that means the two structures are | |
2450 | ordered in either an ascending or descending way. Therefore, we can add |
|
2454 | ordered in either an ascending or descending way. Therefore, we can add | |
2451 | them mantaining the order by iterating over both at the same time |
|
2455 | them mantaining the order by iterating over both at the same time | |
2452 |
|
2456 | |||
2453 | This class does not duck-type baseset and it's only supposed to be used |
|
2457 | This class does not duck-type baseset and it's only supposed to be used | |
2454 | internally |
|
2458 | internally | |
2455 | """ |
|
2459 | """ | |
2456 | def __init__(self, revs1, revs2, ascending=None): |
|
2460 | def __init__(self, revs1, revs2, ascending=None): | |
2457 | self._r1 = revs1 |
|
2461 | self._r1 = revs1 | |
2458 | self._r2 = revs2 |
|
2462 | self._r2 = revs2 | |
2459 | self._iter = None |
|
2463 | self._iter = None | |
2460 | self._ascending = ascending |
|
2464 | self._ascending = ascending | |
2461 | self._genlist = None |
|
2465 | self._genlist = None | |
2462 |
|
2466 | |||
2463 | @util.propertycache |
|
2467 | @util.propertycache | |
2464 | def _list(self): |
|
2468 | def _list(self): | |
2465 | if not self._genlist: |
|
2469 | if not self._genlist: | |
2466 | self._genlist = baseset(self._iterator()) |
|
2470 | self._genlist = baseset(self._iterator()) | |
2467 | return self._genlist |
|
2471 | return self._genlist | |
2468 |
|
2472 | |||
2469 | def filter(self, condition): |
|
2473 | def filter(self, condition): | |
2470 | if self._ascending is not None: |
|
2474 | if self._ascending is not None: | |
2471 | return orderedlazyset(self, condition, ascending=self._ascending) |
|
2475 | return orderedlazyset(self, condition, ascending=self._ascending) | |
2472 | return lazyset(self, condition) |
|
2476 | return lazyset(self, condition) | |
2473 |
|
2477 | |||
2474 | def ascending(self): |
|
2478 | def ascending(self): | |
2475 | if self._ascending is None: |
|
2479 | if self._ascending is None: | |
2476 | self.sort() |
|
2480 | self.sort() | |
2477 | self._ascending = True |
|
2481 | self._ascending = True | |
2478 | else: |
|
2482 | else: | |
2479 | if not self._ascending: |
|
2483 | if not self._ascending: | |
2480 | self.reverse() |
|
2484 | self.reverse() | |
2481 |
|
2485 | |||
2482 | def descending(self): |
|
2486 | def descending(self): | |
2483 | if self._ascending is None: |
|
2487 | if self._ascending is None: | |
2484 | self.sort(reverse=True) |
|
2488 | self.sort(reverse=True) | |
2485 | self._ascending = False |
|
2489 | self._ascending = False | |
2486 | else: |
|
2490 | else: | |
2487 | if self._ascending: |
|
2491 | if self._ascending: | |
2488 | self.reverse() |
|
2492 | self.reverse() | |
2489 |
|
2493 | |||
2490 | def __and__(self, other): |
|
2494 | def __and__(self, other): | |
2491 | filterfunc = other.__contains__ |
|
2495 | filterfunc = other.__contains__ | |
2492 | if self._ascending is not None: |
|
2496 | if self._ascending is not None: | |
2493 | return orderedlazyset(self, filterfunc, ascending=self._ascending) |
|
2497 | return orderedlazyset(self, filterfunc, ascending=self._ascending) | |
2494 | return lazyset(self, filterfunc) |
|
2498 | return lazyset(self, filterfunc) | |
2495 |
|
2499 | |||
2496 | def __sub__(self, other): |
|
2500 | def __sub__(self, other): | |
2497 | filterfunc = lambda r: r not in other |
|
2501 | filterfunc = lambda r: r not in other | |
2498 | if self._ascending is not None: |
|
2502 | if self._ascending is not None: | |
2499 | return orderedlazyset(self, filterfunc, ascending=self._ascending) |
|
2503 | return orderedlazyset(self, filterfunc, ascending=self._ascending) | |
2500 | return lazyset(self, filterfunc) |
|
2504 | return lazyset(self, filterfunc) | |
2501 |
|
2505 | |||
2502 | def __add__(self, other): |
|
2506 | def __add__(self, other): | |
2503 | """When both collections are ascending or descending, preserve the order |
|
2507 | """When both collections are ascending or descending, preserve the order | |
2504 | """ |
|
2508 | """ | |
2505 | kwargs = {} |
|
2509 | kwargs = {} | |
2506 | if self._ascending is not None: |
|
2510 | if self._ascending is not None: | |
2507 | if self.isascending() and other.isascending(): |
|
2511 | if self.isascending() and other.isascending(): | |
2508 | kwargs['ascending'] = True |
|
2512 | kwargs['ascending'] = True | |
2509 | if self.isdescending() and other.isdescending(): |
|
2513 | if self.isdescending() and other.isdescending(): | |
2510 | kwargs['ascending'] = False |
|
2514 | kwargs['ascending'] = False | |
2511 | return _addset(self, other, **kwargs) |
|
2515 | return _addset(self, other, **kwargs) | |
2512 |
|
2516 | |||
2513 | def _iterator(self): |
|
2517 | def _iterator(self): | |
2514 | """Iterate over both collections without repeating elements |
|
2518 | """Iterate over both collections without repeating elements | |
2515 |
|
2519 | |||
2516 | If the ascending attribute is not set, iterate over the first one and |
|
2520 | If the ascending attribute is not set, iterate over the first one and | |
2517 | then over the second one checking for membership on the first one so we |
|
2521 | then over the second one checking for membership on the first one so we | |
2518 | dont yield any duplicates. |
|
2522 | dont yield any duplicates. | |
2519 |
|
2523 | |||
2520 | If the ascending attribute is set, iterate over both collections at the |
|
2524 | If the ascending attribute is set, iterate over both collections at the | |
2521 | same time, yielding only one value at a time in the given order. |
|
2525 | same time, yielding only one value at a time in the given order. | |
2522 | """ |
|
2526 | """ | |
2523 | if not self._iter: |
|
2527 | if not self._iter: | |
2524 | def gen(): |
|
2528 | def gen(): | |
2525 | if self._ascending is None: |
|
2529 | if self._ascending is None: | |
2526 | for r in self._r1: |
|
2530 | for r in self._r1: | |
2527 | yield r |
|
2531 | yield r | |
2528 | s = self._r1.set() |
|
2532 | s = self._r1.set() | |
2529 | for r in self._r2: |
|
2533 | for r in self._r2: | |
2530 | if r not in s: |
|
2534 | if r not in s: | |
2531 | yield r |
|
2535 | yield r | |
2532 | else: |
|
2536 | else: | |
2533 | iter1 = iter(self._r1) |
|
2537 | iter1 = iter(self._r1) | |
2534 | iter2 = iter(self._r2) |
|
2538 | iter2 = iter(self._r2) | |
2535 |
|
2539 | |||
2536 | val1 = None |
|
2540 | val1 = None | |
2537 | val2 = None |
|
2541 | val2 = None | |
2538 |
|
2542 | |||
2539 | choice = max |
|
2543 | choice = max | |
2540 | if self._ascending: |
|
2544 | if self._ascending: | |
2541 | choice = min |
|
2545 | choice = min | |
2542 | try: |
|
2546 | try: | |
2543 | # Consume both iterators in an ordered way until one is |
|
2547 | # Consume both iterators in an ordered way until one is | |
2544 | # empty |
|
2548 | # empty | |
2545 | while True: |
|
2549 | while True: | |
2546 | if val1 is None: |
|
2550 | if val1 is None: | |
2547 | val1 = iter1.next() |
|
2551 | val1 = iter1.next() | |
2548 | if val2 is None: |
|
2552 | if val2 is None: | |
2549 | val2 = iter2.next() |
|
2553 | val2 = iter2.next() | |
2550 | next = choice(val1, val2) |
|
2554 | next = choice(val1, val2) | |
2551 | yield next |
|
2555 | yield next | |
2552 | if val1 == next: |
|
2556 | if val1 == next: | |
2553 | val1 = None |
|
2557 | val1 = None | |
2554 | if val2 == next: |
|
2558 | if val2 == next: | |
2555 | val2 = None |
|
2559 | val2 = None | |
2556 | except StopIteration: |
|
2560 | except StopIteration: | |
2557 | # Flush any remaining values and consume the other one |
|
2561 | # Flush any remaining values and consume the other one | |
2558 | it = iter2 |
|
2562 | it = iter2 | |
2559 | if val1 is not None: |
|
2563 | if val1 is not None: | |
2560 | yield val1 |
|
2564 | yield val1 | |
2561 | it = iter1 |
|
2565 | it = iter1 | |
2562 | elif val2 is not None: |
|
2566 | elif val2 is not None: | |
2563 | # might have been equality and both are empty |
|
2567 | # might have been equality and both are empty | |
2564 | yield val2 |
|
2568 | yield val2 | |
2565 | for val in it: |
|
2569 | for val in it: | |
2566 | yield val |
|
2570 | yield val | |
2567 |
|
2571 | |||
2568 | self._iter = _generatorset(gen()) |
|
2572 | self._iter = _generatorset(gen()) | |
2569 |
|
2573 | |||
2570 | return self._iter |
|
2574 | return self._iter | |
2571 |
|
2575 | |||
2572 | def __iter__(self): |
|
2576 | def __iter__(self): | |
2573 | if self._genlist: |
|
2577 | if self._genlist: | |
2574 | return iter(self._genlist) |
|
2578 | return iter(self._genlist) | |
2575 | return iter(self._iterator()) |
|
2579 | return iter(self._iterator()) | |
2576 |
|
2580 | |||
2577 | def __contains__(self, x): |
|
2581 | def __contains__(self, x): | |
2578 | return x in self._r1 or x in self._r2 |
|
2582 | return x in self._r1 or x in self._r2 | |
2579 |
|
2583 | |||
2580 | def set(self): |
|
2584 | def set(self): | |
2581 | return self |
|
2585 | return self | |
2582 |
|
2586 | |||
2583 | def sort(self, reverse=False): |
|
2587 | def sort(self, reverse=False): | |
2584 | """Sort the added set |
|
2588 | """Sort the added set | |
2585 |
|
2589 | |||
2586 | For this we use the cached list with all the generated values and if we |
|
2590 | For this we use the cached list with all the generated values and if we | |
2587 | know they are ascending or descending we can sort them in a smart way. |
|
2591 | know they are ascending or descending we can sort them in a smart way. | |
2588 | """ |
|
2592 | """ | |
2589 | if self._ascending is None: |
|
2593 | if self._ascending is None: | |
2590 | self._list.sort(reverse=reverse) |
|
2594 | self._list.sort(reverse=reverse) | |
2591 | self._ascending = not reverse |
|
2595 | self._ascending = not reverse | |
2592 | else: |
|
2596 | else: | |
2593 | if bool(self._ascending) == bool(reverse): |
|
2597 | if bool(self._ascending) == bool(reverse): | |
2594 | self.reverse() |
|
2598 | self.reverse() | |
2595 |
|
2599 | |||
2596 | def isascending(self): |
|
2600 | def isascending(self): | |
2597 | return self._ascending is not None and self._ascending |
|
2601 | return self._ascending is not None and self._ascending | |
2598 |
|
2602 | |||
2599 | def isdescending(self): |
|
2603 | def isdescending(self): | |
2600 | return self._ascending is not None and not self._ascending |
|
2604 | return self._ascending is not None and not self._ascending | |
2601 |
|
2605 | |||
2602 | def reverse(self): |
|
2606 | def reverse(self): | |
2603 | self._list.reverse() |
|
2607 | self._list.reverse() | |
2604 | if self._ascending is not None: |
|
2608 | if self._ascending is not None: | |
2605 | self._ascending = not self._ascending |
|
2609 | self._ascending = not self._ascending | |
2606 |
|
2610 | |||
2607 | class _generatorset(object): |
|
2611 | class _generatorset(object): | |
2608 | """Wrap a generator for lazy iteration |
|
2612 | """Wrap a generator for lazy iteration | |
2609 |
|
2613 | |||
2610 | Wrapper structure for generators that provides lazy membership and can |
|
2614 | Wrapper structure for generators that provides lazy membership and can | |
2611 | be iterated more than once. |
|
2615 | be iterated more than once. | |
2612 | When asked for membership it generates values until either it finds the |
|
2616 | When asked for membership it generates values until either it finds the | |
2613 | requested one or has gone through all the elements in the generator |
|
2617 | requested one or has gone through all the elements in the generator | |
2614 |
|
2618 | |||
2615 | This class does not duck-type baseset and it's only supposed to be used |
|
2619 | This class does not duck-type baseset and it's only supposed to be used | |
2616 | internally |
|
2620 | internally | |
2617 | """ |
|
2621 | """ | |
2618 | def __init__(self, gen): |
|
2622 | def __init__(self, gen): | |
2619 | """ |
|
2623 | """ | |
2620 | gen: a generator producing the values for the generatorset. |
|
2624 | gen: a generator producing the values for the generatorset. | |
2621 | """ |
|
2625 | """ | |
2622 | self._gen = gen |
|
2626 | self._gen = gen | |
2623 | self._iter = iter(gen) |
|
2627 | self._iter = iter(gen) | |
2624 | self._cache = {} |
|
2628 | self._cache = {} | |
2625 | self._genlist = baseset([]) |
|
2629 | self._genlist = baseset([]) | |
2626 | self._iterated = False |
|
2630 | self._iterated = False | |
2627 | self._finished = False |
|
2631 | self._finished = False | |
2628 |
|
2632 | |||
2629 | def __contains__(self, x): |
|
2633 | def __contains__(self, x): | |
2630 | if x in self._cache: |
|
2634 | if x in self._cache: | |
2631 | return self._cache[x] |
|
2635 | return self._cache[x] | |
2632 |
|
2636 | |||
2633 | # Use new values only, as existing values would be cached. |
|
2637 | # Use new values only, as existing values would be cached. | |
2634 | for l in self._consumegen(): |
|
2638 | for l in self._consumegen(): | |
2635 | if l == x: |
|
2639 | if l == x: | |
2636 | return True |
|
2640 | return True | |
2637 |
|
2641 | |||
2638 | self._finished = True |
|
2642 | self._finished = True | |
2639 | self._cache[x] = False |
|
2643 | self._cache[x] = False | |
2640 | return False |
|
2644 | return False | |
2641 |
|
2645 | |||
2642 | def __iter__(self): |
|
2646 | def __iter__(self): | |
2643 | if self._iterated: |
|
2647 | if self._iterated: | |
2644 | # At least a part of the list should be cached if iteration has |
|
2648 | # At least a part of the list should be cached if iteration has | |
2645 | # started over the generatorset. |
|
2649 | # started over the generatorset. | |
2646 | for l in self._genlist: |
|
2650 | for l in self._genlist: | |
2647 | yield l |
|
2651 | yield l | |
2648 |
|
2652 | |||
2649 | for item in self._consumegen(): |
|
2653 | for item in self._consumegen(): | |
2650 | yield item |
|
2654 | yield item | |
2651 |
|
2655 | |||
2652 | def _consumegen(self): |
|
2656 | def _consumegen(self): | |
2653 | self._iterated = True |
|
2657 | self._iterated = True | |
2654 |
|
2658 | |||
2655 | for item in self._gen: |
|
2659 | for item in self._gen: | |
2656 | self._cache[item] = True |
|
2660 | self._cache[item] = True | |
2657 | self._genlist.append(item) |
|
2661 | self._genlist.append(item) | |
2658 | yield item |
|
2662 | yield item | |
2659 |
|
2663 | |||
2660 | self._finished = True |
|
2664 | self._finished = True | |
2661 |
|
2665 | |||
2662 | def set(self): |
|
2666 | def set(self): | |
2663 | return self |
|
2667 | return self | |
2664 |
|
2668 | |||
2665 | def sort(self, reverse=False): |
|
2669 | def sort(self, reverse=False): | |
2666 | if not self._finished: |
|
2670 | if not self._finished: | |
2667 | for i in self: |
|
2671 | for i in self: | |
2668 | continue |
|
2672 | continue | |
2669 | self._genlist.sort(reverse=reverse) |
|
2673 | self._genlist.sort(reverse=reverse) | |
2670 |
|
2674 | |||
2671 | class _ascgeneratorset(_generatorset): |
|
2675 | class _ascgeneratorset(_generatorset): | |
2672 | """Wrap a generator of ascending elements for lazy iteration |
|
2676 | """Wrap a generator of ascending elements for lazy iteration | |
2673 |
|
2677 | |||
2674 | Same structure as _generatorset but stops iterating after it goes past |
|
2678 | Same structure as _generatorset but stops iterating after it goes past | |
2675 | the value when asked for membership and the element is not contained |
|
2679 | the value when asked for membership and the element is not contained | |
2676 |
|
2680 | |||
2677 | This class does not duck-type baseset and it's only supposed to be used |
|
2681 | This class does not duck-type baseset and it's only supposed to be used | |
2678 | internally |
|
2682 | internally | |
2679 | """ |
|
2683 | """ | |
2680 | def __contains__(self, x): |
|
2684 | def __contains__(self, x): | |
2681 | if x in self._cache: |
|
2685 | if x in self._cache: | |
2682 | return self._cache[x] |
|
2686 | return self._cache[x] | |
2683 |
|
2687 | |||
2684 | # Use new values only, as existing values would be cached. |
|
2688 | # Use new values only, as existing values would be cached. | |
2685 | for l in self._consumegen(): |
|
2689 | for l in self._consumegen(): | |
2686 | if l == x: |
|
2690 | if l == x: | |
2687 | return True |
|
2691 | return True | |
2688 | if l > x: |
|
2692 | if l > x: | |
2689 | break |
|
2693 | break | |
2690 |
|
2694 | |||
2691 | self._cache[x] = False |
|
2695 | self._cache[x] = False | |
2692 | return False |
|
2696 | return False | |
2693 |
|
2697 | |||
2694 | class _descgeneratorset(_generatorset): |
|
2698 | class _descgeneratorset(_generatorset): | |
2695 | """Wrap a generator of descending elements for lazy iteration |
|
2699 | """Wrap a generator of descending elements for lazy iteration | |
2696 |
|
2700 | |||
2697 | Same structure as _generatorset but stops iterating after it goes past |
|
2701 | Same structure as _generatorset but stops iterating after it goes past | |
2698 | the value when asked for membership and the element is not contained |
|
2702 | the value when asked for membership and the element is not contained | |
2699 |
|
2703 | |||
2700 | This class does not duck-type baseset and it's only supposed to be used |
|
2704 | This class does not duck-type baseset and it's only supposed to be used | |
2701 | internally |
|
2705 | internally | |
2702 | """ |
|
2706 | """ | |
2703 | def __contains__(self, x): |
|
2707 | def __contains__(self, x): | |
2704 | if x in self._cache: |
|
2708 | if x in self._cache: | |
2705 | return self._cache[x] |
|
2709 | return self._cache[x] | |
2706 |
|
2710 | |||
2707 | # Use new values only, as existing values would be cached. |
|
2711 | # Use new values only, as existing values would be cached. | |
2708 | for l in self._consumegen(): |
|
2712 | for l in self._consumegen(): | |
2709 | if l == x: |
|
2713 | if l == x: | |
2710 | return True |
|
2714 | return True | |
2711 | if l < x: |
|
2715 | if l < x: | |
2712 | break |
|
2716 | break | |
2713 |
|
2717 | |||
2714 | self._cache[x] = False |
|
2718 | self._cache[x] = False | |
2715 | return False |
|
2719 | return False | |
2716 |
|
2720 | |||
2717 | class spanset(_orderedsetmixin): |
|
2721 | class spanset(_orderedsetmixin): | |
2718 | """Duck type for baseset class which represents a range of revisions and |
|
2722 | """Duck type for baseset class which represents a range of revisions and | |
2719 | can work lazily and without having all the range in memory |
|
2723 | can work lazily and without having all the range in memory | |
2720 |
|
2724 | |||
2721 | Note that spanset(x, y) behave almost like xrange(x, y) except for two |
|
2725 | Note that spanset(x, y) behave almost like xrange(x, y) except for two | |
2722 | notable points: |
|
2726 | notable points: | |
2723 | - when x < y it will be automatically descending, |
|
2727 | - when x < y it will be automatically descending, | |
2724 | - revision filtered with this repoview will be skipped. |
|
2728 | - revision filtered with this repoview will be skipped. | |
2725 |
|
2729 | |||
2726 | """ |
|
2730 | """ | |
2727 | def __init__(self, repo, start=0, end=None): |
|
2731 | def __init__(self, repo, start=0, end=None): | |
2728 | """ |
|
2732 | """ | |
2729 | start: first revision included the set |
|
2733 | start: first revision included the set | |
2730 | (default to 0) |
|
2734 | (default to 0) | |
2731 | end: first revision excluded (last+1) |
|
2735 | end: first revision excluded (last+1) | |
2732 | (default to len(repo) |
|
2736 | (default to len(repo) | |
2733 |
|
2737 | |||
2734 | Spanset will be descending if `end` < `start`. |
|
2738 | Spanset will be descending if `end` < `start`. | |
2735 | """ |
|
2739 | """ | |
2736 | self._start = start |
|
2740 | self._start = start | |
2737 | if end is not None: |
|
2741 | if end is not None: | |
2738 | self._end = end |
|
2742 | self._end = end | |
2739 | else: |
|
2743 | else: | |
2740 | self._end = len(repo) |
|
2744 | self._end = len(repo) | |
2741 | self._hiddenrevs = repo.changelog.filteredrevs |
|
2745 | self._hiddenrevs = repo.changelog.filteredrevs | |
2742 |
|
2746 | |||
2743 | def ascending(self): |
|
2747 | def ascending(self): | |
2744 | if self._start > self._end: |
|
2748 | if self._start > self._end: | |
2745 | self.reverse() |
|
2749 | self.reverse() | |
2746 |
|
2750 | |||
2747 | def descending(self): |
|
2751 | def descending(self): | |
2748 | if self._start < self._end: |
|
2752 | if self._start < self._end: | |
2749 | self.reverse() |
|
2753 | self.reverse() | |
2750 |
|
2754 | |||
2751 | def _contained(self, rev): |
|
2755 | def _contained(self, rev): | |
2752 | return (rev <= self._start and rev > self._end) or (rev >= self._start |
|
2756 | return (rev <= self._start and rev > self._end) or (rev >= self._start | |
2753 | and rev < self._end) |
|
2757 | and rev < self._end) | |
2754 |
|
2758 | |||
2755 | def __iter__(self): |
|
2759 | def __iter__(self): | |
2756 | if self._start <= self._end: |
|
2760 | if self._start <= self._end: | |
2757 | iterrange = xrange(self._start, self._end) |
|
2761 | iterrange = xrange(self._start, self._end) | |
2758 | else: |
|
2762 | else: | |
2759 | iterrange = xrange(self._start, self._end, -1) |
|
2763 | iterrange = xrange(self._start, self._end, -1) | |
2760 |
|
2764 | |||
2761 | if self._hiddenrevs: |
|
2765 | if self._hiddenrevs: | |
2762 | s = self._hiddenrevs |
|
2766 | s = self._hiddenrevs | |
2763 | for r in iterrange: |
|
2767 | for r in iterrange: | |
2764 | if r not in s: |
|
2768 | if r not in s: | |
2765 | yield r |
|
2769 | yield r | |
2766 | else: |
|
2770 | else: | |
2767 | for r in iterrange: |
|
2771 | for r in iterrange: | |
2768 | yield r |
|
2772 | yield r | |
2769 |
|
2773 | |||
2770 | def __contains__(self, x): |
|
2774 | def __contains__(self, x): | |
2771 | return self._contained(x) and not (self._hiddenrevs and rev in |
|
2775 | return self._contained(x) and not (self._hiddenrevs and rev in | |
2772 | self._hiddenrevs) |
|
2776 | self._hiddenrevs) | |
2773 |
|
2777 | |||
2774 | def __nonzero__(self): |
|
2778 | def __nonzero__(self): | |
2775 | for r in self: |
|
2779 | for r in self: | |
2776 | return True |
|
2780 | return True | |
2777 | return False |
|
2781 | return False | |
2778 |
|
2782 | |||
2779 | def __and__(self, x): |
|
2783 | def __and__(self, x): | |
2780 | if isinstance(x, baseset): |
|
2784 | if isinstance(x, baseset): | |
2781 | x = x.set() |
|
2785 | x = x.set() | |
2782 | if self._start <= self._end: |
|
2786 | if self._start <= self._end: | |
2783 | return orderedlazyset(self, lambda r: r in x) |
|
2787 | return orderedlazyset(self, lambda r: r in x) | |
2784 | else: |
|
2788 | else: | |
2785 | return orderedlazyset(self, lambda r: r in x, ascending=False) |
|
2789 | return orderedlazyset(self, lambda r: r in x, ascending=False) | |
2786 |
|
2790 | |||
2787 | def __sub__(self, x): |
|
2791 | def __sub__(self, x): | |
2788 | if isinstance(x, baseset): |
|
2792 | if isinstance(x, baseset): | |
2789 | x = x.set() |
|
2793 | x = x.set() | |
2790 | if self._start <= self._end: |
|
2794 | if self._start <= self._end: | |
2791 | return orderedlazyset(self, lambda r: r not in x) |
|
2795 | return orderedlazyset(self, lambda r: r not in x) | |
2792 | else: |
|
2796 | else: | |
2793 | return orderedlazyset(self, lambda r: r not in x, ascending=False) |
|
2797 | return orderedlazyset(self, lambda r: r not in x, ascending=False) | |
2794 |
|
2798 | |||
2795 | def __add__(self, x): |
|
2799 | def __add__(self, x): | |
2796 | kwargs = {} |
|
2800 | kwargs = {} | |
2797 | if self.isascending() and x.isascending(): |
|
2801 | if self.isascending() and x.isascending(): | |
2798 | kwargs['ascending'] = True |
|
2802 | kwargs['ascending'] = True | |
2799 | if self.isdescending() and x.isdescending(): |
|
2803 | if self.isdescending() and x.isdescending(): | |
2800 | kwargs['ascending'] = False |
|
2804 | kwargs['ascending'] = False | |
2801 | return _addset(self, x, **kwargs) |
|
2805 | return _addset(self, x, **kwargs) | |
2802 |
|
2806 | |||
2803 | def __len__(self): |
|
2807 | def __len__(self): | |
2804 | if not self._hiddenrevs: |
|
2808 | if not self._hiddenrevs: | |
2805 | return abs(self._end - self._start) |
|
2809 | return abs(self._end - self._start) | |
2806 | else: |
|
2810 | else: | |
2807 | count = 0 |
|
2811 | count = 0 | |
2808 | for rev in self._hiddenrevs: |
|
2812 | for rev in self._hiddenrevs: | |
2809 | if self._contained(rev): |
|
2813 | if self._contained(rev): | |
2810 | count += 1 |
|
2814 | count += 1 | |
2811 | return abs(self._end - self._start) - count |
|
2815 | return abs(self._end - self._start) - count | |
2812 |
|
2816 | |||
2813 | def __getitem__(self, x): |
|
2817 | def __getitem__(self, x): | |
2814 | # Basic implementation to be changed in future patches. |
|
2818 | # Basic implementation to be changed in future patches. | |
2815 | l = baseset([r for r in self]) |
|
2819 | l = baseset([r for r in self]) | |
2816 | return l[x] |
|
2820 | return l[x] | |
2817 |
|
2821 | |||
2818 | def sort(self, reverse=False): |
|
2822 | def sort(self, reverse=False): | |
2819 | if bool(reverse) != (self._start > self._end): |
|
2823 | if bool(reverse) != (self._start > self._end): | |
2820 | self.reverse() |
|
2824 | self.reverse() | |
2821 |
|
2825 | |||
2822 | def reverse(self): |
|
2826 | def reverse(self): | |
2823 | # Just switch the _start and _end parameters |
|
2827 | # Just switch the _start and _end parameters | |
2824 | if self._start <= self._end: |
|
2828 | if self._start <= self._end: | |
2825 | self._start, self._end = self._end - 1, self._start - 1 |
|
2829 | self._start, self._end = self._end - 1, self._start - 1 | |
2826 | else: |
|
2830 | else: | |
2827 | self._start, self._end = self._end + 1, self._start + 1 |
|
2831 | self._start, self._end = self._end + 1, self._start + 1 | |
2828 |
|
2832 | |||
2829 | def set(self): |
|
2833 | def set(self): | |
2830 | return self |
|
2834 | return self | |
2831 |
|
2835 | |||
2832 | def isascending(self): |
|
2836 | def isascending(self): | |
2833 | return self._start < self._end |
|
2837 | return self._start < self._end | |
2834 |
|
2838 | |||
2835 | def isdescending(self): |
|
2839 | def isdescending(self): | |
2836 | return self._start > self._end |
|
2840 | return self._start > self._end | |
2837 |
|
2841 | |||
2838 | def filter(self, l): |
|
2842 | def filter(self, l): | |
2839 | if self._start <= self._end: |
|
2843 | if self._start <= self._end: | |
2840 | return orderedlazyset(self, l) |
|
2844 | return orderedlazyset(self, l) | |
2841 | else: |
|
2845 | else: | |
2842 | return orderedlazyset(self, l, ascending=False) |
|
2846 | return orderedlazyset(self, l, ascending=False) | |
2843 |
|
2847 | |||
2844 | # tell hggettext to extract docstrings from these functions: |
|
2848 | # tell hggettext to extract docstrings from these functions: | |
2845 | i18nfunctions = symbols.values() |
|
2849 | i18nfunctions = symbols.values() |
@@ -1,623 +1,637 b'' | |||||
1 | Prepare repo a: |
|
1 | Prepare repo a: | |
2 |
|
2 | |||
3 | $ hg init a |
|
3 | $ hg init a | |
4 | $ cd a |
|
4 | $ cd a | |
5 | $ echo a > a |
|
5 | $ echo a > a | |
6 | $ hg add a |
|
6 | $ hg add a | |
7 | $ hg commit -m test |
|
7 | $ hg commit -m test | |
8 | $ echo first line > b |
|
8 | $ echo first line > b | |
9 | $ hg add b |
|
9 | $ hg add b | |
10 |
|
10 | |||
11 | Create a non-inlined filelog: |
|
11 | Create a non-inlined filelog: | |
12 |
|
12 | |||
13 | $ python -c 'file("data1", "wb").write("".join("%s\n" % x for x in range(10000)))' |
|
13 | $ python -c 'file("data1", "wb").write("".join("%s\n" % x for x in range(10000)))' | |
14 | $ for j in 0 1 2 3 4 5 6 7 8 9; do |
|
14 | $ for j in 0 1 2 3 4 5 6 7 8 9; do | |
15 | > cat data1 >> b |
|
15 | > cat data1 >> b | |
16 | > hg commit -m test |
|
16 | > hg commit -m test | |
17 | > done |
|
17 | > done | |
18 |
|
18 | |||
19 | List files in store/data (should show a 'b.d'): |
|
19 | List files in store/data (should show a 'b.d'): | |
20 |
|
20 | |||
21 | $ for i in .hg/store/data/*; do |
|
21 | $ for i in .hg/store/data/*; do | |
22 | > echo $i |
|
22 | > echo $i | |
23 | > done |
|
23 | > done | |
24 | .hg/store/data/a.i |
|
24 | .hg/store/data/a.i | |
25 | .hg/store/data/b.d |
|
25 | .hg/store/data/b.d | |
26 | .hg/store/data/b.i |
|
26 | .hg/store/data/b.i | |
27 |
|
27 | |||
28 | Default operation: |
|
28 | Default operation: | |
29 |
|
29 | |||
30 | $ hg clone . ../b |
|
30 | $ hg clone . ../b | |
31 | updating to branch default |
|
31 | updating to branch default | |
32 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
32 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
33 | $ cd ../b |
|
33 | $ cd ../b | |
34 | $ cat a |
|
34 | $ cat a | |
35 | a |
|
35 | a | |
36 | $ hg verify |
|
36 | $ hg verify | |
37 | checking changesets |
|
37 | checking changesets | |
38 | checking manifests |
|
38 | checking manifests | |
39 | crosschecking files in changesets and manifests |
|
39 | crosschecking files in changesets and manifests | |
40 | checking files |
|
40 | checking files | |
41 | 2 files, 11 changesets, 11 total revisions |
|
41 | 2 files, 11 changesets, 11 total revisions | |
42 |
|
42 | |||
43 | Invalid dest '' must abort: |
|
43 | Invalid dest '' must abort: | |
44 |
|
44 | |||
45 | $ hg clone . '' |
|
45 | $ hg clone . '' | |
46 | abort: empty destination path is not valid |
|
46 | abort: empty destination path is not valid | |
47 | [255] |
|
47 | [255] | |
48 |
|
48 | |||
49 | No update, with debug option: |
|
49 | No update, with debug option: | |
50 |
|
50 | |||
51 | #if hardlink |
|
51 | #if hardlink | |
52 | $ hg --debug clone -U . ../c |
|
52 | $ hg --debug clone -U . ../c | |
53 | linked 8 files |
|
53 | linked 8 files | |
54 | listing keys for "bookmarks" |
|
54 | listing keys for "bookmarks" | |
55 | #else |
|
55 | #else | |
56 | $ hg --debug clone -U . ../c |
|
56 | $ hg --debug clone -U . ../c | |
57 | copied 8 files |
|
57 | copied 8 files | |
58 | listing keys for "bookmarks" |
|
58 | listing keys for "bookmarks" | |
59 | #endif |
|
59 | #endif | |
60 | $ cd ../c |
|
60 | $ cd ../c | |
61 | $ cat a 2>/dev/null || echo "a not present" |
|
61 | $ cat a 2>/dev/null || echo "a not present" | |
62 | a not present |
|
62 | a not present | |
63 | $ hg verify |
|
63 | $ hg verify | |
64 | checking changesets |
|
64 | checking changesets | |
65 | checking manifests |
|
65 | checking manifests | |
66 | crosschecking files in changesets and manifests |
|
66 | crosschecking files in changesets and manifests | |
67 | checking files |
|
67 | checking files | |
68 | 2 files, 11 changesets, 11 total revisions |
|
68 | 2 files, 11 changesets, 11 total revisions | |
69 |
|
69 | |||
70 | Default destination: |
|
70 | Default destination: | |
71 |
|
71 | |||
72 | $ mkdir ../d |
|
72 | $ mkdir ../d | |
73 | $ cd ../d |
|
73 | $ cd ../d | |
74 | $ hg clone ../a |
|
74 | $ hg clone ../a | |
75 | destination directory: a |
|
75 | destination directory: a | |
76 | updating to branch default |
|
76 | updating to branch default | |
77 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
77 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
78 | $ cd a |
|
78 | $ cd a | |
79 | $ hg cat a |
|
79 | $ hg cat a | |
80 | a |
|
80 | a | |
81 | $ cd ../.. |
|
81 | $ cd ../.. | |
82 |
|
82 | |||
83 | Check that we drop the 'file:' from the path before writing the .hgrc: |
|
83 | Check that we drop the 'file:' from the path before writing the .hgrc: | |
84 |
|
84 | |||
85 | $ hg clone file:a e |
|
85 | $ hg clone file:a e | |
86 | updating to branch default |
|
86 | updating to branch default | |
87 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
87 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
88 | $ grep 'file:' e/.hg/hgrc |
|
88 | $ grep 'file:' e/.hg/hgrc | |
89 | [1] |
|
89 | [1] | |
90 |
|
90 | |||
91 | Check that path aliases are expanded: |
|
91 | Check that path aliases are expanded: | |
92 |
|
92 | |||
93 | $ hg clone -q -U --config 'paths.foobar=a#0' foobar f |
|
93 | $ hg clone -q -U --config 'paths.foobar=a#0' foobar f | |
94 | $ hg -R f showconfig paths.default |
|
94 | $ hg -R f showconfig paths.default | |
95 | $TESTTMP/a#0 (glob) |
|
95 | $TESTTMP/a#0 (glob) | |
96 |
|
96 | |||
97 | Use --pull: |
|
97 | Use --pull: | |
98 |
|
98 | |||
99 | $ hg clone --pull a g |
|
99 | $ hg clone --pull a g | |
100 | requesting all changes |
|
100 | requesting all changes | |
101 | adding changesets |
|
101 | adding changesets | |
102 | adding manifests |
|
102 | adding manifests | |
103 | adding file changes |
|
103 | adding file changes | |
104 | added 11 changesets with 11 changes to 2 files |
|
104 | added 11 changesets with 11 changes to 2 files | |
105 | updating to branch default |
|
105 | updating to branch default | |
106 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
106 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
107 | $ hg -R g verify |
|
107 | $ hg -R g verify | |
108 | checking changesets |
|
108 | checking changesets | |
109 | checking manifests |
|
109 | checking manifests | |
110 | crosschecking files in changesets and manifests |
|
110 | crosschecking files in changesets and manifests | |
111 | checking files |
|
111 | checking files | |
112 | 2 files, 11 changesets, 11 total revisions |
|
112 | 2 files, 11 changesets, 11 total revisions | |
113 |
|
113 | |||
114 | Invalid dest '' with --pull must abort (issue2528): |
|
114 | Invalid dest '' with --pull must abort (issue2528): | |
115 |
|
115 | |||
116 | $ hg clone --pull a '' |
|
116 | $ hg clone --pull a '' | |
117 | abort: empty destination path is not valid |
|
117 | abort: empty destination path is not valid | |
118 | [255] |
|
118 | [255] | |
119 |
|
119 | |||
120 | Clone to '.': |
|
120 | Clone to '.': | |
121 |
|
121 | |||
122 | $ mkdir h |
|
122 | $ mkdir h | |
123 | $ cd h |
|
123 | $ cd h | |
124 | $ hg clone ../a . |
|
124 | $ hg clone ../a . | |
125 | updating to branch default |
|
125 | updating to branch default | |
126 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
126 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
127 | $ cd .. |
|
127 | $ cd .. | |
128 |
|
128 | |||
129 |
|
129 | |||
130 | *** Tests for option -u *** |
|
130 | *** Tests for option -u *** | |
131 |
|
131 | |||
132 | Adding some more history to repo a: |
|
132 | Adding some more history to repo a: | |
133 |
|
133 | |||
134 | $ cd a |
|
134 | $ cd a | |
135 | $ hg tag ref1 |
|
135 | $ hg tag ref1 | |
136 | $ echo the quick brown fox >a |
|
136 | $ echo the quick brown fox >a | |
137 | $ hg ci -m "hacked default" |
|
137 | $ hg ci -m "hacked default" | |
138 | $ hg up ref1 |
|
138 | $ hg up ref1 | |
139 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
139 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
140 | $ hg branch stable |
|
140 | $ hg branch stable | |
141 | marked working directory as branch stable |
|
141 | marked working directory as branch stable | |
142 | (branches are permanent and global, did you want a bookmark?) |
|
142 | (branches are permanent and global, did you want a bookmark?) | |
143 | $ echo some text >a |
|
143 | $ echo some text >a | |
144 | $ hg ci -m "starting branch stable" |
|
144 | $ hg ci -m "starting branch stable" | |
145 | $ hg tag ref2 |
|
145 | $ hg tag ref2 | |
146 | $ echo some more text >a |
|
146 | $ echo some more text >a | |
147 | $ hg ci -m "another change for branch stable" |
|
147 | $ hg ci -m "another change for branch stable" | |
148 | $ hg up ref2 |
|
148 | $ hg up ref2 | |
149 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
149 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
150 | $ hg parents |
|
150 | $ hg parents | |
151 | changeset: 13:e8ece76546a6 |
|
151 | changeset: 13:e8ece76546a6 | |
152 | branch: stable |
|
152 | branch: stable | |
153 | tag: ref2 |
|
153 | tag: ref2 | |
154 | parent: 10:a7949464abda |
|
154 | parent: 10:a7949464abda | |
155 | user: test |
|
155 | user: test | |
156 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
156 | date: Thu Jan 01 00:00:00 1970 +0000 | |
157 | summary: starting branch stable |
|
157 | summary: starting branch stable | |
158 |
|
158 | |||
159 |
|
159 | |||
160 | Repo a has two heads: |
|
160 | Repo a has two heads: | |
161 |
|
161 | |||
162 | $ hg heads |
|
162 | $ hg heads | |
163 | changeset: 15:0aae7cf88f0d |
|
163 | changeset: 15:0aae7cf88f0d | |
164 | branch: stable |
|
164 | branch: stable | |
165 | tag: tip |
|
165 | tag: tip | |
166 | user: test |
|
166 | user: test | |
167 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
167 | date: Thu Jan 01 00:00:00 1970 +0000 | |
168 | summary: another change for branch stable |
|
168 | summary: another change for branch stable | |
169 |
|
169 | |||
170 | changeset: 12:f21241060d6a |
|
170 | changeset: 12:f21241060d6a | |
171 | user: test |
|
171 | user: test | |
172 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
172 | date: Thu Jan 01 00:00:00 1970 +0000 | |
173 | summary: hacked default |
|
173 | summary: hacked default | |
174 |
|
174 | |||
175 |
|
175 | |||
176 | $ cd .. |
|
176 | $ cd .. | |
177 |
|
177 | |||
178 |
|
178 | |||
179 | Testing --noupdate with --updaterev (must abort): |
|
179 | Testing --noupdate with --updaterev (must abort): | |
180 |
|
180 | |||
181 | $ hg clone --noupdate --updaterev 1 a ua |
|
181 | $ hg clone --noupdate --updaterev 1 a ua | |
182 | abort: cannot specify both --noupdate and --updaterev |
|
182 | abort: cannot specify both --noupdate and --updaterev | |
183 | [255] |
|
183 | [255] | |
184 |
|
184 | |||
185 |
|
185 | |||
186 | Testing clone -u: |
|
186 | Testing clone -u: | |
187 |
|
187 | |||
188 | $ hg clone -u . a ua |
|
188 | $ hg clone -u . a ua | |
189 | updating to branch stable |
|
189 | updating to branch stable | |
190 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
190 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
191 |
|
191 | |||
192 | Repo ua has both heads: |
|
192 | Repo ua has both heads: | |
193 |
|
193 | |||
194 | $ hg -R ua heads |
|
194 | $ hg -R ua heads | |
195 | changeset: 15:0aae7cf88f0d |
|
195 | changeset: 15:0aae7cf88f0d | |
196 | branch: stable |
|
196 | branch: stable | |
197 | tag: tip |
|
197 | tag: tip | |
198 | user: test |
|
198 | user: test | |
199 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
199 | date: Thu Jan 01 00:00:00 1970 +0000 | |
200 | summary: another change for branch stable |
|
200 | summary: another change for branch stable | |
201 |
|
201 | |||
202 | changeset: 12:f21241060d6a |
|
202 | changeset: 12:f21241060d6a | |
203 | user: test |
|
203 | user: test | |
204 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
204 | date: Thu Jan 01 00:00:00 1970 +0000 | |
205 | summary: hacked default |
|
205 | summary: hacked default | |
206 |
|
206 | |||
207 |
|
207 | |||
208 | Same revision checked out in repo a and ua: |
|
208 | Same revision checked out in repo a and ua: | |
209 |
|
209 | |||
210 | $ hg -R a parents --template "{node|short}\n" |
|
210 | $ hg -R a parents --template "{node|short}\n" | |
211 | e8ece76546a6 |
|
211 | e8ece76546a6 | |
212 | $ hg -R ua parents --template "{node|short}\n" |
|
212 | $ hg -R ua parents --template "{node|short}\n" | |
213 | e8ece76546a6 |
|
213 | e8ece76546a6 | |
214 |
|
214 | |||
215 | $ rm -r ua |
|
215 | $ rm -r ua | |
216 |
|
216 | |||
217 |
|
217 | |||
218 | Testing clone --pull -u: |
|
218 | Testing clone --pull -u: | |
219 |
|
219 | |||
220 | $ hg clone --pull -u . a ua |
|
220 | $ hg clone --pull -u . a ua | |
221 | requesting all changes |
|
221 | requesting all changes | |
222 | adding changesets |
|
222 | adding changesets | |
223 | adding manifests |
|
223 | adding manifests | |
224 | adding file changes |
|
224 | adding file changes | |
225 | added 16 changesets with 16 changes to 3 files (+1 heads) |
|
225 | added 16 changesets with 16 changes to 3 files (+1 heads) | |
226 | updating to branch stable |
|
226 | updating to branch stable | |
227 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
227 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
228 |
|
228 | |||
229 | Repo ua has both heads: |
|
229 | Repo ua has both heads: | |
230 |
|
230 | |||
231 | $ hg -R ua heads |
|
231 | $ hg -R ua heads | |
232 | changeset: 15:0aae7cf88f0d |
|
232 | changeset: 15:0aae7cf88f0d | |
233 | branch: stable |
|
233 | branch: stable | |
234 | tag: tip |
|
234 | tag: tip | |
235 | user: test |
|
235 | user: test | |
236 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
236 | date: Thu Jan 01 00:00:00 1970 +0000 | |
237 | summary: another change for branch stable |
|
237 | summary: another change for branch stable | |
238 |
|
238 | |||
239 | changeset: 12:f21241060d6a |
|
239 | changeset: 12:f21241060d6a | |
240 | user: test |
|
240 | user: test | |
241 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
241 | date: Thu Jan 01 00:00:00 1970 +0000 | |
242 | summary: hacked default |
|
242 | summary: hacked default | |
243 |
|
243 | |||
244 |
|
244 | |||
245 | Same revision checked out in repo a and ua: |
|
245 | Same revision checked out in repo a and ua: | |
246 |
|
246 | |||
247 | $ hg -R a parents --template "{node|short}\n" |
|
247 | $ hg -R a parents --template "{node|short}\n" | |
248 | e8ece76546a6 |
|
248 | e8ece76546a6 | |
249 | $ hg -R ua parents --template "{node|short}\n" |
|
249 | $ hg -R ua parents --template "{node|short}\n" | |
250 | e8ece76546a6 |
|
250 | e8ece76546a6 | |
251 |
|
251 | |||
252 | $ rm -r ua |
|
252 | $ rm -r ua | |
253 |
|
253 | |||
254 |
|
254 | |||
255 | Testing clone -u <branch>: |
|
255 | Testing clone -u <branch>: | |
256 |
|
256 | |||
257 | $ hg clone -u stable a ua |
|
257 | $ hg clone -u stable a ua | |
258 | updating to branch stable |
|
258 | updating to branch stable | |
259 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
259 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
260 |
|
260 | |||
261 | Repo ua has both heads: |
|
261 | Repo ua has both heads: | |
262 |
|
262 | |||
263 | $ hg -R ua heads |
|
263 | $ hg -R ua heads | |
264 | changeset: 15:0aae7cf88f0d |
|
264 | changeset: 15:0aae7cf88f0d | |
265 | branch: stable |
|
265 | branch: stable | |
266 | tag: tip |
|
266 | tag: tip | |
267 | user: test |
|
267 | user: test | |
268 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
268 | date: Thu Jan 01 00:00:00 1970 +0000 | |
269 | summary: another change for branch stable |
|
269 | summary: another change for branch stable | |
270 |
|
270 | |||
271 | changeset: 12:f21241060d6a |
|
271 | changeset: 12:f21241060d6a | |
272 | user: test |
|
272 | user: test | |
273 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
273 | date: Thu Jan 01 00:00:00 1970 +0000 | |
274 | summary: hacked default |
|
274 | summary: hacked default | |
275 |
|
275 | |||
276 |
|
276 | |||
277 | Branch 'stable' is checked out: |
|
277 | Branch 'stable' is checked out: | |
278 |
|
278 | |||
279 | $ hg -R ua parents |
|
279 | $ hg -R ua parents | |
280 | changeset: 15:0aae7cf88f0d |
|
280 | changeset: 15:0aae7cf88f0d | |
281 | branch: stable |
|
281 | branch: stable | |
282 | tag: tip |
|
282 | tag: tip | |
283 | user: test |
|
283 | user: test | |
284 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
284 | date: Thu Jan 01 00:00:00 1970 +0000 | |
285 | summary: another change for branch stable |
|
285 | summary: another change for branch stable | |
286 |
|
286 | |||
287 |
|
287 | |||
288 | $ rm -r ua |
|
288 | $ rm -r ua | |
289 |
|
289 | |||
290 |
|
290 | |||
291 | Testing default checkout: |
|
291 | Testing default checkout: | |
292 |
|
292 | |||
293 | $ hg clone a ua |
|
293 | $ hg clone a ua | |
294 | updating to branch default |
|
294 | updating to branch default | |
295 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
295 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
296 |
|
296 | |||
297 | Repo ua has both heads: |
|
297 | Repo ua has both heads: | |
298 |
|
298 | |||
299 | $ hg -R ua heads |
|
299 | $ hg -R ua heads | |
300 | changeset: 15:0aae7cf88f0d |
|
300 | changeset: 15:0aae7cf88f0d | |
301 | branch: stable |
|
301 | branch: stable | |
302 | tag: tip |
|
302 | tag: tip | |
303 | user: test |
|
303 | user: test | |
304 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
304 | date: Thu Jan 01 00:00:00 1970 +0000 | |
305 | summary: another change for branch stable |
|
305 | summary: another change for branch stable | |
306 |
|
306 | |||
307 | changeset: 12:f21241060d6a |
|
307 | changeset: 12:f21241060d6a | |
308 | user: test |
|
308 | user: test | |
309 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
309 | date: Thu Jan 01 00:00:00 1970 +0000 | |
310 | summary: hacked default |
|
310 | summary: hacked default | |
311 |
|
311 | |||
312 |
|
312 | |||
313 | Branch 'default' is checked out: |
|
313 | Branch 'default' is checked out: | |
314 |
|
314 | |||
315 | $ hg -R ua parents |
|
315 | $ hg -R ua parents | |
316 | changeset: 12:f21241060d6a |
|
316 | changeset: 12:f21241060d6a | |
317 | user: test |
|
317 | user: test | |
318 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
318 | date: Thu Jan 01 00:00:00 1970 +0000 | |
319 | summary: hacked default |
|
319 | summary: hacked default | |
320 |
|
320 | |||
321 | Test clone with a branch named "@" (issue3677) |
|
321 | Test clone with a branch named "@" (issue3677) | |
322 |
|
322 | |||
323 | $ hg -R ua branch @ |
|
323 | $ hg -R ua branch @ | |
324 | marked working directory as branch @ |
|
324 | marked working directory as branch @ | |
325 | (branches are permanent and global, did you want a bookmark?) |
|
325 | (branches are permanent and global, did you want a bookmark?) | |
326 | $ hg -R ua commit -m 'created branch @' |
|
326 | $ hg -R ua commit -m 'created branch @' | |
327 | $ hg clone ua atbranch |
|
327 | $ hg clone ua atbranch | |
328 | updating to branch default |
|
328 | updating to branch default | |
329 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
329 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
330 | $ hg -R atbranch heads |
|
330 | $ hg -R atbranch heads | |
331 | changeset: 16:798b6d97153e |
|
331 | changeset: 16:798b6d97153e | |
332 | branch: @ |
|
332 | branch: @ | |
333 | tag: tip |
|
333 | tag: tip | |
334 | parent: 12:f21241060d6a |
|
334 | parent: 12:f21241060d6a | |
335 | user: test |
|
335 | user: test | |
336 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
336 | date: Thu Jan 01 00:00:00 1970 +0000 | |
337 | summary: created branch @ |
|
337 | summary: created branch @ | |
338 |
|
338 | |||
339 | changeset: 15:0aae7cf88f0d |
|
339 | changeset: 15:0aae7cf88f0d | |
340 | branch: stable |
|
340 | branch: stable | |
341 | user: test |
|
341 | user: test | |
342 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
342 | date: Thu Jan 01 00:00:00 1970 +0000 | |
343 | summary: another change for branch stable |
|
343 | summary: another change for branch stable | |
344 |
|
344 | |||
345 | changeset: 12:f21241060d6a |
|
345 | changeset: 12:f21241060d6a | |
346 | user: test |
|
346 | user: test | |
347 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
347 | date: Thu Jan 01 00:00:00 1970 +0000 | |
348 | summary: hacked default |
|
348 | summary: hacked default | |
349 |
|
349 | |||
350 | $ hg -R atbranch parents |
|
350 | $ hg -R atbranch parents | |
351 | changeset: 12:f21241060d6a |
|
351 | changeset: 12:f21241060d6a | |
352 | user: test |
|
352 | user: test | |
353 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
353 | date: Thu Jan 01 00:00:00 1970 +0000 | |
354 | summary: hacked default |
|
354 | summary: hacked default | |
355 |
|
355 | |||
356 |
|
356 | |||
357 | $ rm -r ua atbranch |
|
357 | $ rm -r ua atbranch | |
358 |
|
358 | |||
359 |
|
359 | |||
360 | Testing #<branch>: |
|
360 | Testing #<branch>: | |
361 |
|
361 | |||
362 | $ hg clone -u . a#stable ua |
|
362 | $ hg clone -u . a#stable ua | |
363 | adding changesets |
|
363 | adding changesets | |
364 | adding manifests |
|
364 | adding manifests | |
365 | adding file changes |
|
365 | adding file changes | |
366 | added 14 changesets with 14 changes to 3 files |
|
366 | added 14 changesets with 14 changes to 3 files | |
367 | updating to branch stable |
|
367 | updating to branch stable | |
368 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
368 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
369 |
|
369 | |||
370 | Repo ua has branch 'stable' and 'default' (was changed in fd511e9eeea6): |
|
370 | Repo ua has branch 'stable' and 'default' (was changed in fd511e9eeea6): | |
371 |
|
371 | |||
372 | $ hg -R ua heads |
|
372 | $ hg -R ua heads | |
373 | changeset: 13:0aae7cf88f0d |
|
373 | changeset: 13:0aae7cf88f0d | |
374 | branch: stable |
|
374 | branch: stable | |
375 | tag: tip |
|
375 | tag: tip | |
376 | user: test |
|
376 | user: test | |
377 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
377 | date: Thu Jan 01 00:00:00 1970 +0000 | |
378 | summary: another change for branch stable |
|
378 | summary: another change for branch stable | |
379 |
|
379 | |||
380 | changeset: 10:a7949464abda |
|
380 | changeset: 10:a7949464abda | |
381 | user: test |
|
381 | user: test | |
382 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
382 | date: Thu Jan 01 00:00:00 1970 +0000 | |
383 | summary: test |
|
383 | summary: test | |
384 |
|
384 | |||
385 |
|
385 | |||
386 | Same revision checked out in repo a and ua: |
|
386 | Same revision checked out in repo a and ua: | |
387 |
|
387 | |||
388 | $ hg -R a parents --template "{node|short}\n" |
|
388 | $ hg -R a parents --template "{node|short}\n" | |
389 | e8ece76546a6 |
|
389 | e8ece76546a6 | |
390 | $ hg -R ua parents --template "{node|short}\n" |
|
390 | $ hg -R ua parents --template "{node|short}\n" | |
391 | e8ece76546a6 |
|
391 | e8ece76546a6 | |
392 |
|
392 | |||
393 | $ rm -r ua |
|
393 | $ rm -r ua | |
394 |
|
394 | |||
395 |
|
395 | |||
396 | Testing -u -r <branch>: |
|
396 | Testing -u -r <branch>: | |
397 |
|
397 | |||
398 | $ hg clone -u . -r stable a ua |
|
398 | $ hg clone -u . -r stable a ua | |
399 | adding changesets |
|
399 | adding changesets | |
400 | adding manifests |
|
400 | adding manifests | |
401 | adding file changes |
|
401 | adding file changes | |
402 | added 14 changesets with 14 changes to 3 files |
|
402 | added 14 changesets with 14 changes to 3 files | |
403 | updating to branch stable |
|
403 | updating to branch stable | |
404 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
404 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
405 |
|
405 | |||
406 | Repo ua has branch 'stable' and 'default' (was changed in fd511e9eeea6): |
|
406 | Repo ua has branch 'stable' and 'default' (was changed in fd511e9eeea6): | |
407 |
|
407 | |||
408 | $ hg -R ua heads |
|
408 | $ hg -R ua heads | |
409 | changeset: 13:0aae7cf88f0d |
|
409 | changeset: 13:0aae7cf88f0d | |
410 | branch: stable |
|
410 | branch: stable | |
411 | tag: tip |
|
411 | tag: tip | |
412 | user: test |
|
412 | user: test | |
413 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
413 | date: Thu Jan 01 00:00:00 1970 +0000 | |
414 | summary: another change for branch stable |
|
414 | summary: another change for branch stable | |
415 |
|
415 | |||
416 | changeset: 10:a7949464abda |
|
416 | changeset: 10:a7949464abda | |
417 | user: test |
|
417 | user: test | |
418 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
418 | date: Thu Jan 01 00:00:00 1970 +0000 | |
419 | summary: test |
|
419 | summary: test | |
420 |
|
420 | |||
421 |
|
421 | |||
422 | Same revision checked out in repo a and ua: |
|
422 | Same revision checked out in repo a and ua: | |
423 |
|
423 | |||
424 | $ hg -R a parents --template "{node|short}\n" |
|
424 | $ hg -R a parents --template "{node|short}\n" | |
425 | e8ece76546a6 |
|
425 | e8ece76546a6 | |
426 | $ hg -R ua parents --template "{node|short}\n" |
|
426 | $ hg -R ua parents --template "{node|short}\n" | |
427 | e8ece76546a6 |
|
427 | e8ece76546a6 | |
428 |
|
428 | |||
429 | $ rm -r ua |
|
429 | $ rm -r ua | |
430 |
|
430 | |||
431 |
|
431 | |||
432 | Testing -r <branch>: |
|
432 | Testing -r <branch>: | |
433 |
|
433 | |||
434 | $ hg clone -r stable a ua |
|
434 | $ hg clone -r stable a ua | |
435 | adding changesets |
|
435 | adding changesets | |
436 | adding manifests |
|
436 | adding manifests | |
437 | adding file changes |
|
437 | adding file changes | |
438 | added 14 changesets with 14 changes to 3 files |
|
438 | added 14 changesets with 14 changes to 3 files | |
439 | updating to branch stable |
|
439 | updating to branch stable | |
440 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
440 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
441 |
|
441 | |||
442 | Repo ua has branch 'stable' and 'default' (was changed in fd511e9eeea6): |
|
442 | Repo ua has branch 'stable' and 'default' (was changed in fd511e9eeea6): | |
443 |
|
443 | |||
444 | $ hg -R ua heads |
|
444 | $ hg -R ua heads | |
445 | changeset: 13:0aae7cf88f0d |
|
445 | changeset: 13:0aae7cf88f0d | |
446 | branch: stable |
|
446 | branch: stable | |
447 | tag: tip |
|
447 | tag: tip | |
448 | user: test |
|
448 | user: test | |
449 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
449 | date: Thu Jan 01 00:00:00 1970 +0000 | |
450 | summary: another change for branch stable |
|
450 | summary: another change for branch stable | |
451 |
|
451 | |||
452 | changeset: 10:a7949464abda |
|
452 | changeset: 10:a7949464abda | |
453 | user: test |
|
453 | user: test | |
454 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
454 | date: Thu Jan 01 00:00:00 1970 +0000 | |
455 | summary: test |
|
455 | summary: test | |
456 |
|
456 | |||
457 |
|
457 | |||
458 | Branch 'stable' is checked out: |
|
458 | Branch 'stable' is checked out: | |
459 |
|
459 | |||
460 | $ hg -R ua parents |
|
460 | $ hg -R ua parents | |
461 | changeset: 13:0aae7cf88f0d |
|
461 | changeset: 13:0aae7cf88f0d | |
462 | branch: stable |
|
462 | branch: stable | |
463 | tag: tip |
|
463 | tag: tip | |
464 | user: test |
|
464 | user: test | |
465 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
465 | date: Thu Jan 01 00:00:00 1970 +0000 | |
466 | summary: another change for branch stable |
|
466 | summary: another change for branch stable | |
467 |
|
467 | |||
468 |
|
468 | |||
469 | $ rm -r ua |
|
469 | $ rm -r ua | |
470 |
|
470 | |||
471 |
|
471 | |||
472 | Issue2267: Error in 1.6 hg.py: TypeError: 'NoneType' object is not |
|
472 | Issue2267: Error in 1.6 hg.py: TypeError: 'NoneType' object is not | |
473 | iterable in addbranchrevs() |
|
473 | iterable in addbranchrevs() | |
474 |
|
474 | |||
475 | $ cat <<EOF > simpleclone.py |
|
475 | $ cat <<EOF > simpleclone.py | |
476 | > from mercurial import ui, hg |
|
476 | > from mercurial import ui, hg | |
477 | > myui = ui.ui() |
|
477 | > myui = ui.ui() | |
478 | > repo = hg.repository(myui, 'a') |
|
478 | > repo = hg.repository(myui, 'a') | |
479 | > hg.clone(myui, {}, repo, dest="ua") |
|
479 | > hg.clone(myui, {}, repo, dest="ua") | |
480 | > EOF |
|
480 | > EOF | |
481 |
|
481 | |||
482 | $ python simpleclone.py |
|
482 | $ python simpleclone.py | |
483 | updating to branch default |
|
483 | updating to branch default | |
484 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
484 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
485 |
|
485 | |||
486 | $ rm -r ua |
|
486 | $ rm -r ua | |
487 |
|
487 | |||
488 | $ cat <<EOF > branchclone.py |
|
488 | $ cat <<EOF > branchclone.py | |
489 | > from mercurial import ui, hg, extensions |
|
489 | > from mercurial import ui, hg, extensions | |
490 | > myui = ui.ui() |
|
490 | > myui = ui.ui() | |
491 | > extensions.loadall(myui) |
|
491 | > extensions.loadall(myui) | |
492 | > repo = hg.repository(myui, 'a') |
|
492 | > repo = hg.repository(myui, 'a') | |
493 | > hg.clone(myui, {}, repo, dest="ua", branch=["stable",]) |
|
493 | > hg.clone(myui, {}, repo, dest="ua", branch=["stable",]) | |
494 | > EOF |
|
494 | > EOF | |
495 |
|
495 | |||
496 | $ python branchclone.py |
|
496 | $ python branchclone.py | |
497 | adding changesets |
|
497 | adding changesets | |
498 | adding manifests |
|
498 | adding manifests | |
499 | adding file changes |
|
499 | adding file changes | |
500 | added 14 changesets with 14 changes to 3 files |
|
500 | added 14 changesets with 14 changes to 3 files | |
501 | updating to branch stable |
|
501 | updating to branch stable | |
502 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
502 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
503 | $ rm -r ua |
|
503 | $ rm -r ua | |
504 |
|
504 | |||
505 |
|
505 | |||
506 | Test clone with special '@' bookmark: |
|
506 | Test clone with special '@' bookmark: | |
507 | $ cd a |
|
507 | $ cd a | |
508 | $ hg bookmark -r a7949464abda @ # branch point of stable from default |
|
508 | $ hg bookmark -r a7949464abda @ # branch point of stable from default | |
509 | $ hg clone . ../i |
|
509 | $ hg clone . ../i | |
510 | updating to bookmark @ |
|
510 | updating to bookmark @ | |
511 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
511 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
512 | $ hg id -i ../i |
|
512 | $ hg id -i ../i | |
513 | a7949464abda |
|
513 | a7949464abda | |
514 | $ rm -r ../i |
|
514 | $ rm -r ../i | |
515 |
|
515 | |||
516 | $ hg bookmark -f -r stable @ |
|
516 | $ hg bookmark -f -r stable @ | |
517 | $ hg bookmarks |
|
517 | $ hg bookmarks | |
518 | @ 15:0aae7cf88f0d |
|
518 | @ 15:0aae7cf88f0d | |
519 | $ hg clone . ../i |
|
519 | $ hg clone . ../i | |
520 | updating to bookmark @ on branch stable |
|
520 | updating to bookmark @ on branch stable | |
521 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
521 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
522 | $ hg id -i ../i |
|
522 | $ hg id -i ../i | |
523 | 0aae7cf88f0d |
|
523 | 0aae7cf88f0d | |
524 | $ cd "$TESTTMP" |
|
524 | $ cd "$TESTTMP" | |
525 |
|
525 | |||
526 |
|
526 | |||
527 | Testing failures: |
|
527 | Testing failures: | |
528 |
|
528 | |||
529 | $ mkdir fail |
|
529 | $ mkdir fail | |
530 | $ cd fail |
|
530 | $ cd fail | |
531 |
|
531 | |||
532 | No local source |
|
532 | No local source | |
533 |
|
533 | |||
534 | $ hg clone a b |
|
534 | $ hg clone a b | |
535 | abort: repository a not found! |
|
535 | abort: repository a not found! | |
536 | [255] |
|
536 | [255] | |
537 |
|
537 | |||
538 | No remote source |
|
538 | No remote source | |
539 |
|
539 | |||
540 | $ hg clone http://127.0.0.1:3121/a b |
|
540 | $ hg clone http://127.0.0.1:3121/a b | |
541 | abort: error: *refused* (glob) |
|
541 | abort: error: *refused* (glob) | |
542 | [255] |
|
542 | [255] | |
543 | $ rm -rf b # work around bug with http clone |
|
543 | $ rm -rf b # work around bug with http clone | |
544 |
|
544 | |||
545 |
|
545 | |||
546 | #if unix-permissions no-root |
|
546 | #if unix-permissions no-root | |
547 |
|
547 | |||
548 | Inaccessible source |
|
548 | Inaccessible source | |
549 |
|
549 | |||
550 | $ mkdir a |
|
550 | $ mkdir a | |
551 | $ chmod 000 a |
|
551 | $ chmod 000 a | |
552 | $ hg clone a b |
|
552 | $ hg clone a b | |
553 | abort: repository a not found! |
|
553 | abort: repository a not found! | |
554 | [255] |
|
554 | [255] | |
555 |
|
555 | |||
556 | Inaccessible destination |
|
556 | Inaccessible destination | |
557 |
|
557 | |||
558 | $ hg init b |
|
558 | $ hg init b | |
559 | $ cd b |
|
559 | $ cd b | |
560 | $ hg clone . ../a |
|
560 | $ hg clone . ../a | |
561 | abort: Permission denied: '../a' |
|
561 | abort: Permission denied: '../a' | |
562 | [255] |
|
562 | [255] | |
563 | $ cd .. |
|
563 | $ cd .. | |
564 | $ chmod 700 a |
|
564 | $ chmod 700 a | |
565 | $ rm -r a b |
|
565 | $ rm -r a b | |
566 |
|
566 | |||
567 | #endif |
|
567 | #endif | |
568 |
|
568 | |||
569 |
|
569 | |||
570 | #if fifo |
|
570 | #if fifo | |
571 |
|
571 | |||
572 | Source of wrong type |
|
572 | Source of wrong type | |
573 |
|
573 | |||
574 | $ mkfifo a |
|
574 | $ mkfifo a | |
575 | $ hg clone a b |
|
575 | $ hg clone a b | |
576 | abort: repository a not found! |
|
576 | abort: repository a not found! | |
577 | [255] |
|
577 | [255] | |
578 | $ rm a |
|
578 | $ rm a | |
579 |
|
579 | |||
580 | #endif |
|
580 | #endif | |
581 |
|
581 | |||
582 | Default destination, same directory |
|
582 | Default destination, same directory | |
583 |
|
583 | |||
584 | $ hg init q |
|
584 | $ hg init q | |
585 | $ hg clone q |
|
585 | $ hg clone q | |
586 | destination directory: q |
|
586 | destination directory: q | |
587 | abort: destination 'q' is not empty |
|
587 | abort: destination 'q' is not empty | |
588 | [255] |
|
588 | [255] | |
589 |
|
589 | |||
590 | destination directory not empty |
|
590 | destination directory not empty | |
591 |
|
591 | |||
592 | $ mkdir a |
|
592 | $ mkdir a | |
593 | $ echo stuff > a/a |
|
593 | $ echo stuff > a/a | |
594 | $ hg clone q a |
|
594 | $ hg clone q a | |
595 | abort: destination 'a' is not empty |
|
595 | abort: destination 'a' is not empty | |
596 | [255] |
|
596 | [255] | |
597 |
|
597 | |||
598 |
|
598 | |||
599 | #if unix-permissions no-root |
|
599 | #if unix-permissions no-root | |
600 |
|
600 | |||
601 | leave existing directory in place after clone failure |
|
601 | leave existing directory in place after clone failure | |
602 |
|
602 | |||
603 | $ hg init c |
|
603 | $ hg init c | |
604 | $ cd c |
|
604 | $ cd c | |
605 | $ echo c > c |
|
605 | $ echo c > c | |
606 | $ hg commit -A -m test |
|
606 | $ hg commit -A -m test | |
607 | adding c |
|
607 | adding c | |
608 | $ chmod -rx .hg/store/data |
|
608 | $ chmod -rx .hg/store/data | |
609 | $ cd .. |
|
609 | $ cd .. | |
610 | $ mkdir d |
|
610 | $ mkdir d | |
611 | $ hg clone c d 2> err |
|
611 | $ hg clone c d 2> err | |
612 | [255] |
|
612 | [255] | |
613 | $ test -d d |
|
613 | $ test -d d | |
614 | $ test -d d/.hg |
|
614 | $ test -d d/.hg | |
615 | [1] |
|
615 | [1] | |
616 |
|
616 | |||
617 | re-enable perm to allow deletion |
|
617 | re-enable perm to allow deletion | |
618 |
|
618 | |||
619 | $ chmod +rx c/.hg/store/data |
|
619 | $ chmod +rx c/.hg/store/data | |
620 |
|
620 | |||
621 | #endif |
|
621 | #endif | |
622 |
|
622 | |||
623 | $ cd .. |
|
623 | $ cd .. | |
|
624 | ||||
|
625 | Test clone from the repository in (emulated) revlog format 0 (issue4203): | |||
|
626 | ||||
|
627 | $ mkdir issue4203 | |||
|
628 | $ mkdir -p src/.hg | |||
|
629 | $ echo foo > src/foo | |||
|
630 | $ hg -R src add src/foo | |||
|
631 | $ hg -R src commit -m '#0' | |||
|
632 | $ hg -R src log -q | |||
|
633 | 0:e1bab28bca43 | |||
|
634 | $ hg clone -U -q src dst | |||
|
635 | $ hg -R dst log -q | |||
|
636 | 0:e1bab28bca43 | |||
|
637 | $ cd .. |
General Comments 0
You need to be logged in to leave comments.
Login now