Show More
@@ -1,4900 +1,4901 b'' | |||
|
1 | 1 | # commands.py - command processing for mercurial |
|
2 | 2 | # |
|
3 | 3 | # Copyright 2005-2007 Matt Mackall <mpm@selenic.com> |
|
4 | 4 | # |
|
5 | 5 | # This software may be used and distributed according to the terms of the |
|
6 | 6 | # GNU General Public License version 2 or any later version. |
|
7 | 7 | |
|
8 | 8 | from node import hex, bin, nullid, nullrev, short |
|
9 | 9 | from lock import release |
|
10 | 10 | from i18n import _, gettext |
|
11 | 11 | import os, re, sys, difflib, time, tempfile |
|
12 | 12 | import hg, scmutil, util, revlog, extensions, copies, error, bookmarks |
|
13 | 13 | import patch, help, mdiff, url, encoding, templatekw, discovery |
|
14 | 14 | import archival, changegroup, cmdutil, sshserver, hbisect, hgweb, hgweb.server |
|
15 | 15 | import merge as mergemod |
|
16 | 16 | import minirst, revset, templatefilters |
|
17 | 17 | import dagparser |
|
18 | 18 | |
|
19 | 19 | # Commands start here, listed alphabetically |
|
20 | 20 | |
|
21 | 21 | def add(ui, repo, *pats, **opts): |
|
22 | 22 | """add the specified files on the next commit |
|
23 | 23 | |
|
24 | 24 | Schedule files to be version controlled and added to the |
|
25 | 25 | repository. |
|
26 | 26 | |
|
27 | 27 | The files will be added to the repository at the next commit. To |
|
28 | 28 | undo an add before that, see :hg:`forget`. |
|
29 | 29 | |
|
30 | 30 | If no names are given, add all files to the repository. |
|
31 | 31 | |
|
32 | 32 | .. container:: verbose |
|
33 | 33 | |
|
34 | 34 | An example showing how new (unknown) files are added |
|
35 | 35 | automatically by :hg:`add`:: |
|
36 | 36 | |
|
37 | 37 | $ ls |
|
38 | 38 | foo.c |
|
39 | 39 | $ hg status |
|
40 | 40 | ? foo.c |
|
41 | 41 | $ hg add |
|
42 | 42 | adding foo.c |
|
43 | 43 | $ hg status |
|
44 | 44 | A foo.c |
|
45 | 45 | |
|
46 | 46 | Returns 0 if all files are successfully added. |
|
47 | 47 | """ |
|
48 | 48 | |
|
49 | 49 | m = cmdutil.match(repo, pats, opts) |
|
50 | 50 | rejected = cmdutil.add(ui, repo, m, opts.get('dry_run'), |
|
51 | 51 | opts.get('subrepos'), prefix="") |
|
52 | 52 | return rejected and 1 or 0 |
|
53 | 53 | |
|
54 | 54 | def addremove(ui, repo, *pats, **opts): |
|
55 | 55 | """add all new files, delete all missing files |
|
56 | 56 | |
|
57 | 57 | Add all new files and remove all missing files from the |
|
58 | 58 | repository. |
|
59 | 59 | |
|
60 | 60 | New files are ignored if they match any of the patterns in |
|
61 | 61 | ``.hgignore``. As with add, these changes take effect at the next |
|
62 | 62 | commit. |
|
63 | 63 | |
|
64 | 64 | Use the -s/--similarity option to detect renamed files. With a |
|
65 | 65 | parameter greater than 0, this compares every removed file with |
|
66 | 66 | every added file and records those similar enough as renames. This |
|
67 | 67 | option takes a percentage between 0 (disabled) and 100 (files must |
|
68 | 68 | be identical) as its parameter. Detecting renamed files this way |
|
69 | 69 | can be expensive. After using this option, :hg:`status -C` can be |
|
70 | 70 | used to check which files were identified as moved or renamed. |
|
71 | 71 | |
|
72 | 72 | Returns 0 if all files are successfully added. |
|
73 | 73 | """ |
|
74 | 74 | try: |
|
75 | 75 | sim = float(opts.get('similarity') or 100) |
|
76 | 76 | except ValueError: |
|
77 | 77 | raise util.Abort(_('similarity must be a number')) |
|
78 | 78 | if sim < 0 or sim > 100: |
|
79 | 79 | raise util.Abort(_('similarity must be between 0 and 100')) |
|
80 | 80 | return cmdutil.addremove(repo, pats, opts, similarity=sim / 100.0) |
|
81 | 81 | |
|
82 | 82 | def annotate(ui, repo, *pats, **opts): |
|
83 | 83 | """show changeset information by line for each file |
|
84 | 84 | |
|
85 | 85 | List changes in files, showing the revision id responsible for |
|
86 | 86 | each line |
|
87 | 87 | |
|
88 | 88 | This command is useful for discovering when a change was made and |
|
89 | 89 | by whom. |
|
90 | 90 | |
|
91 | 91 | Without the -a/--text option, annotate will avoid processing files |
|
92 | 92 | it detects as binary. With -a, annotate will annotate the file |
|
93 | 93 | anyway, although the results will probably be neither useful |
|
94 | 94 | nor desirable. |
|
95 | 95 | |
|
96 | 96 | Returns 0 on success. |
|
97 | 97 | """ |
|
98 | 98 | if opts.get('follow'): |
|
99 | 99 | # --follow is deprecated and now just an alias for -f/--file |
|
100 | 100 | # to mimic the behavior of Mercurial before version 1.5 |
|
101 | 101 | opts['file'] = 1 |
|
102 | 102 | |
|
103 | 103 | datefunc = ui.quiet and util.shortdate or util.datestr |
|
104 | 104 | getdate = util.cachefunc(lambda x: datefunc(x[0].date())) |
|
105 | 105 | |
|
106 | 106 | if not pats: |
|
107 | 107 | raise util.Abort(_('at least one filename or pattern is required')) |
|
108 | 108 | |
|
109 | 109 | opmap = [('user', lambda x: ui.shortuser(x[0].user())), |
|
110 | 110 | ('number', lambda x: str(x[0].rev())), |
|
111 | 111 | ('changeset', lambda x: short(x[0].node())), |
|
112 | 112 | ('date', getdate), |
|
113 | 113 | ('file', lambda x: x[0].path()), |
|
114 | 114 | ] |
|
115 | 115 | |
|
116 | 116 | if (not opts.get('user') and not opts.get('changeset') |
|
117 | 117 | and not opts.get('date') and not opts.get('file')): |
|
118 | 118 | opts['number'] = 1 |
|
119 | 119 | |
|
120 | 120 | linenumber = opts.get('line_number') is not None |
|
121 | 121 | if linenumber and (not opts.get('changeset')) and (not opts.get('number')): |
|
122 | 122 | raise util.Abort(_('at least one of -n/-c is required for -l')) |
|
123 | 123 | |
|
124 | 124 | funcmap = [func for op, func in opmap if opts.get(op)] |
|
125 | 125 | if linenumber: |
|
126 | 126 | lastfunc = funcmap[-1] |
|
127 | 127 | funcmap[-1] = lambda x: "%s:%s" % (lastfunc(x), x[1]) |
|
128 | 128 | |
|
129 | 129 | def bad(x, y): |
|
130 | 130 | raise util.Abort("%s: %s" % (x, y)) |
|
131 | 131 | |
|
132 | 132 | ctx = cmdutil.revsingle(repo, opts.get('rev')) |
|
133 | 133 | m = cmdutil.match(repo, pats, opts) |
|
134 | 134 | m.bad = bad |
|
135 | 135 | follow = not opts.get('no_follow') |
|
136 | 136 | for abs in ctx.walk(m): |
|
137 | 137 | fctx = ctx[abs] |
|
138 | 138 | if not opts.get('text') and util.binary(fctx.data()): |
|
139 | 139 | ui.write(_("%s: binary file\n") % ((pats and m.rel(abs)) or abs)) |
|
140 | 140 | continue |
|
141 | 141 | |
|
142 | 142 | lines = fctx.annotate(follow=follow, linenumber=linenumber) |
|
143 | 143 | pieces = [] |
|
144 | 144 | |
|
145 | 145 | for f in funcmap: |
|
146 | 146 | l = [f(n) for n, dummy in lines] |
|
147 | 147 | if l: |
|
148 | 148 | sized = [(x, encoding.colwidth(x)) for x in l] |
|
149 | 149 | ml = max([w for x, w in sized]) |
|
150 | 150 | pieces.append(["%s%s" % (' ' * (ml - w), x) for x, w in sized]) |
|
151 | 151 | |
|
152 | 152 | if pieces: |
|
153 | 153 | for p, l in zip(zip(*pieces), lines): |
|
154 | 154 | ui.write("%s: %s" % (" ".join(p), l[1])) |
|
155 | 155 | |
|
156 | 156 | def archive(ui, repo, dest, **opts): |
|
157 | 157 | '''create an unversioned archive of a repository revision |
|
158 | 158 | |
|
159 | 159 | By default, the revision used is the parent of the working |
|
160 | 160 | directory; use -r/--rev to specify a different revision. |
|
161 | 161 | |
|
162 | 162 | The archive type is automatically detected based on file |
|
163 | 163 | extension (or override using -t/--type). |
|
164 | 164 | |
|
165 | 165 | Valid types are: |
|
166 | 166 | |
|
167 | 167 | :``files``: a directory full of files (default) |
|
168 | 168 | :``tar``: tar archive, uncompressed |
|
169 | 169 | :``tbz2``: tar archive, compressed using bzip2 |
|
170 | 170 | :``tgz``: tar archive, compressed using gzip |
|
171 | 171 | :``uzip``: zip archive, uncompressed |
|
172 | 172 | :``zip``: zip archive, compressed using deflate |
|
173 | 173 | |
|
174 | 174 | The exact name of the destination archive or directory is given |
|
175 | 175 | using a format string; see :hg:`help export` for details. |
|
176 | 176 | |
|
177 | 177 | Each member added to an archive file has a directory prefix |
|
178 | 178 | prepended. Use -p/--prefix to specify a format string for the |
|
179 | 179 | prefix. The default is the basename of the archive, with suffixes |
|
180 | 180 | removed. |
|
181 | 181 | |
|
182 | 182 | Returns 0 on success. |
|
183 | 183 | ''' |
|
184 | 184 | |
|
185 | 185 | ctx = cmdutil.revsingle(repo, opts.get('rev')) |
|
186 | 186 | if not ctx: |
|
187 | 187 | raise util.Abort(_('no working directory: please specify a revision')) |
|
188 | 188 | node = ctx.node() |
|
189 | 189 | dest = cmdutil.make_filename(repo, dest, node) |
|
190 | 190 | if os.path.realpath(dest) == repo.root: |
|
191 | 191 | raise util.Abort(_('repository root cannot be destination')) |
|
192 | 192 | |
|
193 | 193 | kind = opts.get('type') or archival.guesskind(dest) or 'files' |
|
194 | 194 | prefix = opts.get('prefix') |
|
195 | 195 | |
|
196 | 196 | if dest == '-': |
|
197 | 197 | if kind == 'files': |
|
198 | 198 | raise util.Abort(_('cannot archive plain files to stdout')) |
|
199 | 199 | dest = sys.stdout |
|
200 | 200 | if not prefix: |
|
201 | 201 | prefix = os.path.basename(repo.root) + '-%h' |
|
202 | 202 | |
|
203 | 203 | prefix = cmdutil.make_filename(repo, prefix, node) |
|
204 | 204 | matchfn = cmdutil.match(repo, [], opts) |
|
205 | 205 | archival.archive(repo, dest, node, kind, not opts.get('no_decode'), |
|
206 | 206 | matchfn, prefix, subrepos=opts.get('subrepos')) |
|
207 | 207 | |
|
208 | 208 | def backout(ui, repo, node=None, rev=None, **opts): |
|
209 | 209 | '''reverse effect of earlier changeset |
|
210 | 210 | |
|
211 | 211 | Prepare a new changeset with the effect of REV undone in the |
|
212 | 212 | current working directory. |
|
213 | 213 | |
|
214 | 214 | If REV is the parent of the working directory, then this new changeset |
|
215 | 215 | is committed automatically. Otherwise, hg needs to merge the |
|
216 | 216 | changes and the merged result is left uncommitted. |
|
217 | 217 | |
|
218 | 218 | By default, the pending changeset will have one parent, |
|
219 | 219 | maintaining a linear history. With --merge, the pending changeset |
|
220 | 220 | will instead have two parents: the old parent of the working |
|
221 | 221 | directory and a new child of REV that simply undoes REV. |
|
222 | 222 | |
|
223 | 223 | Before version 1.7, the behavior without --merge was equivalent to |
|
224 | 224 | specifying --merge followed by :hg:`update --clean .` to cancel |
|
225 | 225 | the merge and leave the child of REV as a head to be merged |
|
226 | 226 | separately. |
|
227 | 227 | |
|
228 | 228 | See :hg:`help dates` for a list of formats valid for -d/--date. |
|
229 | 229 | |
|
230 | 230 | Returns 0 on success. |
|
231 | 231 | ''' |
|
232 | 232 | if rev and node: |
|
233 | 233 | raise util.Abort(_("please specify just one revision")) |
|
234 | 234 | |
|
235 | 235 | if not rev: |
|
236 | 236 | rev = node |
|
237 | 237 | |
|
238 | 238 | if not rev: |
|
239 | 239 | raise util.Abort(_("please specify a revision to backout")) |
|
240 | 240 | |
|
241 | 241 | date = opts.get('date') |
|
242 | 242 | if date: |
|
243 | 243 | opts['date'] = util.parsedate(date) |
|
244 | 244 | |
|
245 | 245 | cmdutil.bail_if_changed(repo) |
|
246 | 246 | node = cmdutil.revsingle(repo, rev).node() |
|
247 | 247 | |
|
248 | 248 | op1, op2 = repo.dirstate.parents() |
|
249 | 249 | a = repo.changelog.ancestor(op1, node) |
|
250 | 250 | if a != node: |
|
251 | 251 | raise util.Abort(_('cannot backout change on a different branch')) |
|
252 | 252 | |
|
253 | 253 | p1, p2 = repo.changelog.parents(node) |
|
254 | 254 | if p1 == nullid: |
|
255 | 255 | raise util.Abort(_('cannot backout a change with no parents')) |
|
256 | 256 | if p2 != nullid: |
|
257 | 257 | if not opts.get('parent'): |
|
258 | 258 | raise util.Abort(_('cannot backout a merge changeset without ' |
|
259 | 259 | '--parent')) |
|
260 | 260 | p = repo.lookup(opts['parent']) |
|
261 | 261 | if p not in (p1, p2): |
|
262 | 262 | raise util.Abort(_('%s is not a parent of %s') % |
|
263 | 263 | (short(p), short(node))) |
|
264 | 264 | parent = p |
|
265 | 265 | else: |
|
266 | 266 | if opts.get('parent'): |
|
267 | 267 | raise util.Abort(_('cannot use --parent on non-merge changeset')) |
|
268 | 268 | parent = p1 |
|
269 | 269 | |
|
270 | 270 | # the backout should appear on the same branch |
|
271 | 271 | branch = repo.dirstate.branch() |
|
272 | 272 | hg.clean(repo, node, show_stats=False) |
|
273 | 273 | repo.dirstate.setbranch(branch) |
|
274 | 274 | revert_opts = opts.copy() |
|
275 | 275 | revert_opts['date'] = None |
|
276 | 276 | revert_opts['all'] = True |
|
277 | 277 | revert_opts['rev'] = hex(parent) |
|
278 | 278 | revert_opts['no_backup'] = None |
|
279 | 279 | revert(ui, repo, **revert_opts) |
|
280 | 280 | if not opts.get('merge') and op1 != node: |
|
281 | 281 | try: |
|
282 | 282 | ui.setconfig('ui', 'forcemerge', opts.get('tool', '')) |
|
283 | 283 | return hg.update(repo, op1) |
|
284 | 284 | finally: |
|
285 | 285 | ui.setconfig('ui', 'forcemerge', '') |
|
286 | 286 | |
|
287 | 287 | commit_opts = opts.copy() |
|
288 | 288 | commit_opts['addremove'] = False |
|
289 | 289 | if not commit_opts['message'] and not commit_opts['logfile']: |
|
290 | 290 | # we don't translate commit messages |
|
291 | 291 | commit_opts['message'] = "Backed out changeset %s" % short(node) |
|
292 | 292 | commit_opts['force_editor'] = True |
|
293 | 293 | commit(ui, repo, **commit_opts) |
|
294 | 294 | def nice(node): |
|
295 | 295 | return '%d:%s' % (repo.changelog.rev(node), short(node)) |
|
296 | 296 | ui.status(_('changeset %s backs out changeset %s\n') % |
|
297 | 297 | (nice(repo.changelog.tip()), nice(node))) |
|
298 | 298 | if opts.get('merge') and op1 != node: |
|
299 | 299 | hg.clean(repo, op1, show_stats=False) |
|
300 | 300 | ui.status(_('merging with changeset %s\n') |
|
301 | 301 | % nice(repo.changelog.tip())) |
|
302 | 302 | try: |
|
303 | 303 | ui.setconfig('ui', 'forcemerge', opts.get('tool', '')) |
|
304 | 304 | return hg.merge(repo, hex(repo.changelog.tip())) |
|
305 | 305 | finally: |
|
306 | 306 | ui.setconfig('ui', 'forcemerge', '') |
|
307 | 307 | return 0 |
|
308 | 308 | |
|
309 | 309 | def bisect(ui, repo, rev=None, extra=None, command=None, |
|
310 | 310 | reset=None, good=None, bad=None, skip=None, extend=None, |
|
311 | 311 | noupdate=None): |
|
312 | 312 | """subdivision search of changesets |
|
313 | 313 | |
|
314 | 314 | This command helps to find changesets which introduce problems. To |
|
315 | 315 | use, mark the earliest changeset you know exhibits the problem as |
|
316 | 316 | bad, then mark the latest changeset which is free from the problem |
|
317 | 317 | as good. Bisect will update your working directory to a revision |
|
318 | 318 | for testing (unless the -U/--noupdate option is specified). Once |
|
319 | 319 | you have performed tests, mark the working directory as good or |
|
320 | 320 | bad, and bisect will either update to another candidate changeset |
|
321 | 321 | or announce that it has found the bad revision. |
|
322 | 322 | |
|
323 | 323 | As a shortcut, you can also use the revision argument to mark a |
|
324 | 324 | revision as good or bad without checking it out first. |
|
325 | 325 | |
|
326 | 326 | If you supply a command, it will be used for automatic bisection. |
|
327 | 327 | Its exit status will be used to mark revisions as good or bad: |
|
328 | 328 | status 0 means good, 125 means to skip the revision, 127 |
|
329 | 329 | (command not found) will abort the bisection, and any other |
|
330 | 330 | non-zero exit status means the revision is bad. |
|
331 | 331 | |
|
332 | 332 | Returns 0 on success. |
|
333 | 333 | """ |
|
334 | 334 | def extendbisectrange(nodes, good): |
|
335 | 335 | # bisect is incomplete when it ends on a merge node and |
|
336 | 336 | # one of the parent was not checked. |
|
337 | 337 | parents = repo[nodes[0]].parents() |
|
338 | 338 | if len(parents) > 1: |
|
339 | 339 | side = good and state['bad'] or state['good'] |
|
340 | 340 | num = len(set(i.node() for i in parents) & set(side)) |
|
341 | 341 | if num == 1: |
|
342 | 342 | return parents[0].ancestor(parents[1]) |
|
343 | 343 | return None |
|
344 | 344 | |
|
345 | 345 | def print_result(nodes, good): |
|
346 | 346 | displayer = cmdutil.show_changeset(ui, repo, {}) |
|
347 | 347 | if len(nodes) == 1: |
|
348 | 348 | # narrowed it down to a single revision |
|
349 | 349 | if good: |
|
350 | 350 | ui.write(_("The first good revision is:\n")) |
|
351 | 351 | else: |
|
352 | 352 | ui.write(_("The first bad revision is:\n")) |
|
353 | 353 | displayer.show(repo[nodes[0]]) |
|
354 | 354 | parents = repo[nodes[0]].parents() |
|
355 | 355 | extendnode = extendbisectrange(nodes, good) |
|
356 | 356 | if extendnode is not None: |
|
357 | 357 | ui.write(_('Not all ancestors of this changeset have been' |
|
358 | 358 | ' checked.\nUse bisect --extend to continue the ' |
|
359 | 359 | 'bisection from\nthe common ancestor, %s.\n') |
|
360 | 360 | % short(extendnode.node())) |
|
361 | 361 | else: |
|
362 | 362 | # multiple possible revisions |
|
363 | 363 | if good: |
|
364 | 364 | ui.write(_("Due to skipped revisions, the first " |
|
365 | 365 | "good revision could be any of:\n")) |
|
366 | 366 | else: |
|
367 | 367 | ui.write(_("Due to skipped revisions, the first " |
|
368 | 368 | "bad revision could be any of:\n")) |
|
369 | 369 | for n in nodes: |
|
370 | 370 | displayer.show(repo[n]) |
|
371 | 371 | displayer.close() |
|
372 | 372 | |
|
373 | 373 | def check_state(state, interactive=True): |
|
374 | 374 | if not state['good'] or not state['bad']: |
|
375 | 375 | if (good or bad or skip or reset) and interactive: |
|
376 | 376 | return |
|
377 | 377 | if not state['good']: |
|
378 | 378 | raise util.Abort(_('cannot bisect (no known good revisions)')) |
|
379 | 379 | else: |
|
380 | 380 | raise util.Abort(_('cannot bisect (no known bad revisions)')) |
|
381 | 381 | return True |
|
382 | 382 | |
|
383 | 383 | # backward compatibility |
|
384 | 384 | if rev in "good bad reset init".split(): |
|
385 | 385 | ui.warn(_("(use of 'hg bisect <cmd>' is deprecated)\n")) |
|
386 | 386 | cmd, rev, extra = rev, extra, None |
|
387 | 387 | if cmd == "good": |
|
388 | 388 | good = True |
|
389 | 389 | elif cmd == "bad": |
|
390 | 390 | bad = True |
|
391 | 391 | else: |
|
392 | 392 | reset = True |
|
393 | 393 | elif extra or good + bad + skip + reset + extend + bool(command) > 1: |
|
394 | 394 | raise util.Abort(_('incompatible arguments')) |
|
395 | 395 | |
|
396 | 396 | if reset: |
|
397 | 397 | p = repo.join("bisect.state") |
|
398 | 398 | if os.path.exists(p): |
|
399 | 399 | os.unlink(p) |
|
400 | 400 | return |
|
401 | 401 | |
|
402 | 402 | state = hbisect.load_state(repo) |
|
403 | 403 | |
|
404 | 404 | if command: |
|
405 | 405 | changesets = 1 |
|
406 | 406 | try: |
|
407 | 407 | while changesets: |
|
408 | 408 | # update state |
|
409 | 409 | status = util.system(command) |
|
410 | 410 | if status == 125: |
|
411 | 411 | transition = "skip" |
|
412 | 412 | elif status == 0: |
|
413 | 413 | transition = "good" |
|
414 | 414 | # status < 0 means process was killed |
|
415 | 415 | elif status == 127: |
|
416 | 416 | raise util.Abort(_("failed to execute %s") % command) |
|
417 | 417 | elif status < 0: |
|
418 | 418 | raise util.Abort(_("%s killed") % command) |
|
419 | 419 | else: |
|
420 | 420 | transition = "bad" |
|
421 | 421 | ctx = cmdutil.revsingle(repo, rev) |
|
422 | 422 | rev = None # clear for future iterations |
|
423 | 423 | state[transition].append(ctx.node()) |
|
424 | 424 | ui.status(_('Changeset %d:%s: %s\n') % (ctx, ctx, transition)) |
|
425 | 425 | check_state(state, interactive=False) |
|
426 | 426 | # bisect |
|
427 | 427 | nodes, changesets, good = hbisect.bisect(repo.changelog, state) |
|
428 | 428 | # update to next check |
|
429 | 429 | cmdutil.bail_if_changed(repo) |
|
430 | 430 | hg.clean(repo, nodes[0], show_stats=False) |
|
431 | 431 | finally: |
|
432 | 432 | hbisect.save_state(repo, state) |
|
433 | 433 | print_result(nodes, good) |
|
434 | 434 | return |
|
435 | 435 | |
|
436 | 436 | # update state |
|
437 | 437 | |
|
438 | 438 | if rev: |
|
439 | 439 | nodes = [repo.lookup(i) for i in cmdutil.revrange(repo, [rev])] |
|
440 | 440 | else: |
|
441 | 441 | nodes = [repo.lookup('.')] |
|
442 | 442 | |
|
443 | 443 | if good or bad or skip: |
|
444 | 444 | if good: |
|
445 | 445 | state['good'] += nodes |
|
446 | 446 | elif bad: |
|
447 | 447 | state['bad'] += nodes |
|
448 | 448 | elif skip: |
|
449 | 449 | state['skip'] += nodes |
|
450 | 450 | hbisect.save_state(repo, state) |
|
451 | 451 | |
|
452 | 452 | if not check_state(state): |
|
453 | 453 | return |
|
454 | 454 | |
|
455 | 455 | # actually bisect |
|
456 | 456 | nodes, changesets, good = hbisect.bisect(repo.changelog, state) |
|
457 | 457 | if extend: |
|
458 | 458 | if not changesets: |
|
459 | 459 | extendnode = extendbisectrange(nodes, good) |
|
460 | 460 | if extendnode is not None: |
|
461 | 461 | ui.write(_("Extending search to changeset %d:%s\n" |
|
462 | 462 | % (extendnode.rev(), short(extendnode.node())))) |
|
463 | 463 | if noupdate: |
|
464 | 464 | return |
|
465 | 465 | cmdutil.bail_if_changed(repo) |
|
466 | 466 | return hg.clean(repo, extendnode.node()) |
|
467 | 467 | raise util.Abort(_("nothing to extend")) |
|
468 | 468 | |
|
469 | 469 | if changesets == 0: |
|
470 | 470 | print_result(nodes, good) |
|
471 | 471 | else: |
|
472 | 472 | assert len(nodes) == 1 # only a single node can be tested next |
|
473 | 473 | node = nodes[0] |
|
474 | 474 | # compute the approximate number of remaining tests |
|
475 | 475 | tests, size = 0, 2 |
|
476 | 476 | while size <= changesets: |
|
477 | 477 | tests, size = tests + 1, size * 2 |
|
478 | 478 | rev = repo.changelog.rev(node) |
|
479 | 479 | ui.write(_("Testing changeset %d:%s " |
|
480 | 480 | "(%d changesets remaining, ~%d tests)\n") |
|
481 | 481 | % (rev, short(node), changesets, tests)) |
|
482 | 482 | if not noupdate: |
|
483 | 483 | cmdutil.bail_if_changed(repo) |
|
484 | 484 | return hg.clean(repo, node) |
|
485 | 485 | |
|
486 | 486 | def bookmark(ui, repo, mark=None, rev=None, force=False, delete=False, rename=None): |
|
487 | 487 | '''track a line of development with movable markers |
|
488 | 488 | |
|
489 | 489 | Bookmarks are pointers to certain commits that move when |
|
490 | 490 | committing. Bookmarks are local. They can be renamed, copied and |
|
491 | 491 | deleted. It is possible to use bookmark names in :hg:`merge` and |
|
492 | 492 | :hg:`update` to merge and update respectively to a given bookmark. |
|
493 | 493 | |
|
494 | 494 | You can use :hg:`bookmark NAME` to set a bookmark on the working |
|
495 | 495 | directory's parent revision with the given name. If you specify |
|
496 | 496 | a revision using -r REV (where REV may be an existing bookmark), |
|
497 | 497 | the bookmark is assigned to that revision. |
|
498 | 498 | |
|
499 | 499 | Bookmarks can be pushed and pulled between repositories (see :hg:`help |
|
500 | 500 | push` and :hg:`help pull`). This requires both the local and remote |
|
501 | 501 | repositories to support bookmarks. For versions prior to 1.8, this means |
|
502 | 502 | the bookmarks extension must be enabled. |
|
503 | 503 | ''' |
|
504 | 504 | hexfn = ui.debugflag and hex or short |
|
505 | 505 | marks = repo._bookmarks |
|
506 | 506 | cur = repo.changectx('.').node() |
|
507 | 507 | |
|
508 | 508 | if rename: |
|
509 | 509 | if rename not in marks: |
|
510 | 510 | raise util.Abort(_("bookmark '%s' does not exist") % rename) |
|
511 | 511 | if mark in marks and not force: |
|
512 | 512 | raise util.Abort(_("bookmark '%s' already exists " |
|
513 | 513 | "(use -f to force)") % mark) |
|
514 | 514 | if mark is None: |
|
515 | 515 | raise util.Abort(_("new bookmark name required")) |
|
516 | 516 | marks[mark] = marks[rename] |
|
517 | 517 | if repo._bookmarkcurrent == rename: |
|
518 | 518 | bookmarks.setcurrent(repo, mark) |
|
519 | 519 | del marks[rename] |
|
520 | 520 | bookmarks.write(repo) |
|
521 | 521 | return |
|
522 | 522 | |
|
523 | 523 | if delete: |
|
524 | 524 | if mark is None: |
|
525 | 525 | raise util.Abort(_("bookmark name required")) |
|
526 | 526 | if mark not in marks: |
|
527 | 527 | raise util.Abort(_("bookmark '%s' does not exist") % mark) |
|
528 | 528 | if mark == repo._bookmarkcurrent: |
|
529 | 529 | bookmarks.setcurrent(repo, None) |
|
530 | 530 | del marks[mark] |
|
531 | 531 | bookmarks.write(repo) |
|
532 | 532 | return |
|
533 | 533 | |
|
534 | 534 | if mark is not None: |
|
535 | 535 | if "\n" in mark: |
|
536 | 536 | raise util.Abort(_("bookmark name cannot contain newlines")) |
|
537 | 537 | mark = mark.strip() |
|
538 | 538 | if not mark: |
|
539 | 539 | raise util.Abort(_("bookmark names cannot consist entirely of " |
|
540 | 540 | "whitespace")) |
|
541 | 541 | if mark in marks and not force: |
|
542 | 542 | raise util.Abort(_("bookmark '%s' already exists " |
|
543 | 543 | "(use -f to force)") % mark) |
|
544 | 544 | if ((mark in repo.branchtags() or mark == repo.dirstate.branch()) |
|
545 | 545 | and not force): |
|
546 | 546 | raise util.Abort( |
|
547 | 547 | _("a bookmark cannot have the name of an existing branch")) |
|
548 | 548 | if rev: |
|
549 | 549 | marks[mark] = repo.lookup(rev) |
|
550 | 550 | else: |
|
551 | 551 | marks[mark] = repo.changectx('.').node() |
|
552 | 552 | if repo.changectx('.').node() == marks[mark]: |
|
553 | 553 | bookmarks.setcurrent(repo, mark) |
|
554 | 554 | bookmarks.write(repo) |
|
555 | 555 | return |
|
556 | 556 | |
|
557 | 557 | if mark is None: |
|
558 | 558 | if rev: |
|
559 | 559 | raise util.Abort(_("bookmark name required")) |
|
560 | 560 | if len(marks) == 0: |
|
561 | 561 | ui.status(_("no bookmarks set\n")) |
|
562 | 562 | else: |
|
563 | 563 | for bmark, n in sorted(marks.iteritems()): |
|
564 | 564 | current = repo._bookmarkcurrent |
|
565 | 565 | if bmark == current and n == cur: |
|
566 | 566 | prefix, label = '*', 'bookmarks.current' |
|
567 | 567 | else: |
|
568 | 568 | prefix, label = ' ', '' |
|
569 | 569 | |
|
570 | 570 | if ui.quiet: |
|
571 | 571 | ui.write("%s\n" % bmark, label=label) |
|
572 | 572 | else: |
|
573 | 573 | ui.write(" %s %-25s %d:%s\n" % ( |
|
574 | 574 | prefix, bmark, repo.changelog.rev(n), hexfn(n)), |
|
575 | 575 | label=label) |
|
576 | 576 | return |
|
577 | 577 | |
|
578 | 578 | def branch(ui, repo, label=None, **opts): |
|
579 | 579 | """set or show the current branch name |
|
580 | 580 | |
|
581 | 581 | With no argument, show the current branch name. With one argument, |
|
582 | 582 | set the working directory branch name (the branch will not exist |
|
583 | 583 | in the repository until the next commit). Standard practice |
|
584 | 584 | recommends that primary development take place on the 'default' |
|
585 | 585 | branch. |
|
586 | 586 | |
|
587 | 587 | Unless -f/--force is specified, branch will not let you set a |
|
588 | 588 | branch name that already exists, even if it's inactive. |
|
589 | 589 | |
|
590 | 590 | Use -C/--clean to reset the working directory branch to that of |
|
591 | 591 | the parent of the working directory, negating a previous branch |
|
592 | 592 | change. |
|
593 | 593 | |
|
594 | 594 | Use the command :hg:`update` to switch to an existing branch. Use |
|
595 | 595 | :hg:`commit --close-branch` to mark this branch as closed. |
|
596 | 596 | |
|
597 | 597 | Returns 0 on success. |
|
598 | 598 | """ |
|
599 | 599 | |
|
600 | 600 | if opts.get('clean'): |
|
601 | 601 | label = repo[None].p1().branch() |
|
602 | 602 | repo.dirstate.setbranch(label) |
|
603 | 603 | ui.status(_('reset working directory to branch %s\n') % label) |
|
604 | 604 | elif label: |
|
605 | 605 | if not opts.get('force') and label in repo.branchtags(): |
|
606 | 606 | if label not in [p.branch() for p in repo.parents()]: |
|
607 | 607 | raise util.Abort(_('a branch of the same name already exists' |
|
608 | 608 | " (use 'hg update' to switch to it)")) |
|
609 | 609 | repo.dirstate.setbranch(label) |
|
610 | 610 | ui.status(_('marked working directory as branch %s\n') % label) |
|
611 | 611 | else: |
|
612 | 612 | ui.write("%s\n" % repo.dirstate.branch()) |
|
613 | 613 | |
|
614 | 614 | def branches(ui, repo, active=False, closed=False): |
|
615 | 615 | """list repository named branches |
|
616 | 616 | |
|
617 | 617 | List the repository's named branches, indicating which ones are |
|
618 | 618 | inactive. If -c/--closed is specified, also list branches which have |
|
619 | 619 | been marked closed (see :hg:`commit --close-branch`). |
|
620 | 620 | |
|
621 | 621 | If -a/--active is specified, only show active branches. A branch |
|
622 | 622 | is considered active if it contains repository heads. |
|
623 | 623 | |
|
624 | 624 | Use the command :hg:`update` to switch to an existing branch. |
|
625 | 625 | |
|
626 | 626 | Returns 0. |
|
627 | 627 | """ |
|
628 | 628 | |
|
629 | 629 | hexfunc = ui.debugflag and hex or short |
|
630 | 630 | activebranches = [repo[n].branch() for n in repo.heads()] |
|
631 | 631 | def testactive(tag, node): |
|
632 | 632 | realhead = tag in activebranches |
|
633 | 633 | open = node in repo.branchheads(tag, closed=False) |
|
634 | 634 | return realhead and open |
|
635 | 635 | branches = sorted([(testactive(tag, node), repo.changelog.rev(node), tag) |
|
636 | 636 | for tag, node in repo.branchtags().items()], |
|
637 | 637 | reverse=True) |
|
638 | 638 | |
|
639 | 639 | for isactive, node, tag in branches: |
|
640 | 640 | if (not active) or isactive: |
|
641 | 641 | if ui.quiet: |
|
642 | 642 | ui.write("%s\n" % tag) |
|
643 | 643 | else: |
|
644 | 644 | hn = repo.lookup(node) |
|
645 | 645 | if isactive: |
|
646 | 646 | label = 'branches.active' |
|
647 | 647 | notice = '' |
|
648 | 648 | elif hn not in repo.branchheads(tag, closed=False): |
|
649 | 649 | if not closed: |
|
650 | 650 | continue |
|
651 | 651 | label = 'branches.closed' |
|
652 | 652 | notice = _(' (closed)') |
|
653 | 653 | else: |
|
654 | 654 | label = 'branches.inactive' |
|
655 | 655 | notice = _(' (inactive)') |
|
656 | 656 | if tag == repo.dirstate.branch(): |
|
657 | 657 | label = 'branches.current' |
|
658 | 658 | rev = str(node).rjust(31 - encoding.colwidth(tag)) |
|
659 | 659 | rev = ui.label('%s:%s' % (rev, hexfunc(hn)), 'log.changeset') |
|
660 | 660 | tag = ui.label(tag, label) |
|
661 | 661 | ui.write("%s %s%s\n" % (tag, rev, notice)) |
|
662 | 662 | |
|
663 | 663 | def bundle(ui, repo, fname, dest=None, **opts): |
|
664 | 664 | """create a changegroup file |
|
665 | 665 | |
|
666 | 666 | Generate a compressed changegroup file collecting changesets not |
|
667 | 667 | known to be in another repository. |
|
668 | 668 | |
|
669 | 669 | If you omit the destination repository, then hg assumes the |
|
670 | 670 | destination will have all the nodes you specify with --base |
|
671 | 671 | parameters. To create a bundle containing all changesets, use |
|
672 | 672 | -a/--all (or --base null). |
|
673 | 673 | |
|
674 | 674 | You can change compression method with the -t/--type option. |
|
675 | 675 | The available compression methods are: none, bzip2, and |
|
676 | 676 | gzip (by default, bundles are compressed using bzip2). |
|
677 | 677 | |
|
678 | 678 | The bundle file can then be transferred using conventional means |
|
679 | 679 | and applied to another repository with the unbundle or pull |
|
680 | 680 | command. This is useful when direct push and pull are not |
|
681 | 681 | available or when exporting an entire repository is undesirable. |
|
682 | 682 | |
|
683 | 683 | Applying bundles preserves all changeset contents including |
|
684 | 684 | permissions, copy/rename information, and revision history. |
|
685 | 685 | |
|
686 | 686 | Returns 0 on success, 1 if no changes found. |
|
687 | 687 | """ |
|
688 | 688 | revs = None |
|
689 | 689 | if 'rev' in opts: |
|
690 | 690 | revs = cmdutil.revrange(repo, opts['rev']) |
|
691 | 691 | |
|
692 | 692 | if opts.get('all'): |
|
693 | 693 | base = ['null'] |
|
694 | 694 | else: |
|
695 | 695 | base = cmdutil.revrange(repo, opts.get('base')) |
|
696 | 696 | if base: |
|
697 | 697 | if dest: |
|
698 | 698 | raise util.Abort(_("--base is incompatible with specifying " |
|
699 | 699 | "a destination")) |
|
700 | 700 | base = [repo.lookup(rev) for rev in base] |
|
701 | 701 | # create the right base |
|
702 | 702 | # XXX: nodesbetween / changegroup* should be "fixed" instead |
|
703 | 703 | o = [] |
|
704 | 704 | has = set((nullid,)) |
|
705 | 705 | for n in base: |
|
706 | 706 | has.update(repo.changelog.reachable(n)) |
|
707 | 707 | if revs: |
|
708 | 708 | revs = [repo.lookup(rev) for rev in revs] |
|
709 | 709 | visit = revs[:] |
|
710 | 710 | has.difference_update(visit) |
|
711 | 711 | else: |
|
712 | 712 | visit = repo.changelog.heads() |
|
713 | 713 | seen = {} |
|
714 | 714 | while visit: |
|
715 | 715 | n = visit.pop(0) |
|
716 | 716 | parents = [p for p in repo.changelog.parents(n) if p not in has] |
|
717 | 717 | if len(parents) == 0: |
|
718 | 718 | if n not in has: |
|
719 | 719 | o.append(n) |
|
720 | 720 | else: |
|
721 | 721 | for p in parents: |
|
722 | 722 | if p not in seen: |
|
723 | 723 | seen[p] = 1 |
|
724 | 724 | visit.append(p) |
|
725 | 725 | else: |
|
726 | 726 | dest = ui.expandpath(dest or 'default-push', dest or 'default') |
|
727 | 727 | dest, branches = hg.parseurl(dest, opts.get('branch')) |
|
728 | 728 | other = hg.repository(hg.remoteui(repo, opts), dest) |
|
729 | 729 | revs, checkout = hg.addbranchrevs(repo, other, branches, revs) |
|
730 | 730 | if revs: |
|
731 | 731 | revs = [repo.lookup(rev) for rev in revs] |
|
732 | 732 | o = discovery.findoutgoing(repo, other, force=opts.get('force')) |
|
733 | 733 | |
|
734 | 734 | if not o: |
|
735 | 735 | ui.status(_("no changes found\n")) |
|
736 | 736 | return 1 |
|
737 | 737 | |
|
738 | 738 | if revs: |
|
739 | 739 | cg = repo.changegroupsubset(o, revs, 'bundle') |
|
740 | 740 | else: |
|
741 | 741 | cg = repo.changegroup(o, 'bundle') |
|
742 | 742 | |
|
743 | 743 | bundletype = opts.get('type', 'bzip2').lower() |
|
744 | 744 | btypes = {'none': 'HG10UN', 'bzip2': 'HG10BZ', 'gzip': 'HG10GZ'} |
|
745 | 745 | bundletype = btypes.get(bundletype) |
|
746 | 746 | if bundletype not in changegroup.bundletypes: |
|
747 | 747 | raise util.Abort(_('unknown bundle type specified with --type')) |
|
748 | 748 | |
|
749 | 749 | changegroup.writebundle(cg, fname, bundletype) |
|
750 | 750 | |
|
751 | 751 | def cat(ui, repo, file1, *pats, **opts): |
|
752 | 752 | """output the current or given revision of files |
|
753 | 753 | |
|
754 | 754 | Print the specified files as they were at the given revision. If |
|
755 | 755 | no revision is given, the parent of the working directory is used, |
|
756 | 756 | or tip if no revision is checked out. |
|
757 | 757 | |
|
758 | 758 | Output may be to a file, in which case the name of the file is |
|
759 | 759 | given using a format string. The formatting rules are the same as |
|
760 | 760 | for the export command, with the following additions: |
|
761 | 761 | |
|
762 | 762 | :``%s``: basename of file being printed |
|
763 | 763 | :``%d``: dirname of file being printed, or '.' if in repository root |
|
764 | 764 | :``%p``: root-relative path name of file being printed |
|
765 | 765 | |
|
766 | 766 | Returns 0 on success. |
|
767 | 767 | """ |
|
768 | 768 | ctx = cmdutil.revsingle(repo, opts.get('rev')) |
|
769 | 769 | err = 1 |
|
770 | 770 | m = cmdutil.match(repo, (file1,) + pats, opts) |
|
771 | 771 | for abs in ctx.walk(m): |
|
772 | 772 | fp = cmdutil.make_file(repo, opts.get('output'), ctx.node(), pathname=abs) |
|
773 | 773 | data = ctx[abs].data() |
|
774 | 774 | if opts.get('decode'): |
|
775 | 775 | data = repo.wwritedata(abs, data) |
|
776 | 776 | fp.write(data) |
|
777 | 777 | fp.close() |
|
778 | 778 | err = 0 |
|
779 | 779 | return err |
|
780 | 780 | |
|
781 | 781 | def clone(ui, source, dest=None, **opts): |
|
782 | 782 | """make a copy of an existing repository |
|
783 | 783 | |
|
784 | 784 | Create a copy of an existing repository in a new directory. |
|
785 | 785 | |
|
786 | 786 | If no destination directory name is specified, it defaults to the |
|
787 | 787 | basename of the source. |
|
788 | 788 | |
|
789 | 789 | The location of the source is added to the new repository's |
|
790 | 790 | ``.hg/hgrc`` file, as the default to be used for future pulls. |
|
791 | 791 | |
|
792 | 792 | See :hg:`help urls` for valid source format details. |
|
793 | 793 | |
|
794 | 794 | It is possible to specify an ``ssh://`` URL as the destination, but no |
|
795 | 795 | ``.hg/hgrc`` and working directory will be created on the remote side. |
|
796 | 796 | Please see :hg:`help urls` for important details about ``ssh://`` URLs. |
|
797 | 797 | |
|
798 | 798 | A set of changesets (tags, or branch names) to pull may be specified |
|
799 | 799 | by listing each changeset (tag, or branch name) with -r/--rev. |
|
800 | 800 | If -r/--rev is used, the cloned repository will contain only a subset |
|
801 | 801 | of the changesets of the source repository. Only the set of changesets |
|
802 | 802 | defined by all -r/--rev options (including all their ancestors) |
|
803 | 803 | will be pulled into the destination repository. |
|
804 | 804 | No subsequent changesets (including subsequent tags) will be present |
|
805 | 805 | in the destination. |
|
806 | 806 | |
|
807 | 807 | Using -r/--rev (or 'clone src#rev dest') implies --pull, even for |
|
808 | 808 | local source repositories. |
|
809 | 809 | |
|
810 | 810 | For efficiency, hardlinks are used for cloning whenever the source |
|
811 | 811 | and destination are on the same filesystem (note this applies only |
|
812 | 812 | to the repository data, not to the working directory). Some |
|
813 | 813 | filesystems, such as AFS, implement hardlinking incorrectly, but |
|
814 | 814 | do not report errors. In these cases, use the --pull option to |
|
815 | 815 | avoid hardlinking. |
|
816 | 816 | |
|
817 | 817 | In some cases, you can clone repositories and the working directory |
|
818 | 818 | using full hardlinks with :: |
|
819 | 819 | |
|
820 | 820 | $ cp -al REPO REPOCLONE |
|
821 | 821 | |
|
822 | 822 | This is the fastest way to clone, but it is not always safe. The |
|
823 | 823 | operation is not atomic (making sure REPO is not modified during |
|
824 | 824 | the operation is up to you) and you have to make sure your editor |
|
825 | 825 | breaks hardlinks (Emacs and most Linux Kernel tools do so). Also, |
|
826 | 826 | this is not compatible with certain extensions that place their |
|
827 | 827 | metadata under the .hg directory, such as mq. |
|
828 | 828 | |
|
829 | 829 | Mercurial will update the working directory to the first applicable |
|
830 | 830 | revision from this list: |
|
831 | 831 | |
|
832 | 832 | a) null if -U or the source repository has no changesets |
|
833 | 833 | b) if -u . and the source repository is local, the first parent of |
|
834 | 834 | the source repository's working directory |
|
835 | 835 | c) the changeset specified with -u (if a branch name, this means the |
|
836 | 836 | latest head of that branch) |
|
837 | 837 | d) the changeset specified with -r |
|
838 | 838 | e) the tipmost head specified with -b |
|
839 | 839 | f) the tipmost head specified with the url#branch source syntax |
|
840 | 840 | g) the tipmost head of the default branch |
|
841 | 841 | h) tip |
|
842 | 842 | |
|
843 | 843 | Returns 0 on success. |
|
844 | 844 | """ |
|
845 | 845 | if opts.get('noupdate') and opts.get('updaterev'): |
|
846 | 846 | raise util.Abort(_("cannot specify both --noupdate and --updaterev")) |
|
847 | 847 | |
|
848 | 848 | r = hg.clone(hg.remoteui(ui, opts), source, dest, |
|
849 | 849 | pull=opts.get('pull'), |
|
850 | 850 | stream=opts.get('uncompressed'), |
|
851 | 851 | rev=opts.get('rev'), |
|
852 | 852 | update=opts.get('updaterev') or not opts.get('noupdate'), |
|
853 | 853 | branch=opts.get('branch')) |
|
854 | 854 | |
|
855 | 855 | return r is None |
|
856 | 856 | |
|
857 | 857 | def commit(ui, repo, *pats, **opts): |
|
858 | 858 | """commit the specified files or all outstanding changes |
|
859 | 859 | |
|
860 | 860 | Commit changes to the given files into the repository. Unlike a |
|
861 | 861 | centralized SCM, this operation is a local operation. See |
|
862 | 862 | :hg:`push` for a way to actively distribute your changes. |
|
863 | 863 | |
|
864 | 864 | If a list of files is omitted, all changes reported by :hg:`status` |
|
865 | 865 | will be committed. |
|
866 | 866 | |
|
867 | 867 | If you are committing the result of a merge, do not provide any |
|
868 | 868 | filenames or -I/-X filters. |
|
869 | 869 | |
|
870 | 870 | If no commit message is specified, Mercurial starts your |
|
871 | 871 | configured editor where you can enter a message. In case your |
|
872 | 872 | commit fails, you will find a backup of your message in |
|
873 | 873 | ``.hg/last-message.txt``. |
|
874 | 874 | |
|
875 | 875 | See :hg:`help dates` for a list of formats valid for -d/--date. |
|
876 | 876 | |
|
877 | 877 | Returns 0 on success, 1 if nothing changed. |
|
878 | 878 | """ |
|
879 | 879 | extra = {} |
|
880 | 880 | if opts.get('close_branch'): |
|
881 | 881 | if repo['.'].node() not in repo.branchheads(): |
|
882 | 882 | # The topo heads set is included in the branch heads set of the |
|
883 | 883 | # current branch, so it's sufficient to test branchheads |
|
884 | 884 | raise util.Abort(_('can only close branch heads')) |
|
885 | 885 | extra['close'] = 1 |
|
886 | 886 | e = cmdutil.commiteditor |
|
887 | 887 | if opts.get('force_editor'): |
|
888 | 888 | e = cmdutil.commitforceeditor |
|
889 | 889 | |
|
890 | 890 | def commitfunc(ui, repo, message, match, opts): |
|
891 | 891 | return repo.commit(message, opts.get('user'), opts.get('date'), match, |
|
892 | 892 | editor=e, extra=extra) |
|
893 | 893 | |
|
894 | 894 | branch = repo[None].branch() |
|
895 | 895 | bheads = repo.branchheads(branch) |
|
896 | 896 | |
|
897 | 897 | node = cmdutil.commit(ui, repo, commitfunc, pats, opts) |
|
898 | 898 | if not node: |
|
899 | 899 | stat = repo.status(match=cmdutil.match(repo, pats, opts)) |
|
900 | 900 | if stat[3]: |
|
901 | 901 | ui.status(_("nothing changed (%d missing files, see 'hg status')\n") |
|
902 | 902 | % len(stat[3])) |
|
903 | 903 | else: |
|
904 | 904 | ui.status(_("nothing changed\n")) |
|
905 | 905 | return 1 |
|
906 | 906 | |
|
907 | 907 | ctx = repo[node] |
|
908 | 908 | parents = ctx.parents() |
|
909 | 909 | |
|
910 | 910 | if bheads and not [x for x in parents |
|
911 | 911 | if x.node() in bheads and x.branch() == branch]: |
|
912 | 912 | ui.status(_('created new head\n')) |
|
913 | 913 | # The message is not printed for initial roots. For the other |
|
914 | 914 | # changesets, it is printed in the following situations: |
|
915 | 915 | # |
|
916 | 916 | # Par column: for the 2 parents with ... |
|
917 | 917 | # N: null or no parent |
|
918 | 918 | # B: parent is on another named branch |
|
919 | 919 | # C: parent is a regular non head changeset |
|
920 | 920 | # H: parent was a branch head of the current branch |
|
921 | 921 | # Msg column: whether we print "created new head" message |
|
922 | 922 | # In the following, it is assumed that there already exists some |
|
923 | 923 | # initial branch heads of the current branch, otherwise nothing is |
|
924 | 924 | # printed anyway. |
|
925 | 925 | # |
|
926 | 926 | # Par Msg Comment |
|
927 | 927 | # NN y additional topo root |
|
928 | 928 | # |
|
929 | 929 | # BN y additional branch root |
|
930 | 930 | # CN y additional topo head |
|
931 | 931 | # HN n usual case |
|
932 | 932 | # |
|
933 | 933 | # BB y weird additional branch root |
|
934 | 934 | # CB y branch merge |
|
935 | 935 | # HB n merge with named branch |
|
936 | 936 | # |
|
937 | 937 | # CC y additional head from merge |
|
938 | 938 | # CH n merge with a head |
|
939 | 939 | # |
|
940 | 940 | # HH n head merge: head count decreases |
|
941 | 941 | |
|
942 | 942 | if not opts.get('close_branch'): |
|
943 | 943 | for r in parents: |
|
944 | 944 | if r.extra().get('close') and r.branch() == branch: |
|
945 | 945 | ui.status(_('reopening closed branch head %d\n') % r) |
|
946 | 946 | |
|
947 | 947 | if ui.debugflag: |
|
948 | 948 | ui.write(_('committed changeset %d:%s\n') % (int(ctx), ctx.hex())) |
|
949 | 949 | elif ui.verbose: |
|
950 | 950 | ui.write(_('committed changeset %d:%s\n') % (int(ctx), ctx)) |
|
951 | 951 | |
|
952 | 952 | def copy(ui, repo, *pats, **opts): |
|
953 | 953 | """mark files as copied for the next commit |
|
954 | 954 | |
|
955 | 955 | Mark dest as having copies of source files. If dest is a |
|
956 | 956 | directory, copies are put in that directory. If dest is a file, |
|
957 | 957 | the source must be a single file. |
|
958 | 958 | |
|
959 | 959 | By default, this command copies the contents of files as they |
|
960 | 960 | exist in the working directory. If invoked with -A/--after, the |
|
961 | 961 | operation is recorded, but no copying is performed. |
|
962 | 962 | |
|
963 | 963 | This command takes effect with the next commit. To undo a copy |
|
964 | 964 | before that, see :hg:`revert`. |
|
965 | 965 | |
|
966 | 966 | Returns 0 on success, 1 if errors are encountered. |
|
967 | 967 | """ |
|
968 | 968 | wlock = repo.wlock(False) |
|
969 | 969 | try: |
|
970 | 970 | return cmdutil.copy(ui, repo, pats, opts) |
|
971 | 971 | finally: |
|
972 | 972 | wlock.release() |
|
973 | 973 | |
|
974 | 974 | def debugancestor(ui, repo, *args): |
|
975 | 975 | """find the ancestor revision of two revisions in a given index""" |
|
976 | 976 | if len(args) == 3: |
|
977 | 977 | index, rev1, rev2 = args |
|
978 | 978 | r = revlog.revlog(scmutil.opener(os.getcwd(), audit=False), index) |
|
979 | 979 | lookup = r.lookup |
|
980 | 980 | elif len(args) == 2: |
|
981 | 981 | if not repo: |
|
982 | 982 | raise util.Abort(_("there is no Mercurial repository here " |
|
983 | 983 | "(.hg not found)")) |
|
984 | 984 | rev1, rev2 = args |
|
985 | 985 | r = repo.changelog |
|
986 | 986 | lookup = repo.lookup |
|
987 | 987 | else: |
|
988 | 988 | raise util.Abort(_('either two or three arguments required')) |
|
989 | 989 | a = r.ancestor(lookup(rev1), lookup(rev2)) |
|
990 | 990 | ui.write("%d:%s\n" % (r.rev(a), hex(a))) |
|
991 | 991 | |
|
992 | 992 | def debugbuilddag(ui, repo, text, |
|
993 | 993 | mergeable_file=False, |
|
994 | 994 | appended_file=False, |
|
995 | 995 | overwritten_file=False, |
|
996 | 996 | new_file=False): |
|
997 | 997 | """builds a repo with a given dag from scratch in the current empty repo |
|
998 | 998 | |
|
999 | 999 | Elements: |
|
1000 | 1000 | |
|
1001 | 1001 | - "+n" is a linear run of n nodes based on the current default parent |
|
1002 | 1002 | - "." is a single node based on the current default parent |
|
1003 | 1003 | - "$" resets the default parent to null (implied at the start); |
|
1004 | 1004 | otherwise the default parent is always the last node created |
|
1005 | 1005 | - "<p" sets the default parent to the backref p |
|
1006 | 1006 | - "*p" is a fork at parent p, which is a backref |
|
1007 | 1007 | - "*p1/p2" is a merge of parents p1 and p2, which are backrefs |
|
1008 | 1008 | - "/p2" is a merge of the preceding node and p2 |
|
1009 | 1009 | - ":tag" defines a local tag for the preceding node |
|
1010 | 1010 | - "@branch" sets the named branch for subsequent nodes |
|
1011 | 1011 | - "!command" runs the command using your shell |
|
1012 | 1012 | - "!!my command\\n" is like "!", but to the end of the line |
|
1013 | 1013 | - "#...\\n" is a comment up to the end of the line |
|
1014 | 1014 | |
|
1015 | 1015 | Whitespace between the above elements is ignored. |
|
1016 | 1016 | |
|
1017 | 1017 | A backref is either |
|
1018 | 1018 | |
|
1019 | 1019 | - a number n, which references the node curr-n, where curr is the current |
|
1020 | 1020 | node, or |
|
1021 | 1021 | - the name of a local tag you placed earlier using ":tag", or |
|
1022 | 1022 | - empty to denote the default parent. |
|
1023 | 1023 | |
|
1024 | 1024 | All string valued-elements are either strictly alphanumeric, or must |
|
1025 | 1025 | be enclosed in double quotes ("..."), with "\\" as escape character. |
|
1026 | 1026 | |
|
1027 | 1027 | Note that the --overwritten-file and --appended-file options imply the |
|
1028 | 1028 | use of "HGMERGE=internal:local" during DAG buildup. |
|
1029 | 1029 | """ |
|
1030 | 1030 | |
|
1031 | 1031 | if not (mergeable_file or appended_file or overwritten_file or new_file): |
|
1032 | 1032 | raise util.Abort(_('need at least one of -m, -a, -o, -n')) |
|
1033 | 1033 | |
|
1034 | 1034 | if len(repo.changelog) > 0: |
|
1035 | 1035 | raise util.Abort(_('repository is not empty')) |
|
1036 | 1036 | |
|
1037 | 1037 | if overwritten_file or appended_file: |
|
1038 | 1038 | # we don't want to fail in merges during buildup |
|
1039 | 1039 | os.environ['HGMERGE'] = 'internal:local' |
|
1040 | 1040 | |
|
1041 | 1041 | def writefile(fname, text, fmode="wb"): |
|
1042 | 1042 | f = open(fname, fmode) |
|
1043 | 1043 | try: |
|
1044 | 1044 | f.write(text) |
|
1045 | 1045 | finally: |
|
1046 | 1046 | f.close() |
|
1047 | 1047 | |
|
1048 | 1048 | if mergeable_file: |
|
1049 | 1049 | linesperrev = 2 |
|
1050 | 1050 | # determine number of revs in DAG |
|
1051 | 1051 | n = 0 |
|
1052 | 1052 | for type, data in dagparser.parsedag(text): |
|
1053 | 1053 | if type == 'n': |
|
1054 | 1054 | n += 1 |
|
1055 | 1055 | # make a file with k lines per rev |
|
1056 | 1056 | writefile("mf", "\n".join(str(i) for i in xrange(0, n * linesperrev)) |
|
1057 | 1057 | + "\n") |
|
1058 | 1058 | |
|
1059 | 1059 | at = -1 |
|
1060 | 1060 | atbranch = 'default' |
|
1061 | 1061 | for type, data in dagparser.parsedag(text): |
|
1062 | 1062 | if type == 'n': |
|
1063 | 1063 | ui.status('node %s\n' % str(data)) |
|
1064 | 1064 | id, ps = data |
|
1065 | 1065 | p1 = ps[0] |
|
1066 | 1066 | if p1 != at: |
|
1067 | 1067 | update(ui, repo, node=str(p1), clean=True) |
|
1068 | 1068 | at = p1 |
|
1069 | 1069 | if repo.dirstate.branch() != atbranch: |
|
1070 | 1070 | branch(ui, repo, atbranch, force=True) |
|
1071 | 1071 | if len(ps) > 1: |
|
1072 | 1072 | p2 = ps[1] |
|
1073 | 1073 | merge(ui, repo, node=p2) |
|
1074 | 1074 | |
|
1075 | 1075 | if mergeable_file: |
|
1076 | 1076 | f = open("mf", "rb+") |
|
1077 | 1077 | try: |
|
1078 | 1078 | lines = f.read().split("\n") |
|
1079 | 1079 | lines[id * linesperrev] += " r%i" % id |
|
1080 | 1080 | f.seek(0) |
|
1081 | 1081 | f.write("\n".join(lines)) |
|
1082 | 1082 | finally: |
|
1083 | 1083 | f.close() |
|
1084 | 1084 | |
|
1085 | 1085 | if appended_file: |
|
1086 | 1086 | writefile("af", "r%i\n" % id, "ab") |
|
1087 | 1087 | |
|
1088 | 1088 | if overwritten_file: |
|
1089 | 1089 | writefile("of", "r%i\n" % id) |
|
1090 | 1090 | |
|
1091 | 1091 | if new_file: |
|
1092 | 1092 | writefile("nf%i" % id, "r%i\n" % id) |
|
1093 | 1093 | |
|
1094 | 1094 | commit(ui, repo, addremove=True, message="r%i" % id, date=(id, 0)) |
|
1095 | 1095 | at = id |
|
1096 | 1096 | elif type == 'l': |
|
1097 | 1097 | id, name = data |
|
1098 | 1098 | ui.status('tag %s\n' % name) |
|
1099 | 1099 | tag(ui, repo, name, local=True) |
|
1100 | 1100 | elif type == 'a': |
|
1101 | 1101 | ui.status('branch %s\n' % data) |
|
1102 | 1102 | atbranch = data |
|
1103 | 1103 | elif type in 'cC': |
|
1104 | 1104 | r = util.system(data, cwd=repo.root) |
|
1105 | 1105 | if r: |
|
1106 | 1106 | desc, r = util.explain_exit(r) |
|
1107 | 1107 | raise util.Abort(_('%s command %s') % (data, desc)) |
|
1108 | 1108 | |
|
1109 | 1109 | def debugcommands(ui, cmd='', *args): |
|
1110 | 1110 | """list all available commands and options""" |
|
1111 | 1111 | for cmd, vals in sorted(table.iteritems()): |
|
1112 | 1112 | cmd = cmd.split('|')[0].strip('^') |
|
1113 | 1113 | opts = ', '.join([i[1] for i in vals[1]]) |
|
1114 | 1114 | ui.write('%s: %s\n' % (cmd, opts)) |
|
1115 | 1115 | |
|
1116 | 1116 | def debugcomplete(ui, cmd='', **opts): |
|
1117 | 1117 | """returns the completion list associated with the given command""" |
|
1118 | 1118 | |
|
1119 | 1119 | if opts.get('options'): |
|
1120 | 1120 | options = [] |
|
1121 | 1121 | otables = [globalopts] |
|
1122 | 1122 | if cmd: |
|
1123 | 1123 | aliases, entry = cmdutil.findcmd(cmd, table, False) |
|
1124 | 1124 | otables.append(entry[1]) |
|
1125 | 1125 | for t in otables: |
|
1126 | 1126 | for o in t: |
|
1127 | 1127 | if "(DEPRECATED)" in o[3]: |
|
1128 | 1128 | continue |
|
1129 | 1129 | if o[0]: |
|
1130 | 1130 | options.append('-%s' % o[0]) |
|
1131 | 1131 | options.append('--%s' % o[1]) |
|
1132 | 1132 | ui.write("%s\n" % "\n".join(options)) |
|
1133 | 1133 | return |
|
1134 | 1134 | |
|
1135 | 1135 | cmdlist = cmdutil.findpossible(cmd, table) |
|
1136 | 1136 | if ui.verbose: |
|
1137 | 1137 | cmdlist = [' '.join(c[0]) for c in cmdlist.values()] |
|
1138 | 1138 | ui.write("%s\n" % "\n".join(sorted(cmdlist))) |
|
1139 | 1139 | |
|
1140 | 1140 | def debugfsinfo(ui, path = "."): |
|
1141 | 1141 | """show information detected about current filesystem""" |
|
1142 | 1142 | open('.debugfsinfo', 'w').write('') |
|
1143 | 1143 | ui.write('exec: %s\n' % (util.checkexec(path) and 'yes' or 'no')) |
|
1144 | 1144 | ui.write('symlink: %s\n' % (util.checklink(path) and 'yes' or 'no')) |
|
1145 | 1145 | ui.write('case-sensitive: %s\n' % (util.checkcase('.debugfsinfo') |
|
1146 | 1146 | and 'yes' or 'no')) |
|
1147 | 1147 | os.unlink('.debugfsinfo') |
|
1148 | 1148 | |
|
1149 | 1149 | def debugrebuildstate(ui, repo, rev="tip"): |
|
1150 | 1150 | """rebuild the dirstate as it would look like for the given revision""" |
|
1151 | 1151 | ctx = cmdutil.revsingle(repo, rev) |
|
1152 | 1152 | wlock = repo.wlock() |
|
1153 | 1153 | try: |
|
1154 | 1154 | repo.dirstate.rebuild(ctx.node(), ctx.manifest()) |
|
1155 | 1155 | finally: |
|
1156 | 1156 | wlock.release() |
|
1157 | 1157 | |
|
1158 | 1158 | def debugcheckstate(ui, repo): |
|
1159 | 1159 | """validate the correctness of the current dirstate""" |
|
1160 | 1160 | parent1, parent2 = repo.dirstate.parents() |
|
1161 | 1161 | m1 = repo[parent1].manifest() |
|
1162 | 1162 | m2 = repo[parent2].manifest() |
|
1163 | 1163 | errors = 0 |
|
1164 | 1164 | for f in repo.dirstate: |
|
1165 | 1165 | state = repo.dirstate[f] |
|
1166 | 1166 | if state in "nr" and f not in m1: |
|
1167 | 1167 | ui.warn(_("%s in state %s, but not in manifest1\n") % (f, state)) |
|
1168 | 1168 | errors += 1 |
|
1169 | 1169 | if state in "a" and f in m1: |
|
1170 | 1170 | ui.warn(_("%s in state %s, but also in manifest1\n") % (f, state)) |
|
1171 | 1171 | errors += 1 |
|
1172 | 1172 | if state in "m" and f not in m1 and f not in m2: |
|
1173 | 1173 | ui.warn(_("%s in state %s, but not in either manifest\n") % |
|
1174 | 1174 | (f, state)) |
|
1175 | 1175 | errors += 1 |
|
1176 | 1176 | for f in m1: |
|
1177 | 1177 | state = repo.dirstate[f] |
|
1178 | 1178 | if state not in "nrm": |
|
1179 | 1179 | ui.warn(_("%s in manifest1, but listed as state %s") % (f, state)) |
|
1180 | 1180 | errors += 1 |
|
1181 | 1181 | if errors: |
|
1182 | 1182 | error = _(".hg/dirstate inconsistent with current parent's manifest") |
|
1183 | 1183 | raise util.Abort(error) |
|
1184 | 1184 | |
|
1185 | 1185 | def showconfig(ui, repo, *values, **opts): |
|
1186 | 1186 | """show combined config settings from all hgrc files |
|
1187 | 1187 | |
|
1188 | 1188 | With no arguments, print names and values of all config items. |
|
1189 | 1189 | |
|
1190 | 1190 | With one argument of the form section.name, print just the value |
|
1191 | 1191 | of that config item. |
|
1192 | 1192 | |
|
1193 | 1193 | With multiple arguments, print names and values of all config |
|
1194 | 1194 | items with matching section names. |
|
1195 | 1195 | |
|
1196 | 1196 | With --debug, the source (filename and line number) is printed |
|
1197 | 1197 | for each config item. |
|
1198 | 1198 | |
|
1199 | 1199 | Returns 0 on success. |
|
1200 | 1200 | """ |
|
1201 | 1201 | |
|
1202 | 1202 | for f in scmutil.rcpath(): |
|
1203 | 1203 | ui.debug(_('read config from: %s\n') % f) |
|
1204 | 1204 | untrusted = bool(opts.get('untrusted')) |
|
1205 | 1205 | if values: |
|
1206 | 1206 | sections = [v for v in values if '.' not in v] |
|
1207 | 1207 | items = [v for v in values if '.' in v] |
|
1208 | 1208 | if len(items) > 1 or items and sections: |
|
1209 | 1209 | raise util.Abort(_('only one config item permitted')) |
|
1210 | 1210 | for section, name, value in ui.walkconfig(untrusted=untrusted): |
|
1211 | 1211 | value = str(value).replace('\n', '\\n') |
|
1212 | 1212 | sectname = section + '.' + name |
|
1213 | 1213 | if values: |
|
1214 | 1214 | for v in values: |
|
1215 | 1215 | if v == section: |
|
1216 | 1216 | ui.debug('%s: ' % |
|
1217 | 1217 | ui.configsource(section, name, untrusted)) |
|
1218 | 1218 | ui.write('%s=%s\n' % (sectname, value)) |
|
1219 | 1219 | elif v == sectname: |
|
1220 | 1220 | ui.debug('%s: ' % |
|
1221 | 1221 | ui.configsource(section, name, untrusted)) |
|
1222 | 1222 | ui.write(value, '\n') |
|
1223 | 1223 | else: |
|
1224 | 1224 | ui.debug('%s: ' % |
|
1225 | 1225 | ui.configsource(section, name, untrusted)) |
|
1226 | 1226 | ui.write('%s=%s\n' % (sectname, value)) |
|
1227 | 1227 | |
|
1228 | 1228 | def debugknown(ui, repopath, *ids, **opts): |
|
1229 | 1229 | """test whether node ids are known to a repo |
|
1230 | 1230 | |
|
1231 | 1231 | Every ID must be a full-length hex node id string. Returns a list of 0s and 1s |
|
1232 | 1232 | indicating unknown/known. |
|
1233 | 1233 | """ |
|
1234 | 1234 | repo = hg.repository(ui, repopath) |
|
1235 | 1235 | if not repo.capable('known'): |
|
1236 | 1236 | raise util.Abort("known() not supported by target repository") |
|
1237 | 1237 | flags = repo.known([bin(s) for s in ids]) |
|
1238 | 1238 | ui.write("%s\n" % ("".join([f and "1" or "0" for f in flags]))) |
|
1239 | 1239 | |
|
1240 | 1240 | def debugbundle(ui, bundlepath, all=None, **opts): |
|
1241 | 1241 | """lists the contents of a bundle""" |
|
1242 | 1242 | f = url.open(ui, bundlepath) |
|
1243 | 1243 | try: |
|
1244 | 1244 | gen = changegroup.readbundle(f, bundlepath) |
|
1245 | 1245 | if all: |
|
1246 | 1246 | ui.write("format: id, p1, p2, cset, len(delta)\n") |
|
1247 | 1247 | |
|
1248 | 1248 | def showchunks(named): |
|
1249 | 1249 | ui.write("\n%s\n" % named) |
|
1250 | 1250 | while 1: |
|
1251 | 1251 | chunkdata = gen.parsechunk() |
|
1252 | 1252 | if not chunkdata: |
|
1253 | 1253 | break |
|
1254 | 1254 | node = chunkdata['node'] |
|
1255 | 1255 | p1 = chunkdata['p1'] |
|
1256 | 1256 | p2 = chunkdata['p2'] |
|
1257 | 1257 | cs = chunkdata['cs'] |
|
1258 | 1258 | delta = chunkdata['data'] |
|
1259 | 1259 | ui.write("%s %s %s %s %s\n" % |
|
1260 | 1260 | (hex(node), hex(p1), hex(p2), |
|
1261 | 1261 | hex(cs), len(delta))) |
|
1262 | 1262 | |
|
1263 | 1263 | showchunks("changelog") |
|
1264 | 1264 | showchunks("manifest") |
|
1265 | 1265 | while 1: |
|
1266 | 1266 | fname = gen.chunk() |
|
1267 | 1267 | if not fname: |
|
1268 | 1268 | break |
|
1269 | 1269 | showchunks(fname) |
|
1270 | 1270 | else: |
|
1271 | 1271 | while 1: |
|
1272 | 1272 | chunkdata = gen.parsechunk() |
|
1273 | 1273 | if not chunkdata: |
|
1274 | 1274 | break |
|
1275 | 1275 | node = chunkdata['node'] |
|
1276 | 1276 | ui.write("%s\n" % hex(node)) |
|
1277 | 1277 | finally: |
|
1278 | 1278 | f.close() |
|
1279 | 1279 | |
|
1280 | 1280 | def debuggetbundle(ui, repopath, bundlepath, head=None, common=None, **opts): |
|
1281 | 1281 | """retrieves a bundle from a repo |
|
1282 | 1282 | |
|
1283 | 1283 | Every ID must be a full-length hex node id string. Saves the bundle to the |
|
1284 | 1284 | given file. |
|
1285 | 1285 | """ |
|
1286 | 1286 | repo = hg.repository(ui, repopath) |
|
1287 | 1287 | if not repo.capable('getbundle'): |
|
1288 | 1288 | raise util.Abort("getbundle() not supported by target repository") |
|
1289 | 1289 | args = {} |
|
1290 | 1290 | if common: |
|
1291 | 1291 | args['common'] = [bin(s) for s in common] |
|
1292 | 1292 | if head: |
|
1293 | 1293 | args['heads'] = [bin(s) for s in head] |
|
1294 | 1294 | bundle = repo.getbundle('debug', **args) |
|
1295 | 1295 | |
|
1296 | 1296 | bundletype = opts.get('type', 'bzip2').lower() |
|
1297 | 1297 | btypes = {'none': 'HG10UN', 'bzip2': 'HG10BZ', 'gzip': 'HG10GZ'} |
|
1298 | 1298 | bundletype = btypes.get(bundletype) |
|
1299 | 1299 | if bundletype not in changegroup.bundletypes: |
|
1300 | 1300 | raise util.Abort(_('unknown bundle type specified with --type')) |
|
1301 | 1301 | changegroup.writebundle(bundle, bundlepath, bundletype) |
|
1302 | 1302 | |
|
1303 | 1303 | def debugpushkey(ui, repopath, namespace, *keyinfo): |
|
1304 | 1304 | '''access the pushkey key/value protocol |
|
1305 | 1305 | |
|
1306 | 1306 | With two args, list the keys in the given namespace. |
|
1307 | 1307 | |
|
1308 | 1308 | With five args, set a key to new if it currently is set to old. |
|
1309 | 1309 | Reports success or failure. |
|
1310 | 1310 | ''' |
|
1311 | 1311 | |
|
1312 | 1312 | target = hg.repository(ui, repopath) |
|
1313 | 1313 | if keyinfo: |
|
1314 | 1314 | key, old, new = keyinfo |
|
1315 | 1315 | r = target.pushkey(namespace, key, old, new) |
|
1316 | 1316 | ui.status(str(r) + '\n') |
|
1317 | 1317 | return not r |
|
1318 | 1318 | else: |
|
1319 | 1319 | for k, v in target.listkeys(namespace).iteritems(): |
|
1320 | 1320 | ui.write("%s\t%s\n" % (k.encode('string-escape'), |
|
1321 | 1321 | v.encode('string-escape'))) |
|
1322 | 1322 | |
|
1323 | 1323 | def debugrevspec(ui, repo, expr): |
|
1324 | 1324 | '''parse and apply a revision specification''' |
|
1325 | 1325 | if ui.verbose: |
|
1326 | 1326 | tree = revset.parse(expr)[0] |
|
1327 | 1327 | ui.note(tree, "\n") |
|
1328 | 1328 | func = revset.match(expr) |
|
1329 | 1329 | for c in func(repo, range(len(repo))): |
|
1330 | 1330 | ui.write("%s\n" % c) |
|
1331 | 1331 | |
|
1332 | 1332 | def debugsetparents(ui, repo, rev1, rev2=None): |
|
1333 | 1333 | """manually set the parents of the current working directory |
|
1334 | 1334 | |
|
1335 | 1335 | This is useful for writing repository conversion tools, but should |
|
1336 | 1336 | be used with care. |
|
1337 | 1337 | |
|
1338 | 1338 | Returns 0 on success. |
|
1339 | 1339 | """ |
|
1340 | 1340 | |
|
1341 | 1341 | r1 = cmdutil.revsingle(repo, rev1).node() |
|
1342 | 1342 | r2 = cmdutil.revsingle(repo, rev2, 'null').node() |
|
1343 | 1343 | |
|
1344 | 1344 | wlock = repo.wlock() |
|
1345 | 1345 | try: |
|
1346 | 1346 | repo.dirstate.setparents(r1, r2) |
|
1347 | 1347 | finally: |
|
1348 | 1348 | wlock.release() |
|
1349 | 1349 | |
|
1350 | 1350 | def debugstate(ui, repo, nodates=None, datesort=None): |
|
1351 | 1351 | """show the contents of the current dirstate""" |
|
1352 | 1352 | timestr = "" |
|
1353 | 1353 | showdate = not nodates |
|
1354 | 1354 | if datesort: |
|
1355 | 1355 | keyfunc = lambda x: (x[1][3], x[0]) # sort by mtime, then by filename |
|
1356 | 1356 | else: |
|
1357 | 1357 | keyfunc = None # sort by filename |
|
1358 | 1358 | for file_, ent in sorted(repo.dirstate._map.iteritems(), key=keyfunc): |
|
1359 | 1359 | if showdate: |
|
1360 | 1360 | if ent[3] == -1: |
|
1361 | 1361 | # Pad or slice to locale representation |
|
1362 | 1362 | locale_len = len(time.strftime("%Y-%m-%d %H:%M:%S ", |
|
1363 | 1363 | time.localtime(0))) |
|
1364 | 1364 | timestr = 'unset' |
|
1365 | 1365 | timestr = (timestr[:locale_len] + |
|
1366 | 1366 | ' ' * (locale_len - len(timestr))) |
|
1367 | 1367 | else: |
|
1368 | 1368 | timestr = time.strftime("%Y-%m-%d %H:%M:%S ", |
|
1369 | 1369 | time.localtime(ent[3])) |
|
1370 | 1370 | if ent[1] & 020000: |
|
1371 | 1371 | mode = 'lnk' |
|
1372 | 1372 | else: |
|
1373 | 1373 | mode = '%3o' % (ent[1] & 0777) |
|
1374 | 1374 | ui.write("%c %s %10d %s%s\n" % (ent[0], mode, ent[2], timestr, file_)) |
|
1375 | 1375 | for f in repo.dirstate.copies(): |
|
1376 | 1376 | ui.write(_("copy: %s -> %s\n") % (repo.dirstate.copied(f), f)) |
|
1377 | 1377 | |
|
1378 | 1378 | def debugsub(ui, repo, rev=None): |
|
1379 | 1379 | ctx = cmdutil.revsingle(repo, rev, None) |
|
1380 | 1380 | for k, v in sorted(ctx.substate.items()): |
|
1381 | 1381 | ui.write('path %s\n' % k) |
|
1382 | 1382 | ui.write(' source %s\n' % v[0]) |
|
1383 | 1383 | ui.write(' revision %s\n' % v[1]) |
|
1384 | 1384 | |
|
1385 | 1385 | def debugdag(ui, repo, file_=None, *revs, **opts): |
|
1386 | 1386 | """format the changelog or an index DAG as a concise textual description |
|
1387 | 1387 | |
|
1388 | 1388 | If you pass a revlog index, the revlog's DAG is emitted. If you list |
|
1389 | 1389 | revision numbers, they get labelled in the output as rN. |
|
1390 | 1390 | |
|
1391 | 1391 | Otherwise, the changelog DAG of the current repo is emitted. |
|
1392 | 1392 | """ |
|
1393 | 1393 | spaces = opts.get('spaces') |
|
1394 | 1394 | dots = opts.get('dots') |
|
1395 | 1395 | if file_: |
|
1396 | 1396 | rlog = revlog.revlog(scmutil.opener(os.getcwd(), audit=False), file_) |
|
1397 | 1397 | revs = set((int(r) for r in revs)) |
|
1398 | 1398 | def events(): |
|
1399 | 1399 | for r in rlog: |
|
1400 | 1400 | yield 'n', (r, list(set(p for p in rlog.parentrevs(r) if p != -1))) |
|
1401 | 1401 | if r in revs: |
|
1402 | 1402 | yield 'l', (r, "r%i" % r) |
|
1403 | 1403 | elif repo: |
|
1404 | 1404 | cl = repo.changelog |
|
1405 | 1405 | tags = opts.get('tags') |
|
1406 | 1406 | branches = opts.get('branches') |
|
1407 | 1407 | if tags: |
|
1408 | 1408 | labels = {} |
|
1409 | 1409 | for l, n in repo.tags().items(): |
|
1410 | 1410 | labels.setdefault(cl.rev(n), []).append(l) |
|
1411 | 1411 | def events(): |
|
1412 | 1412 | b = "default" |
|
1413 | 1413 | for r in cl: |
|
1414 | 1414 | if branches: |
|
1415 | 1415 | newb = cl.read(cl.node(r))[5]['branch'] |
|
1416 | 1416 | if newb != b: |
|
1417 | 1417 | yield 'a', newb |
|
1418 | 1418 | b = newb |
|
1419 | 1419 | yield 'n', (r, list(set(p for p in cl.parentrevs(r) if p != -1))) |
|
1420 | 1420 | if tags: |
|
1421 | 1421 | ls = labels.get(r) |
|
1422 | 1422 | if ls: |
|
1423 | 1423 | for l in ls: |
|
1424 | 1424 | yield 'l', (r, l) |
|
1425 | 1425 | else: |
|
1426 | 1426 | raise util.Abort(_('need repo for changelog dag')) |
|
1427 | 1427 | |
|
1428 | 1428 | for line in dagparser.dagtextlines(events(), |
|
1429 | 1429 | addspaces=spaces, |
|
1430 | 1430 | wraplabels=True, |
|
1431 | 1431 | wrapannotations=True, |
|
1432 | 1432 | wrapnonlinear=dots, |
|
1433 | 1433 | usedots=dots, |
|
1434 | 1434 | maxlinewidth=70): |
|
1435 | 1435 | ui.write(line) |
|
1436 | 1436 | ui.write("\n") |
|
1437 | 1437 | |
|
1438 | 1438 | def debugdata(ui, repo, file_, rev): |
|
1439 | 1439 | """dump the contents of a data file revision""" |
|
1440 | 1440 | r = None |
|
1441 | 1441 | if repo: |
|
1442 | 1442 | filelog = repo.file(file_) |
|
1443 | 1443 | if len(filelog): |
|
1444 | 1444 | r = filelog |
|
1445 | 1445 | if not r: |
|
1446 | 1446 | r = revlog.revlog(scmutil.opener(os.getcwd(), audit=False), |
|
1447 | 1447 | file_[:-2] + ".i") |
|
1448 | 1448 | try: |
|
1449 | 1449 | ui.write(r.revision(r.lookup(rev))) |
|
1450 | 1450 | except KeyError: |
|
1451 | 1451 | raise util.Abort(_('invalid revision identifier %s') % rev) |
|
1452 | 1452 | |
|
1453 | 1453 | def debugdate(ui, date, range=None, **opts): |
|
1454 | 1454 | """parse and display a date""" |
|
1455 | 1455 | if opts["extended"]: |
|
1456 | 1456 | d = util.parsedate(date, util.extendeddateformats) |
|
1457 | 1457 | else: |
|
1458 | 1458 | d = util.parsedate(date) |
|
1459 | 1459 | ui.write("internal: %s %s\n" % d) |
|
1460 | 1460 | ui.write("standard: %s\n" % util.datestr(d)) |
|
1461 | 1461 | if range: |
|
1462 | 1462 | m = util.matchdate(range) |
|
1463 | 1463 | ui.write("match: %s\n" % m(d[0])) |
|
1464 | 1464 | |
|
1465 | 1465 | def debugignore(ui, repo, *values, **opts): |
|
1466 | 1466 | """display the combined ignore pattern""" |
|
1467 | 1467 | ignore = repo.dirstate._ignore |
|
1468 | 1468 | if hasattr(ignore, 'includepat'): |
|
1469 | 1469 | ui.write("%s\n" % ignore.includepat) |
|
1470 | 1470 | else: |
|
1471 | 1471 | raise util.Abort(_("no ignore patterns found")) |
|
1472 | 1472 | |
|
1473 | 1473 | def debugindex(ui, repo, file_, **opts): |
|
1474 | 1474 | """dump the contents of an index file""" |
|
1475 | 1475 | r = None |
|
1476 | 1476 | if repo: |
|
1477 | 1477 | filelog = repo.file(file_) |
|
1478 | 1478 | if len(filelog): |
|
1479 | 1479 | r = filelog |
|
1480 | 1480 | |
|
1481 | 1481 | format = opts.get('format', 0) |
|
1482 | 1482 | if format not in (0, 1): |
|
1483 | 1483 | raise util.Abort(_("unknown format %d") % format) |
|
1484 | 1484 | |
|
1485 | 1485 | if not r: |
|
1486 | 1486 | r = revlog.revlog(scmutil.opener(os.getcwd(), audit=False), file_) |
|
1487 | 1487 | |
|
1488 | 1488 | if format == 0: |
|
1489 | 1489 | ui.write(" rev offset length base linkrev" |
|
1490 | 1490 | " nodeid p1 p2\n") |
|
1491 | 1491 | elif format == 1: |
|
1492 | 1492 | ui.write(" rev flag offset length" |
|
1493 | 1493 | " size base link p1 p2 nodeid\n") |
|
1494 | 1494 | |
|
1495 | 1495 | for i in r: |
|
1496 | 1496 | node = r.node(i) |
|
1497 | 1497 | if format == 0: |
|
1498 | 1498 | try: |
|
1499 | 1499 | pp = r.parents(node) |
|
1500 | 1500 | except: |
|
1501 | 1501 | pp = [nullid, nullid] |
|
1502 | 1502 | ui.write("% 6d % 9d % 7d % 6d % 7d %s %s %s\n" % ( |
|
1503 | 1503 | i, r.start(i), r.length(i), r.base(i), r.linkrev(i), |
|
1504 | 1504 | short(node), short(pp[0]), short(pp[1]))) |
|
1505 | 1505 | elif format == 1: |
|
1506 | 1506 | pr = r.parentrevs(i) |
|
1507 | 1507 | ui.write("% 6d %04x % 8d % 8d % 8d % 6d % 6d % 6d % 6d %s\n" % ( |
|
1508 | 1508 | i, r.flags(i), r.start(i), r.length(i), r.rawsize(i), |
|
1509 | 1509 | r.base(i), r.linkrev(i), pr[0], pr[1], short(node))) |
|
1510 | 1510 | |
|
1511 | 1511 | def debugindexdot(ui, repo, file_): |
|
1512 | 1512 | """dump an index DAG as a graphviz dot file""" |
|
1513 | 1513 | r = None |
|
1514 | 1514 | if repo: |
|
1515 | 1515 | filelog = repo.file(file_) |
|
1516 | 1516 | if len(filelog): |
|
1517 | 1517 | r = filelog |
|
1518 | 1518 | if not r: |
|
1519 | 1519 | r = revlog.revlog(scmutil.opener(os.getcwd(), audit=False), file_) |
|
1520 | 1520 | ui.write("digraph G {\n") |
|
1521 | 1521 | for i in r: |
|
1522 | 1522 | node = r.node(i) |
|
1523 | 1523 | pp = r.parents(node) |
|
1524 | 1524 | ui.write("\t%d -> %d\n" % (r.rev(pp[0]), i)) |
|
1525 | 1525 | if pp[1] != nullid: |
|
1526 | 1526 | ui.write("\t%d -> %d\n" % (r.rev(pp[1]), i)) |
|
1527 | 1527 | ui.write("}\n") |
|
1528 | 1528 | |
|
1529 | 1529 | def debuginstall(ui): |
|
1530 | 1530 | '''test Mercurial installation |
|
1531 | 1531 | |
|
1532 | 1532 | Returns 0 on success. |
|
1533 | 1533 | ''' |
|
1534 | 1534 | |
|
1535 | 1535 | def writetemp(contents): |
|
1536 | 1536 | (fd, name) = tempfile.mkstemp(prefix="hg-debuginstall-") |
|
1537 | 1537 | f = os.fdopen(fd, "wb") |
|
1538 | 1538 | f.write(contents) |
|
1539 | 1539 | f.close() |
|
1540 | 1540 | return name |
|
1541 | 1541 | |
|
1542 | 1542 | problems = 0 |
|
1543 | 1543 | |
|
1544 | 1544 | # encoding |
|
1545 | 1545 | ui.status(_("Checking encoding (%s)...\n") % encoding.encoding) |
|
1546 | 1546 | try: |
|
1547 | 1547 | encoding.fromlocal("test") |
|
1548 | 1548 | except util.Abort, inst: |
|
1549 | 1549 | ui.write(" %s\n" % inst) |
|
1550 | 1550 | ui.write(_(" (check that your locale is properly set)\n")) |
|
1551 | 1551 | problems += 1 |
|
1552 | 1552 | |
|
1553 | 1553 | # compiled modules |
|
1554 | 1554 | ui.status(_("Checking installed modules (%s)...\n") |
|
1555 | 1555 | % os.path.dirname(__file__)) |
|
1556 | 1556 | try: |
|
1557 | 1557 | import bdiff, mpatch, base85, osutil |
|
1558 | 1558 | except Exception, inst: |
|
1559 | 1559 | ui.write(" %s\n" % inst) |
|
1560 | 1560 | ui.write(_(" One or more extensions could not be found")) |
|
1561 | 1561 | ui.write(_(" (check that you compiled the extensions)\n")) |
|
1562 | 1562 | problems += 1 |
|
1563 | 1563 | |
|
1564 | 1564 | # templates |
|
1565 | 1565 | ui.status(_("Checking templates...\n")) |
|
1566 | 1566 | try: |
|
1567 | 1567 | import templater |
|
1568 | 1568 | templater.templater(templater.templatepath("map-cmdline.default")) |
|
1569 | 1569 | except Exception, inst: |
|
1570 | 1570 | ui.write(" %s\n" % inst) |
|
1571 | 1571 | ui.write(_(" (templates seem to have been installed incorrectly)\n")) |
|
1572 | 1572 | problems += 1 |
|
1573 | 1573 | |
|
1574 | 1574 | # editor |
|
1575 | 1575 | ui.status(_("Checking commit editor...\n")) |
|
1576 | 1576 | editor = ui.geteditor() |
|
1577 | 1577 | cmdpath = util.find_exe(editor) or util.find_exe(editor.split()[0]) |
|
1578 | 1578 | if not cmdpath: |
|
1579 | 1579 | if editor == 'vi': |
|
1580 | 1580 | ui.write(_(" No commit editor set and can't find vi in PATH\n")) |
|
1581 | 1581 | ui.write(_(" (specify a commit editor in your configuration" |
|
1582 | 1582 | " file)\n")) |
|
1583 | 1583 | else: |
|
1584 | 1584 | ui.write(_(" Can't find editor '%s' in PATH\n") % editor) |
|
1585 | 1585 | ui.write(_(" (specify a commit editor in your configuration" |
|
1586 | 1586 | " file)\n")) |
|
1587 | 1587 | problems += 1 |
|
1588 | 1588 | |
|
1589 | 1589 | # check username |
|
1590 | 1590 | ui.status(_("Checking username...\n")) |
|
1591 | 1591 | try: |
|
1592 | 1592 | ui.username() |
|
1593 | 1593 | except util.Abort, e: |
|
1594 | 1594 | ui.write(" %s\n" % e) |
|
1595 | 1595 | ui.write(_(" (specify a username in your configuration file)\n")) |
|
1596 | 1596 | problems += 1 |
|
1597 | 1597 | |
|
1598 | 1598 | if not problems: |
|
1599 | 1599 | ui.status(_("No problems detected\n")) |
|
1600 | 1600 | else: |
|
1601 | 1601 | ui.write(_("%s problems detected," |
|
1602 | 1602 | " please check your install!\n") % problems) |
|
1603 | 1603 | |
|
1604 | 1604 | return problems |
|
1605 | 1605 | |
|
1606 | 1606 | def debugrename(ui, repo, file1, *pats, **opts): |
|
1607 | 1607 | """dump rename information""" |
|
1608 | 1608 | |
|
1609 | 1609 | ctx = cmdutil.revsingle(repo, opts.get('rev')) |
|
1610 | 1610 | m = cmdutil.match(repo, (file1,) + pats, opts) |
|
1611 | 1611 | for abs in ctx.walk(m): |
|
1612 | 1612 | fctx = ctx[abs] |
|
1613 | 1613 | o = fctx.filelog().renamed(fctx.filenode()) |
|
1614 | 1614 | rel = m.rel(abs) |
|
1615 | 1615 | if o: |
|
1616 | 1616 | ui.write(_("%s renamed from %s:%s\n") % (rel, o[0], hex(o[1]))) |
|
1617 | 1617 | else: |
|
1618 | 1618 | ui.write(_("%s not renamed\n") % rel) |
|
1619 | 1619 | |
|
1620 | 1620 | def debugwalk(ui, repo, *pats, **opts): |
|
1621 | 1621 | """show how files match on given patterns""" |
|
1622 | 1622 | m = cmdutil.match(repo, pats, opts) |
|
1623 | 1623 | items = list(repo.walk(m)) |
|
1624 | 1624 | if not items: |
|
1625 | 1625 | return |
|
1626 | 1626 | fmt = 'f %%-%ds %%-%ds %%s' % ( |
|
1627 | 1627 | max([len(abs) for abs in items]), |
|
1628 | 1628 | max([len(m.rel(abs)) for abs in items])) |
|
1629 | 1629 | for abs in items: |
|
1630 | 1630 | line = fmt % (abs, m.rel(abs), m.exact(abs) and 'exact' or '') |
|
1631 | 1631 | ui.write("%s\n" % line.rstrip()) |
|
1632 | 1632 | |
|
1633 | 1633 | def debugwireargs(ui, repopath, *vals, **opts): |
|
1634 | 1634 | repo = hg.repository(hg.remoteui(ui, opts), repopath) |
|
1635 | 1635 | for opt in remoteopts: |
|
1636 | 1636 | del opts[opt[1]] |
|
1637 | 1637 | args = {} |
|
1638 | 1638 | for k, v in opts.iteritems(): |
|
1639 | 1639 | if v: |
|
1640 | 1640 | args[k] = v |
|
1641 | 1641 | # run twice to check that we don't mess up the stream for the next command |
|
1642 | 1642 | res1 = repo.debugwireargs(*vals, **args) |
|
1643 | 1643 | res2 = repo.debugwireargs(*vals, **args) |
|
1644 | 1644 | ui.write("%s\n" % res1) |
|
1645 | 1645 | if res1 != res2: |
|
1646 | 1646 | ui.warn("%s\n" % res2) |
|
1647 | 1647 | |
|
1648 | 1648 | def diff(ui, repo, *pats, **opts): |
|
1649 | 1649 | """diff repository (or selected files) |
|
1650 | 1650 | |
|
1651 | 1651 | Show differences between revisions for the specified files. |
|
1652 | 1652 | |
|
1653 | 1653 | Differences between files are shown using the unified diff format. |
|
1654 | 1654 | |
|
1655 | 1655 | .. note:: |
|
1656 | 1656 | diff may generate unexpected results for merges, as it will |
|
1657 | 1657 | default to comparing against the working directory's first |
|
1658 | 1658 | parent changeset if no revisions are specified. |
|
1659 | 1659 | |
|
1660 | 1660 | When two revision arguments are given, then changes are shown |
|
1661 | 1661 | between those revisions. If only one revision is specified then |
|
1662 | 1662 | that revision is compared to the working directory, and, when no |
|
1663 | 1663 | revisions are specified, the working directory files are compared |
|
1664 | 1664 | to its parent. |
|
1665 | 1665 | |
|
1666 | 1666 | Alternatively you can specify -c/--change with a revision to see |
|
1667 | 1667 | the changes in that changeset relative to its first parent. |
|
1668 | 1668 | |
|
1669 | 1669 | Without the -a/--text option, diff will avoid generating diffs of |
|
1670 | 1670 | files it detects as binary. With -a, diff will generate a diff |
|
1671 | 1671 | anyway, probably with undesirable results. |
|
1672 | 1672 | |
|
1673 | 1673 | Use the -g/--git option to generate diffs in the git extended diff |
|
1674 | 1674 | format. For more information, read :hg:`help diffs`. |
|
1675 | 1675 | |
|
1676 | 1676 | Returns 0 on success. |
|
1677 | 1677 | """ |
|
1678 | 1678 | |
|
1679 | 1679 | revs = opts.get('rev') |
|
1680 | 1680 | change = opts.get('change') |
|
1681 | 1681 | stat = opts.get('stat') |
|
1682 | 1682 | reverse = opts.get('reverse') |
|
1683 | 1683 | |
|
1684 | 1684 | if revs and change: |
|
1685 | 1685 | msg = _('cannot specify --rev and --change at the same time') |
|
1686 | 1686 | raise util.Abort(msg) |
|
1687 | 1687 | elif change: |
|
1688 | 1688 | node2 = cmdutil.revsingle(repo, change, None).node() |
|
1689 | 1689 | node1 = repo[node2].p1().node() |
|
1690 | 1690 | else: |
|
1691 | 1691 | node1, node2 = cmdutil.revpair(repo, revs) |
|
1692 | 1692 | |
|
1693 | 1693 | if reverse: |
|
1694 | 1694 | node1, node2 = node2, node1 |
|
1695 | 1695 | |
|
1696 | 1696 | diffopts = patch.diffopts(ui, opts) |
|
1697 | 1697 | m = cmdutil.match(repo, pats, opts) |
|
1698 | 1698 | cmdutil.diffordiffstat(ui, repo, diffopts, node1, node2, m, stat=stat, |
|
1699 | 1699 | listsubrepos=opts.get('subrepos')) |
|
1700 | 1700 | |
|
1701 | 1701 | def export(ui, repo, *changesets, **opts): |
|
1702 | 1702 | """dump the header and diffs for one or more changesets |
|
1703 | 1703 | |
|
1704 | 1704 | Print the changeset header and diffs for one or more revisions. |
|
1705 | 1705 | |
|
1706 | 1706 | The information shown in the changeset header is: author, date, |
|
1707 | 1707 | branch name (if non-default), changeset hash, parent(s) and commit |
|
1708 | 1708 | comment. |
|
1709 | 1709 | |
|
1710 | 1710 | .. note:: |
|
1711 | 1711 | export may generate unexpected diff output for merge |
|
1712 | 1712 | changesets, as it will compare the merge changeset against its |
|
1713 | 1713 | first parent only. |
|
1714 | 1714 | |
|
1715 | 1715 | Output may be to a file, in which case the name of the file is |
|
1716 | 1716 | given using a format string. The formatting rules are as follows: |
|
1717 | 1717 | |
|
1718 | 1718 | :``%%``: literal "%" character |
|
1719 | 1719 | :``%H``: changeset hash (40 hexadecimal digits) |
|
1720 | 1720 | :``%N``: number of patches being generated |
|
1721 | 1721 | :``%R``: changeset revision number |
|
1722 | 1722 | :``%b``: basename of the exporting repository |
|
1723 | 1723 | :``%h``: short-form changeset hash (12 hexadecimal digits) |
|
1724 | 1724 | :``%n``: zero-padded sequence number, starting at 1 |
|
1725 | 1725 | :``%r``: zero-padded changeset revision number |
|
1726 | 1726 | |
|
1727 | 1727 | Without the -a/--text option, export will avoid generating diffs |
|
1728 | 1728 | of files it detects as binary. With -a, export will generate a |
|
1729 | 1729 | diff anyway, probably with undesirable results. |
|
1730 | 1730 | |
|
1731 | 1731 | Use the -g/--git option to generate diffs in the git extended diff |
|
1732 | 1732 | format. See :hg:`help diffs` for more information. |
|
1733 | 1733 | |
|
1734 | 1734 | With the --switch-parent option, the diff will be against the |
|
1735 | 1735 | second parent. It can be useful to review a merge. |
|
1736 | 1736 | |
|
1737 | 1737 | Returns 0 on success. |
|
1738 | 1738 | """ |
|
1739 | 1739 | changesets += tuple(opts.get('rev', [])) |
|
1740 | 1740 | if not changesets: |
|
1741 | 1741 | raise util.Abort(_("export requires at least one changeset")) |
|
1742 | 1742 | revs = cmdutil.revrange(repo, changesets) |
|
1743 | 1743 | if len(revs) > 1: |
|
1744 | 1744 | ui.note(_('exporting patches:\n')) |
|
1745 | 1745 | else: |
|
1746 | 1746 | ui.note(_('exporting patch:\n')) |
|
1747 | 1747 | cmdutil.export(repo, revs, template=opts.get('output'), |
|
1748 | 1748 | switch_parent=opts.get('switch_parent'), |
|
1749 | 1749 | opts=patch.diffopts(ui, opts)) |
|
1750 | 1750 | |
|
1751 | 1751 | def forget(ui, repo, *pats, **opts): |
|
1752 | 1752 | """forget the specified files on the next commit |
|
1753 | 1753 | |
|
1754 | 1754 | Mark the specified files so they will no longer be tracked |
|
1755 | 1755 | after the next commit. |
|
1756 | 1756 | |
|
1757 | 1757 | This only removes files from the current branch, not from the |
|
1758 | 1758 | entire project history, and it does not delete them from the |
|
1759 | 1759 | working directory. |
|
1760 | 1760 | |
|
1761 | 1761 | To undo a forget before the next commit, see :hg:`add`. |
|
1762 | 1762 | |
|
1763 | 1763 | Returns 0 on success. |
|
1764 | 1764 | """ |
|
1765 | 1765 | |
|
1766 | 1766 | if not pats: |
|
1767 | 1767 | raise util.Abort(_('no files specified')) |
|
1768 | 1768 | |
|
1769 | 1769 | m = cmdutil.match(repo, pats, opts) |
|
1770 | 1770 | s = repo.status(match=m, clean=True) |
|
1771 | 1771 | forget = sorted(s[0] + s[1] + s[3] + s[6]) |
|
1772 | 1772 | errs = 0 |
|
1773 | 1773 | |
|
1774 | 1774 | for f in m.files(): |
|
1775 | 1775 | if f not in repo.dirstate and not os.path.isdir(m.rel(f)): |
|
1776 | 1776 | ui.warn(_('not removing %s: file is already untracked\n') |
|
1777 | 1777 | % m.rel(f)) |
|
1778 | 1778 | errs = 1 |
|
1779 | 1779 | |
|
1780 | 1780 | for f in forget: |
|
1781 | 1781 | if ui.verbose or not m.exact(f): |
|
1782 | 1782 | ui.status(_('removing %s\n') % m.rel(f)) |
|
1783 | 1783 | |
|
1784 | 1784 | repo[None].remove(forget, unlink=False) |
|
1785 | 1785 | return errs |
|
1786 | 1786 | |
|
1787 | 1787 | def grep(ui, repo, pattern, *pats, **opts): |
|
1788 | 1788 | """search for a pattern in specified files and revisions |
|
1789 | 1789 | |
|
1790 | 1790 | Search revisions of files for a regular expression. |
|
1791 | 1791 | |
|
1792 | 1792 | This command behaves differently than Unix grep. It only accepts |
|
1793 | 1793 | Python/Perl regexps. It searches repository history, not the |
|
1794 | 1794 | working directory. It always prints the revision number in which a |
|
1795 | 1795 | match appears. |
|
1796 | 1796 | |
|
1797 | 1797 | By default, grep only prints output for the first revision of a |
|
1798 | 1798 | file in which it finds a match. To get it to print every revision |
|
1799 | 1799 | that contains a change in match status ("-" for a match that |
|
1800 | 1800 | becomes a non-match, or "+" for a non-match that becomes a match), |
|
1801 | 1801 | use the --all flag. |
|
1802 | 1802 | |
|
1803 | 1803 | Returns 0 if a match is found, 1 otherwise. |
|
1804 | 1804 | """ |
|
1805 | 1805 | reflags = 0 |
|
1806 | 1806 | if opts.get('ignore_case'): |
|
1807 | 1807 | reflags |= re.I |
|
1808 | 1808 | try: |
|
1809 | 1809 | regexp = re.compile(pattern, reflags) |
|
1810 | 1810 | except re.error, inst: |
|
1811 | 1811 | ui.warn(_("grep: invalid match pattern: %s\n") % inst) |
|
1812 | 1812 | return 1 |
|
1813 | 1813 | sep, eol = ':', '\n' |
|
1814 | 1814 | if opts.get('print0'): |
|
1815 | 1815 | sep = eol = '\0' |
|
1816 | 1816 | |
|
1817 | 1817 | getfile = util.lrucachefunc(repo.file) |
|
1818 | 1818 | |
|
1819 | 1819 | def matchlines(body): |
|
1820 | 1820 | begin = 0 |
|
1821 | 1821 | linenum = 0 |
|
1822 | 1822 | while True: |
|
1823 | 1823 | match = regexp.search(body, begin) |
|
1824 | 1824 | if not match: |
|
1825 | 1825 | break |
|
1826 | 1826 | mstart, mend = match.span() |
|
1827 | 1827 | linenum += body.count('\n', begin, mstart) + 1 |
|
1828 | 1828 | lstart = body.rfind('\n', begin, mstart) + 1 or begin |
|
1829 | 1829 | begin = body.find('\n', mend) + 1 or len(body) |
|
1830 | 1830 | lend = begin - 1 |
|
1831 | 1831 | yield linenum, mstart - lstart, mend - lstart, body[lstart:lend] |
|
1832 | 1832 | |
|
1833 | 1833 | class linestate(object): |
|
1834 | 1834 | def __init__(self, line, linenum, colstart, colend): |
|
1835 | 1835 | self.line = line |
|
1836 | 1836 | self.linenum = linenum |
|
1837 | 1837 | self.colstart = colstart |
|
1838 | 1838 | self.colend = colend |
|
1839 | 1839 | |
|
1840 | 1840 | def __hash__(self): |
|
1841 | 1841 | return hash((self.linenum, self.line)) |
|
1842 | 1842 | |
|
1843 | 1843 | def __eq__(self, other): |
|
1844 | 1844 | return self.line == other.line |
|
1845 | 1845 | |
|
1846 | 1846 | matches = {} |
|
1847 | 1847 | copies = {} |
|
1848 | 1848 | def grepbody(fn, rev, body): |
|
1849 | 1849 | matches[rev].setdefault(fn, []) |
|
1850 | 1850 | m = matches[rev][fn] |
|
1851 | 1851 | for lnum, cstart, cend, line in matchlines(body): |
|
1852 | 1852 | s = linestate(line, lnum, cstart, cend) |
|
1853 | 1853 | m.append(s) |
|
1854 | 1854 | |
|
1855 | 1855 | def difflinestates(a, b): |
|
1856 | 1856 | sm = difflib.SequenceMatcher(None, a, b) |
|
1857 | 1857 | for tag, alo, ahi, blo, bhi in sm.get_opcodes(): |
|
1858 | 1858 | if tag == 'insert': |
|
1859 | 1859 | for i in xrange(blo, bhi): |
|
1860 | 1860 | yield ('+', b[i]) |
|
1861 | 1861 | elif tag == 'delete': |
|
1862 | 1862 | for i in xrange(alo, ahi): |
|
1863 | 1863 | yield ('-', a[i]) |
|
1864 | 1864 | elif tag == 'replace': |
|
1865 | 1865 | for i in xrange(alo, ahi): |
|
1866 | 1866 | yield ('-', a[i]) |
|
1867 | 1867 | for i in xrange(blo, bhi): |
|
1868 | 1868 | yield ('+', b[i]) |
|
1869 | 1869 | |
|
1870 | 1870 | def display(fn, ctx, pstates, states): |
|
1871 | 1871 | rev = ctx.rev() |
|
1872 | 1872 | datefunc = ui.quiet and util.shortdate or util.datestr |
|
1873 | 1873 | found = False |
|
1874 | 1874 | filerevmatches = {} |
|
1875 | 1875 | def binary(): |
|
1876 | 1876 | flog = getfile(fn) |
|
1877 | 1877 | return util.binary(flog.read(ctx.filenode(fn))) |
|
1878 | 1878 | |
|
1879 | 1879 | if opts.get('all'): |
|
1880 | 1880 | iter = difflinestates(pstates, states) |
|
1881 | 1881 | else: |
|
1882 | 1882 | iter = [('', l) for l in states] |
|
1883 | 1883 | for change, l in iter: |
|
1884 | 1884 | cols = [fn, str(rev)] |
|
1885 | 1885 | before, match, after = None, None, None |
|
1886 | 1886 | if opts.get('line_number'): |
|
1887 | 1887 | cols.append(str(l.linenum)) |
|
1888 | 1888 | if opts.get('all'): |
|
1889 | 1889 | cols.append(change) |
|
1890 | 1890 | if opts.get('user'): |
|
1891 | 1891 | cols.append(ui.shortuser(ctx.user())) |
|
1892 | 1892 | if opts.get('date'): |
|
1893 | 1893 | cols.append(datefunc(ctx.date())) |
|
1894 | 1894 | if opts.get('files_with_matches'): |
|
1895 | 1895 | c = (fn, rev) |
|
1896 | 1896 | if c in filerevmatches: |
|
1897 | 1897 | continue |
|
1898 | 1898 | filerevmatches[c] = 1 |
|
1899 | 1899 | else: |
|
1900 | 1900 | before = l.line[:l.colstart] |
|
1901 | 1901 | match = l.line[l.colstart:l.colend] |
|
1902 | 1902 | after = l.line[l.colend:] |
|
1903 | 1903 | ui.write(sep.join(cols)) |
|
1904 | 1904 | if before is not None: |
|
1905 | 1905 | if not opts.get('text') and binary(): |
|
1906 | 1906 | ui.write(sep + " Binary file matches") |
|
1907 | 1907 | else: |
|
1908 | 1908 | ui.write(sep + before) |
|
1909 | 1909 | ui.write(match, label='grep.match') |
|
1910 | 1910 | ui.write(after) |
|
1911 | 1911 | ui.write(eol) |
|
1912 | 1912 | found = True |
|
1913 | 1913 | return found |
|
1914 | 1914 | |
|
1915 | 1915 | skip = {} |
|
1916 | 1916 | revfiles = {} |
|
1917 | 1917 | matchfn = cmdutil.match(repo, pats, opts) |
|
1918 | 1918 | found = False |
|
1919 | 1919 | follow = opts.get('follow') |
|
1920 | 1920 | |
|
1921 | 1921 | def prep(ctx, fns): |
|
1922 | 1922 | rev = ctx.rev() |
|
1923 | 1923 | pctx = ctx.p1() |
|
1924 | 1924 | parent = pctx.rev() |
|
1925 | 1925 | matches.setdefault(rev, {}) |
|
1926 | 1926 | matches.setdefault(parent, {}) |
|
1927 | 1927 | files = revfiles.setdefault(rev, []) |
|
1928 | 1928 | for fn in fns: |
|
1929 | 1929 | flog = getfile(fn) |
|
1930 | 1930 | try: |
|
1931 | 1931 | fnode = ctx.filenode(fn) |
|
1932 | 1932 | except error.LookupError: |
|
1933 | 1933 | continue |
|
1934 | 1934 | |
|
1935 | 1935 | copied = flog.renamed(fnode) |
|
1936 | 1936 | copy = follow and copied and copied[0] |
|
1937 | 1937 | if copy: |
|
1938 | 1938 | copies.setdefault(rev, {})[fn] = copy |
|
1939 | 1939 | if fn in skip: |
|
1940 | 1940 | if copy: |
|
1941 | 1941 | skip[copy] = True |
|
1942 | 1942 | continue |
|
1943 | 1943 | files.append(fn) |
|
1944 | 1944 | |
|
1945 | 1945 | if fn not in matches[rev]: |
|
1946 | 1946 | grepbody(fn, rev, flog.read(fnode)) |
|
1947 | 1947 | |
|
1948 | 1948 | pfn = copy or fn |
|
1949 | 1949 | if pfn not in matches[parent]: |
|
1950 | 1950 | try: |
|
1951 | 1951 | fnode = pctx.filenode(pfn) |
|
1952 | 1952 | grepbody(pfn, parent, flog.read(fnode)) |
|
1953 | 1953 | except error.LookupError: |
|
1954 | 1954 | pass |
|
1955 | 1955 | |
|
1956 | 1956 | for ctx in cmdutil.walkchangerevs(repo, matchfn, opts, prep): |
|
1957 | 1957 | rev = ctx.rev() |
|
1958 | 1958 | parent = ctx.p1().rev() |
|
1959 | 1959 | for fn in sorted(revfiles.get(rev, [])): |
|
1960 | 1960 | states = matches[rev][fn] |
|
1961 | 1961 | copy = copies.get(rev, {}).get(fn) |
|
1962 | 1962 | if fn in skip: |
|
1963 | 1963 | if copy: |
|
1964 | 1964 | skip[copy] = True |
|
1965 | 1965 | continue |
|
1966 | 1966 | pstates = matches.get(parent, {}).get(copy or fn, []) |
|
1967 | 1967 | if pstates or states: |
|
1968 | 1968 | r = display(fn, ctx, pstates, states) |
|
1969 | 1969 | found = found or r |
|
1970 | 1970 | if r and not opts.get('all'): |
|
1971 | 1971 | skip[fn] = True |
|
1972 | 1972 | if copy: |
|
1973 | 1973 | skip[copy] = True |
|
1974 | 1974 | del matches[rev] |
|
1975 | 1975 | del revfiles[rev] |
|
1976 | 1976 | |
|
1977 | 1977 | return not found |
|
1978 | 1978 | |
|
1979 | 1979 | def heads(ui, repo, *branchrevs, **opts): |
|
1980 | 1980 | """show current repository heads or show branch heads |
|
1981 | 1981 | |
|
1982 | 1982 | With no arguments, show all repository branch heads. |
|
1983 | 1983 | |
|
1984 | 1984 | Repository "heads" are changesets with no child changesets. They are |
|
1985 | 1985 | where development generally takes place and are the usual targets |
|
1986 | 1986 | for update and merge operations. Branch heads are changesets that have |
|
1987 | 1987 | no child changeset on the same branch. |
|
1988 | 1988 | |
|
1989 | 1989 | If one or more REVs are given, only branch heads on the branches |
|
1990 | 1990 | associated with the specified changesets are shown. |
|
1991 | 1991 | |
|
1992 | 1992 | If -c/--closed is specified, also show branch heads marked closed |
|
1993 | 1993 | (see :hg:`commit --close-branch`). |
|
1994 | 1994 | |
|
1995 | 1995 | If STARTREV is specified, only those heads that are descendants of |
|
1996 | 1996 | STARTREV will be displayed. |
|
1997 | 1997 | |
|
1998 | 1998 | If -t/--topo is specified, named branch mechanics will be ignored and only |
|
1999 | 1999 | changesets without children will be shown. |
|
2000 | 2000 | |
|
2001 | 2001 | Returns 0 if matching heads are found, 1 if not. |
|
2002 | 2002 | """ |
|
2003 | 2003 | |
|
2004 | 2004 | start = None |
|
2005 | 2005 | if 'rev' in opts: |
|
2006 | 2006 | start = cmdutil.revsingle(repo, opts['rev'], None).node() |
|
2007 | 2007 | |
|
2008 | 2008 | if opts.get('topo'): |
|
2009 | 2009 | heads = [repo[h] for h in repo.heads(start)] |
|
2010 | 2010 | else: |
|
2011 | 2011 | heads = [] |
|
2012 | 2012 | for b, ls in repo.branchmap().iteritems(): |
|
2013 | 2013 | if start is None: |
|
2014 | 2014 | heads += [repo[h] for h in ls] |
|
2015 | 2015 | continue |
|
2016 | 2016 | startrev = repo.changelog.rev(start) |
|
2017 | 2017 | descendants = set(repo.changelog.descendants(startrev)) |
|
2018 | 2018 | descendants.add(startrev) |
|
2019 | 2019 | rev = repo.changelog.rev |
|
2020 | 2020 | heads += [repo[h] for h in ls if rev(h) in descendants] |
|
2021 | 2021 | |
|
2022 | 2022 | if branchrevs: |
|
2023 | 2023 | branches = set(repo[br].branch() for br in branchrevs) |
|
2024 | 2024 | heads = [h for h in heads if h.branch() in branches] |
|
2025 | 2025 | |
|
2026 | 2026 | if not opts.get('closed'): |
|
2027 | 2027 | heads = [h for h in heads if not h.extra().get('close')] |
|
2028 | 2028 | |
|
2029 | 2029 | if opts.get('active') and branchrevs: |
|
2030 | 2030 | dagheads = repo.heads(start) |
|
2031 | 2031 | heads = [h for h in heads if h.node() in dagheads] |
|
2032 | 2032 | |
|
2033 | 2033 | if branchrevs: |
|
2034 | 2034 | haveheads = set(h.branch() for h in heads) |
|
2035 | 2035 | if branches - haveheads: |
|
2036 | 2036 | headless = ', '.join(b for b in branches - haveheads) |
|
2037 | 2037 | msg = _('no open branch heads found on branches %s') |
|
2038 | 2038 | if opts.get('rev'): |
|
2039 | 2039 | msg += _(' (started at %s)' % opts['rev']) |
|
2040 | 2040 | ui.warn((msg + '\n') % headless) |
|
2041 | 2041 | |
|
2042 | 2042 | if not heads: |
|
2043 | 2043 | return 1 |
|
2044 | 2044 | |
|
2045 | 2045 | heads = sorted(heads, key=lambda x: -x.rev()) |
|
2046 | 2046 | displayer = cmdutil.show_changeset(ui, repo, opts) |
|
2047 | 2047 | for ctx in heads: |
|
2048 | 2048 | displayer.show(ctx) |
|
2049 | 2049 | displayer.close() |
|
2050 | 2050 | |
|
2051 | 2051 | def help_(ui, name=None, with_version=False, unknowncmd=False, full=True): |
|
2052 | 2052 | """show help for a given topic or a help overview |
|
2053 | 2053 | |
|
2054 | 2054 | With no arguments, print a list of commands with short help messages. |
|
2055 | 2055 | |
|
2056 | 2056 | Given a topic, extension, or command name, print help for that |
|
2057 | 2057 | topic. |
|
2058 | 2058 | |
|
2059 | 2059 | Returns 0 if successful. |
|
2060 | 2060 | """ |
|
2061 | 2061 | option_lists = [] |
|
2062 | 2062 | textwidth = min(ui.termwidth(), 80) - 2 |
|
2063 | 2063 | |
|
2064 | 2064 | def addglobalopts(aliases): |
|
2065 | 2065 | if ui.verbose: |
|
2066 | 2066 | option_lists.append((_("global options:"), globalopts)) |
|
2067 | 2067 | if name == 'shortlist': |
|
2068 | 2068 | option_lists.append((_('use "hg help" for the full list ' |
|
2069 | 2069 | 'of commands'), ())) |
|
2070 | 2070 | else: |
|
2071 | 2071 | if name == 'shortlist': |
|
2072 | 2072 | msg = _('use "hg help" for the full list of commands ' |
|
2073 | 2073 | 'or "hg -v" for details') |
|
2074 | 2074 | elif name and not full: |
|
2075 | 2075 | msg = _('use "hg help %s" to show the full help text' % name) |
|
2076 | 2076 | elif aliases: |
|
2077 | 2077 | msg = _('use "hg -v help%s" to show builtin aliases and ' |
|
2078 | 2078 | 'global options') % (name and " " + name or "") |
|
2079 | 2079 | else: |
|
2080 | 2080 | msg = _('use "hg -v help %s" to show global options') % name |
|
2081 | 2081 | option_lists.append((msg, ())) |
|
2082 | 2082 | |
|
2083 | 2083 | def helpcmd(name): |
|
2084 | 2084 | if with_version: |
|
2085 | 2085 | version_(ui) |
|
2086 | 2086 | ui.write('\n') |
|
2087 | 2087 | |
|
2088 | 2088 | try: |
|
2089 | 2089 | aliases, entry = cmdutil.findcmd(name, table, strict=unknowncmd) |
|
2090 | 2090 | except error.AmbiguousCommand, inst: |
|
2091 | 2091 | # py3k fix: except vars can't be used outside the scope of the |
|
2092 | 2092 | # except block, nor can be used inside a lambda. python issue4617 |
|
2093 | 2093 | prefix = inst.args[0] |
|
2094 | 2094 | select = lambda c: c.lstrip('^').startswith(prefix) |
|
2095 | 2095 | helplist(_('list of commands:\n\n'), select) |
|
2096 | 2096 | return |
|
2097 | 2097 | |
|
2098 | 2098 | # check if it's an invalid alias and display its error if it is |
|
2099 | 2099 | if getattr(entry[0], 'badalias', False): |
|
2100 | 2100 | if not unknowncmd: |
|
2101 | 2101 | entry[0](ui) |
|
2102 | 2102 | return |
|
2103 | 2103 | |
|
2104 | 2104 | # synopsis |
|
2105 | 2105 | if len(entry) > 2: |
|
2106 | 2106 | if entry[2].startswith('hg'): |
|
2107 | 2107 | ui.write("%s\n" % entry[2]) |
|
2108 | 2108 | else: |
|
2109 | 2109 | ui.write('hg %s %s\n' % (aliases[0], entry[2])) |
|
2110 | 2110 | else: |
|
2111 | 2111 | ui.write('hg %s\n' % aliases[0]) |
|
2112 | 2112 | |
|
2113 | 2113 | # aliases |
|
2114 | 2114 | if full and not ui.quiet and len(aliases) > 1: |
|
2115 | 2115 | ui.write(_("\naliases: %s\n") % ', '.join(aliases[1:])) |
|
2116 | 2116 | |
|
2117 | 2117 | # description |
|
2118 | 2118 | doc = gettext(entry[0].__doc__) |
|
2119 | 2119 | if not doc: |
|
2120 | 2120 | doc = _("(no help text available)") |
|
2121 | 2121 | if hasattr(entry[0], 'definition'): # aliased command |
|
2122 | 2122 | if entry[0].definition.startswith('!'): # shell alias |
|
2123 | 2123 | doc = _('shell alias for::\n\n %s') % entry[0].definition[1:] |
|
2124 | 2124 | else: |
|
2125 | 2125 | doc = _('alias for: hg %s\n\n%s') % (entry[0].definition, doc) |
|
2126 | 2126 | if ui.quiet or not full: |
|
2127 | 2127 | doc = doc.splitlines()[0] |
|
2128 | 2128 | keep = ui.verbose and ['verbose'] or [] |
|
2129 | 2129 | formatted, pruned = minirst.format(doc, textwidth, keep=keep) |
|
2130 | 2130 | ui.write("\n%s\n" % formatted) |
|
2131 | 2131 | if pruned: |
|
2132 | 2132 | ui.write(_('\nuse "hg -v help %s" to show verbose help\n') % name) |
|
2133 | 2133 | |
|
2134 | 2134 | if not ui.quiet: |
|
2135 | 2135 | # options |
|
2136 | 2136 | if entry[1]: |
|
2137 | 2137 | option_lists.append((_("options:\n"), entry[1])) |
|
2138 | 2138 | |
|
2139 | 2139 | addglobalopts(False) |
|
2140 | 2140 | |
|
2141 | 2141 | def helplist(header, select=None): |
|
2142 | 2142 | h = {} |
|
2143 | 2143 | cmds = {} |
|
2144 | 2144 | for c, e in table.iteritems(): |
|
2145 | 2145 | f = c.split("|", 1)[0] |
|
2146 | 2146 | if select and not select(f): |
|
2147 | 2147 | continue |
|
2148 | 2148 | if (not select and name != 'shortlist' and |
|
2149 | 2149 | e[0].__module__ != __name__): |
|
2150 | 2150 | continue |
|
2151 | 2151 | if name == "shortlist" and not f.startswith("^"): |
|
2152 | 2152 | continue |
|
2153 | 2153 | f = f.lstrip("^") |
|
2154 | 2154 | if not ui.debugflag and f.startswith("debug"): |
|
2155 | 2155 | continue |
|
2156 | 2156 | doc = e[0].__doc__ |
|
2157 | 2157 | if doc and 'DEPRECATED' in doc and not ui.verbose: |
|
2158 | 2158 | continue |
|
2159 | 2159 | doc = gettext(doc) |
|
2160 | 2160 | if not doc: |
|
2161 | 2161 | doc = _("(no help text available)") |
|
2162 | 2162 | h[f] = doc.splitlines()[0].rstrip() |
|
2163 | 2163 | cmds[f] = c.lstrip("^") |
|
2164 | 2164 | |
|
2165 | 2165 | if not h: |
|
2166 | 2166 | ui.status(_('no commands defined\n')) |
|
2167 | 2167 | return |
|
2168 | 2168 | |
|
2169 | 2169 | ui.status(header) |
|
2170 | 2170 | fns = sorted(h) |
|
2171 | 2171 | m = max(map(len, fns)) |
|
2172 | 2172 | for f in fns: |
|
2173 | 2173 | if ui.verbose: |
|
2174 | 2174 | commands = cmds[f].replace("|",", ") |
|
2175 | 2175 | ui.write(" %s:\n %s\n"%(commands, h[f])) |
|
2176 | 2176 | else: |
|
2177 | 2177 | ui.write('%s\n' % (util.wrap(h[f], textwidth, |
|
2178 | 2178 | initindent=' %-*s ' % (m, f), |
|
2179 | 2179 | hangindent=' ' * (m + 4)))) |
|
2180 | 2180 | |
|
2181 | 2181 | if not ui.quiet: |
|
2182 | 2182 | addglobalopts(True) |
|
2183 | 2183 | |
|
2184 | 2184 | def helptopic(name): |
|
2185 | 2185 | for names, header, doc in help.helptable: |
|
2186 | 2186 | if name in names: |
|
2187 | 2187 | break |
|
2188 | 2188 | else: |
|
2189 | 2189 | raise error.UnknownCommand(name) |
|
2190 | 2190 | |
|
2191 | 2191 | # description |
|
2192 | 2192 | if not doc: |
|
2193 | 2193 | doc = _("(no help text available)") |
|
2194 | 2194 | if hasattr(doc, '__call__'): |
|
2195 | 2195 | doc = doc() |
|
2196 | 2196 | |
|
2197 | 2197 | ui.write("%s\n\n" % header) |
|
2198 | 2198 | ui.write("%s\n" % minirst.format(doc, textwidth, indent=4)) |
|
2199 | 2199 | |
|
2200 | 2200 | def helpext(name): |
|
2201 | 2201 | try: |
|
2202 | 2202 | mod = extensions.find(name) |
|
2203 | 2203 | doc = gettext(mod.__doc__) or _('no help text available') |
|
2204 | 2204 | except KeyError: |
|
2205 | 2205 | mod = None |
|
2206 | 2206 | doc = extensions.disabledext(name) |
|
2207 | 2207 | if not doc: |
|
2208 | 2208 | raise error.UnknownCommand(name) |
|
2209 | 2209 | |
|
2210 | 2210 | if '\n' not in doc: |
|
2211 | 2211 | head, tail = doc, "" |
|
2212 | 2212 | else: |
|
2213 | 2213 | head, tail = doc.split('\n', 1) |
|
2214 | 2214 | ui.write(_('%s extension - %s\n\n') % (name.split('.')[-1], head)) |
|
2215 | 2215 | if tail: |
|
2216 | 2216 | ui.write(minirst.format(tail, textwidth)) |
|
2217 | 2217 | ui.status('\n\n') |
|
2218 | 2218 | |
|
2219 | 2219 | if mod: |
|
2220 | 2220 | try: |
|
2221 | 2221 | ct = mod.cmdtable |
|
2222 | 2222 | except AttributeError: |
|
2223 | 2223 | ct = {} |
|
2224 | 2224 | modcmds = set([c.split('|', 1)[0] for c in ct]) |
|
2225 | 2225 | helplist(_('list of commands:\n\n'), modcmds.__contains__) |
|
2226 | 2226 | else: |
|
2227 | 2227 | ui.write(_('use "hg help extensions" for information on enabling ' |
|
2228 | 2228 | 'extensions\n')) |
|
2229 | 2229 | |
|
2230 | 2230 | def helpextcmd(name): |
|
2231 | 2231 | cmd, ext, mod = extensions.disabledcmd(ui, name, ui.config('ui', 'strict')) |
|
2232 | 2232 | doc = gettext(mod.__doc__).splitlines()[0] |
|
2233 | 2233 | |
|
2234 | 2234 | msg = help.listexts(_("'%s' is provided by the following " |
|
2235 | 2235 | "extension:") % cmd, {ext: doc}, len(ext), |
|
2236 | 2236 | indent=4) |
|
2237 | 2237 | ui.write(minirst.format(msg, textwidth)) |
|
2238 | 2238 | ui.write('\n\n') |
|
2239 | 2239 | ui.write(_('use "hg help extensions" for information on enabling ' |
|
2240 | 2240 | 'extensions\n')) |
|
2241 | 2241 | |
|
2242 | 2242 | help.addtopichook('revsets', revset.makedoc) |
|
2243 | 2243 | help.addtopichook('templates', templatekw.makedoc) |
|
2244 | 2244 | help.addtopichook('templates', templatefilters.makedoc) |
|
2245 | 2245 | |
|
2246 | 2246 | if name and name != 'shortlist': |
|
2247 | 2247 | i = None |
|
2248 | 2248 | if unknowncmd: |
|
2249 | 2249 | queries = (helpextcmd,) |
|
2250 | 2250 | else: |
|
2251 | 2251 | queries = (helptopic, helpcmd, helpext, helpextcmd) |
|
2252 | 2252 | for f in queries: |
|
2253 | 2253 | try: |
|
2254 | 2254 | f(name) |
|
2255 | 2255 | i = None |
|
2256 | 2256 | break |
|
2257 | 2257 | except error.UnknownCommand, inst: |
|
2258 | 2258 | i = inst |
|
2259 | 2259 | if i: |
|
2260 | 2260 | raise i |
|
2261 | 2261 | |
|
2262 | 2262 | else: |
|
2263 | 2263 | # program name |
|
2264 | 2264 | if ui.verbose or with_version: |
|
2265 | 2265 | version_(ui) |
|
2266 | 2266 | else: |
|
2267 | 2267 | ui.status(_("Mercurial Distributed SCM\n")) |
|
2268 | 2268 | ui.status('\n') |
|
2269 | 2269 | |
|
2270 | 2270 | # list of commands |
|
2271 | 2271 | if name == "shortlist": |
|
2272 | 2272 | header = _('basic commands:\n\n') |
|
2273 | 2273 | else: |
|
2274 | 2274 | header = _('list of commands:\n\n') |
|
2275 | 2275 | |
|
2276 | 2276 | helplist(header) |
|
2277 | 2277 | if name != 'shortlist': |
|
2278 | 2278 | exts, maxlength = extensions.enabled() |
|
2279 | 2279 | text = help.listexts(_('enabled extensions:'), exts, maxlength) |
|
2280 | 2280 | if text: |
|
2281 | 2281 | ui.write("\n%s\n" % minirst.format(text, textwidth)) |
|
2282 | 2282 | |
|
2283 | 2283 | # list all option lists |
|
2284 | 2284 | opt_output = [] |
|
2285 | 2285 | multioccur = False |
|
2286 | 2286 | for title, options in option_lists: |
|
2287 | 2287 | opt_output.append(("\n%s" % title, None)) |
|
2288 | 2288 | for option in options: |
|
2289 | 2289 | if len(option) == 5: |
|
2290 | 2290 | shortopt, longopt, default, desc, optlabel = option |
|
2291 | 2291 | else: |
|
2292 | 2292 | shortopt, longopt, default, desc = option |
|
2293 | 2293 | optlabel = _("VALUE") # default label |
|
2294 | 2294 | |
|
2295 | 2295 | if _("DEPRECATED") in desc and not ui.verbose: |
|
2296 | 2296 | continue |
|
2297 | 2297 | if isinstance(default, list): |
|
2298 | 2298 | numqualifier = " %s [+]" % optlabel |
|
2299 | 2299 | multioccur = True |
|
2300 | 2300 | elif (default is not None) and not isinstance(default, bool): |
|
2301 | 2301 | numqualifier = " %s" % optlabel |
|
2302 | 2302 | else: |
|
2303 | 2303 | numqualifier = "" |
|
2304 | 2304 | opt_output.append(("%2s%s" % |
|
2305 | 2305 | (shortopt and "-%s" % shortopt, |
|
2306 | 2306 | longopt and " --%s%s" % |
|
2307 | 2307 | (longopt, numqualifier)), |
|
2308 | 2308 | "%s%s" % (desc, |
|
2309 | 2309 | default |
|
2310 | 2310 | and _(" (default: %s)") % default |
|
2311 | 2311 | or ""))) |
|
2312 | 2312 | if multioccur: |
|
2313 | 2313 | msg = _("\n[+] marked option can be specified multiple times") |
|
2314 | 2314 | if ui.verbose and name != 'shortlist': |
|
2315 | 2315 | opt_output.append((msg, None)) |
|
2316 | 2316 | else: |
|
2317 | 2317 | opt_output.insert(-1, (msg, None)) |
|
2318 | 2318 | |
|
2319 | 2319 | if not name: |
|
2320 | 2320 | ui.write(_("\nadditional help topics:\n\n")) |
|
2321 | 2321 | topics = [] |
|
2322 | 2322 | for names, header, doc in help.helptable: |
|
2323 | 2323 | topics.append((sorted(names, key=len, reverse=True)[0], header)) |
|
2324 | 2324 | topics_len = max([len(s[0]) for s in topics]) |
|
2325 | 2325 | for t, desc in topics: |
|
2326 | 2326 | ui.write(" %-*s %s\n" % (topics_len, t, desc)) |
|
2327 | 2327 | |
|
2328 | 2328 | if opt_output: |
|
2329 | 2329 | colwidth = encoding.colwidth |
|
2330 | 2330 | # normalize: (opt or message, desc or None, width of opt) |
|
2331 | 2331 | entries = [desc and (opt, desc, colwidth(opt)) or (opt, None, 0) |
|
2332 | 2332 | for opt, desc in opt_output] |
|
2333 | 2333 | hanging = max([e[2] for e in entries]) |
|
2334 | 2334 | for opt, desc, width in entries: |
|
2335 | 2335 | if desc: |
|
2336 | 2336 | initindent = ' %s%s ' % (opt, ' ' * (hanging - width)) |
|
2337 | 2337 | hangindent = ' ' * (hanging + 3) |
|
2338 | 2338 | ui.write('%s\n' % (util.wrap(desc, textwidth, |
|
2339 | 2339 | initindent=initindent, |
|
2340 | 2340 | hangindent=hangindent))) |
|
2341 | 2341 | else: |
|
2342 | 2342 | ui.write("%s\n" % opt) |
|
2343 | 2343 | |
|
2344 | 2344 | def identify(ui, repo, source=None, rev=None, |
|
2345 | 2345 | num=None, id=None, branch=None, tags=None, bookmarks=None): |
|
2346 | 2346 | """identify the working copy or specified revision |
|
2347 | 2347 | |
|
2348 | 2348 | Print a summary identifying the repository state at REV using one or |
|
2349 | 2349 | two parent hash identifiers, followed by a "+" if the working |
|
2350 | 2350 | directory has uncommitted changes, the branch name (if not default), |
|
2351 | 2351 | a list of tags, and a list of bookmarks. |
|
2352 | 2352 | |
|
2353 | 2353 | When REV is not given, print a summary of the current state of the |
|
2354 | 2354 | repository. |
|
2355 | 2355 | |
|
2356 | 2356 | Specifying a path to a repository root or Mercurial bundle will |
|
2357 | 2357 | cause lookup to operate on that repository/bundle. |
|
2358 | 2358 | |
|
2359 | 2359 | Returns 0 if successful. |
|
2360 | 2360 | """ |
|
2361 | 2361 | |
|
2362 | 2362 | if not repo and not source: |
|
2363 | 2363 | raise util.Abort(_("there is no Mercurial repository here " |
|
2364 | 2364 | "(.hg not found)")) |
|
2365 | 2365 | |
|
2366 | 2366 | hexfunc = ui.debugflag and hex or short |
|
2367 | 2367 | default = not (num or id or branch or tags or bookmarks) |
|
2368 | 2368 | output = [] |
|
2369 | 2369 | revs = [] |
|
2370 | 2370 | |
|
2371 | 2371 | if source: |
|
2372 | 2372 | source, branches = hg.parseurl(ui.expandpath(source)) |
|
2373 | 2373 | repo = hg.repository(ui, source) |
|
2374 | 2374 | revs, checkout = hg.addbranchrevs(repo, repo, branches, None) |
|
2375 | 2375 | |
|
2376 | 2376 | if not repo.local(): |
|
2377 | 2377 | if num or branch or tags: |
|
2378 | 2378 | raise util.Abort( |
|
2379 | 2379 | _("can't query remote revision number, branch, or tags")) |
|
2380 | 2380 | if not rev and revs: |
|
2381 | 2381 | rev = revs[0] |
|
2382 | 2382 | if not rev: |
|
2383 | 2383 | rev = "tip" |
|
2384 | 2384 | |
|
2385 | 2385 | remoterev = repo.lookup(rev) |
|
2386 | 2386 | if default or id: |
|
2387 | 2387 | output = [hexfunc(remoterev)] |
|
2388 | 2388 | |
|
2389 | 2389 | def getbms(): |
|
2390 | 2390 | bms = [] |
|
2391 | 2391 | |
|
2392 | 2392 | if 'bookmarks' in repo.listkeys('namespaces'): |
|
2393 | 2393 | hexremoterev = hex(remoterev) |
|
2394 | 2394 | bms = [bm for bm, bmr in repo.listkeys('bookmarks').iteritems() |
|
2395 | 2395 | if bmr == hexremoterev] |
|
2396 | 2396 | |
|
2397 | 2397 | return bms |
|
2398 | 2398 | |
|
2399 | 2399 | if bookmarks: |
|
2400 | 2400 | output.extend(getbms()) |
|
2401 | 2401 | elif default and not ui.quiet: |
|
2402 | 2402 | # multiple bookmarks for a single parent separated by '/' |
|
2403 | 2403 | bm = '/'.join(getbms()) |
|
2404 | 2404 | if bm: |
|
2405 | 2405 | output.append(bm) |
|
2406 | 2406 | else: |
|
2407 | 2407 | if not rev: |
|
2408 | 2408 | ctx = repo[None] |
|
2409 | 2409 | parents = ctx.parents() |
|
2410 | 2410 | changed = "" |
|
2411 | 2411 | if default or id or num: |
|
2412 | 2412 | changed = util.any(repo.status()) and "+" or "" |
|
2413 | 2413 | if default or id: |
|
2414 | 2414 | output = ["%s%s" % |
|
2415 | 2415 | ('+'.join([hexfunc(p.node()) for p in parents]), changed)] |
|
2416 | 2416 | if num: |
|
2417 | 2417 | output.append("%s%s" % |
|
2418 | 2418 | ('+'.join([str(p.rev()) for p in parents]), changed)) |
|
2419 | 2419 | else: |
|
2420 | 2420 | ctx = cmdutil.revsingle(repo, rev) |
|
2421 | 2421 | if default or id: |
|
2422 | 2422 | output = [hexfunc(ctx.node())] |
|
2423 | 2423 | if num: |
|
2424 | 2424 | output.append(str(ctx.rev())) |
|
2425 | 2425 | |
|
2426 | 2426 | if default and not ui.quiet: |
|
2427 | 2427 | b = ctx.branch() |
|
2428 | 2428 | if b != 'default': |
|
2429 | 2429 | output.append("(%s)" % b) |
|
2430 | 2430 | |
|
2431 | 2431 | # multiple tags for a single parent separated by '/' |
|
2432 | 2432 | t = '/'.join(ctx.tags()) |
|
2433 | 2433 | if t: |
|
2434 | 2434 | output.append(t) |
|
2435 | 2435 | |
|
2436 | 2436 | # multiple bookmarks for a single parent separated by '/' |
|
2437 | 2437 | bm = '/'.join(ctx.bookmarks()) |
|
2438 | 2438 | if bm: |
|
2439 | 2439 | output.append(bm) |
|
2440 | 2440 | else: |
|
2441 | 2441 | if branch: |
|
2442 | 2442 | output.append(ctx.branch()) |
|
2443 | 2443 | |
|
2444 | 2444 | if tags: |
|
2445 | 2445 | output.extend(ctx.tags()) |
|
2446 | 2446 | |
|
2447 | 2447 | if bookmarks: |
|
2448 | 2448 | output.extend(ctx.bookmarks()) |
|
2449 | 2449 | |
|
2450 | 2450 | ui.write("%s\n" % ' '.join(output)) |
|
2451 | 2451 | |
|
2452 | 2452 | def import_(ui, repo, patch1, *patches, **opts): |
|
2453 | 2453 | """import an ordered set of patches |
|
2454 | 2454 | |
|
2455 | 2455 | Import a list of patches and commit them individually (unless |
|
2456 | 2456 | --no-commit is specified). |
|
2457 | 2457 | |
|
2458 | 2458 | If there are outstanding changes in the working directory, import |
|
2459 | 2459 | will abort unless given the -f/--force flag. |
|
2460 | 2460 | |
|
2461 | 2461 | You can import a patch straight from a mail message. Even patches |
|
2462 | 2462 | as attachments work (to use the body part, it must have type |
|
2463 | 2463 | text/plain or text/x-patch). From and Subject headers of email |
|
2464 | 2464 | message are used as default committer and commit message. All |
|
2465 | 2465 | text/plain body parts before first diff are added to commit |
|
2466 | 2466 | message. |
|
2467 | 2467 | |
|
2468 | 2468 | If the imported patch was generated by :hg:`export`, user and |
|
2469 | 2469 | description from patch override values from message headers and |
|
2470 | 2470 | body. Values given on command line with -m/--message and -u/--user |
|
2471 | 2471 | override these. |
|
2472 | 2472 | |
|
2473 | 2473 | If --exact is specified, import will set the working directory to |
|
2474 | 2474 | the parent of each patch before applying it, and will abort if the |
|
2475 | 2475 | resulting changeset has a different ID than the one recorded in |
|
2476 | 2476 | the patch. This may happen due to character set problems or other |
|
2477 | 2477 | deficiencies in the text patch format. |
|
2478 | 2478 | |
|
2479 | 2479 | With -s/--similarity, hg will attempt to discover renames and |
|
2480 | 2480 | copies in the patch in the same way as 'addremove'. |
|
2481 | 2481 | |
|
2482 | 2482 | To read a patch from standard input, use "-" as the patch name. If |
|
2483 | 2483 | a URL is specified, the patch will be downloaded from it. |
|
2484 | 2484 | See :hg:`help dates` for a list of formats valid for -d/--date. |
|
2485 | 2485 | |
|
2486 | 2486 | Returns 0 on success. |
|
2487 | 2487 | """ |
|
2488 | 2488 | patches = (patch1,) + patches |
|
2489 | 2489 | |
|
2490 | 2490 | date = opts.get('date') |
|
2491 | 2491 | if date: |
|
2492 | 2492 | opts['date'] = util.parsedate(date) |
|
2493 | 2493 | |
|
2494 | 2494 | try: |
|
2495 | 2495 | sim = float(opts.get('similarity') or 0) |
|
2496 | 2496 | except ValueError: |
|
2497 | 2497 | raise util.Abort(_('similarity must be a number')) |
|
2498 | 2498 | if sim < 0 or sim > 100: |
|
2499 | 2499 | raise util.Abort(_('similarity must be between 0 and 100')) |
|
2500 | 2500 | |
|
2501 | 2501 | if opts.get('exact') or not opts.get('force'): |
|
2502 | 2502 | cmdutil.bail_if_changed(repo) |
|
2503 | 2503 | |
|
2504 | 2504 | d = opts["base"] |
|
2505 | 2505 | strip = opts["strip"] |
|
2506 | 2506 | wlock = lock = None |
|
2507 | 2507 | msgs = [] |
|
2508 | 2508 | |
|
2509 | 2509 | def tryone(ui, hunk): |
|
2510 | 2510 | tmpname, message, user, date, branch, nodeid, p1, p2 = \ |
|
2511 | 2511 | patch.extract(ui, hunk) |
|
2512 | 2512 | |
|
2513 | 2513 | if not tmpname: |
|
2514 | 2514 | return None |
|
2515 | 2515 | commitid = _('to working directory') |
|
2516 | 2516 | |
|
2517 | 2517 | try: |
|
2518 | 2518 | cmdline_message = cmdutil.logmessage(opts) |
|
2519 | 2519 | if cmdline_message: |
|
2520 | 2520 | # pickup the cmdline msg |
|
2521 | 2521 | message = cmdline_message |
|
2522 | 2522 | elif message: |
|
2523 | 2523 | # pickup the patch msg |
|
2524 | 2524 | message = message.strip() |
|
2525 | 2525 | else: |
|
2526 | 2526 | # launch the editor |
|
2527 | 2527 | message = None |
|
2528 | 2528 | ui.debug('message:\n%s\n' % message) |
|
2529 | 2529 | |
|
2530 | 2530 | wp = repo.parents() |
|
2531 | 2531 | if opts.get('exact'): |
|
2532 | 2532 | if not nodeid or not p1: |
|
2533 | 2533 | raise util.Abort(_('not a Mercurial patch')) |
|
2534 | 2534 | p1 = repo.lookup(p1) |
|
2535 | 2535 | p2 = repo.lookup(p2 or hex(nullid)) |
|
2536 | 2536 | |
|
2537 | 2537 | if p1 != wp[0].node(): |
|
2538 | 2538 | hg.clean(repo, p1) |
|
2539 | 2539 | repo.dirstate.setparents(p1, p2) |
|
2540 | 2540 | elif p2: |
|
2541 | 2541 | try: |
|
2542 | 2542 | p1 = repo.lookup(p1) |
|
2543 | 2543 | p2 = repo.lookup(p2) |
|
2544 | 2544 | if p1 == wp[0].node(): |
|
2545 | 2545 | repo.dirstate.setparents(p1, p2) |
|
2546 | 2546 | except error.RepoError: |
|
2547 | 2547 | pass |
|
2548 | 2548 | if opts.get('exact') or opts.get('import_branch'): |
|
2549 | 2549 | repo.dirstate.setbranch(branch or 'default') |
|
2550 | 2550 | |
|
2551 | 2551 | files = {} |
|
2552 | 2552 | try: |
|
2553 | 2553 | patch.patch(tmpname, ui, strip=strip, cwd=repo.root, |
|
2554 | 2554 | files=files, eolmode=None) |
|
2555 | 2555 | finally: |
|
2556 | 2556 | files = cmdutil.updatedir(ui, repo, files, |
|
2557 | 2557 | similarity=sim / 100.0) |
|
2558 | 2558 | if opts.get('no_commit'): |
|
2559 | 2559 | if message: |
|
2560 | 2560 | msgs.append(message) |
|
2561 | 2561 | else: |
|
2562 | 2562 | if opts.get('exact'): |
|
2563 | 2563 | m = None |
|
2564 | 2564 | else: |
|
2565 | 2565 | m = cmdutil.matchfiles(repo, files or []) |
|
2566 | 2566 | n = repo.commit(message, opts.get('user') or user, |
|
2567 | 2567 | opts.get('date') or date, match=m, |
|
2568 | 2568 | editor=cmdutil.commiteditor) |
|
2569 | 2569 | if opts.get('exact'): |
|
2570 | 2570 | if hex(n) != nodeid: |
|
2571 | 2571 | repo.rollback() |
|
2572 | 2572 | raise util.Abort(_('patch is damaged' |
|
2573 | 2573 | ' or loses information')) |
|
2574 | 2574 | # Force a dirstate write so that the next transaction |
|
2575 | 2575 | # backups an up-do-date file. |
|
2576 | 2576 | repo.dirstate.write() |
|
2577 | 2577 | if n: |
|
2578 | 2578 | commitid = short(n) |
|
2579 | 2579 | |
|
2580 | 2580 | return commitid |
|
2581 | 2581 | finally: |
|
2582 | 2582 | os.unlink(tmpname) |
|
2583 | 2583 | |
|
2584 | 2584 | try: |
|
2585 | 2585 | wlock = repo.wlock() |
|
2586 | 2586 | lock = repo.lock() |
|
2587 | 2587 | lastcommit = None |
|
2588 | 2588 | for p in patches: |
|
2589 | 2589 | pf = os.path.join(d, p) |
|
2590 | 2590 | |
|
2591 | 2591 | if pf == '-': |
|
2592 | 2592 | ui.status(_("applying patch from stdin\n")) |
|
2593 | 2593 | pf = sys.stdin |
|
2594 | 2594 | else: |
|
2595 | 2595 | ui.status(_("applying %s\n") % p) |
|
2596 | 2596 | pf = url.open(ui, pf) |
|
2597 | 2597 | |
|
2598 | 2598 | haspatch = False |
|
2599 | 2599 | for hunk in patch.split(pf): |
|
2600 | 2600 | commitid = tryone(ui, hunk) |
|
2601 | 2601 | if commitid: |
|
2602 | 2602 | haspatch = True |
|
2603 | 2603 | if lastcommit: |
|
2604 | 2604 | ui.status(_('applied %s\n') % lastcommit) |
|
2605 | 2605 | lastcommit = commitid |
|
2606 | 2606 | |
|
2607 | 2607 | if not haspatch: |
|
2608 | 2608 | raise util.Abort(_('no diffs found')) |
|
2609 | 2609 | |
|
2610 | 2610 | if msgs: |
|
2611 | 2611 | repo.opener('last-message.txt', 'wb').write('\n* * *\n'.join(msgs)) |
|
2612 | 2612 | finally: |
|
2613 | 2613 | release(lock, wlock) |
|
2614 | 2614 | |
|
2615 | 2615 | def incoming(ui, repo, source="default", **opts): |
|
2616 | 2616 | """show new changesets found in source |
|
2617 | 2617 | |
|
2618 | 2618 | Show new changesets found in the specified path/URL or the default |
|
2619 | 2619 | pull location. These are the changesets that would have been pulled |
|
2620 | 2620 | if a pull at the time you issued this command. |
|
2621 | 2621 | |
|
2622 | 2622 | For remote repository, using --bundle avoids downloading the |
|
2623 | 2623 | changesets twice if the incoming is followed by a pull. |
|
2624 | 2624 | |
|
2625 | 2625 | See pull for valid source format details. |
|
2626 | 2626 | |
|
2627 | 2627 | Returns 0 if there are incoming changes, 1 otherwise. |
|
2628 | 2628 | """ |
|
2629 | 2629 | if opts.get('bundle') and opts.get('subrepos'): |
|
2630 | 2630 | raise util.Abort(_('cannot combine --bundle and --subrepos')) |
|
2631 | 2631 | |
|
2632 | 2632 | if opts.get('bookmarks'): |
|
2633 | 2633 | source, branches = hg.parseurl(ui.expandpath(source), |
|
2634 | 2634 | opts.get('branch')) |
|
2635 | 2635 | other = hg.repository(hg.remoteui(repo, opts), source) |
|
2636 | 2636 | if 'bookmarks' not in other.listkeys('namespaces'): |
|
2637 | 2637 | ui.warn(_("remote doesn't support bookmarks\n")) |
|
2638 | 2638 | return 0 |
|
2639 | 2639 | ui.status(_('comparing with %s\n') % url.hidepassword(source)) |
|
2640 | 2640 | return bookmarks.diff(ui, repo, other) |
|
2641 | 2641 | |
|
2642 | 2642 | ret = hg.incoming(ui, repo, source, opts) |
|
2643 | 2643 | return ret |
|
2644 | 2644 | |
|
2645 | 2645 | def init(ui, dest=".", **opts): |
|
2646 | 2646 | """create a new repository in the given directory |
|
2647 | 2647 | |
|
2648 | 2648 | Initialize a new repository in the given directory. If the given |
|
2649 | 2649 | directory does not exist, it will be created. |
|
2650 | 2650 | |
|
2651 | 2651 | If no directory is given, the current directory is used. |
|
2652 | 2652 | |
|
2653 | 2653 | It is possible to specify an ``ssh://`` URL as the destination. |
|
2654 | 2654 | See :hg:`help urls` for more information. |
|
2655 | 2655 | |
|
2656 | 2656 | Returns 0 on success. |
|
2657 | 2657 | """ |
|
2658 | 2658 | hg.repository(hg.remoteui(ui, opts), ui.expandpath(dest), create=1) |
|
2659 | 2659 | |
|
2660 | 2660 | def locate(ui, repo, *pats, **opts): |
|
2661 | 2661 | """locate files matching specific patterns |
|
2662 | 2662 | |
|
2663 | 2663 | Print files under Mercurial control in the working directory whose |
|
2664 | 2664 | names match the given patterns. |
|
2665 | 2665 | |
|
2666 | 2666 | By default, this command searches all directories in the working |
|
2667 | 2667 | directory. To search just the current directory and its |
|
2668 | 2668 | subdirectories, use "--include .". |
|
2669 | 2669 | |
|
2670 | 2670 | If no patterns are given to match, this command prints the names |
|
2671 | 2671 | of all files under Mercurial control in the working directory. |
|
2672 | 2672 | |
|
2673 | 2673 | If you want to feed the output of this command into the "xargs" |
|
2674 | 2674 | command, use the -0 option to both this command and "xargs". This |
|
2675 | 2675 | will avoid the problem of "xargs" treating single filenames that |
|
2676 | 2676 | contain whitespace as multiple filenames. |
|
2677 | 2677 | |
|
2678 | 2678 | Returns 0 if a match is found, 1 otherwise. |
|
2679 | 2679 | """ |
|
2680 | 2680 | end = opts.get('print0') and '\0' or '\n' |
|
2681 | 2681 | rev = cmdutil.revsingle(repo, opts.get('rev'), None).node() |
|
2682 | 2682 | |
|
2683 | 2683 | ret = 1 |
|
2684 | 2684 | m = cmdutil.match(repo, pats, opts, default='relglob') |
|
2685 | 2685 | m.bad = lambda x, y: False |
|
2686 | 2686 | for abs in repo[rev].walk(m): |
|
2687 | 2687 | if not rev and abs not in repo.dirstate: |
|
2688 | 2688 | continue |
|
2689 | 2689 | if opts.get('fullpath'): |
|
2690 | 2690 | ui.write(repo.wjoin(abs), end) |
|
2691 | 2691 | else: |
|
2692 | 2692 | ui.write(((pats and m.rel(abs)) or abs), end) |
|
2693 | 2693 | ret = 0 |
|
2694 | 2694 | |
|
2695 | 2695 | return ret |
|
2696 | 2696 | |
|
2697 | 2697 | def log(ui, repo, *pats, **opts): |
|
2698 | 2698 | """show revision history of entire repository or files |
|
2699 | 2699 | |
|
2700 | 2700 | Print the revision history of the specified files or the entire |
|
2701 | 2701 | project. |
|
2702 | 2702 | |
|
2703 | 2703 | File history is shown without following rename or copy history of |
|
2704 | 2704 | files. Use -f/--follow with a filename to follow history across |
|
2705 | 2705 | renames and copies. --follow without a filename will only show |
|
2706 | 2706 | ancestors or descendants of the starting revision. --follow-first |
|
2707 | 2707 | only follows the first parent of merge revisions. |
|
2708 | 2708 | |
|
2709 | 2709 | If no revision range is specified, the default is ``tip:0`` unless |
|
2710 | 2710 | --follow is set, in which case the working directory parent is |
|
2711 | 2711 | used as the starting revision. You can specify a revision set for |
|
2712 | 2712 | log, see :hg:`help revsets` for more information. |
|
2713 | 2713 | |
|
2714 | 2714 | See :hg:`help dates` for a list of formats valid for -d/--date. |
|
2715 | 2715 | |
|
2716 | 2716 | By default this command prints revision number and changeset id, |
|
2717 | 2717 | tags, non-trivial parents, user, date and time, and a summary for |
|
2718 | 2718 | each commit. When the -v/--verbose switch is used, the list of |
|
2719 | 2719 | changed files and full commit message are shown. |
|
2720 | 2720 | |
|
2721 | 2721 | .. note:: |
|
2722 | 2722 | log -p/--patch may generate unexpected diff output for merge |
|
2723 | 2723 | changesets, as it will only compare the merge changeset against |
|
2724 | 2724 | its first parent. Also, only files different from BOTH parents |
|
2725 | 2725 | will appear in files:. |
|
2726 | 2726 | |
|
2727 | 2727 | Returns 0 on success. |
|
2728 | 2728 | """ |
|
2729 | 2729 | |
|
2730 | 2730 | matchfn = cmdutil.match(repo, pats, opts) |
|
2731 | 2731 | limit = cmdutil.loglimit(opts) |
|
2732 | 2732 | count = 0 |
|
2733 | 2733 | |
|
2734 | 2734 | endrev = None |
|
2735 | 2735 | if opts.get('copies') and opts.get('rev'): |
|
2736 | 2736 | endrev = max(cmdutil.revrange(repo, opts.get('rev'))) + 1 |
|
2737 | 2737 | |
|
2738 | 2738 | df = False |
|
2739 | 2739 | if opts["date"]: |
|
2740 | 2740 | df = util.matchdate(opts["date"]) |
|
2741 | 2741 | |
|
2742 | 2742 | branches = opts.get('branch', []) + opts.get('only_branch', []) |
|
2743 | 2743 | opts['branch'] = [repo.lookupbranch(b) for b in branches] |
|
2744 | 2744 | |
|
2745 | 2745 | displayer = cmdutil.show_changeset(ui, repo, opts, True) |
|
2746 | 2746 | def prep(ctx, fns): |
|
2747 | 2747 | rev = ctx.rev() |
|
2748 | 2748 | parents = [p for p in repo.changelog.parentrevs(rev) |
|
2749 | 2749 | if p != nullrev] |
|
2750 | 2750 | if opts.get('no_merges') and len(parents) == 2: |
|
2751 | 2751 | return |
|
2752 | 2752 | if opts.get('only_merges') and len(parents) != 2: |
|
2753 | 2753 | return |
|
2754 | 2754 | if opts.get('branch') and ctx.branch() not in opts['branch']: |
|
2755 | 2755 | return |
|
2756 | 2756 | if df and not df(ctx.date()[0]): |
|
2757 | 2757 | return |
|
2758 | 2758 | if opts['user'] and not [k for k in opts['user'] |
|
2759 | 2759 | if k.lower() in ctx.user().lower()]: |
|
2760 | 2760 | return |
|
2761 | 2761 | if opts.get('keyword'): |
|
2762 | 2762 | for k in [kw.lower() for kw in opts['keyword']]: |
|
2763 | 2763 | if (k in ctx.user().lower() or |
|
2764 | 2764 | k in ctx.description().lower() or |
|
2765 | 2765 | k in " ".join(ctx.files()).lower()): |
|
2766 | 2766 | break |
|
2767 | 2767 | else: |
|
2768 | 2768 | return |
|
2769 | 2769 | |
|
2770 | 2770 | copies = None |
|
2771 | 2771 | if opts.get('copies') and rev: |
|
2772 | 2772 | copies = [] |
|
2773 | 2773 | getrenamed = templatekw.getrenamedfn(repo, endrev=endrev) |
|
2774 | 2774 | for fn in ctx.files(): |
|
2775 | 2775 | rename = getrenamed(fn, rev) |
|
2776 | 2776 | if rename: |
|
2777 | 2777 | copies.append((fn, rename[0])) |
|
2778 | 2778 | |
|
2779 | 2779 | revmatchfn = None |
|
2780 | 2780 | if opts.get('patch') or opts.get('stat'): |
|
2781 | 2781 | if opts.get('follow') or opts.get('follow_first'): |
|
2782 | 2782 | # note: this might be wrong when following through merges |
|
2783 | 2783 | revmatchfn = cmdutil.match(repo, fns, default='path') |
|
2784 | 2784 | else: |
|
2785 | 2785 | revmatchfn = matchfn |
|
2786 | 2786 | |
|
2787 | 2787 | displayer.show(ctx, copies=copies, matchfn=revmatchfn) |
|
2788 | 2788 | |
|
2789 | 2789 | for ctx in cmdutil.walkchangerevs(repo, matchfn, opts, prep): |
|
2790 | 2790 | if count == limit: |
|
2791 | 2791 | break |
|
2792 | 2792 | if displayer.flush(ctx.rev()): |
|
2793 | 2793 | count += 1 |
|
2794 | 2794 | displayer.close() |
|
2795 | 2795 | |
|
2796 | 2796 | def manifest(ui, repo, node=None, rev=None): |
|
2797 | 2797 | """output the current or given revision of the project manifest |
|
2798 | 2798 | |
|
2799 | 2799 | Print a list of version controlled files for the given revision. |
|
2800 | 2800 | If no revision is given, the first parent of the working directory |
|
2801 | 2801 | is used, or the null revision if no revision is checked out. |
|
2802 | 2802 | |
|
2803 | 2803 | With -v, print file permissions, symlink and executable bits. |
|
2804 | 2804 | With --debug, print file revision hashes. |
|
2805 | 2805 | |
|
2806 | 2806 | Returns 0 on success. |
|
2807 | 2807 | """ |
|
2808 | 2808 | |
|
2809 | 2809 | if rev and node: |
|
2810 | 2810 | raise util.Abort(_("please specify just one revision")) |
|
2811 | 2811 | |
|
2812 | 2812 | if not node: |
|
2813 | 2813 | node = rev |
|
2814 | 2814 | |
|
2815 | 2815 | decor = {'l':'644 @ ', 'x':'755 * ', '':'644 '} |
|
2816 | 2816 | ctx = cmdutil.revsingle(repo, node) |
|
2817 | 2817 | for f in ctx: |
|
2818 | 2818 | if ui.debugflag: |
|
2819 | 2819 | ui.write("%40s " % hex(ctx.manifest()[f])) |
|
2820 | 2820 | if ui.verbose: |
|
2821 | 2821 | ui.write(decor[ctx.flags(f)]) |
|
2822 | 2822 | ui.write("%s\n" % f) |
|
2823 | 2823 | |
|
2824 | 2824 | def merge(ui, repo, node=None, **opts): |
|
2825 | 2825 | """merge working directory with another revision |
|
2826 | 2826 | |
|
2827 | 2827 | The current working directory is updated with all changes made in |
|
2828 | 2828 | the requested revision since the last common predecessor revision. |
|
2829 | 2829 | |
|
2830 | 2830 | Files that changed between either parent are marked as changed for |
|
2831 | 2831 | the next commit and a commit must be performed before any further |
|
2832 | 2832 | updates to the repository are allowed. The next commit will have |
|
2833 | 2833 | two parents. |
|
2834 | 2834 | |
|
2835 | 2835 | ``--tool`` can be used to specify the merge tool used for file |
|
2836 | 2836 | merges. It overrides the HGMERGE environment variable and your |
|
2837 | 2837 | configuration files. See :hg:`help merge-tools` for options. |
|
2838 | 2838 | |
|
2839 | 2839 | If no revision is specified, the working directory's parent is a |
|
2840 | 2840 | head revision, and the current branch contains exactly one other |
|
2841 | 2841 | head, the other head is merged with by default. Otherwise, an |
|
2842 | 2842 | explicit revision with which to merge with must be provided. |
|
2843 | 2843 | |
|
2844 | 2844 | :hg:`resolve` must be used to resolve unresolved files. |
|
2845 | 2845 | |
|
2846 | 2846 | To undo an uncommitted merge, use :hg:`update --clean .` which |
|
2847 | 2847 | will check out a clean copy of the original merge parent, losing |
|
2848 | 2848 | all changes. |
|
2849 | 2849 | |
|
2850 | 2850 | Returns 0 on success, 1 if there are unresolved files. |
|
2851 | 2851 | """ |
|
2852 | 2852 | |
|
2853 | 2853 | if opts.get('rev') and node: |
|
2854 | 2854 | raise util.Abort(_("please specify just one revision")) |
|
2855 | 2855 | if not node: |
|
2856 | 2856 | node = opts.get('rev') |
|
2857 | 2857 | |
|
2858 | 2858 | if not node: |
|
2859 | 2859 | branch = repo[None].branch() |
|
2860 | 2860 | bheads = repo.branchheads(branch) |
|
2861 | 2861 | if len(bheads) > 2: |
|
2862 | 2862 | raise util.Abort(_( |
|
2863 | 2863 | 'branch \'%s\' has %d heads - ' |
|
2864 | 2864 | 'please merge with an explicit rev\n' |
|
2865 | 2865 | '(run \'hg heads .\' to see heads)') |
|
2866 | 2866 | % (branch, len(bheads))) |
|
2867 | 2867 | |
|
2868 | 2868 | parent = repo.dirstate.p1() |
|
2869 | 2869 | if len(bheads) == 1: |
|
2870 | 2870 | if len(repo.heads()) > 1: |
|
2871 | 2871 | raise util.Abort(_( |
|
2872 | 2872 | 'branch \'%s\' has one head - ' |
|
2873 | 2873 | 'please merge with an explicit rev\n' |
|
2874 | 2874 | '(run \'hg heads\' to see all heads)') |
|
2875 | 2875 | % branch) |
|
2876 | 2876 | msg = _('there is nothing to merge') |
|
2877 | 2877 | if parent != repo.lookup(repo[None].branch()): |
|
2878 | 2878 | msg = _('%s - use "hg update" instead') % msg |
|
2879 | 2879 | raise util.Abort(msg) |
|
2880 | 2880 | |
|
2881 | 2881 | if parent not in bheads: |
|
2882 | 2882 | raise util.Abort(_('working dir not at a head rev - ' |
|
2883 | 2883 | 'use "hg update" or merge with an explicit rev')) |
|
2884 | 2884 | node = parent == bheads[0] and bheads[-1] or bheads[0] |
|
2885 | 2885 | else: |
|
2886 | 2886 | node = cmdutil.revsingle(repo, node).node() |
|
2887 | 2887 | |
|
2888 | 2888 | if opts.get('preview'): |
|
2889 | 2889 | # find nodes that are ancestors of p2 but not of p1 |
|
2890 | 2890 | p1 = repo.lookup('.') |
|
2891 | 2891 | p2 = repo.lookup(node) |
|
2892 | 2892 | nodes = repo.changelog.findmissing(common=[p1], heads=[p2]) |
|
2893 | 2893 | |
|
2894 | 2894 | displayer = cmdutil.show_changeset(ui, repo, opts) |
|
2895 | 2895 | for node in nodes: |
|
2896 | 2896 | displayer.show(repo[node]) |
|
2897 | 2897 | displayer.close() |
|
2898 | 2898 | return 0 |
|
2899 | 2899 | |
|
2900 | 2900 | try: |
|
2901 | 2901 | # ui.forcemerge is an internal variable, do not document |
|
2902 | 2902 | ui.setconfig('ui', 'forcemerge', opts.get('tool', '')) |
|
2903 | 2903 | return hg.merge(repo, node, force=opts.get('force')) |
|
2904 | 2904 | finally: |
|
2905 | 2905 | ui.setconfig('ui', 'forcemerge', '') |
|
2906 | 2906 | |
|
2907 | 2907 | def outgoing(ui, repo, dest=None, **opts): |
|
2908 | 2908 | """show changesets not found in the destination |
|
2909 | 2909 | |
|
2910 | 2910 | Show changesets not found in the specified destination repository |
|
2911 | 2911 | or the default push location. These are the changesets that would |
|
2912 | 2912 | be pushed if a push was requested. |
|
2913 | 2913 | |
|
2914 | 2914 | See pull for details of valid destination formats. |
|
2915 | 2915 | |
|
2916 | 2916 | Returns 0 if there are outgoing changes, 1 otherwise. |
|
2917 | 2917 | """ |
|
2918 | 2918 | |
|
2919 | 2919 | if opts.get('bookmarks'): |
|
2920 | 2920 | dest = ui.expandpath(dest or 'default-push', dest or 'default') |
|
2921 | 2921 | dest, branches = hg.parseurl(dest, opts.get('branch')) |
|
2922 | 2922 | other = hg.repository(hg.remoteui(repo, opts), dest) |
|
2923 | 2923 | if 'bookmarks' not in other.listkeys('namespaces'): |
|
2924 | 2924 | ui.warn(_("remote doesn't support bookmarks\n")) |
|
2925 | 2925 | return 0 |
|
2926 | 2926 | ui.status(_('comparing with %s\n') % url.hidepassword(dest)) |
|
2927 | 2927 | return bookmarks.diff(ui, other, repo) |
|
2928 | 2928 | |
|
2929 | 2929 | ret = hg.outgoing(ui, repo, dest, opts) |
|
2930 | 2930 | return ret |
|
2931 | 2931 | |
|
2932 | 2932 | def parents(ui, repo, file_=None, **opts): |
|
2933 | 2933 | """show the parents of the working directory or revision |
|
2934 | 2934 | |
|
2935 | 2935 | Print the working directory's parent revisions. If a revision is |
|
2936 | 2936 | given via -r/--rev, the parent of that revision will be printed. |
|
2937 | 2937 | If a file argument is given, the revision in which the file was |
|
2938 | 2938 | last changed (before the working directory revision or the |
|
2939 | 2939 | argument to --rev if given) is printed. |
|
2940 | 2940 | |
|
2941 | 2941 | Returns 0 on success. |
|
2942 | 2942 | """ |
|
2943 | 2943 | |
|
2944 | 2944 | ctx = cmdutil.revsingle(repo, opts.get('rev'), None) |
|
2945 | 2945 | |
|
2946 | 2946 | if file_: |
|
2947 | 2947 | m = cmdutil.match(repo, (file_,), opts) |
|
2948 | 2948 | if m.anypats() or len(m.files()) != 1: |
|
2949 | 2949 | raise util.Abort(_('can only specify an explicit filename')) |
|
2950 | 2950 | file_ = m.files()[0] |
|
2951 | 2951 | filenodes = [] |
|
2952 | 2952 | for cp in ctx.parents(): |
|
2953 | 2953 | if not cp: |
|
2954 | 2954 | continue |
|
2955 | 2955 | try: |
|
2956 | 2956 | filenodes.append(cp.filenode(file_)) |
|
2957 | 2957 | except error.LookupError: |
|
2958 | 2958 | pass |
|
2959 | 2959 | if not filenodes: |
|
2960 | 2960 | raise util.Abort(_("'%s' not found in manifest!") % file_) |
|
2961 | 2961 | fl = repo.file(file_) |
|
2962 | 2962 | p = [repo.lookup(fl.linkrev(fl.rev(fn))) for fn in filenodes] |
|
2963 | 2963 | else: |
|
2964 | 2964 | p = [cp.node() for cp in ctx.parents()] |
|
2965 | 2965 | |
|
2966 | 2966 | displayer = cmdutil.show_changeset(ui, repo, opts) |
|
2967 | 2967 | for n in p: |
|
2968 | 2968 | if n != nullid: |
|
2969 | 2969 | displayer.show(repo[n]) |
|
2970 | 2970 | displayer.close() |
|
2971 | 2971 | |
|
2972 | 2972 | def paths(ui, repo, search=None): |
|
2973 | 2973 | """show aliases for remote repositories |
|
2974 | 2974 | |
|
2975 | 2975 | Show definition of symbolic path name NAME. If no name is given, |
|
2976 | 2976 | show definition of all available names. |
|
2977 | 2977 | |
|
2978 | 2978 | Path names are defined in the [paths] section of your |
|
2979 | 2979 | configuration file and in ``/etc/mercurial/hgrc``. If run inside a |
|
2980 | 2980 | repository, ``.hg/hgrc`` is used, too. |
|
2981 | 2981 | |
|
2982 | 2982 | The path names ``default`` and ``default-push`` have a special |
|
2983 | 2983 | meaning. When performing a push or pull operation, they are used |
|
2984 | 2984 | as fallbacks if no location is specified on the command-line. |
|
2985 | 2985 | When ``default-push`` is set, it will be used for push and |
|
2986 | 2986 | ``default`` will be used for pull; otherwise ``default`` is used |
|
2987 | 2987 | as the fallback for both. When cloning a repository, the clone |
|
2988 | 2988 | source is written as ``default`` in ``.hg/hgrc``. Note that |
|
2989 | 2989 | ``default`` and ``default-push`` apply to all inbound (e.g. |
|
2990 | 2990 | :hg:`incoming`) and outbound (e.g. :hg:`outgoing`, :hg:`email` and |
|
2991 | 2991 | :hg:`bundle`) operations. |
|
2992 | 2992 | |
|
2993 | 2993 | See :hg:`help urls` for more information. |
|
2994 | 2994 | |
|
2995 | 2995 | Returns 0 on success. |
|
2996 | 2996 | """ |
|
2997 | 2997 | if search: |
|
2998 | 2998 | for name, path in ui.configitems("paths"): |
|
2999 | 2999 | if name == search: |
|
3000 | 3000 | ui.write("%s\n" % url.hidepassword(path)) |
|
3001 | 3001 | return |
|
3002 | 3002 | ui.warn(_("not found!\n")) |
|
3003 | 3003 | return 1 |
|
3004 | 3004 | else: |
|
3005 | 3005 | for name, path in ui.configitems("paths"): |
|
3006 | 3006 | ui.write("%s = %s\n" % (name, url.hidepassword(path))) |
|
3007 | 3007 | |
|
3008 | 3008 | def postincoming(ui, repo, modheads, optupdate, checkout): |
|
3009 | 3009 | if modheads == 0: |
|
3010 | 3010 | return |
|
3011 | 3011 | if optupdate: |
|
3012 | 3012 | if (modheads <= 1 or len(repo.branchheads()) == 1) or checkout: |
|
3013 | 3013 | return hg.update(repo, checkout) |
|
3014 | 3014 | else: |
|
3015 | 3015 | ui.status(_("not updating, since new heads added\n")) |
|
3016 | 3016 | if modheads > 1: |
|
3017 | 3017 | currentbranchheads = len(repo.branchheads()) |
|
3018 | 3018 | if currentbranchheads == modheads: |
|
3019 | 3019 | ui.status(_("(run 'hg heads' to see heads, 'hg merge' to merge)\n")) |
|
3020 | 3020 | elif currentbranchheads > 1: |
|
3021 | 3021 | ui.status(_("(run 'hg heads .' to see heads, 'hg merge' to merge)\n")) |
|
3022 | 3022 | else: |
|
3023 | 3023 | ui.status(_("(run 'hg heads' to see heads)\n")) |
|
3024 | 3024 | else: |
|
3025 | 3025 | ui.status(_("(run 'hg update' to get a working copy)\n")) |
|
3026 | 3026 | |
|
3027 | 3027 | def pull(ui, repo, source="default", **opts): |
|
3028 | 3028 | """pull changes from the specified source |
|
3029 | 3029 | |
|
3030 | 3030 | Pull changes from a remote repository to a local one. |
|
3031 | 3031 | |
|
3032 | 3032 | This finds all changes from the repository at the specified path |
|
3033 | 3033 | or URL and adds them to a local repository (the current one unless |
|
3034 | 3034 | -R is specified). By default, this does not update the copy of the |
|
3035 | 3035 | project in the working directory. |
|
3036 | 3036 | |
|
3037 | 3037 | Use :hg:`incoming` if you want to see what would have been added |
|
3038 | 3038 | by a pull at the time you issued this command. If you then decide |
|
3039 | 3039 | to add those changes to the repository, you should use :hg:`pull |
|
3040 | 3040 | -r X` where ``X`` is the last changeset listed by :hg:`incoming`. |
|
3041 | 3041 | |
|
3042 | 3042 | If SOURCE is omitted, the 'default' path will be used. |
|
3043 | 3043 | See :hg:`help urls` for more information. |
|
3044 | 3044 | |
|
3045 | 3045 | Returns 0 on success, 1 if an update had unresolved files. |
|
3046 | 3046 | """ |
|
3047 | 3047 | source, branches = hg.parseurl(ui.expandpath(source), opts.get('branch')) |
|
3048 | 3048 | other = hg.repository(hg.remoteui(repo, opts), source) |
|
3049 | 3049 | ui.status(_('pulling from %s\n') % url.hidepassword(source)) |
|
3050 | 3050 | revs, checkout = hg.addbranchrevs(repo, other, branches, opts.get('rev')) |
|
3051 | 3051 | |
|
3052 | 3052 | if opts.get('bookmark'): |
|
3053 | 3053 | if not revs: |
|
3054 | 3054 | revs = [] |
|
3055 | 3055 | rb = other.listkeys('bookmarks') |
|
3056 | 3056 | for b in opts['bookmark']: |
|
3057 | 3057 | if b not in rb: |
|
3058 | 3058 | raise util.Abort(_('remote bookmark %s not found!') % b) |
|
3059 | 3059 | revs.append(rb[b]) |
|
3060 | 3060 | |
|
3061 | 3061 | if revs: |
|
3062 | 3062 | try: |
|
3063 | 3063 | revs = [other.lookup(rev) for rev in revs] |
|
3064 | 3064 | except error.CapabilityError: |
|
3065 | 3065 | err = _("other repository doesn't support revision lookup, " |
|
3066 | 3066 | "so a rev cannot be specified.") |
|
3067 | 3067 | raise util.Abort(err) |
|
3068 | 3068 | |
|
3069 | 3069 | modheads = repo.pull(other, heads=revs, force=opts.get('force')) |
|
3070 | 3070 | bookmarks.updatefromremote(ui, repo, other) |
|
3071 | 3071 | if checkout: |
|
3072 | 3072 | checkout = str(repo.changelog.rev(other.lookup(checkout))) |
|
3073 | 3073 | repo._subtoppath = source |
|
3074 | 3074 | try: |
|
3075 | 3075 | ret = postincoming(ui, repo, modheads, opts.get('update'), checkout) |
|
3076 | 3076 | |
|
3077 | 3077 | finally: |
|
3078 | 3078 | del repo._subtoppath |
|
3079 | 3079 | |
|
3080 | 3080 | # update specified bookmarks |
|
3081 | 3081 | if opts.get('bookmark'): |
|
3082 | 3082 | for b in opts['bookmark']: |
|
3083 | 3083 | # explicit pull overrides local bookmark if any |
|
3084 | 3084 | ui.status(_("importing bookmark %s\n") % b) |
|
3085 | 3085 | repo._bookmarks[b] = repo[rb[b]].node() |
|
3086 | 3086 | bookmarks.write(repo) |
|
3087 | 3087 | |
|
3088 | 3088 | return ret |
|
3089 | 3089 | |
|
3090 | 3090 | def push(ui, repo, dest=None, **opts): |
|
3091 | 3091 | """push changes to the specified destination |
|
3092 | 3092 | |
|
3093 | 3093 | Push changesets from the local repository to the specified |
|
3094 | 3094 | destination. |
|
3095 | 3095 | |
|
3096 | 3096 | This operation is symmetrical to pull: it is identical to a pull |
|
3097 | 3097 | in the destination repository from the current one. |
|
3098 | 3098 | |
|
3099 | 3099 | By default, push will not allow creation of new heads at the |
|
3100 | 3100 | destination, since multiple heads would make it unclear which head |
|
3101 | 3101 | to use. In this situation, it is recommended to pull and merge |
|
3102 | 3102 | before pushing. |
|
3103 | 3103 | |
|
3104 | 3104 | Use --new-branch if you want to allow push to create a new named |
|
3105 | 3105 | branch that is not present at the destination. This allows you to |
|
3106 | 3106 | only create a new branch without forcing other changes. |
|
3107 | 3107 | |
|
3108 | 3108 | Use -f/--force to override the default behavior and push all |
|
3109 | 3109 | changesets on all branches. |
|
3110 | 3110 | |
|
3111 | 3111 | If -r/--rev is used, the specified revision and all its ancestors |
|
3112 | 3112 | will be pushed to the remote repository. |
|
3113 | 3113 | |
|
3114 | 3114 | Please see :hg:`help urls` for important details about ``ssh://`` |
|
3115 | 3115 | URLs. If DESTINATION is omitted, a default path will be used. |
|
3116 | 3116 | |
|
3117 | 3117 | Returns 0 if push was successful, 1 if nothing to push. |
|
3118 | 3118 | """ |
|
3119 | 3119 | |
|
3120 | 3120 | if opts.get('bookmark'): |
|
3121 | 3121 | for b in opts['bookmark']: |
|
3122 | 3122 | # translate -B options to -r so changesets get pushed |
|
3123 | 3123 | if b in repo._bookmarks: |
|
3124 | 3124 | opts.setdefault('rev', []).append(b) |
|
3125 | 3125 | else: |
|
3126 | 3126 | # if we try to push a deleted bookmark, translate it to null |
|
3127 | 3127 | # this lets simultaneous -r, -b options continue working |
|
3128 | 3128 | opts.setdefault('rev', []).append("null") |
|
3129 | 3129 | |
|
3130 | 3130 | dest = ui.expandpath(dest or 'default-push', dest or 'default') |
|
3131 | 3131 | dest, branches = hg.parseurl(dest, opts.get('branch')) |
|
3132 | 3132 | ui.status(_('pushing to %s\n') % url.hidepassword(dest)) |
|
3133 | 3133 | revs, checkout = hg.addbranchrevs(repo, repo, branches, opts.get('rev')) |
|
3134 | 3134 | other = hg.repository(hg.remoteui(repo, opts), dest) |
|
3135 | 3135 | if revs: |
|
3136 | 3136 | revs = [repo.lookup(rev) for rev in revs] |
|
3137 | 3137 | |
|
3138 | 3138 | repo._subtoppath = dest |
|
3139 | 3139 | try: |
|
3140 | 3140 | # push subrepos depth-first for coherent ordering |
|
3141 | 3141 | c = repo[''] |
|
3142 | 3142 | subs = c.substate # only repos that are committed |
|
3143 | 3143 | for s in sorted(subs): |
|
3144 | 3144 | if not c.sub(s).push(opts.get('force')): |
|
3145 | 3145 | return False |
|
3146 | 3146 | finally: |
|
3147 | 3147 | del repo._subtoppath |
|
3148 | 3148 | result = repo.push(other, opts.get('force'), revs=revs, |
|
3149 | 3149 | newbranch=opts.get('new_branch')) |
|
3150 | 3150 | |
|
3151 | 3151 | result = (result == 0) |
|
3152 | 3152 | |
|
3153 | 3153 | if opts.get('bookmark'): |
|
3154 | 3154 | rb = other.listkeys('bookmarks') |
|
3155 | 3155 | for b in opts['bookmark']: |
|
3156 | 3156 | # explicit push overrides remote bookmark if any |
|
3157 | 3157 | if b in repo._bookmarks: |
|
3158 | 3158 | ui.status(_("exporting bookmark %s\n") % b) |
|
3159 | 3159 | new = repo[b].hex() |
|
3160 | 3160 | elif b in rb: |
|
3161 | 3161 | ui.status(_("deleting remote bookmark %s\n") % b) |
|
3162 | 3162 | new = '' # delete |
|
3163 | 3163 | else: |
|
3164 | 3164 | ui.warn(_('bookmark %s does not exist on the local ' |
|
3165 | 3165 | 'or remote repository!\n') % b) |
|
3166 | 3166 | return 2 |
|
3167 | 3167 | old = rb.get(b, '') |
|
3168 | 3168 | r = other.pushkey('bookmarks', b, old, new) |
|
3169 | 3169 | if not r: |
|
3170 | 3170 | ui.warn(_('updating bookmark %s failed!\n') % b) |
|
3171 | 3171 | if not result: |
|
3172 | 3172 | result = 2 |
|
3173 | 3173 | |
|
3174 | 3174 | return result |
|
3175 | 3175 | |
|
3176 | 3176 | def recover(ui, repo): |
|
3177 | 3177 | """roll back an interrupted transaction |
|
3178 | 3178 | |
|
3179 | 3179 | Recover from an interrupted commit or pull. |
|
3180 | 3180 | |
|
3181 | 3181 | This command tries to fix the repository status after an |
|
3182 | 3182 | interrupted operation. It should only be necessary when Mercurial |
|
3183 | 3183 | suggests it. |
|
3184 | 3184 | |
|
3185 | 3185 | Returns 0 if successful, 1 if nothing to recover or verify fails. |
|
3186 | 3186 | """ |
|
3187 | 3187 | if repo.recover(): |
|
3188 | 3188 | return hg.verify(repo) |
|
3189 | 3189 | return 1 |
|
3190 | 3190 | |
|
3191 | 3191 | def remove(ui, repo, *pats, **opts): |
|
3192 | 3192 | """remove the specified files on the next commit |
|
3193 | 3193 | |
|
3194 | 3194 | Schedule the indicated files for removal from the repository. |
|
3195 | 3195 | |
|
3196 | 3196 | This only removes files from the current branch, not from the |
|
3197 | 3197 | entire project history. -A/--after can be used to remove only |
|
3198 | 3198 | files that have already been deleted, -f/--force can be used to |
|
3199 | 3199 | force deletion, and -Af can be used to remove files from the next |
|
3200 | 3200 | revision without deleting them from the working directory. |
|
3201 | 3201 | |
|
3202 | 3202 | The following table details the behavior of remove for different |
|
3203 | 3203 | file states (columns) and option combinations (rows). The file |
|
3204 | 3204 | states are Added [A], Clean [C], Modified [M] and Missing [!] (as |
|
3205 | 3205 | reported by :hg:`status`). The actions are Warn, Remove (from |
|
3206 | 3206 | branch) and Delete (from disk):: |
|
3207 | 3207 | |
|
3208 | 3208 | A C M ! |
|
3209 | 3209 | none W RD W R |
|
3210 | 3210 | -f R RD RD R |
|
3211 | 3211 | -A W W W R |
|
3212 | 3212 | -Af R R R R |
|
3213 | 3213 | |
|
3214 | 3214 | This command schedules the files to be removed at the next commit. |
|
3215 | 3215 | To undo a remove before that, see :hg:`revert`. |
|
3216 | 3216 | |
|
3217 | 3217 | Returns 0 on success, 1 if any warnings encountered. |
|
3218 | 3218 | """ |
|
3219 | 3219 | |
|
3220 | 3220 | ret = 0 |
|
3221 | 3221 | after, force = opts.get('after'), opts.get('force') |
|
3222 | 3222 | if not pats and not after: |
|
3223 | 3223 | raise util.Abort(_('no files specified')) |
|
3224 | 3224 | |
|
3225 | 3225 | m = cmdutil.match(repo, pats, opts) |
|
3226 | 3226 | s = repo.status(match=m, clean=True) |
|
3227 | 3227 | modified, added, deleted, clean = s[0], s[1], s[3], s[6] |
|
3228 | 3228 | |
|
3229 | 3229 | for f in m.files(): |
|
3230 | 3230 | if f not in repo.dirstate and not os.path.isdir(m.rel(f)): |
|
3231 | 3231 | ui.warn(_('not removing %s: file is untracked\n') % m.rel(f)) |
|
3232 | 3232 | ret = 1 |
|
3233 | 3233 | |
|
3234 | 3234 | if force: |
|
3235 | 3235 | remove, forget = modified + deleted + clean, added |
|
3236 | 3236 | elif after: |
|
3237 | 3237 | remove, forget = deleted, [] |
|
3238 | 3238 | for f in modified + added + clean: |
|
3239 | 3239 | ui.warn(_('not removing %s: file still exists (use -f' |
|
3240 | 3240 | ' to force removal)\n') % m.rel(f)) |
|
3241 | 3241 | ret = 1 |
|
3242 | 3242 | else: |
|
3243 | 3243 | remove, forget = deleted + clean, [] |
|
3244 | 3244 | for f in modified: |
|
3245 | 3245 | ui.warn(_('not removing %s: file is modified (use -f' |
|
3246 | 3246 | ' to force removal)\n') % m.rel(f)) |
|
3247 | 3247 | ret = 1 |
|
3248 | 3248 | for f in added: |
|
3249 | 3249 | ui.warn(_('not removing %s: file has been marked for add (use -f' |
|
3250 | 3250 | ' to force removal)\n') % m.rel(f)) |
|
3251 | 3251 | ret = 1 |
|
3252 | 3252 | |
|
3253 | 3253 | for f in sorted(remove + forget): |
|
3254 | 3254 | if ui.verbose or not m.exact(f): |
|
3255 | 3255 | ui.status(_('removing %s\n') % m.rel(f)) |
|
3256 | 3256 | |
|
3257 | 3257 | repo[None].forget(forget) |
|
3258 | 3258 | repo[None].remove(remove, unlink=not after) |
|
3259 | 3259 | return ret |
|
3260 | 3260 | |
|
3261 | 3261 | def rename(ui, repo, *pats, **opts): |
|
3262 | 3262 | """rename files; equivalent of copy + remove |
|
3263 | 3263 | |
|
3264 | 3264 | Mark dest as copies of sources; mark sources for deletion. If dest |
|
3265 | 3265 | is a directory, copies are put in that directory. If dest is a |
|
3266 | 3266 | file, there can only be one source. |
|
3267 | 3267 | |
|
3268 | 3268 | By default, this command copies the contents of files as they |
|
3269 | 3269 | exist in the working directory. If invoked with -A/--after, the |
|
3270 | 3270 | operation is recorded, but no copying is performed. |
|
3271 | 3271 | |
|
3272 | 3272 | This command takes effect at the next commit. To undo a rename |
|
3273 | 3273 | before that, see :hg:`revert`. |
|
3274 | 3274 | |
|
3275 | 3275 | Returns 0 on success, 1 if errors are encountered. |
|
3276 | 3276 | """ |
|
3277 | 3277 | wlock = repo.wlock(False) |
|
3278 | 3278 | try: |
|
3279 | 3279 | return cmdutil.copy(ui, repo, pats, opts, rename=True) |
|
3280 | 3280 | finally: |
|
3281 | 3281 | wlock.release() |
|
3282 | 3282 | |
|
3283 | 3283 | def resolve(ui, repo, *pats, **opts): |
|
3284 | 3284 | """redo merges or set/view the merge status of files |
|
3285 | 3285 | |
|
3286 | 3286 | Merges with unresolved conflicts are often the result of |
|
3287 | 3287 | non-interactive merging using the ``internal:merge`` configuration |
|
3288 | 3288 | setting, or a command-line merge tool like ``diff3``. The resolve |
|
3289 | 3289 | command is used to manage the files involved in a merge, after |
|
3290 | 3290 | :hg:`merge` has been run, and before :hg:`commit` is run (i.e. the |
|
3291 | 3291 | working directory must have two parents). |
|
3292 | 3292 | |
|
3293 | 3293 | The resolve command can be used in the following ways: |
|
3294 | 3294 | |
|
3295 | 3295 | - :hg:`resolve [--tool TOOL] FILE...`: attempt to re-merge the specified |
|
3296 | 3296 | files, discarding any previous merge attempts. Re-merging is not |
|
3297 | 3297 | performed for files already marked as resolved. Use ``--all/-a`` |
|
3298 | 3298 | to selects all unresolved files. ``--tool`` can be used to specify |
|
3299 | 3299 | the merge tool used for the given files. It overrides the HGMERGE |
|
3300 | 3300 | environment variable and your configuration files. |
|
3301 | 3301 | |
|
3302 | 3302 | - :hg:`resolve -m [FILE]`: mark a file as having been resolved |
|
3303 | 3303 | (e.g. after having manually fixed-up the files). The default is |
|
3304 | 3304 | to mark all unresolved files. |
|
3305 | 3305 | |
|
3306 | 3306 | - :hg:`resolve -u [FILE]...`: mark a file as unresolved. The |
|
3307 | 3307 | default is to mark all resolved files. |
|
3308 | 3308 | |
|
3309 | 3309 | - :hg:`resolve -l`: list files which had or still have conflicts. |
|
3310 | 3310 | In the printed list, ``U`` = unresolved and ``R`` = resolved. |
|
3311 | 3311 | |
|
3312 | 3312 | Note that Mercurial will not let you commit files with unresolved |
|
3313 | 3313 | merge conflicts. You must use :hg:`resolve -m ...` before you can |
|
3314 | 3314 | commit after a conflicting merge. |
|
3315 | 3315 | |
|
3316 | 3316 | Returns 0 on success, 1 if any files fail a resolve attempt. |
|
3317 | 3317 | """ |
|
3318 | 3318 | |
|
3319 | 3319 | all, mark, unmark, show, nostatus = \ |
|
3320 | 3320 | [opts.get(o) for o in 'all mark unmark list no_status'.split()] |
|
3321 | 3321 | |
|
3322 | 3322 | if (show and (mark or unmark)) or (mark and unmark): |
|
3323 | 3323 | raise util.Abort(_("too many options specified")) |
|
3324 | 3324 | if pats and all: |
|
3325 | 3325 | raise util.Abort(_("can't specify --all and patterns")) |
|
3326 | 3326 | if not (all or pats or show or mark or unmark): |
|
3327 | 3327 | raise util.Abort(_('no files or directories specified; ' |
|
3328 | 3328 | 'use --all to remerge all files')) |
|
3329 | 3329 | |
|
3330 | 3330 | ms = mergemod.mergestate(repo) |
|
3331 | 3331 | m = cmdutil.match(repo, pats, opts) |
|
3332 | 3332 | ret = 0 |
|
3333 | 3333 | |
|
3334 | 3334 | for f in ms: |
|
3335 | 3335 | if m(f): |
|
3336 | 3336 | if show: |
|
3337 | 3337 | if nostatus: |
|
3338 | 3338 | ui.write("%s\n" % f) |
|
3339 | 3339 | else: |
|
3340 | 3340 | ui.write("%s %s\n" % (ms[f].upper(), f), |
|
3341 | 3341 | label='resolve.' + |
|
3342 | 3342 | {'u': 'unresolved', 'r': 'resolved'}[ms[f]]) |
|
3343 | 3343 | elif mark: |
|
3344 | 3344 | ms.mark(f, "r") |
|
3345 | 3345 | elif unmark: |
|
3346 | 3346 | ms.mark(f, "u") |
|
3347 | 3347 | else: |
|
3348 | 3348 | wctx = repo[None] |
|
3349 | 3349 | mctx = wctx.parents()[-1] |
|
3350 | 3350 | |
|
3351 | 3351 | # backup pre-resolve (merge uses .orig for its own purposes) |
|
3352 | 3352 | a = repo.wjoin(f) |
|
3353 | 3353 | util.copyfile(a, a + ".resolve") |
|
3354 | 3354 | |
|
3355 | 3355 | try: |
|
3356 | 3356 | # resolve file |
|
3357 | 3357 | ui.setconfig('ui', 'forcemerge', opts.get('tool', '')) |
|
3358 | 3358 | if ms.resolve(f, wctx, mctx): |
|
3359 | 3359 | ret = 1 |
|
3360 | 3360 | finally: |
|
3361 | 3361 | ui.setconfig('ui', 'forcemerge', '') |
|
3362 | 3362 | |
|
3363 | 3363 | # replace filemerge's .orig file with our resolve file |
|
3364 | 3364 | util.rename(a + ".resolve", a + ".orig") |
|
3365 | 3365 | |
|
3366 | 3366 | ms.commit() |
|
3367 | 3367 | return ret |
|
3368 | 3368 | |
|
3369 | 3369 | def revert(ui, repo, *pats, **opts): |
|
3370 | 3370 | """restore individual files or directories to an earlier state |
|
3371 | 3371 | |
|
3372 | 3372 | .. note:: |
|
3373 | 3373 | This command is most likely not what you are looking for. |
|
3374 | 3374 | Revert will partially overwrite content in the working |
|
3375 | 3375 | directory without changing the working directory parents. Use |
|
3376 | 3376 | :hg:`update -r rev` to check out earlier revisions, or |
|
3377 | 3377 | :hg:`update --clean .` to undo a merge which has added another |
|
3378 | 3378 | parent. |
|
3379 | 3379 | |
|
3380 | 3380 | With no revision specified, revert the named files or directories |
|
3381 | 3381 | to the contents they had in the parent of the working directory. |
|
3382 | 3382 | This restores the contents of the affected files to an unmodified |
|
3383 | 3383 | state and unschedules adds, removes, copies, and renames. If the |
|
3384 | 3384 | working directory has two parents, you must explicitly specify a |
|
3385 | 3385 | revision. |
|
3386 | 3386 | |
|
3387 | 3387 | Using the -r/--rev option, revert the given files or directories |
|
3388 | 3388 | to their contents as of a specific revision. This can be helpful |
|
3389 | 3389 | to "roll back" some or all of an earlier change. See :hg:`help |
|
3390 | 3390 | dates` for a list of formats valid for -d/--date. |
|
3391 | 3391 | |
|
3392 | 3392 | Revert modifies the working directory. It does not commit any |
|
3393 | 3393 | changes, or change the parent of the working directory. If you |
|
3394 | 3394 | revert to a revision other than the parent of the working |
|
3395 | 3395 | directory, the reverted files will thus appear modified |
|
3396 | 3396 | afterwards. |
|
3397 | 3397 | |
|
3398 | 3398 | If a file has been deleted, it is restored. Files scheduled for |
|
3399 | 3399 | addition are just unscheduled and left as they are. If the |
|
3400 | 3400 | executable mode of a file was changed, it is reset. |
|
3401 | 3401 | |
|
3402 | 3402 | If names are given, all files matching the names are reverted. |
|
3403 | 3403 | If no arguments are given, no files are reverted. |
|
3404 | 3404 | |
|
3405 | 3405 | Modified files are saved with a .orig suffix before reverting. |
|
3406 | 3406 | To disable these backups, use --no-backup. |
|
3407 | 3407 | |
|
3408 | 3408 | Returns 0 on success. |
|
3409 | 3409 | """ |
|
3410 | 3410 | |
|
3411 | 3411 | if opts.get("date"): |
|
3412 | 3412 | if opts.get("rev"): |
|
3413 | 3413 | raise util.Abort(_("you can't specify a revision and a date")) |
|
3414 | 3414 | opts["rev"] = cmdutil.finddate(ui, repo, opts["date"]) |
|
3415 | 3415 | |
|
3416 | 3416 | parent, p2 = repo.dirstate.parents() |
|
3417 | 3417 | if not opts.get('rev') and p2 != nullid: |
|
3418 | 3418 | raise util.Abort(_('uncommitted merge - ' |
|
3419 | 3419 | 'use "hg update", see "hg help revert"')) |
|
3420 | 3420 | |
|
3421 | 3421 | if not pats and not opts.get('all'): |
|
3422 | 3422 | raise util.Abort(_('no files or directories specified; ' |
|
3423 | 3423 | 'use --all to revert the whole repo')) |
|
3424 | 3424 | |
|
3425 | 3425 | ctx = cmdutil.revsingle(repo, opts.get('rev')) |
|
3426 | 3426 | node = ctx.node() |
|
3427 | 3427 | mf = ctx.manifest() |
|
3428 | 3428 | if node == parent: |
|
3429 | 3429 | pmf = mf |
|
3430 | 3430 | else: |
|
3431 | 3431 | pmf = None |
|
3432 | 3432 | |
|
3433 | 3433 | # need all matching names in dirstate and manifest of target rev, |
|
3434 | 3434 | # so have to walk both. do not print errors if files exist in one |
|
3435 | 3435 | # but not other. |
|
3436 | 3436 | |
|
3437 | 3437 | names = {} |
|
3438 | 3438 | |
|
3439 | 3439 | wlock = repo.wlock() |
|
3440 | 3440 | try: |
|
3441 | 3441 | # walk dirstate. |
|
3442 | 3442 | |
|
3443 | 3443 | m = cmdutil.match(repo, pats, opts) |
|
3444 | 3444 | m.bad = lambda x, y: False |
|
3445 | 3445 | for abs in repo.walk(m): |
|
3446 | 3446 | names[abs] = m.rel(abs), m.exact(abs) |
|
3447 | 3447 | |
|
3448 | 3448 | # walk target manifest. |
|
3449 | 3449 | |
|
3450 | 3450 | def badfn(path, msg): |
|
3451 | 3451 | if path in names: |
|
3452 | 3452 | return |
|
3453 | 3453 | path_ = path + '/' |
|
3454 | 3454 | for f in names: |
|
3455 | 3455 | if f.startswith(path_): |
|
3456 | 3456 | return |
|
3457 | 3457 | ui.warn("%s: %s\n" % (m.rel(path), msg)) |
|
3458 | 3458 | |
|
3459 | 3459 | m = cmdutil.match(repo, pats, opts) |
|
3460 | 3460 | m.bad = badfn |
|
3461 | 3461 | for abs in repo[node].walk(m): |
|
3462 | 3462 | if abs not in names: |
|
3463 | 3463 | names[abs] = m.rel(abs), m.exact(abs) |
|
3464 | 3464 | |
|
3465 | 3465 | m = cmdutil.matchfiles(repo, names) |
|
3466 | 3466 | changes = repo.status(match=m)[:4] |
|
3467 | 3467 | modified, added, removed, deleted = map(set, changes) |
|
3468 | 3468 | |
|
3469 | 3469 | # if f is a rename, also revert the source |
|
3470 | 3470 | cwd = repo.getcwd() |
|
3471 | 3471 | for f in added: |
|
3472 | 3472 | src = repo.dirstate.copied(f) |
|
3473 | 3473 | if src and src not in names and repo.dirstate[src] == 'r': |
|
3474 | 3474 | removed.add(src) |
|
3475 | 3475 | names[src] = (repo.pathto(src, cwd), True) |
|
3476 | 3476 | |
|
3477 | 3477 | def removeforget(abs): |
|
3478 | 3478 | if repo.dirstate[abs] == 'a': |
|
3479 | 3479 | return _('forgetting %s\n') |
|
3480 | 3480 | return _('removing %s\n') |
|
3481 | 3481 | |
|
3482 | 3482 | revert = ([], _('reverting %s\n')) |
|
3483 | 3483 | add = ([], _('adding %s\n')) |
|
3484 | 3484 | remove = ([], removeforget) |
|
3485 | 3485 | undelete = ([], _('undeleting %s\n')) |
|
3486 | 3486 | |
|
3487 | 3487 | disptable = ( |
|
3488 | 3488 | # dispatch table: |
|
3489 | 3489 | # file state |
|
3490 | 3490 | # action if in target manifest |
|
3491 | 3491 | # action if not in target manifest |
|
3492 | 3492 | # make backup if in target manifest |
|
3493 | 3493 | # make backup if not in target manifest |
|
3494 | 3494 | (modified, revert, remove, True, True), |
|
3495 | 3495 | (added, revert, remove, True, False), |
|
3496 | 3496 | (removed, undelete, None, False, False), |
|
3497 | 3497 | (deleted, revert, remove, False, False), |
|
3498 | 3498 | ) |
|
3499 | 3499 | |
|
3500 | 3500 | for abs, (rel, exact) in sorted(names.items()): |
|
3501 | 3501 | mfentry = mf.get(abs) |
|
3502 | 3502 | target = repo.wjoin(abs) |
|
3503 | 3503 | def handle(xlist, dobackup): |
|
3504 | 3504 | xlist[0].append(abs) |
|
3505 | 3505 | if (dobackup and not opts.get('no_backup') and |
|
3506 | 3506 | os.path.lexists(target)): |
|
3507 | 3507 | bakname = "%s.orig" % rel |
|
3508 | 3508 | ui.note(_('saving current version of %s as %s\n') % |
|
3509 | 3509 | (rel, bakname)) |
|
3510 | 3510 | if not opts.get('dry_run'): |
|
3511 | 3511 | util.rename(target, bakname) |
|
3512 | 3512 | if ui.verbose or not exact: |
|
3513 | 3513 | msg = xlist[1] |
|
3514 | 3514 | if not isinstance(msg, basestring): |
|
3515 | 3515 | msg = msg(abs) |
|
3516 | 3516 | ui.status(msg % rel) |
|
3517 | 3517 | for table, hitlist, misslist, backuphit, backupmiss in disptable: |
|
3518 | 3518 | if abs not in table: |
|
3519 | 3519 | continue |
|
3520 | 3520 | # file has changed in dirstate |
|
3521 | 3521 | if mfentry: |
|
3522 | 3522 | handle(hitlist, backuphit) |
|
3523 | 3523 | elif misslist is not None: |
|
3524 | 3524 | handle(misslist, backupmiss) |
|
3525 | 3525 | break |
|
3526 | 3526 | else: |
|
3527 | 3527 | if abs not in repo.dirstate: |
|
3528 | 3528 | if mfentry: |
|
3529 | 3529 | handle(add, True) |
|
3530 | 3530 | elif exact: |
|
3531 | 3531 | ui.warn(_('file not managed: %s\n') % rel) |
|
3532 | 3532 | continue |
|
3533 | 3533 | # file has not changed in dirstate |
|
3534 | 3534 | if node == parent: |
|
3535 | 3535 | if exact: |
|
3536 | 3536 | ui.warn(_('no changes needed to %s\n') % rel) |
|
3537 | 3537 | continue |
|
3538 | 3538 | if pmf is None: |
|
3539 | 3539 | # only need parent manifest in this unlikely case, |
|
3540 | 3540 | # so do not read by default |
|
3541 | 3541 | pmf = repo[parent].manifest() |
|
3542 | 3542 | if abs in pmf: |
|
3543 | 3543 | if mfentry: |
|
3544 | 3544 | # if version of file is same in parent and target |
|
3545 | 3545 | # manifests, do nothing |
|
3546 | 3546 | if (pmf[abs] != mfentry or |
|
3547 | 3547 | pmf.flags(abs) != mf.flags(abs)): |
|
3548 | 3548 | handle(revert, False) |
|
3549 | 3549 | else: |
|
3550 | 3550 | handle(remove, False) |
|
3551 | 3551 | |
|
3552 | 3552 | if not opts.get('dry_run'): |
|
3553 | 3553 | def checkout(f): |
|
3554 | 3554 | fc = ctx[f] |
|
3555 | 3555 | repo.wwrite(f, fc.data(), fc.flags()) |
|
3556 | 3556 | |
|
3557 | 3557 | audit_path = scmutil.path_auditor(repo.root) |
|
3558 | 3558 | for f in remove[0]: |
|
3559 | 3559 | if repo.dirstate[f] == 'a': |
|
3560 | 3560 | repo.dirstate.forget(f) |
|
3561 | 3561 | continue |
|
3562 | 3562 | audit_path(f) |
|
3563 | 3563 | try: |
|
3564 | 3564 | util.unlinkpath(repo.wjoin(f)) |
|
3565 | 3565 | except OSError: |
|
3566 | 3566 | pass |
|
3567 | 3567 | repo.dirstate.remove(f) |
|
3568 | 3568 | |
|
3569 | 3569 | normal = None |
|
3570 | 3570 | if node == parent: |
|
3571 | 3571 | # We're reverting to our parent. If possible, we'd like status |
|
3572 | 3572 | # to report the file as clean. We have to use normallookup for |
|
3573 | 3573 | # merges to avoid losing information about merged/dirty files. |
|
3574 | 3574 | if p2 != nullid: |
|
3575 | 3575 | normal = repo.dirstate.normallookup |
|
3576 | 3576 | else: |
|
3577 | 3577 | normal = repo.dirstate.normal |
|
3578 | 3578 | for f in revert[0]: |
|
3579 | 3579 | checkout(f) |
|
3580 | 3580 | if normal: |
|
3581 | 3581 | normal(f) |
|
3582 | 3582 | |
|
3583 | 3583 | for f in add[0]: |
|
3584 | 3584 | checkout(f) |
|
3585 | 3585 | repo.dirstate.add(f) |
|
3586 | 3586 | |
|
3587 | 3587 | normal = repo.dirstate.normallookup |
|
3588 | 3588 | if node == parent and p2 == nullid: |
|
3589 | 3589 | normal = repo.dirstate.normal |
|
3590 | 3590 | for f in undelete[0]: |
|
3591 | 3591 | checkout(f) |
|
3592 | 3592 | normal(f) |
|
3593 | 3593 | |
|
3594 | 3594 | finally: |
|
3595 | 3595 | wlock.release() |
|
3596 | 3596 | |
|
3597 | 3597 | def rollback(ui, repo, **opts): |
|
3598 | 3598 | """roll back the last transaction (dangerous) |
|
3599 | 3599 | |
|
3600 | 3600 | This command should be used with care. There is only one level of |
|
3601 | 3601 | rollback, and there is no way to undo a rollback. It will also |
|
3602 | 3602 | restore the dirstate at the time of the last transaction, losing |
|
3603 | 3603 | any dirstate changes since that time. This command does not alter |
|
3604 | 3604 | the working directory. |
|
3605 | 3605 | |
|
3606 | 3606 | Transactions are used to encapsulate the effects of all commands |
|
3607 | 3607 | that create new changesets or propagate existing changesets into a |
|
3608 | 3608 | repository. For example, the following commands are transactional, |
|
3609 | 3609 | and their effects can be rolled back: |
|
3610 | 3610 | |
|
3611 | 3611 | - commit |
|
3612 | 3612 | - import |
|
3613 | 3613 | - pull |
|
3614 | 3614 | - push (with this repository as the destination) |
|
3615 | 3615 | - unbundle |
|
3616 | 3616 | |
|
3617 | 3617 | This command is not intended for use on public repositories. Once |
|
3618 | 3618 | changes are visible for pull by other users, rolling a transaction |
|
3619 | 3619 | back locally is ineffective (someone else may already have pulled |
|
3620 | 3620 | the changes). Furthermore, a race is possible with readers of the |
|
3621 | 3621 | repository; for example an in-progress pull from the repository |
|
3622 | 3622 | may fail if a rollback is performed. |
|
3623 | 3623 | |
|
3624 | 3624 | Returns 0 on success, 1 if no rollback data is available. |
|
3625 | 3625 | """ |
|
3626 | 3626 | return repo.rollback(opts.get('dry_run')) |
|
3627 | 3627 | |
|
3628 | 3628 | def root(ui, repo): |
|
3629 | 3629 | """print the root (top) of the current working directory |
|
3630 | 3630 | |
|
3631 | 3631 | Print the root directory of the current repository. |
|
3632 | 3632 | |
|
3633 | 3633 | Returns 0 on success. |
|
3634 | 3634 | """ |
|
3635 | 3635 | ui.write(repo.root + "\n") |
|
3636 | 3636 | |
|
3637 | 3637 | def serve(ui, repo, **opts): |
|
3638 | 3638 | """start stand-alone webserver |
|
3639 | 3639 | |
|
3640 | 3640 | Start a local HTTP repository browser and pull server. You can use |
|
3641 | 3641 | this for ad-hoc sharing and browsing of repositories. It is |
|
3642 | 3642 | recommended to use a real web server to serve a repository for |
|
3643 | 3643 | longer periods of time. |
|
3644 | 3644 | |
|
3645 | 3645 | Please note that the server does not implement access control. |
|
3646 | 3646 | This means that, by default, anybody can read from the server and |
|
3647 | 3647 | nobody can write to it by default. Set the ``web.allow_push`` |
|
3648 | 3648 | option to ``*`` to allow everybody to push to the server. You |
|
3649 | 3649 | should use a real web server if you need to authenticate users. |
|
3650 | 3650 | |
|
3651 | 3651 | By default, the server logs accesses to stdout and errors to |
|
3652 | 3652 | stderr. Use the -A/--accesslog and -E/--errorlog options to log to |
|
3653 | 3653 | files. |
|
3654 | 3654 | |
|
3655 | 3655 | To have the server choose a free port number to listen on, specify |
|
3656 | 3656 | a port number of 0; in this case, the server will print the port |
|
3657 | 3657 | number it uses. |
|
3658 | 3658 | |
|
3659 | 3659 | Returns 0 on success. |
|
3660 | 3660 | """ |
|
3661 | 3661 | |
|
3662 | 3662 | if opts["stdio"]: |
|
3663 | 3663 | if repo is None: |
|
3664 | 3664 | raise error.RepoError(_("There is no Mercurial repository here" |
|
3665 | 3665 | " (.hg not found)")) |
|
3666 | 3666 | s = sshserver.sshserver(ui, repo) |
|
3667 | 3667 | s.serve_forever() |
|
3668 | 3668 | |
|
3669 | 3669 | # this way we can check if something was given in the command-line |
|
3670 | 3670 | if opts.get('port'): |
|
3671 | 3671 | opts['port'] = util.getport(opts.get('port')) |
|
3672 | 3672 | |
|
3673 | 3673 | baseui = repo and repo.baseui or ui |
|
3674 | 3674 | optlist = ("name templates style address port prefix ipv6" |
|
3675 | 3675 | " accesslog errorlog certificate encoding") |
|
3676 | 3676 | for o in optlist.split(): |
|
3677 | 3677 | val = opts.get(o, '') |
|
3678 | 3678 | if val in (None, ''): # should check against default options instead |
|
3679 | 3679 | continue |
|
3680 | 3680 | baseui.setconfig("web", o, val) |
|
3681 | 3681 | if repo and repo.ui != baseui: |
|
3682 | 3682 | repo.ui.setconfig("web", o, val) |
|
3683 | 3683 | |
|
3684 | 3684 | o = opts.get('web_conf') or opts.get('webdir_conf') |
|
3685 | 3685 | if not o: |
|
3686 | 3686 | if not repo: |
|
3687 | 3687 | raise error.RepoError(_("There is no Mercurial repository" |
|
3688 | 3688 | " here (.hg not found)")) |
|
3689 | 3689 | o = repo.root |
|
3690 | 3690 | |
|
3691 | 3691 | app = hgweb.hgweb(o, baseui=ui) |
|
3692 | 3692 | |
|
3693 | 3693 | class service(object): |
|
3694 | 3694 | def init(self): |
|
3695 | 3695 | util.set_signal_handler() |
|
3696 | 3696 | self.httpd = hgweb.server.create_server(ui, app) |
|
3697 | 3697 | |
|
3698 | 3698 | if opts['port'] and not ui.verbose: |
|
3699 | 3699 | return |
|
3700 | 3700 | |
|
3701 | 3701 | if self.httpd.prefix: |
|
3702 | 3702 | prefix = self.httpd.prefix.strip('/') + '/' |
|
3703 | 3703 | else: |
|
3704 | 3704 | prefix = '' |
|
3705 | 3705 | |
|
3706 | 3706 | port = ':%d' % self.httpd.port |
|
3707 | 3707 | if port == ':80': |
|
3708 | 3708 | port = '' |
|
3709 | 3709 | |
|
3710 | 3710 | bindaddr = self.httpd.addr |
|
3711 | 3711 | if bindaddr == '0.0.0.0': |
|
3712 | 3712 | bindaddr = '*' |
|
3713 | 3713 | elif ':' in bindaddr: # IPv6 |
|
3714 | 3714 | bindaddr = '[%s]' % bindaddr |
|
3715 | 3715 | |
|
3716 | 3716 | fqaddr = self.httpd.fqaddr |
|
3717 | 3717 | if ':' in fqaddr: |
|
3718 | 3718 | fqaddr = '[%s]' % fqaddr |
|
3719 | 3719 | if opts['port']: |
|
3720 | 3720 | write = ui.status |
|
3721 | 3721 | else: |
|
3722 | 3722 | write = ui.write |
|
3723 | 3723 | write(_('listening at http://%s%s/%s (bound to %s:%d)\n') % |
|
3724 | 3724 | (fqaddr, port, prefix, bindaddr, self.httpd.port)) |
|
3725 | 3725 | |
|
3726 | 3726 | def run(self): |
|
3727 | 3727 | self.httpd.serve_forever() |
|
3728 | 3728 | |
|
3729 | 3729 | service = service() |
|
3730 | 3730 | |
|
3731 | 3731 | cmdutil.service(opts, initfn=service.init, runfn=service.run) |
|
3732 | 3732 | |
|
3733 | 3733 | def status(ui, repo, *pats, **opts): |
|
3734 | 3734 | """show changed files in the working directory |
|
3735 | 3735 | |
|
3736 | 3736 | Show status of files in the repository. If names are given, only |
|
3737 | 3737 | files that match are shown. Files that are clean or ignored or |
|
3738 | 3738 | the source of a copy/move operation, are not listed unless |
|
3739 | 3739 | -c/--clean, -i/--ignored, -C/--copies or -A/--all are given. |
|
3740 | 3740 | Unless options described with "show only ..." are given, the |
|
3741 | 3741 | options -mardu are used. |
|
3742 | 3742 | |
|
3743 | 3743 | Option -q/--quiet hides untracked (unknown and ignored) files |
|
3744 | 3744 | unless explicitly requested with -u/--unknown or -i/--ignored. |
|
3745 | 3745 | |
|
3746 | 3746 | .. note:: |
|
3747 | 3747 | status may appear to disagree with diff if permissions have |
|
3748 | 3748 | changed or a merge has occurred. The standard diff format does |
|
3749 | 3749 | not report permission changes and diff only reports changes |
|
3750 | 3750 | relative to one merge parent. |
|
3751 | 3751 | |
|
3752 | 3752 | If one revision is given, it is used as the base revision. |
|
3753 | 3753 | If two revisions are given, the differences between them are |
|
3754 | 3754 | shown. The --change option can also be used as a shortcut to list |
|
3755 | 3755 | the changed files of a revision from its first parent. |
|
3756 | 3756 | |
|
3757 | 3757 | The codes used to show the status of files are:: |
|
3758 | 3758 | |
|
3759 | 3759 | M = modified |
|
3760 | 3760 | A = added |
|
3761 | 3761 | R = removed |
|
3762 | 3762 | C = clean |
|
3763 | 3763 | ! = missing (deleted by non-hg command, but still tracked) |
|
3764 | 3764 | ? = not tracked |
|
3765 | 3765 | I = ignored |
|
3766 | 3766 | = origin of the previous file listed as A (added) |
|
3767 | 3767 | |
|
3768 | 3768 | Returns 0 on success. |
|
3769 | 3769 | """ |
|
3770 | 3770 | |
|
3771 | 3771 | revs = opts.get('rev') |
|
3772 | 3772 | change = opts.get('change') |
|
3773 | 3773 | |
|
3774 | 3774 | if revs and change: |
|
3775 | 3775 | msg = _('cannot specify --rev and --change at the same time') |
|
3776 | 3776 | raise util.Abort(msg) |
|
3777 | 3777 | elif change: |
|
3778 | 3778 | node2 = repo.lookup(change) |
|
3779 | 3779 | node1 = repo[node2].p1().node() |
|
3780 | 3780 | else: |
|
3781 | 3781 | node1, node2 = cmdutil.revpair(repo, revs) |
|
3782 | 3782 | |
|
3783 | 3783 | cwd = (pats and repo.getcwd()) or '' |
|
3784 | 3784 | end = opts.get('print0') and '\0' or '\n' |
|
3785 | 3785 | copy = {} |
|
3786 | 3786 | states = 'modified added removed deleted unknown ignored clean'.split() |
|
3787 | 3787 | show = [k for k in states if opts.get(k)] |
|
3788 | 3788 | if opts.get('all'): |
|
3789 | 3789 | show += ui.quiet and (states[:4] + ['clean']) or states |
|
3790 | 3790 | if not show: |
|
3791 | 3791 | show = ui.quiet and states[:4] or states[:5] |
|
3792 | 3792 | |
|
3793 | 3793 | stat = repo.status(node1, node2, cmdutil.match(repo, pats, opts), |
|
3794 | 3794 | 'ignored' in show, 'clean' in show, 'unknown' in show, |
|
3795 | 3795 | opts.get('subrepos')) |
|
3796 | 3796 | changestates = zip(states, 'MAR!?IC', stat) |
|
3797 | 3797 | |
|
3798 | 3798 | if (opts.get('all') or opts.get('copies')) and not opts.get('no_status'): |
|
3799 | 3799 | ctxn = repo[nullid] |
|
3800 | 3800 | ctx1 = repo[node1] |
|
3801 | 3801 | ctx2 = repo[node2] |
|
3802 | 3802 | added = stat[1] |
|
3803 | 3803 | if node2 is None: |
|
3804 | 3804 | added = stat[0] + stat[1] # merged? |
|
3805 | 3805 | |
|
3806 | 3806 | for k, v in copies.copies(repo, ctx1, ctx2, ctxn)[0].iteritems(): |
|
3807 | 3807 | if k in added: |
|
3808 | 3808 | copy[k] = v |
|
3809 | 3809 | elif v in added: |
|
3810 | 3810 | copy[v] = k |
|
3811 | 3811 | |
|
3812 | 3812 | for state, char, files in changestates: |
|
3813 | 3813 | if state in show: |
|
3814 | 3814 | format = "%s %%s%s" % (char, end) |
|
3815 | 3815 | if opts.get('no_status'): |
|
3816 | 3816 | format = "%%s%s" % end |
|
3817 | 3817 | |
|
3818 | 3818 | for f in files: |
|
3819 | 3819 | ui.write(format % repo.pathto(f, cwd), |
|
3820 | 3820 | label='status.' + state) |
|
3821 | 3821 | if f in copy: |
|
3822 | 3822 | ui.write(' %s%s' % (repo.pathto(copy[f], cwd), end), |
|
3823 | 3823 | label='status.copied') |
|
3824 | 3824 | |
|
3825 | 3825 | def summary(ui, repo, **opts): |
|
3826 | 3826 | """summarize working directory state |
|
3827 | 3827 | |
|
3828 | 3828 | This generates a brief summary of the working directory state, |
|
3829 | 3829 | including parents, branch, commit status, and available updates. |
|
3830 | 3830 | |
|
3831 | 3831 | With the --remote option, this will check the default paths for |
|
3832 | 3832 | incoming and outgoing changes. This can be time-consuming. |
|
3833 | 3833 | |
|
3834 | 3834 | Returns 0 on success. |
|
3835 | 3835 | """ |
|
3836 | 3836 | |
|
3837 | 3837 | ctx = repo[None] |
|
3838 | 3838 | parents = ctx.parents() |
|
3839 | 3839 | pnode = parents[0].node() |
|
3840 | 3840 | |
|
3841 | 3841 | for p in parents: |
|
3842 | 3842 | # label with log.changeset (instead of log.parent) since this |
|
3843 | 3843 | # shows a working directory parent *changeset*: |
|
3844 | 3844 | ui.write(_('parent: %d:%s ') % (p.rev(), str(p)), |
|
3845 | 3845 | label='log.changeset') |
|
3846 | 3846 | ui.write(' '.join(p.tags()), label='log.tag') |
|
3847 | 3847 | if p.bookmarks(): |
|
3848 | 3848 | ui.write(' ' + ' '.join(p.bookmarks()), label='log.bookmark') |
|
3849 | 3849 | if p.rev() == -1: |
|
3850 | 3850 | if not len(repo): |
|
3851 | 3851 | ui.write(_(' (empty repository)')) |
|
3852 | 3852 | else: |
|
3853 | 3853 | ui.write(_(' (no revision checked out)')) |
|
3854 | 3854 | ui.write('\n') |
|
3855 | 3855 | if p.description(): |
|
3856 | 3856 | ui.status(' ' + p.description().splitlines()[0].strip() + '\n', |
|
3857 | 3857 | label='log.summary') |
|
3858 | 3858 | |
|
3859 | 3859 | branch = ctx.branch() |
|
3860 | 3860 | bheads = repo.branchheads(branch) |
|
3861 | 3861 | m = _('branch: %s\n') % branch |
|
3862 | 3862 | if branch != 'default': |
|
3863 | 3863 | ui.write(m, label='log.branch') |
|
3864 | 3864 | else: |
|
3865 | 3865 | ui.status(m, label='log.branch') |
|
3866 | 3866 | |
|
3867 | 3867 | st = list(repo.status(unknown=True))[:6] |
|
3868 | 3868 | |
|
3869 | 3869 | c = repo.dirstate.copies() |
|
3870 | 3870 | copied, renamed = [], [] |
|
3871 | 3871 | for d, s in c.iteritems(): |
|
3872 | 3872 | if s in st[2]: |
|
3873 | 3873 | st[2].remove(s) |
|
3874 | 3874 | renamed.append(d) |
|
3875 | 3875 | else: |
|
3876 | 3876 | copied.append(d) |
|
3877 | 3877 | if d in st[1]: |
|
3878 | 3878 | st[1].remove(d) |
|
3879 | 3879 | st.insert(3, renamed) |
|
3880 | 3880 | st.insert(4, copied) |
|
3881 | 3881 | |
|
3882 | 3882 | ms = mergemod.mergestate(repo) |
|
3883 | 3883 | st.append([f for f in ms if ms[f] == 'u']) |
|
3884 | 3884 | |
|
3885 | 3885 | subs = [s for s in ctx.substate if ctx.sub(s).dirty()] |
|
3886 | 3886 | st.append(subs) |
|
3887 | 3887 | |
|
3888 | 3888 | labels = [ui.label(_('%d modified'), 'status.modified'), |
|
3889 | 3889 | ui.label(_('%d added'), 'status.added'), |
|
3890 | 3890 | ui.label(_('%d removed'), 'status.removed'), |
|
3891 | 3891 | ui.label(_('%d renamed'), 'status.copied'), |
|
3892 | 3892 | ui.label(_('%d copied'), 'status.copied'), |
|
3893 | 3893 | ui.label(_('%d deleted'), 'status.deleted'), |
|
3894 | 3894 | ui.label(_('%d unknown'), 'status.unknown'), |
|
3895 | 3895 | ui.label(_('%d ignored'), 'status.ignored'), |
|
3896 | 3896 | ui.label(_('%d unresolved'), 'resolve.unresolved'), |
|
3897 | 3897 | ui.label(_('%d subrepos'), 'status.modified')] |
|
3898 | 3898 | t = [] |
|
3899 | 3899 | for s, l in zip(st, labels): |
|
3900 | 3900 | if s: |
|
3901 | 3901 | t.append(l % len(s)) |
|
3902 | 3902 | |
|
3903 | 3903 | t = ', '.join(t) |
|
3904 | 3904 | cleanworkdir = False |
|
3905 | 3905 | |
|
3906 | 3906 | if len(parents) > 1: |
|
3907 | 3907 | t += _(' (merge)') |
|
3908 | 3908 | elif branch != parents[0].branch(): |
|
3909 | 3909 | t += _(' (new branch)') |
|
3910 | 3910 | elif (parents[0].extra().get('close') and |
|
3911 | 3911 | pnode in repo.branchheads(branch, closed=True)): |
|
3912 | 3912 | t += _(' (head closed)') |
|
3913 | 3913 | elif not (st[0] or st[1] or st[2] or st[3] or st[4] or st[9]): |
|
3914 | 3914 | t += _(' (clean)') |
|
3915 | 3915 | cleanworkdir = True |
|
3916 | 3916 | elif pnode not in bheads: |
|
3917 | 3917 | t += _(' (new branch head)') |
|
3918 | 3918 | |
|
3919 | 3919 | if cleanworkdir: |
|
3920 | 3920 | ui.status(_('commit: %s\n') % t.strip()) |
|
3921 | 3921 | else: |
|
3922 | 3922 | ui.write(_('commit: %s\n') % t.strip()) |
|
3923 | 3923 | |
|
3924 | 3924 | # all ancestors of branch heads - all ancestors of parent = new csets |
|
3925 | 3925 | new = [0] * len(repo) |
|
3926 | 3926 | cl = repo.changelog |
|
3927 | 3927 | for a in [cl.rev(n) for n in bheads]: |
|
3928 | 3928 | new[a] = 1 |
|
3929 | 3929 | for a in cl.ancestors(*[cl.rev(n) for n in bheads]): |
|
3930 | 3930 | new[a] = 1 |
|
3931 | 3931 | for a in [p.rev() for p in parents]: |
|
3932 | 3932 | if a >= 0: |
|
3933 | 3933 | new[a] = 0 |
|
3934 | 3934 | for a in cl.ancestors(*[p.rev() for p in parents]): |
|
3935 | 3935 | new[a] = 0 |
|
3936 | 3936 | new = sum(new) |
|
3937 | 3937 | |
|
3938 | 3938 | if new == 0: |
|
3939 | 3939 | ui.status(_('update: (current)\n')) |
|
3940 | 3940 | elif pnode not in bheads: |
|
3941 | 3941 | ui.write(_('update: %d new changesets (update)\n') % new) |
|
3942 | 3942 | else: |
|
3943 | 3943 | ui.write(_('update: %d new changesets, %d branch heads (merge)\n') % |
|
3944 | 3944 | (new, len(bheads))) |
|
3945 | 3945 | |
|
3946 | 3946 | if opts.get('remote'): |
|
3947 | 3947 | t = [] |
|
3948 | 3948 | source, branches = hg.parseurl(ui.expandpath('default')) |
|
3949 | 3949 | other = hg.repository(hg.remoteui(repo, {}), source) |
|
3950 | 3950 | revs, checkout = hg.addbranchrevs(repo, other, branches, opts.get('rev')) |
|
3951 | 3951 | ui.debug('comparing with %s\n' % url.hidepassword(source)) |
|
3952 | 3952 | repo.ui.pushbuffer() |
|
3953 | 3953 | common, incoming, rheads = discovery.findcommonincoming(repo, other) |
|
3954 | 3954 | repo.ui.popbuffer() |
|
3955 | 3955 | if incoming: |
|
3956 | 3956 | t.append(_('1 or more incoming')) |
|
3957 | 3957 | |
|
3958 | 3958 | dest, branches = hg.parseurl(ui.expandpath('default-push', 'default')) |
|
3959 | 3959 | revs, checkout = hg.addbranchrevs(repo, repo, branches, None) |
|
3960 | 3960 | other = hg.repository(hg.remoteui(repo, {}), dest) |
|
3961 | 3961 | ui.debug('comparing with %s\n' % url.hidepassword(dest)) |
|
3962 | 3962 | repo.ui.pushbuffer() |
|
3963 | 3963 | o = discovery.findoutgoing(repo, other) |
|
3964 | 3964 | repo.ui.popbuffer() |
|
3965 | 3965 | o = repo.changelog.nodesbetween(o, None)[0] |
|
3966 | 3966 | if o: |
|
3967 | 3967 | t.append(_('%d outgoing') % len(o)) |
|
3968 | 3968 | if 'bookmarks' in other.listkeys('namespaces'): |
|
3969 | 3969 | lmarks = repo.listkeys('bookmarks') |
|
3970 | 3970 | rmarks = other.listkeys('bookmarks') |
|
3971 | 3971 | diff = set(rmarks) - set(lmarks) |
|
3972 | 3972 | if len(diff) > 0: |
|
3973 | 3973 | t.append(_('%d incoming bookmarks') % len(diff)) |
|
3974 | 3974 | diff = set(lmarks) - set(rmarks) |
|
3975 | 3975 | if len(diff) > 0: |
|
3976 | 3976 | t.append(_('%d outgoing bookmarks') % len(diff)) |
|
3977 | 3977 | |
|
3978 | 3978 | if t: |
|
3979 | 3979 | ui.write(_('remote: %s\n') % (', '.join(t))) |
|
3980 | 3980 | else: |
|
3981 | 3981 | ui.status(_('remote: (synced)\n')) |
|
3982 | 3982 | |
|
3983 | 3983 | def tag(ui, repo, name1, *names, **opts): |
|
3984 | 3984 | """add one or more tags for the current or given revision |
|
3985 | 3985 | |
|
3986 | 3986 | Name a particular revision using <name>. |
|
3987 | 3987 | |
|
3988 | 3988 | Tags are used to name particular revisions of the repository and are |
|
3989 | 3989 | very useful to compare different revisions, to go back to significant |
|
3990 | 3990 | earlier versions or to mark branch points as releases, etc. Changing |
|
3991 | 3991 | an existing tag is normally disallowed; use -f/--force to override. |
|
3992 | 3992 | |
|
3993 | 3993 | If no revision is given, the parent of the working directory is |
|
3994 | 3994 | used, or tip if no revision is checked out. |
|
3995 | 3995 | |
|
3996 | 3996 | To facilitate version control, distribution, and merging of tags, |
|
3997 | 3997 | they are stored as a file named ".hgtags" which is managed similarly |
|
3998 | 3998 | to other project files and can be hand-edited if necessary. This |
|
3999 | 3999 | also means that tagging creates a new commit. The file |
|
4000 | 4000 | ".hg/localtags" is used for local tags (not shared among |
|
4001 | 4001 | repositories). |
|
4002 | 4002 | |
|
4003 | 4003 | Tag commits are usually made at the head of a branch. If the parent |
|
4004 | 4004 | of the working directory is not a branch head, :hg:`tag` aborts; use |
|
4005 | 4005 | -f/--force to force the tag commit to be based on a non-head |
|
4006 | 4006 | changeset. |
|
4007 | 4007 | |
|
4008 | 4008 | See :hg:`help dates` for a list of formats valid for -d/--date. |
|
4009 | 4009 | |
|
4010 | 4010 | Since tag names have priority over branch names during revision |
|
4011 | 4011 | lookup, using an existing branch name as a tag name is discouraged. |
|
4012 | 4012 | |
|
4013 | 4013 | Returns 0 on success. |
|
4014 | 4014 | """ |
|
4015 | 4015 | |
|
4016 | 4016 | rev_ = "." |
|
4017 | 4017 | names = [t.strip() for t in (name1,) + names] |
|
4018 | 4018 | if len(names) != len(set(names)): |
|
4019 | 4019 | raise util.Abort(_('tag names must be unique')) |
|
4020 | 4020 | for n in names: |
|
4021 | 4021 | if n in ['tip', '.', 'null']: |
|
4022 | 4022 | raise util.Abort(_('the name \'%s\' is reserved') % n) |
|
4023 | 4023 | if not n: |
|
4024 | 4024 | raise util.Abort(_('tag names cannot consist entirely of whitespace')) |
|
4025 | 4025 | if opts.get('rev') and opts.get('remove'): |
|
4026 | 4026 | raise util.Abort(_("--rev and --remove are incompatible")) |
|
4027 | 4027 | if opts.get('rev'): |
|
4028 | 4028 | rev_ = opts['rev'] |
|
4029 | 4029 | message = opts.get('message') |
|
4030 | 4030 | if opts.get('remove'): |
|
4031 | 4031 | expectedtype = opts.get('local') and 'local' or 'global' |
|
4032 | 4032 | for n in names: |
|
4033 | 4033 | if not repo.tagtype(n): |
|
4034 | 4034 | raise util.Abort(_('tag \'%s\' does not exist') % n) |
|
4035 | 4035 | if repo.tagtype(n) != expectedtype: |
|
4036 | 4036 | if expectedtype == 'global': |
|
4037 | 4037 | raise util.Abort(_('tag \'%s\' is not a global tag') % n) |
|
4038 | 4038 | else: |
|
4039 | 4039 | raise util.Abort(_('tag \'%s\' is not a local tag') % n) |
|
4040 | 4040 | rev_ = nullid |
|
4041 | 4041 | if not message: |
|
4042 | 4042 | # we don't translate commit messages |
|
4043 | 4043 | message = 'Removed tag %s' % ', '.join(names) |
|
4044 | 4044 | elif not opts.get('force'): |
|
4045 | 4045 | for n in names: |
|
4046 | 4046 | if n in repo.tags(): |
|
4047 | 4047 | raise util.Abort(_('tag \'%s\' already exists ' |
|
4048 | 4048 | '(use -f to force)') % n) |
|
4049 | 4049 | if not opts.get('local'): |
|
4050 | 4050 | p1, p2 = repo.dirstate.parents() |
|
4051 | 4051 | if p2 != nullid: |
|
4052 | 4052 | raise util.Abort(_('uncommitted merge')) |
|
4053 | 4053 | bheads = repo.branchheads() |
|
4054 | 4054 | if not opts.get('force') and bheads and p1 not in bheads: |
|
4055 | 4055 | raise util.Abort(_('not at a branch head (use -f to force)')) |
|
4056 | 4056 | r = cmdutil.revsingle(repo, rev_).node() |
|
4057 | 4057 | |
|
4058 | 4058 | if not message: |
|
4059 | 4059 | # we don't translate commit messages |
|
4060 | 4060 | message = ('Added tag %s for changeset %s' % |
|
4061 | 4061 | (', '.join(names), short(r))) |
|
4062 | 4062 | |
|
4063 | 4063 | date = opts.get('date') |
|
4064 | 4064 | if date: |
|
4065 | 4065 | date = util.parsedate(date) |
|
4066 | 4066 | |
|
4067 | 4067 | if opts.get('edit'): |
|
4068 | 4068 | message = ui.edit(message, ui.username()) |
|
4069 | 4069 | |
|
4070 | 4070 | repo.tag(names, r, message, opts.get('local'), opts.get('user'), date) |
|
4071 | 4071 | |
|
4072 | 4072 | def tags(ui, repo): |
|
4073 | 4073 | """list repository tags |
|
4074 | 4074 | |
|
4075 | 4075 | This lists both regular and local tags. When the -v/--verbose |
|
4076 | 4076 | switch is used, a third column "local" is printed for local tags. |
|
4077 | 4077 | |
|
4078 | 4078 | Returns 0 on success. |
|
4079 | 4079 | """ |
|
4080 | 4080 | |
|
4081 | 4081 | hexfunc = ui.debugflag and hex or short |
|
4082 | 4082 | tagtype = "" |
|
4083 | 4083 | |
|
4084 | 4084 | for t, n in reversed(repo.tagslist()): |
|
4085 | 4085 | if ui.quiet: |
|
4086 | 4086 | ui.write("%s\n" % t) |
|
4087 | 4087 | continue |
|
4088 | 4088 | |
|
4089 | 4089 | hn = hexfunc(n) |
|
4090 | 4090 | r = "%5d:%s" % (repo.changelog.rev(n), hn) |
|
4091 | 4091 | spaces = " " * (30 - encoding.colwidth(t)) |
|
4092 | 4092 | |
|
4093 | 4093 | if ui.verbose: |
|
4094 | 4094 | if repo.tagtype(t) == 'local': |
|
4095 | 4095 | tagtype = " local" |
|
4096 | 4096 | else: |
|
4097 | 4097 | tagtype = "" |
|
4098 | 4098 | ui.write("%s%s %s%s\n" % (t, spaces, r, tagtype)) |
|
4099 | 4099 | |
|
4100 | 4100 | def tip(ui, repo, **opts): |
|
4101 | 4101 | """show the tip revision |
|
4102 | 4102 | |
|
4103 | 4103 | The tip revision (usually just called the tip) is the changeset |
|
4104 | 4104 | most recently added to the repository (and therefore the most |
|
4105 | 4105 | recently changed head). |
|
4106 | 4106 | |
|
4107 | 4107 | If you have just made a commit, that commit will be the tip. If |
|
4108 | 4108 | you have just pulled changes from another repository, the tip of |
|
4109 | 4109 | that repository becomes the current tip. The "tip" tag is special |
|
4110 | 4110 | and cannot be renamed or assigned to a different changeset. |
|
4111 | 4111 | |
|
4112 | 4112 | Returns 0 on success. |
|
4113 | 4113 | """ |
|
4114 | 4114 | displayer = cmdutil.show_changeset(ui, repo, opts) |
|
4115 | 4115 | displayer.show(repo[len(repo) - 1]) |
|
4116 | 4116 | displayer.close() |
|
4117 | 4117 | |
|
4118 | 4118 | def unbundle(ui, repo, fname1, *fnames, **opts): |
|
4119 | 4119 | """apply one or more changegroup files |
|
4120 | 4120 | |
|
4121 | 4121 | Apply one or more compressed changegroup files generated by the |
|
4122 | 4122 | bundle command. |
|
4123 | 4123 | |
|
4124 | 4124 | Returns 0 on success, 1 if an update has unresolved files. |
|
4125 | 4125 | """ |
|
4126 | 4126 | fnames = (fname1,) + fnames |
|
4127 | 4127 | |
|
4128 | 4128 | lock = repo.lock() |
|
4129 | 4129 | wc = repo['.'] |
|
4130 | 4130 | try: |
|
4131 | 4131 | for fname in fnames: |
|
4132 | 4132 | f = url.open(ui, fname) |
|
4133 | 4133 | gen = changegroup.readbundle(f, fname) |
|
4134 | 4134 | modheads = repo.addchangegroup(gen, 'unbundle', 'bundle:' + fname, |
|
4135 | 4135 | lock=lock) |
|
4136 | 4136 | bookmarks.updatecurrentbookmark(repo, wc.node(), wc.branch()) |
|
4137 | 4137 | finally: |
|
4138 | 4138 | lock.release() |
|
4139 | 4139 | return postincoming(ui, repo, modheads, opts.get('update'), None) |
|
4140 | 4140 | |
|
4141 | 4141 | def update(ui, repo, node=None, rev=None, clean=False, date=None, check=False): |
|
4142 | 4142 | """update working directory (or switch revisions) |
|
4143 | 4143 | |
|
4144 | 4144 | Update the repository's working directory to the specified |
|
4145 | 4145 | changeset. If no changeset is specified, update to the tip of the |
|
4146 | 4146 | current named branch. |
|
4147 | 4147 | |
|
4148 | 4148 | If the changeset is not a descendant of the working directory's |
|
4149 | 4149 | parent, the update is aborted. With the -c/--check option, the |
|
4150 | 4150 | working directory is checked for uncommitted changes; if none are |
|
4151 | 4151 | found, the working directory is updated to the specified |
|
4152 | 4152 | changeset. |
|
4153 | 4153 | |
|
4154 | 4154 | The following rules apply when the working directory contains |
|
4155 | 4155 | uncommitted changes: |
|
4156 | 4156 | |
|
4157 | 4157 | 1. If neither -c/--check nor -C/--clean is specified, and if |
|
4158 | 4158 | the requested changeset is an ancestor or descendant of |
|
4159 | 4159 | the working directory's parent, the uncommitted changes |
|
4160 | 4160 | are merged into the requested changeset and the merged |
|
4161 | 4161 | result is left uncommitted. If the requested changeset is |
|
4162 | 4162 | not an ancestor or descendant (that is, it is on another |
|
4163 | 4163 | branch), the update is aborted and the uncommitted changes |
|
4164 | 4164 | are preserved. |
|
4165 | 4165 | |
|
4166 | 4166 | 2. With the -c/--check option, the update is aborted and the |
|
4167 | 4167 | uncommitted changes are preserved. |
|
4168 | 4168 | |
|
4169 | 4169 | 3. With the -C/--clean option, uncommitted changes are discarded and |
|
4170 | 4170 | the working directory is updated to the requested changeset. |
|
4171 | 4171 | |
|
4172 | 4172 | Use null as the changeset to remove the working directory (like |
|
4173 | 4173 | :hg:`clone -U`). |
|
4174 | 4174 | |
|
4175 | 4175 | If you want to update just one file to an older changeset, use |
|
4176 | 4176 | :hg:`revert`. |
|
4177 | 4177 | |
|
4178 | 4178 | See :hg:`help dates` for a list of formats valid for -d/--date. |
|
4179 | 4179 | |
|
4180 | 4180 | Returns 0 on success, 1 if there are unresolved files. |
|
4181 | 4181 | """ |
|
4182 | 4182 | if rev and node: |
|
4183 | 4183 | raise util.Abort(_("please specify just one revision")) |
|
4184 | 4184 | |
|
4185 | 4185 | if rev is None or rev == '': |
|
4186 | 4186 | rev = node |
|
4187 | 4187 | |
|
4188 | 4188 | # if we defined a bookmark, we have to remember the original bookmark name |
|
4189 | 4189 | brev = rev |
|
4190 | 4190 | rev = cmdutil.revsingle(repo, rev, rev).rev() |
|
4191 | 4191 | |
|
4192 | 4192 | if check and clean: |
|
4193 | 4193 | raise util.Abort(_("cannot specify both -c/--check and -C/--clean")) |
|
4194 | 4194 | |
|
4195 | 4195 | if check: |
|
4196 | 4196 | # we could use dirty() but we can ignore merge and branch trivia |
|
4197 | 4197 | c = repo[None] |
|
4198 | 4198 | if c.modified() or c.added() or c.removed(): |
|
4199 | 4199 | raise util.Abort(_("uncommitted local changes")) |
|
4200 | 4200 | |
|
4201 | 4201 | if date: |
|
4202 | 4202 | if rev is not None: |
|
4203 | 4203 | raise util.Abort(_("you can't specify a revision and a date")) |
|
4204 | 4204 | rev = cmdutil.finddate(ui, repo, date) |
|
4205 | 4205 | |
|
4206 | 4206 | if clean or check: |
|
4207 | 4207 | ret = hg.clean(repo, rev) |
|
4208 | 4208 | else: |
|
4209 | 4209 | ret = hg.update(repo, rev) |
|
4210 | 4210 | |
|
4211 | 4211 | if brev in repo._bookmarks: |
|
4212 | 4212 | bookmarks.setcurrent(repo, brev) |
|
4213 | 4213 | |
|
4214 | 4214 | return ret |
|
4215 | 4215 | |
|
4216 | 4216 | def verify(ui, repo): |
|
4217 | 4217 | """verify the integrity of the repository |
|
4218 | 4218 | |
|
4219 | 4219 | Verify the integrity of the current repository. |
|
4220 | 4220 | |
|
4221 | 4221 | This will perform an extensive check of the repository's |
|
4222 | 4222 | integrity, validating the hashes and checksums of each entry in |
|
4223 | 4223 | the changelog, manifest, and tracked files, as well as the |
|
4224 | 4224 | integrity of their crosslinks and indices. |
|
4225 | 4225 | |
|
4226 | 4226 | Returns 0 on success, 1 if errors are encountered. |
|
4227 | 4227 | """ |
|
4228 | 4228 | return hg.verify(repo) |
|
4229 | 4229 | |
|
4230 | 4230 | def version_(ui): |
|
4231 | 4231 | """output version and copyright information""" |
|
4232 | 4232 | ui.write(_("Mercurial Distributed SCM (version %s)\n") |
|
4233 | 4233 | % util.version()) |
|
4234 | 4234 | ui.status(_( |
|
4235 | 4235 | "(see http://mercurial.selenic.com for more information)\n" |
|
4236 | 4236 | "\nCopyright (C) 2005-2011 Matt Mackall and others\n" |
|
4237 | 4237 | "This is free software; see the source for copying conditions. " |
|
4238 | 4238 | "There is NO\nwarranty; " |
|
4239 | 4239 | "not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n" |
|
4240 | 4240 | )) |
|
4241 | 4241 | |
|
4242 | 4242 | # Command options and aliases are listed here, alphabetically |
|
4243 | 4243 | |
|
4244 | 4244 | globalopts = [ |
|
4245 | 4245 | ('R', 'repository', '', |
|
4246 | 4246 | _('repository root directory or name of overlay bundle file'), |
|
4247 | 4247 | _('REPO')), |
|
4248 | 4248 | ('', 'cwd', '', |
|
4249 | 4249 | _('change working directory'), _('DIR')), |
|
4250 | 4250 | ('y', 'noninteractive', None, |
|
4251 | 4251 | _('do not prompt, assume \'yes\' for any required answers')), |
|
4252 | 4252 | ('q', 'quiet', None, _('suppress output')), |
|
4253 | 4253 | ('v', 'verbose', None, _('enable additional output')), |
|
4254 | 4254 | ('', 'config', [], |
|
4255 | 4255 | _('set/override config option (use \'section.name=value\')'), |
|
4256 | 4256 | _('CONFIG')), |
|
4257 | 4257 | ('', 'debug', None, _('enable debugging output')), |
|
4258 | 4258 | ('', 'debugger', None, _('start debugger')), |
|
4259 | 4259 | ('', 'encoding', encoding.encoding, _('set the charset encoding'), |
|
4260 | 4260 | _('ENCODE')), |
|
4261 | 4261 | ('', 'encodingmode', encoding.encodingmode, |
|
4262 | 4262 | _('set the charset encoding mode'), _('MODE')), |
|
4263 | 4263 | ('', 'traceback', None, _('always print a traceback on exception')), |
|
4264 | 4264 | ('', 'time', None, _('time how long the command takes')), |
|
4265 | 4265 | ('', 'profile', None, _('print command execution profile')), |
|
4266 | 4266 | ('', 'version', None, _('output version information and exit')), |
|
4267 | 4267 | ('h', 'help', None, _('display help and exit')), |
|
4268 | 4268 | ] |
|
4269 | 4269 | |
|
4270 | 4270 | dryrunopts = [('n', 'dry-run', None, |
|
4271 | 4271 | _('do not perform actions, just print output'))] |
|
4272 | 4272 | |
|
4273 | 4273 | remoteopts = [ |
|
4274 | 4274 | ('e', 'ssh', '', |
|
4275 | 4275 | _('specify ssh command to use'), _('CMD')), |
|
4276 | 4276 | ('', 'remotecmd', '', |
|
4277 | 4277 | _('specify hg command to run on the remote side'), _('CMD')), |
|
4278 | 4278 | ('', 'insecure', None, |
|
4279 | 4279 | _('do not verify server certificate (ignoring web.cacerts config)')), |
|
4280 | 4280 | ] |
|
4281 | 4281 | |
|
4282 | 4282 | walkopts = [ |
|
4283 | 4283 | ('I', 'include', [], |
|
4284 | 4284 | _('include names matching the given patterns'), _('PATTERN')), |
|
4285 | 4285 | ('X', 'exclude', [], |
|
4286 | 4286 | _('exclude names matching the given patterns'), _('PATTERN')), |
|
4287 | 4287 | ] |
|
4288 | 4288 | |
|
4289 | 4289 | commitopts = [ |
|
4290 | 4290 | ('m', 'message', '', |
|
4291 | 4291 | _('use text as commit message'), _('TEXT')), |
|
4292 | 4292 | ('l', 'logfile', '', |
|
4293 | 4293 | _('read commit message from file'), _('FILE')), |
|
4294 | 4294 | ] |
|
4295 | 4295 | |
|
4296 | 4296 | commitopts2 = [ |
|
4297 | 4297 | ('d', 'date', '', |
|
4298 | 4298 | _('record the specified date as commit date'), _('DATE')), |
|
4299 | 4299 | ('u', 'user', '', |
|
4300 | 4300 | _('record the specified user as committer'), _('USER')), |
|
4301 | 4301 | ] |
|
4302 | 4302 | |
|
4303 | 4303 | templateopts = [ |
|
4304 | 4304 | ('', 'style', '', |
|
4305 | 4305 | _('display using template map file'), _('STYLE')), |
|
4306 | 4306 | ('', 'template', '', |
|
4307 | 4307 | _('display with template'), _('TEMPLATE')), |
|
4308 | 4308 | ] |
|
4309 | 4309 | |
|
4310 | 4310 | logopts = [ |
|
4311 | 4311 | ('p', 'patch', None, _('show patch')), |
|
4312 | 4312 | ('g', 'git', None, _('use git extended diff format')), |
|
4313 | 4313 | ('l', 'limit', '', |
|
4314 | 4314 | _('limit number of changes displayed'), _('NUM')), |
|
4315 | 4315 | ('M', 'no-merges', None, _('do not show merges')), |
|
4316 | 4316 | ('', 'stat', None, _('output diffstat-style summary of changes')), |
|
4317 | 4317 | ] + templateopts |
|
4318 | 4318 | |
|
4319 | 4319 | diffopts = [ |
|
4320 | 4320 | ('a', 'text', None, _('treat all files as text')), |
|
4321 | 4321 | ('g', 'git', None, _('use git extended diff format')), |
|
4322 | 4322 | ('', 'nodates', None, _('omit dates from diff headers')) |
|
4323 | 4323 | ] |
|
4324 | 4324 | |
|
4325 | 4325 | diffopts2 = [ |
|
4326 | 4326 | ('p', 'show-function', None, _('show which function each change is in')), |
|
4327 | 4327 | ('', 'reverse', None, _('produce a diff that undoes the changes')), |
|
4328 | 4328 | ('w', 'ignore-all-space', None, |
|
4329 | 4329 | _('ignore white space when comparing lines')), |
|
4330 | 4330 | ('b', 'ignore-space-change', None, |
|
4331 | 4331 | _('ignore changes in the amount of white space')), |
|
4332 | 4332 | ('B', 'ignore-blank-lines', None, |
|
4333 | 4333 | _('ignore changes whose lines are all blank')), |
|
4334 | 4334 | ('U', 'unified', '', |
|
4335 | 4335 | _('number of lines of context to show'), _('NUM')), |
|
4336 | 4336 | ('', 'stat', None, _('output diffstat-style summary of changes')), |
|
4337 | 4337 | ] |
|
4338 | 4338 | |
|
4339 | 4339 | similarityopts = [ |
|
4340 | 4340 | ('s', 'similarity', '', |
|
4341 | 4341 | _('guess renamed files by similarity (0<=s<=100)'), _('SIMILARITY')) |
|
4342 | 4342 | ] |
|
4343 | 4343 | |
|
4344 | 4344 | subrepoopts = [ |
|
4345 | 4345 | ('S', 'subrepos', None, |
|
4346 | 4346 | _('recurse into subrepositories')) |
|
4347 | 4347 | ] |
|
4348 | 4348 | |
|
4349 | 4349 | table = { |
|
4350 | 4350 | "^add": (add, walkopts + subrepoopts + dryrunopts, |
|
4351 | 4351 | _('[OPTION]... [FILE]...')), |
|
4352 | 4352 | "addremove": |
|
4353 | 4353 | (addremove, similarityopts + walkopts + dryrunopts, |
|
4354 | 4354 | _('[OPTION]... [FILE]...')), |
|
4355 | 4355 | "^annotate|blame": |
|
4356 | 4356 | (annotate, |
|
4357 | 4357 | [('r', 'rev', '', |
|
4358 | 4358 | _('annotate the specified revision'), _('REV')), |
|
4359 | 4359 | ('', 'follow', None, |
|
4360 | 4360 | _('follow copies/renames and list the filename (DEPRECATED)')), |
|
4361 | 4361 | ('', 'no-follow', None, _("don't follow copies and renames")), |
|
4362 | 4362 | ('a', 'text', None, _('treat all files as text')), |
|
4363 | 4363 | ('u', 'user', None, _('list the author (long with -v)')), |
|
4364 | 4364 | ('f', 'file', None, _('list the filename')), |
|
4365 | 4365 | ('d', 'date', None, _('list the date (short with -q)')), |
|
4366 | 4366 | ('n', 'number', None, _('list the revision number (default)')), |
|
4367 | 4367 | ('c', 'changeset', None, _('list the changeset')), |
|
4368 | 4368 | ('l', 'line-number', None, |
|
4369 | 4369 | _('show line number at the first appearance')) |
|
4370 | 4370 | ] + walkopts, |
|
4371 | 4371 | _('[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FILE...')), |
|
4372 | 4372 | "archive": |
|
4373 | 4373 | (archive, |
|
4374 | 4374 | [('', 'no-decode', None, _('do not pass files through decoders')), |
|
4375 | 4375 | ('p', 'prefix', '', |
|
4376 | 4376 | _('directory prefix for files in archive'), _('PREFIX')), |
|
4377 | 4377 | ('r', 'rev', '', |
|
4378 | 4378 | _('revision to distribute'), _('REV')), |
|
4379 | 4379 | ('t', 'type', '', |
|
4380 | 4380 | _('type of distribution to create'), _('TYPE')), |
|
4381 | 4381 | ] + subrepoopts + walkopts, |
|
4382 | 4382 | _('[OPTION]... DEST')), |
|
4383 | 4383 | "backout": |
|
4384 | 4384 | (backout, |
|
4385 | 4385 | [('', 'merge', None, |
|
4386 | 4386 | _('merge with old dirstate parent after backout')), |
|
4387 | 4387 | ('', 'parent', '', |
|
4388 | 4388 | _('parent to choose when backing out merge'), _('REV')), |
|
4389 | 4389 | ('t', 'tool', '', |
|
4390 | 4390 | _('specify merge tool')), |
|
4391 | 4391 | ('r', 'rev', '', |
|
4392 | 4392 | _('revision to backout'), _('REV')), |
|
4393 | 4393 | ] + walkopts + commitopts + commitopts2, |
|
4394 | 4394 | _('[OPTION]... [-r] REV')), |
|
4395 | 4395 | "bisect": |
|
4396 | 4396 | (bisect, |
|
4397 | 4397 | [('r', 'reset', False, _('reset bisect state')), |
|
4398 | 4398 | ('g', 'good', False, _('mark changeset good')), |
|
4399 | 4399 | ('b', 'bad', False, _('mark changeset bad')), |
|
4400 | 4400 | ('s', 'skip', False, _('skip testing changeset')), |
|
4401 | 4401 | ('e', 'extend', False, _('extend the bisect range')), |
|
4402 | 4402 | ('c', 'command', '', |
|
4403 | 4403 | _('use command to check changeset state'), _('CMD')), |
|
4404 | 4404 | ('U', 'noupdate', False, _('do not update to target'))], |
|
4405 | 4405 | _("[-gbsr] [-U] [-c CMD] [REV]")), |
|
4406 | 4406 | "bookmarks": |
|
4407 | 4407 | (bookmark, |
|
4408 | 4408 | [('f', 'force', False, _('force')), |
|
4409 | 4409 | ('r', 'rev', '', _('revision'), _('REV')), |
|
4410 | 4410 | ('d', 'delete', False, _('delete a given bookmark')), |
|
4411 | 4411 | ('m', 'rename', '', _('rename a given bookmark'), _('NAME'))], |
|
4412 | 4412 | _('hg bookmarks [-f] [-d] [-m NAME] [-r REV] [NAME]')), |
|
4413 | 4413 | "branch": |
|
4414 | 4414 | (branch, |
|
4415 | 4415 | [('f', 'force', None, |
|
4416 | 4416 | _('set branch name even if it shadows an existing branch')), |
|
4417 | 4417 | ('C', 'clean', None, _('reset branch name to parent branch name'))], |
|
4418 | 4418 | _('[-fC] [NAME]')), |
|
4419 | 4419 | "branches": |
|
4420 | 4420 | (branches, |
|
4421 | 4421 | [('a', 'active', False, |
|
4422 | 4422 | _('show only branches that have unmerged heads')), |
|
4423 | 4423 | ('c', 'closed', False, |
|
4424 | 4424 | _('show normal and closed branches'))], |
|
4425 | 4425 | _('[-ac]')), |
|
4426 | 4426 | "bundle": |
|
4427 | 4427 | (bundle, |
|
4428 | 4428 | [('f', 'force', None, |
|
4429 | 4429 | _('run even when the destination is unrelated')), |
|
4430 | 4430 | ('r', 'rev', [], |
|
4431 | 4431 | _('a changeset intended to be added to the destination'), |
|
4432 | 4432 | _('REV')), |
|
4433 | 4433 | ('b', 'branch', [], |
|
4434 | 4434 | _('a specific branch you would like to bundle'), |
|
4435 | 4435 | _('BRANCH')), |
|
4436 | 4436 | ('', 'base', [], |
|
4437 | 4437 | _('a base changeset assumed to be available at the destination'), |
|
4438 | 4438 | _('REV')), |
|
4439 | 4439 | ('a', 'all', None, _('bundle all changesets in the repository')), |
|
4440 | 4440 | ('t', 'type', 'bzip2', |
|
4441 | 4441 | _('bundle compression type to use'), _('TYPE')), |
|
4442 | 4442 | ] + remoteopts, |
|
4443 | 4443 | _('[-f] [-t TYPE] [-a] [-r REV]... [--base REV]... FILE [DEST]')), |
|
4444 | 4444 | "cat": |
|
4445 | 4445 | (cat, |
|
4446 | 4446 | [('o', 'output', '', |
|
4447 | 4447 | _('print output to file with formatted name'), _('FORMAT')), |
|
4448 | 4448 | ('r', 'rev', '', |
|
4449 | 4449 | _('print the given revision'), _('REV')), |
|
4450 | 4450 | ('', 'decode', None, _('apply any matching decode filter')), |
|
4451 | 4451 | ] + walkopts, |
|
4452 | 4452 | _('[OPTION]... FILE...')), |
|
4453 | 4453 | "^clone": |
|
4454 | 4454 | (clone, |
|
4455 | 4455 | [('U', 'noupdate', None, |
|
4456 | 4456 | _('the clone will include an empty working copy (only a repository)')), |
|
4457 | 4457 | ('u', 'updaterev', '', |
|
4458 | 4458 | _('revision, tag or branch to check out'), _('REV')), |
|
4459 | 4459 | ('r', 'rev', [], |
|
4460 | 4460 | _('include the specified changeset'), _('REV')), |
|
4461 | 4461 | ('b', 'branch', [], |
|
4462 | 4462 | _('clone only the specified branch'), _('BRANCH')), |
|
4463 | 4463 | ('', 'pull', None, _('use pull protocol to copy metadata')), |
|
4464 | 4464 | ('', 'uncompressed', None, |
|
4465 | 4465 | _('use uncompressed transfer (fast over LAN)')), |
|
4466 | 4466 | ] + remoteopts, |
|
4467 | 4467 | _('[OPTION]... SOURCE [DEST]')), |
|
4468 | 4468 | "^commit|ci": |
|
4469 | 4469 | (commit, |
|
4470 | 4470 | [('A', 'addremove', None, |
|
4471 | 4471 | _('mark new/missing files as added/removed before committing')), |
|
4472 | 4472 | ('', 'close-branch', None, |
|
4473 | 4473 | _('mark a branch as closed, hiding it from the branch list')), |
|
4474 | 4474 | ] + walkopts + commitopts + commitopts2, |
|
4475 | 4475 | _('[OPTION]... [FILE]...')), |
|
4476 | 4476 | "copy|cp": |
|
4477 | 4477 | (copy, |
|
4478 | 4478 | [('A', 'after', None, _('record a copy that has already occurred')), |
|
4479 | 4479 | ('f', 'force', None, |
|
4480 | 4480 | _('forcibly copy over an existing managed file')), |
|
4481 | 4481 | ] + walkopts + dryrunopts, |
|
4482 | 4482 | _('[OPTION]... [SOURCE]... DEST')), |
|
4483 | 4483 | "debugancestor": (debugancestor, [], _('[INDEX] REV1 REV2')), |
|
4484 | 4484 | "debugbuilddag": |
|
4485 | 4485 | (debugbuilddag, |
|
4486 | 4486 | [('m', 'mergeable-file', None, _('add single file mergeable changes')), |
|
4487 | 4487 | ('a', 'appended-file', None, _('add single file all revs append to')), |
|
4488 | 4488 | ('o', 'overwritten-file', None, _('add single file all revs overwrite')), |
|
4489 | 4489 | ('n', 'new-file', None, _('add new file at each rev')), |
|
4490 | 4490 | ], |
|
4491 | 4491 | _('[OPTION]... TEXT')), |
|
4492 | 4492 | "debugbundle": |
|
4493 | 4493 | (debugbundle, |
|
4494 | 4494 | [('a', 'all', None, _('show all details')), |
|
4495 | 4495 | ], |
|
4496 | 4496 | _('FILE')), |
|
4497 | 4497 | "debugcheckstate": (debugcheckstate, [], ''), |
|
4498 | 4498 | "debugcommands": (debugcommands, [], _('[COMMAND]')), |
|
4499 | 4499 | "debugcomplete": |
|
4500 | 4500 | (debugcomplete, |
|
4501 | 4501 | [('o', 'options', None, _('show the command options'))], |
|
4502 | 4502 | _('[-o] CMD')), |
|
4503 | 4503 | "debugdag": |
|
4504 | 4504 | (debugdag, |
|
4505 | 4505 | [('t', 'tags', None, _('use tags as labels')), |
|
4506 | 4506 | ('b', 'branches', None, _('annotate with branch names')), |
|
4507 | 4507 | ('', 'dots', None, _('use dots for runs')), |
|
4508 | 4508 | ('s', 'spaces', None, _('separate elements by spaces')), |
|
4509 | 4509 | ], |
|
4510 | 4510 | _('[OPTION]... [FILE [REV]...]')), |
|
4511 | 4511 | "debugdate": |
|
4512 | 4512 | (debugdate, |
|
4513 | 4513 | [('e', 'extended', None, _('try extended date formats'))], |
|
4514 | 4514 | _('[-e] DATE [RANGE]')), |
|
4515 | 4515 | "debugdata": (debugdata, [], _('FILE REV')), |
|
4516 | 4516 | "debugfsinfo": (debugfsinfo, [], _('[PATH]')), |
|
4517 | 4517 | "debuggetbundle": |
|
4518 | 4518 | (debuggetbundle, |
|
4519 | 4519 | [('H', 'head', [], _('id of head node'), _('ID')), |
|
4520 | 4520 | ('C', 'common', [], _('id of common node'), _('ID')), |
|
4521 | 4521 | ('t', 'type', 'bzip2', _('bundle compression type to use'), _('TYPE')), |
|
4522 | 4522 | ], |
|
4523 | 4523 | _('REPO FILE [-H|-C ID]...')), |
|
4524 | 4524 | "debugignore": (debugignore, [], ''), |
|
4525 | 4525 | "debugindex": (debugindex, |
|
4526 | 4526 | [('f', 'format', 0, _('revlog format'), _('FORMAT'))], |
|
4527 | 4527 | _('FILE')), |
|
4528 | 4528 | "debugindexdot": (debugindexdot, [], _('FILE')), |
|
4529 | 4529 | "debuginstall": (debuginstall, [], ''), |
|
4530 | 4530 | "debugknown": (debugknown, [], _('REPO ID...')), |
|
4531 | 4531 | "debugpushkey": (debugpushkey, [], _('REPO NAMESPACE [KEY OLD NEW]')), |
|
4532 | 4532 | "debugrebuildstate": |
|
4533 | 4533 | (debugrebuildstate, |
|
4534 | 4534 | [('r', 'rev', '', |
|
4535 | 4535 | _('revision to rebuild to'), _('REV'))], |
|
4536 | 4536 | _('[-r REV] [REV]')), |
|
4537 | 4537 | "debugrename": |
|
4538 | 4538 | (debugrename, |
|
4539 | 4539 | [('r', 'rev', '', |
|
4540 | 4540 | _('revision to debug'), _('REV'))], |
|
4541 | 4541 | _('[-r REV] FILE')), |
|
4542 | 4542 | "debugrevspec": |
|
4543 | 4543 | (debugrevspec, [], ('REVSPEC')), |
|
4544 | 4544 | "debugsetparents": |
|
4545 | 4545 | (debugsetparents, [], _('REV1 [REV2]')), |
|
4546 | 4546 | "debugstate": |
|
4547 | 4547 | (debugstate, |
|
4548 | 4548 | [('', 'nodates', None, _('do not display the saved mtime')), |
|
4549 | 4549 | ('', 'datesort', None, _('sort by saved mtime'))], |
|
4550 | 4550 | _('[OPTION]...')), |
|
4551 | 4551 | "debugsub": |
|
4552 | 4552 | (debugsub, |
|
4553 | 4553 | [('r', 'rev', '', |
|
4554 | 4554 | _('revision to check'), _('REV'))], |
|
4555 | 4555 | _('[-r REV] [REV]')), |
|
4556 | 4556 | "debugwalk": (debugwalk, walkopts, _('[OPTION]... [FILE]...')), |
|
4557 | 4557 | "debugwireargs": |
|
4558 | 4558 | (debugwireargs, |
|
4559 | 4559 | [('', 'three', '', 'three'), |
|
4560 | 4560 | ('', 'four', '', 'four'), |
|
4561 | ('', 'five', '', 'five'), | |
|
4561 | 4562 | ] + remoteopts, |
|
4562 | 4563 | _('REPO [OPTIONS]... [ONE [TWO]]')), |
|
4563 | 4564 | "^diff": |
|
4564 | 4565 | (diff, |
|
4565 | 4566 | [('r', 'rev', [], |
|
4566 | 4567 | _('revision'), _('REV')), |
|
4567 | 4568 | ('c', 'change', '', |
|
4568 | 4569 | _('change made by revision'), _('REV')) |
|
4569 | 4570 | ] + diffopts + diffopts2 + walkopts + subrepoopts, |
|
4570 | 4571 | _('[OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]...')), |
|
4571 | 4572 | "^export": |
|
4572 | 4573 | (export, |
|
4573 | 4574 | [('o', 'output', '', |
|
4574 | 4575 | _('print output to file with formatted name'), _('FORMAT')), |
|
4575 | 4576 | ('', 'switch-parent', None, _('diff against the second parent')), |
|
4576 | 4577 | ('r', 'rev', [], |
|
4577 | 4578 | _('revisions to export'), _('REV')), |
|
4578 | 4579 | ] + diffopts, |
|
4579 | 4580 | _('[OPTION]... [-o OUTFILESPEC] REV...')), |
|
4580 | 4581 | "^forget": |
|
4581 | 4582 | (forget, |
|
4582 | 4583 | [] + walkopts, |
|
4583 | 4584 | _('[OPTION]... FILE...')), |
|
4584 | 4585 | "grep": |
|
4585 | 4586 | (grep, |
|
4586 | 4587 | [('0', 'print0', None, _('end fields with NUL')), |
|
4587 | 4588 | ('', 'all', None, _('print all revisions that match')), |
|
4588 | 4589 | ('a', 'text', None, _('treat all files as text')), |
|
4589 | 4590 | ('f', 'follow', None, |
|
4590 | 4591 | _('follow changeset history,' |
|
4591 | 4592 | ' or file history across copies and renames')), |
|
4592 | 4593 | ('i', 'ignore-case', None, _('ignore case when matching')), |
|
4593 | 4594 | ('l', 'files-with-matches', None, |
|
4594 | 4595 | _('print only filenames and revisions that match')), |
|
4595 | 4596 | ('n', 'line-number', None, _('print matching line numbers')), |
|
4596 | 4597 | ('r', 'rev', [], |
|
4597 | 4598 | _('only search files changed within revision range'), _('REV')), |
|
4598 | 4599 | ('u', 'user', None, _('list the author (long with -v)')), |
|
4599 | 4600 | ('d', 'date', None, _('list the date (short with -q)')), |
|
4600 | 4601 | ] + walkopts, |
|
4601 | 4602 | _('[OPTION]... PATTERN [FILE]...')), |
|
4602 | 4603 | "heads": |
|
4603 | 4604 | (heads, |
|
4604 | 4605 | [('r', 'rev', '', |
|
4605 | 4606 | _('show only heads which are descendants of STARTREV'), |
|
4606 | 4607 | _('STARTREV')), |
|
4607 | 4608 | ('t', 'topo', False, _('show topological heads only')), |
|
4608 | 4609 | ('a', 'active', False, |
|
4609 | 4610 | _('show active branchheads only (DEPRECATED)')), |
|
4610 | 4611 | ('c', 'closed', False, |
|
4611 | 4612 | _('show normal and closed branch heads')), |
|
4612 | 4613 | ] + templateopts, |
|
4613 | 4614 | _('[-ac] [-r STARTREV] [REV]...')), |
|
4614 | 4615 | "help": (help_, [], _('[TOPIC]')), |
|
4615 | 4616 | "identify|id": |
|
4616 | 4617 | (identify, |
|
4617 | 4618 | [('r', 'rev', '', |
|
4618 | 4619 | _('identify the specified revision'), _('REV')), |
|
4619 | 4620 | ('n', 'num', None, _('show local revision number')), |
|
4620 | 4621 | ('i', 'id', None, _('show global revision id')), |
|
4621 | 4622 | ('b', 'branch', None, _('show branch')), |
|
4622 | 4623 | ('t', 'tags', None, _('show tags')), |
|
4623 | 4624 | ('B', 'bookmarks', None, _('show bookmarks'))], |
|
4624 | 4625 | _('[-nibtB] [-r REV] [SOURCE]')), |
|
4625 | 4626 | "import|patch": |
|
4626 | 4627 | (import_, |
|
4627 | 4628 | [('p', 'strip', 1, |
|
4628 | 4629 | _('directory strip option for patch. This has the same ' |
|
4629 | 4630 | 'meaning as the corresponding patch option'), |
|
4630 | 4631 | _('NUM')), |
|
4631 | 4632 | ('b', 'base', '', |
|
4632 | 4633 | _('base path'), _('PATH')), |
|
4633 | 4634 | ('f', 'force', None, |
|
4634 | 4635 | _('skip check for outstanding uncommitted changes')), |
|
4635 | 4636 | ('', 'no-commit', None, |
|
4636 | 4637 | _("don't commit, just update the working directory")), |
|
4637 | 4638 | ('', 'exact', None, |
|
4638 | 4639 | _('apply patch to the nodes from which it was generated')), |
|
4639 | 4640 | ('', 'import-branch', None, |
|
4640 | 4641 | _('use any branch information in patch (implied by --exact)'))] + |
|
4641 | 4642 | commitopts + commitopts2 + similarityopts, |
|
4642 | 4643 | _('[OPTION]... PATCH...')), |
|
4643 | 4644 | "incoming|in": |
|
4644 | 4645 | (incoming, |
|
4645 | 4646 | [('f', 'force', None, |
|
4646 | 4647 | _('run even if remote repository is unrelated')), |
|
4647 | 4648 | ('n', 'newest-first', None, _('show newest record first')), |
|
4648 | 4649 | ('', 'bundle', '', |
|
4649 | 4650 | _('file to store the bundles into'), _('FILE')), |
|
4650 | 4651 | ('r', 'rev', [], |
|
4651 | 4652 | _('a remote changeset intended to be added'), _('REV')), |
|
4652 | 4653 | ('B', 'bookmarks', False, _("compare bookmarks")), |
|
4653 | 4654 | ('b', 'branch', [], |
|
4654 | 4655 | _('a specific branch you would like to pull'), _('BRANCH')), |
|
4655 | 4656 | ] + logopts + remoteopts + subrepoopts, |
|
4656 | 4657 | _('[-p] [-n] [-M] [-f] [-r REV]...' |
|
4657 | 4658 | ' [--bundle FILENAME] [SOURCE]')), |
|
4658 | 4659 | "^init": |
|
4659 | 4660 | (init, |
|
4660 | 4661 | remoteopts, |
|
4661 | 4662 | _('[-e CMD] [--remotecmd CMD] [DEST]')), |
|
4662 | 4663 | "locate": |
|
4663 | 4664 | (locate, |
|
4664 | 4665 | [('r', 'rev', '', |
|
4665 | 4666 | _('search the repository as it is in REV'), _('REV')), |
|
4666 | 4667 | ('0', 'print0', None, |
|
4667 | 4668 | _('end filenames with NUL, for use with xargs')), |
|
4668 | 4669 | ('f', 'fullpath', None, |
|
4669 | 4670 | _('print complete paths from the filesystem root')), |
|
4670 | 4671 | ] + walkopts, |
|
4671 | 4672 | _('[OPTION]... [PATTERN]...')), |
|
4672 | 4673 | "^log|history": |
|
4673 | 4674 | (log, |
|
4674 | 4675 | [('f', 'follow', None, |
|
4675 | 4676 | _('follow changeset history,' |
|
4676 | 4677 | ' or file history across copies and renames')), |
|
4677 | 4678 | ('', 'follow-first', None, |
|
4678 | 4679 | _('only follow the first parent of merge changesets')), |
|
4679 | 4680 | ('d', 'date', '', |
|
4680 | 4681 | _('show revisions matching date spec'), _('DATE')), |
|
4681 | 4682 | ('C', 'copies', None, _('show copied files')), |
|
4682 | 4683 | ('k', 'keyword', [], |
|
4683 | 4684 | _('do case-insensitive search for a given text'), _('TEXT')), |
|
4684 | 4685 | ('r', 'rev', [], |
|
4685 | 4686 | _('show the specified revision or range'), _('REV')), |
|
4686 | 4687 | ('', 'removed', None, _('include revisions where files were removed')), |
|
4687 | 4688 | ('m', 'only-merges', None, _('show only merges')), |
|
4688 | 4689 | ('u', 'user', [], |
|
4689 | 4690 | _('revisions committed by user'), _('USER')), |
|
4690 | 4691 | ('', 'only-branch', [], |
|
4691 | 4692 | _('show only changesets within the given named branch (DEPRECATED)'), |
|
4692 | 4693 | _('BRANCH')), |
|
4693 | 4694 | ('b', 'branch', [], |
|
4694 | 4695 | _('show changesets within the given named branch'), _('BRANCH')), |
|
4695 | 4696 | ('P', 'prune', [], |
|
4696 | 4697 | _('do not display revision or any of its ancestors'), _('REV')), |
|
4697 | 4698 | ] + logopts + walkopts, |
|
4698 | 4699 | _('[OPTION]... [FILE]')), |
|
4699 | 4700 | "manifest": |
|
4700 | 4701 | (manifest, |
|
4701 | 4702 | [('r', 'rev', '', |
|
4702 | 4703 | _('revision to display'), _('REV'))], |
|
4703 | 4704 | _('[-r REV]')), |
|
4704 | 4705 | "^merge": |
|
4705 | 4706 | (merge, |
|
4706 | 4707 | [('f', 'force', None, _('force a merge with outstanding changes')), |
|
4707 | 4708 | ('t', 'tool', '', _('specify merge tool')), |
|
4708 | 4709 | ('r', 'rev', '', |
|
4709 | 4710 | _('revision to merge'), _('REV')), |
|
4710 | 4711 | ('P', 'preview', None, |
|
4711 | 4712 | _('review revisions to merge (no merge is performed)'))], |
|
4712 | 4713 | _('[-P] [-f] [[-r] REV]')), |
|
4713 | 4714 | "outgoing|out": |
|
4714 | 4715 | (outgoing, |
|
4715 | 4716 | [('f', 'force', None, |
|
4716 | 4717 | _('run even when the destination is unrelated')), |
|
4717 | 4718 | ('r', 'rev', [], |
|
4718 | 4719 | _('a changeset intended to be included in the destination'), |
|
4719 | 4720 | _('REV')), |
|
4720 | 4721 | ('n', 'newest-first', None, _('show newest record first')), |
|
4721 | 4722 | ('B', 'bookmarks', False, _("compare bookmarks")), |
|
4722 | 4723 | ('b', 'branch', [], |
|
4723 | 4724 | _('a specific branch you would like to push'), _('BRANCH')), |
|
4724 | 4725 | ] + logopts + remoteopts + subrepoopts, |
|
4725 | 4726 | _('[-M] [-p] [-n] [-f] [-r REV]... [DEST]')), |
|
4726 | 4727 | "parents": |
|
4727 | 4728 | (parents, |
|
4728 | 4729 | [('r', 'rev', '', |
|
4729 | 4730 | _('show parents of the specified revision'), _('REV')), |
|
4730 | 4731 | ] + templateopts, |
|
4731 | 4732 | _('[-r REV] [FILE]')), |
|
4732 | 4733 | "paths": (paths, [], _('[NAME]')), |
|
4733 | 4734 | "^pull": |
|
4734 | 4735 | (pull, |
|
4735 | 4736 | [('u', 'update', None, |
|
4736 | 4737 | _('update to new branch head if changesets were pulled')), |
|
4737 | 4738 | ('f', 'force', None, |
|
4738 | 4739 | _('run even when remote repository is unrelated')), |
|
4739 | 4740 | ('r', 'rev', [], |
|
4740 | 4741 | _('a remote changeset intended to be added'), _('REV')), |
|
4741 | 4742 | ('B', 'bookmark', [], _("bookmark to pull"), _('BOOKMARK')), |
|
4742 | 4743 | ('b', 'branch', [], |
|
4743 | 4744 | _('a specific branch you would like to pull'), _('BRANCH')), |
|
4744 | 4745 | ] + remoteopts, |
|
4745 | 4746 | _('[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]')), |
|
4746 | 4747 | "^push": |
|
4747 | 4748 | (push, |
|
4748 | 4749 | [('f', 'force', None, _('force push')), |
|
4749 | 4750 | ('r', 'rev', [], |
|
4750 | 4751 | _('a changeset intended to be included in the destination'), |
|
4751 | 4752 | _('REV')), |
|
4752 | 4753 | ('B', 'bookmark', [], _("bookmark to push"), _('BOOKMARK')), |
|
4753 | 4754 | ('b', 'branch', [], |
|
4754 | 4755 | _('a specific branch you would like to push'), _('BRANCH')), |
|
4755 | 4756 | ('', 'new-branch', False, _('allow pushing a new branch')), |
|
4756 | 4757 | ] + remoteopts, |
|
4757 | 4758 | _('[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]')), |
|
4758 | 4759 | "recover": (recover, []), |
|
4759 | 4760 | "^remove|rm": |
|
4760 | 4761 | (remove, |
|
4761 | 4762 | [('A', 'after', None, _('record delete for missing files')), |
|
4762 | 4763 | ('f', 'force', None, |
|
4763 | 4764 | _('remove (and delete) file even if added or modified')), |
|
4764 | 4765 | ] + walkopts, |
|
4765 | 4766 | _('[OPTION]... FILE...')), |
|
4766 | 4767 | "rename|move|mv": |
|
4767 | 4768 | (rename, |
|
4768 | 4769 | [('A', 'after', None, _('record a rename that has already occurred')), |
|
4769 | 4770 | ('f', 'force', None, |
|
4770 | 4771 | _('forcibly copy over an existing managed file')), |
|
4771 | 4772 | ] + walkopts + dryrunopts, |
|
4772 | 4773 | _('[OPTION]... SOURCE... DEST')), |
|
4773 | 4774 | "resolve": |
|
4774 | 4775 | (resolve, |
|
4775 | 4776 | [('a', 'all', None, _('select all unresolved files')), |
|
4776 | 4777 | ('l', 'list', None, _('list state of files needing merge')), |
|
4777 | 4778 | ('m', 'mark', None, _('mark files as resolved')), |
|
4778 | 4779 | ('u', 'unmark', None, _('mark files as unresolved')), |
|
4779 | 4780 | ('t', 'tool', '', _('specify merge tool')), |
|
4780 | 4781 | ('n', 'no-status', None, _('hide status prefix'))] |
|
4781 | 4782 | + walkopts, |
|
4782 | 4783 | _('[OPTION]... [FILE]...')), |
|
4783 | 4784 | "revert": |
|
4784 | 4785 | (revert, |
|
4785 | 4786 | [('a', 'all', None, _('revert all changes when no arguments given')), |
|
4786 | 4787 | ('d', 'date', '', |
|
4787 | 4788 | _('tipmost revision matching date'), _('DATE')), |
|
4788 | 4789 | ('r', 'rev', '', |
|
4789 | 4790 | _('revert to the specified revision'), _('REV')), |
|
4790 | 4791 | ('', 'no-backup', None, _('do not save backup copies of files')), |
|
4791 | 4792 | ] + walkopts + dryrunopts, |
|
4792 | 4793 | _('[OPTION]... [-r REV] [NAME]...')), |
|
4793 | 4794 | "rollback": (rollback, dryrunopts), |
|
4794 | 4795 | "root": (root, []), |
|
4795 | 4796 | "^serve": |
|
4796 | 4797 | (serve, |
|
4797 | 4798 | [('A', 'accesslog', '', |
|
4798 | 4799 | _('name of access log file to write to'), _('FILE')), |
|
4799 | 4800 | ('d', 'daemon', None, _('run server in background')), |
|
4800 | 4801 | ('', 'daemon-pipefds', '', |
|
4801 | 4802 | _('used internally by daemon mode'), _('NUM')), |
|
4802 | 4803 | ('E', 'errorlog', '', |
|
4803 | 4804 | _('name of error log file to write to'), _('FILE')), |
|
4804 | 4805 | # use string type, then we can check if something was passed |
|
4805 | 4806 | ('p', 'port', '', |
|
4806 | 4807 | _('port to listen on (default: 8000)'), _('PORT')), |
|
4807 | 4808 | ('a', 'address', '', |
|
4808 | 4809 | _('address to listen on (default: all interfaces)'), _('ADDR')), |
|
4809 | 4810 | ('', 'prefix', '', |
|
4810 | 4811 | _('prefix path to serve from (default: server root)'), _('PREFIX')), |
|
4811 | 4812 | ('n', 'name', '', |
|
4812 | 4813 | _('name to show in web pages (default: working directory)'), |
|
4813 | 4814 | _('NAME')), |
|
4814 | 4815 | ('', 'web-conf', '', |
|
4815 | 4816 | _('name of the hgweb config file (see "hg help hgweb")'), |
|
4816 | 4817 | _('FILE')), |
|
4817 | 4818 | ('', 'webdir-conf', '', |
|
4818 | 4819 | _('name of the hgweb config file (DEPRECATED)'), _('FILE')), |
|
4819 | 4820 | ('', 'pid-file', '', |
|
4820 | 4821 | _('name of file to write process ID to'), _('FILE')), |
|
4821 | 4822 | ('', 'stdio', None, _('for remote clients')), |
|
4822 | 4823 | ('t', 'templates', '', |
|
4823 | 4824 | _('web templates to use'), _('TEMPLATE')), |
|
4824 | 4825 | ('', 'style', '', |
|
4825 | 4826 | _('template style to use'), _('STYLE')), |
|
4826 | 4827 | ('6', 'ipv6', None, _('use IPv6 in addition to IPv4')), |
|
4827 | 4828 | ('', 'certificate', '', |
|
4828 | 4829 | _('SSL certificate file'), _('FILE'))], |
|
4829 | 4830 | _('[OPTION]...')), |
|
4830 | 4831 | "showconfig|debugconfig": |
|
4831 | 4832 | (showconfig, |
|
4832 | 4833 | [('u', 'untrusted', None, _('show untrusted configuration options'))], |
|
4833 | 4834 | _('[-u] [NAME]...')), |
|
4834 | 4835 | "^summary|sum": |
|
4835 | 4836 | (summary, |
|
4836 | 4837 | [('', 'remote', None, _('check for push and pull'))], '[--remote]'), |
|
4837 | 4838 | "^status|st": |
|
4838 | 4839 | (status, |
|
4839 | 4840 | [('A', 'all', None, _('show status of all files')), |
|
4840 | 4841 | ('m', 'modified', None, _('show only modified files')), |
|
4841 | 4842 | ('a', 'added', None, _('show only added files')), |
|
4842 | 4843 | ('r', 'removed', None, _('show only removed files')), |
|
4843 | 4844 | ('d', 'deleted', None, _('show only deleted (but tracked) files')), |
|
4844 | 4845 | ('c', 'clean', None, _('show only files without changes')), |
|
4845 | 4846 | ('u', 'unknown', None, _('show only unknown (not tracked) files')), |
|
4846 | 4847 | ('i', 'ignored', None, _('show only ignored files')), |
|
4847 | 4848 | ('n', 'no-status', None, _('hide status prefix')), |
|
4848 | 4849 | ('C', 'copies', None, _('show source of copied files')), |
|
4849 | 4850 | ('0', 'print0', None, |
|
4850 | 4851 | _('end filenames with NUL, for use with xargs')), |
|
4851 | 4852 | ('', 'rev', [], |
|
4852 | 4853 | _('show difference from revision'), _('REV')), |
|
4853 | 4854 | ('', 'change', '', |
|
4854 | 4855 | _('list the changed files of a revision'), _('REV')), |
|
4855 | 4856 | ] + walkopts + subrepoopts, |
|
4856 | 4857 | _('[OPTION]... [FILE]...')), |
|
4857 | 4858 | "tag": |
|
4858 | 4859 | (tag, |
|
4859 | 4860 | [('f', 'force', None, _('force tag')), |
|
4860 | 4861 | ('l', 'local', None, _('make the tag local')), |
|
4861 | 4862 | ('r', 'rev', '', |
|
4862 | 4863 | _('revision to tag'), _('REV')), |
|
4863 | 4864 | ('', 'remove', None, _('remove a tag')), |
|
4864 | 4865 | # -l/--local is already there, commitopts cannot be used |
|
4865 | 4866 | ('e', 'edit', None, _('edit commit message')), |
|
4866 | 4867 | ('m', 'message', '', |
|
4867 | 4868 | _('use <text> as commit message'), _('TEXT')), |
|
4868 | 4869 | ] + commitopts2, |
|
4869 | 4870 | _('[-f] [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME...')), |
|
4870 | 4871 | "tags": (tags, [], ''), |
|
4871 | 4872 | "tip": |
|
4872 | 4873 | (tip, |
|
4873 | 4874 | [('p', 'patch', None, _('show patch')), |
|
4874 | 4875 | ('g', 'git', None, _('use git extended diff format')), |
|
4875 | 4876 | ] + templateopts, |
|
4876 | 4877 | _('[-p] [-g]')), |
|
4877 | 4878 | "unbundle": |
|
4878 | 4879 | (unbundle, |
|
4879 | 4880 | [('u', 'update', None, |
|
4880 | 4881 | _('update to new branch head if changesets were unbundled'))], |
|
4881 | 4882 | _('[-u] FILE...')), |
|
4882 | 4883 | "^update|up|checkout|co": |
|
4883 | 4884 | (update, |
|
4884 | 4885 | [('C', 'clean', None, _('discard uncommitted changes (no backup)')), |
|
4885 | 4886 | ('c', 'check', None, |
|
4886 | 4887 | _('update across branches if no uncommitted changes')), |
|
4887 | 4888 | ('d', 'date', '', |
|
4888 | 4889 | _('tipmost revision matching date'), _('DATE')), |
|
4889 | 4890 | ('r', 'rev', '', |
|
4890 | 4891 | _('revision'), _('REV'))], |
|
4891 | 4892 | _('[-c] [-C] [-d DATE] [[-r] REV]')), |
|
4892 | 4893 | "verify": (verify, []), |
|
4893 | 4894 | "version": (version_, []), |
|
4894 | 4895 | } |
|
4895 | 4896 | |
|
4896 | 4897 | norepo = ("clone init version help debugcommands debugcomplete" |
|
4897 | 4898 | " debugdate debuginstall debugfsinfo debugpushkey debugwireargs" |
|
4898 | 4899 | " debugknown debuggetbundle debugbundle") |
|
4899 | 4900 | optionalrepo = ("identify paths serve showconfig debugancestor debugdag" |
|
4900 | 4901 | " debugdata debugindex debugindexdot") |
@@ -1,1940 +1,1940 b'' | |||
|
1 | 1 | # localrepo.py - read/write repository class for mercurial |
|
2 | 2 | # |
|
3 | 3 | # Copyright 2005-2007 Matt Mackall <mpm@selenic.com> |
|
4 | 4 | # |
|
5 | 5 | # This software may be used and distributed according to the terms of the |
|
6 | 6 | # GNU General Public License version 2 or any later version. |
|
7 | 7 | |
|
8 | 8 | from node import bin, hex, nullid, nullrev, short |
|
9 | 9 | from i18n import _ |
|
10 | 10 | import repo, changegroup, subrepo, discovery, pushkey |
|
11 | 11 | import changelog, dirstate, filelog, manifest, context, bookmarks |
|
12 | 12 | import lock, transaction, store, encoding |
|
13 | 13 | import scmutil, util, extensions, hook, error |
|
14 | 14 | import match as matchmod |
|
15 | 15 | import merge as mergemod |
|
16 | 16 | import tags as tagsmod |
|
17 | 17 | import url as urlmod |
|
18 | 18 | from lock import release |
|
19 | 19 | import weakref, errno, os, time, inspect |
|
20 | 20 | propertycache = util.propertycache |
|
21 | 21 | |
|
22 | 22 | class localrepository(repo.repository): |
|
23 | 23 | capabilities = set(('lookup', 'changegroupsubset', 'branchmap', 'pushkey', |
|
24 | 24 | 'known', 'getbundle')) |
|
25 | 25 | supportedformats = set(('revlogv1', 'parentdelta')) |
|
26 | 26 | supported = supportedformats | set(('store', 'fncache', 'shared', |
|
27 | 27 | 'dotencode')) |
|
28 | 28 | |
|
29 | 29 | def __init__(self, baseui, path=None, create=0): |
|
30 | 30 | repo.repository.__init__(self) |
|
31 | 31 | self.root = os.path.realpath(util.expandpath(path)) |
|
32 | 32 | self.path = os.path.join(self.root, ".hg") |
|
33 | 33 | self.origroot = path |
|
34 | 34 | self.auditor = scmutil.path_auditor(self.root, self._checknested) |
|
35 | 35 | self.opener = scmutil.opener(self.path) |
|
36 | 36 | self.wopener = scmutil.opener(self.root) |
|
37 | 37 | self.baseui = baseui |
|
38 | 38 | self.ui = baseui.copy() |
|
39 | 39 | |
|
40 | 40 | try: |
|
41 | 41 | self.ui.readconfig(self.join("hgrc"), self.root) |
|
42 | 42 | extensions.loadall(self.ui) |
|
43 | 43 | except IOError: |
|
44 | 44 | pass |
|
45 | 45 | |
|
46 | 46 | if not os.path.isdir(self.path): |
|
47 | 47 | if create: |
|
48 | 48 | if not os.path.exists(path): |
|
49 | 49 | util.makedirs(path) |
|
50 | 50 | util.makedir(self.path, notindexed=True) |
|
51 | 51 | requirements = ["revlogv1"] |
|
52 | 52 | if self.ui.configbool('format', 'usestore', True): |
|
53 | 53 | os.mkdir(os.path.join(self.path, "store")) |
|
54 | 54 | requirements.append("store") |
|
55 | 55 | if self.ui.configbool('format', 'usefncache', True): |
|
56 | 56 | requirements.append("fncache") |
|
57 | 57 | if self.ui.configbool('format', 'dotencode', True): |
|
58 | 58 | requirements.append('dotencode') |
|
59 | 59 | # create an invalid changelog |
|
60 | 60 | self.opener("00changelog.i", "a").write( |
|
61 | 61 | '\0\0\0\2' # represents revlogv2 |
|
62 | 62 | ' dummy changelog to prevent using the old repo layout' |
|
63 | 63 | ) |
|
64 | 64 | if self.ui.configbool('format', 'parentdelta', False): |
|
65 | 65 | requirements.append("parentdelta") |
|
66 | 66 | else: |
|
67 | 67 | raise error.RepoError(_("repository %s not found") % path) |
|
68 | 68 | elif create: |
|
69 | 69 | raise error.RepoError(_("repository %s already exists") % path) |
|
70 | 70 | else: |
|
71 | 71 | # find requirements |
|
72 | 72 | requirements = set() |
|
73 | 73 | try: |
|
74 | 74 | requirements = set(self.opener("requires").read().splitlines()) |
|
75 | 75 | except IOError, inst: |
|
76 | 76 | if inst.errno != errno.ENOENT: |
|
77 | 77 | raise |
|
78 | 78 | for r in requirements - self.supported: |
|
79 | 79 | raise error.RequirementError( |
|
80 | 80 | _("requirement '%s' not supported") % r) |
|
81 | 81 | |
|
82 | 82 | self.sharedpath = self.path |
|
83 | 83 | try: |
|
84 | 84 | s = os.path.realpath(self.opener("sharedpath").read()) |
|
85 | 85 | if not os.path.exists(s): |
|
86 | 86 | raise error.RepoError( |
|
87 | 87 | _('.hg/sharedpath points to nonexistent directory %s') % s) |
|
88 | 88 | self.sharedpath = s |
|
89 | 89 | except IOError, inst: |
|
90 | 90 | if inst.errno != errno.ENOENT: |
|
91 | 91 | raise |
|
92 | 92 | |
|
93 | 93 | self.store = store.store(requirements, self.sharedpath, scmutil.opener) |
|
94 | 94 | self.spath = self.store.path |
|
95 | 95 | self.sopener = self.store.opener |
|
96 | 96 | self.sjoin = self.store.join |
|
97 | 97 | self.opener.createmode = self.store.createmode |
|
98 | 98 | self._applyrequirements(requirements) |
|
99 | 99 | if create: |
|
100 | 100 | self._writerequirements() |
|
101 | 101 | |
|
102 | 102 | # These two define the set of tags for this repository. _tags |
|
103 | 103 | # maps tag name to node; _tagtypes maps tag name to 'global' or |
|
104 | 104 | # 'local'. (Global tags are defined by .hgtags across all |
|
105 | 105 | # heads, and local tags are defined in .hg/localtags.) They |
|
106 | 106 | # constitute the in-memory cache of tags. |
|
107 | 107 | self._tags = None |
|
108 | 108 | self._tagtypes = None |
|
109 | 109 | |
|
110 | 110 | self._branchcache = None |
|
111 | 111 | self._branchcachetip = None |
|
112 | 112 | self.nodetagscache = None |
|
113 | 113 | self.filterpats = {} |
|
114 | 114 | self._datafilters = {} |
|
115 | 115 | self._transref = self._lockref = self._wlockref = None |
|
116 | 116 | |
|
117 | 117 | def _applyrequirements(self, requirements): |
|
118 | 118 | self.requirements = requirements |
|
119 | 119 | self.sopener.options = {} |
|
120 | 120 | if 'parentdelta' in requirements: |
|
121 | 121 | self.sopener.options['parentdelta'] = 1 |
|
122 | 122 | |
|
123 | 123 | def _writerequirements(self): |
|
124 | 124 | reqfile = self.opener("requires", "w") |
|
125 | 125 | for r in self.requirements: |
|
126 | 126 | reqfile.write("%s\n" % r) |
|
127 | 127 | reqfile.close() |
|
128 | 128 | |
|
129 | 129 | def _checknested(self, path): |
|
130 | 130 | """Determine if path is a legal nested repository.""" |
|
131 | 131 | if not path.startswith(self.root): |
|
132 | 132 | return False |
|
133 | 133 | subpath = path[len(self.root) + 1:] |
|
134 | 134 | |
|
135 | 135 | # XXX: Checking against the current working copy is wrong in |
|
136 | 136 | # the sense that it can reject things like |
|
137 | 137 | # |
|
138 | 138 | # $ hg cat -r 10 sub/x.txt |
|
139 | 139 | # |
|
140 | 140 | # if sub/ is no longer a subrepository in the working copy |
|
141 | 141 | # parent revision. |
|
142 | 142 | # |
|
143 | 143 | # However, it can of course also allow things that would have |
|
144 | 144 | # been rejected before, such as the above cat command if sub/ |
|
145 | 145 | # is a subrepository now, but was a normal directory before. |
|
146 | 146 | # The old path auditor would have rejected by mistake since it |
|
147 | 147 | # panics when it sees sub/.hg/. |
|
148 | 148 | # |
|
149 | 149 | # All in all, checking against the working copy seems sensible |
|
150 | 150 | # since we want to prevent access to nested repositories on |
|
151 | 151 | # the filesystem *now*. |
|
152 | 152 | ctx = self[None] |
|
153 | 153 | parts = util.splitpath(subpath) |
|
154 | 154 | while parts: |
|
155 | 155 | prefix = os.sep.join(parts) |
|
156 | 156 | if prefix in ctx.substate: |
|
157 | 157 | if prefix == subpath: |
|
158 | 158 | return True |
|
159 | 159 | else: |
|
160 | 160 | sub = ctx.sub(prefix) |
|
161 | 161 | return sub.checknested(subpath[len(prefix) + 1:]) |
|
162 | 162 | else: |
|
163 | 163 | parts.pop() |
|
164 | 164 | return False |
|
165 | 165 | |
|
166 | 166 | @util.propertycache |
|
167 | 167 | def _bookmarks(self): |
|
168 | 168 | return bookmarks.read(self) |
|
169 | 169 | |
|
170 | 170 | @util.propertycache |
|
171 | 171 | def _bookmarkcurrent(self): |
|
172 | 172 | return bookmarks.readcurrent(self) |
|
173 | 173 | |
|
174 | 174 | @propertycache |
|
175 | 175 | def changelog(self): |
|
176 | 176 | c = changelog.changelog(self.sopener) |
|
177 | 177 | if 'HG_PENDING' in os.environ: |
|
178 | 178 | p = os.environ['HG_PENDING'] |
|
179 | 179 | if p.startswith(self.root): |
|
180 | 180 | c.readpending('00changelog.i.a') |
|
181 | 181 | self.sopener.options['defversion'] = c.version |
|
182 | 182 | return c |
|
183 | 183 | |
|
184 | 184 | @propertycache |
|
185 | 185 | def manifest(self): |
|
186 | 186 | return manifest.manifest(self.sopener) |
|
187 | 187 | |
|
188 | 188 | @propertycache |
|
189 | 189 | def dirstate(self): |
|
190 | 190 | warned = [0] |
|
191 | 191 | def validate(node): |
|
192 | 192 | try: |
|
193 | 193 | r = self.changelog.rev(node) |
|
194 | 194 | return node |
|
195 | 195 | except error.LookupError: |
|
196 | 196 | if not warned[0]: |
|
197 | 197 | warned[0] = True |
|
198 | 198 | self.ui.warn(_("warning: ignoring unknown" |
|
199 | 199 | " working parent %s!\n") % short(node)) |
|
200 | 200 | return nullid |
|
201 | 201 | |
|
202 | 202 | return dirstate.dirstate(self.opener, self.ui, self.root, validate) |
|
203 | 203 | |
|
204 | 204 | def __getitem__(self, changeid): |
|
205 | 205 | if changeid is None: |
|
206 | 206 | return context.workingctx(self) |
|
207 | 207 | return context.changectx(self, changeid) |
|
208 | 208 | |
|
209 | 209 | def __contains__(self, changeid): |
|
210 | 210 | try: |
|
211 | 211 | return bool(self.lookup(changeid)) |
|
212 | 212 | except error.RepoLookupError: |
|
213 | 213 | return False |
|
214 | 214 | |
|
215 | 215 | def __nonzero__(self): |
|
216 | 216 | return True |
|
217 | 217 | |
|
218 | 218 | def __len__(self): |
|
219 | 219 | return len(self.changelog) |
|
220 | 220 | |
|
221 | 221 | def __iter__(self): |
|
222 | 222 | for i in xrange(len(self)): |
|
223 | 223 | yield i |
|
224 | 224 | |
|
225 | 225 | def url(self): |
|
226 | 226 | return 'file:' + self.root |
|
227 | 227 | |
|
228 | 228 | def hook(self, name, throw=False, **args): |
|
229 | 229 | return hook.hook(self.ui, self, name, throw, **args) |
|
230 | 230 | |
|
231 | 231 | tag_disallowed = ':\r\n' |
|
232 | 232 | |
|
233 | 233 | def _tag(self, names, node, message, local, user, date, extra={}): |
|
234 | 234 | if isinstance(names, str): |
|
235 | 235 | allchars = names |
|
236 | 236 | names = (names,) |
|
237 | 237 | else: |
|
238 | 238 | allchars = ''.join(names) |
|
239 | 239 | for c in self.tag_disallowed: |
|
240 | 240 | if c in allchars: |
|
241 | 241 | raise util.Abort(_('%r cannot be used in a tag name') % c) |
|
242 | 242 | |
|
243 | 243 | branches = self.branchmap() |
|
244 | 244 | for name in names: |
|
245 | 245 | self.hook('pretag', throw=True, node=hex(node), tag=name, |
|
246 | 246 | local=local) |
|
247 | 247 | if name in branches: |
|
248 | 248 | self.ui.warn(_("warning: tag %s conflicts with existing" |
|
249 | 249 | " branch name\n") % name) |
|
250 | 250 | |
|
251 | 251 | def writetags(fp, names, munge, prevtags): |
|
252 | 252 | fp.seek(0, 2) |
|
253 | 253 | if prevtags and prevtags[-1] != '\n': |
|
254 | 254 | fp.write('\n') |
|
255 | 255 | for name in names: |
|
256 | 256 | m = munge and munge(name) or name |
|
257 | 257 | if self._tagtypes and name in self._tagtypes: |
|
258 | 258 | old = self._tags.get(name, nullid) |
|
259 | 259 | fp.write('%s %s\n' % (hex(old), m)) |
|
260 | 260 | fp.write('%s %s\n' % (hex(node), m)) |
|
261 | 261 | fp.close() |
|
262 | 262 | |
|
263 | 263 | prevtags = '' |
|
264 | 264 | if local: |
|
265 | 265 | try: |
|
266 | 266 | fp = self.opener('localtags', 'r+') |
|
267 | 267 | except IOError: |
|
268 | 268 | fp = self.opener('localtags', 'a') |
|
269 | 269 | else: |
|
270 | 270 | prevtags = fp.read() |
|
271 | 271 | |
|
272 | 272 | # local tags are stored in the current charset |
|
273 | 273 | writetags(fp, names, None, prevtags) |
|
274 | 274 | for name in names: |
|
275 | 275 | self.hook('tag', node=hex(node), tag=name, local=local) |
|
276 | 276 | return |
|
277 | 277 | |
|
278 | 278 | try: |
|
279 | 279 | fp = self.wfile('.hgtags', 'rb+') |
|
280 | 280 | except IOError: |
|
281 | 281 | fp = self.wfile('.hgtags', 'ab') |
|
282 | 282 | else: |
|
283 | 283 | prevtags = fp.read() |
|
284 | 284 | |
|
285 | 285 | # committed tags are stored in UTF-8 |
|
286 | 286 | writetags(fp, names, encoding.fromlocal, prevtags) |
|
287 | 287 | |
|
288 | 288 | fp.close() |
|
289 | 289 | |
|
290 | 290 | if '.hgtags' not in self.dirstate: |
|
291 | 291 | self[None].add(['.hgtags']) |
|
292 | 292 | |
|
293 | 293 | m = matchmod.exact(self.root, '', ['.hgtags']) |
|
294 | 294 | tagnode = self.commit(message, user, date, extra=extra, match=m) |
|
295 | 295 | |
|
296 | 296 | for name in names: |
|
297 | 297 | self.hook('tag', node=hex(node), tag=name, local=local) |
|
298 | 298 | |
|
299 | 299 | return tagnode |
|
300 | 300 | |
|
301 | 301 | def tag(self, names, node, message, local, user, date): |
|
302 | 302 | '''tag a revision with one or more symbolic names. |
|
303 | 303 | |
|
304 | 304 | names is a list of strings or, when adding a single tag, names may be a |
|
305 | 305 | string. |
|
306 | 306 | |
|
307 | 307 | if local is True, the tags are stored in a per-repository file. |
|
308 | 308 | otherwise, they are stored in the .hgtags file, and a new |
|
309 | 309 | changeset is committed with the change. |
|
310 | 310 | |
|
311 | 311 | keyword arguments: |
|
312 | 312 | |
|
313 | 313 | local: whether to store tags in non-version-controlled file |
|
314 | 314 | (default False) |
|
315 | 315 | |
|
316 | 316 | message: commit message to use if committing |
|
317 | 317 | |
|
318 | 318 | user: name of user to use if committing |
|
319 | 319 | |
|
320 | 320 | date: date tuple to use if committing''' |
|
321 | 321 | |
|
322 | 322 | if not local: |
|
323 | 323 | for x in self.status()[:5]: |
|
324 | 324 | if '.hgtags' in x: |
|
325 | 325 | raise util.Abort(_('working copy of .hgtags is changed ' |
|
326 | 326 | '(please commit .hgtags manually)')) |
|
327 | 327 | |
|
328 | 328 | self.tags() # instantiate the cache |
|
329 | 329 | self._tag(names, node, message, local, user, date) |
|
330 | 330 | |
|
331 | 331 | def tags(self): |
|
332 | 332 | '''return a mapping of tag to node''' |
|
333 | 333 | if self._tags is None: |
|
334 | 334 | (self._tags, self._tagtypes) = self._findtags() |
|
335 | 335 | |
|
336 | 336 | return self._tags |
|
337 | 337 | |
|
338 | 338 | def _findtags(self): |
|
339 | 339 | '''Do the hard work of finding tags. Return a pair of dicts |
|
340 | 340 | (tags, tagtypes) where tags maps tag name to node, and tagtypes |
|
341 | 341 | maps tag name to a string like \'global\' or \'local\'. |
|
342 | 342 | Subclasses or extensions are free to add their own tags, but |
|
343 | 343 | should be aware that the returned dicts will be retained for the |
|
344 | 344 | duration of the localrepo object.''' |
|
345 | 345 | |
|
346 | 346 | # XXX what tagtype should subclasses/extensions use? Currently |
|
347 | 347 | # mq and bookmarks add tags, but do not set the tagtype at all. |
|
348 | 348 | # Should each extension invent its own tag type? Should there |
|
349 | 349 | # be one tagtype for all such "virtual" tags? Or is the status |
|
350 | 350 | # quo fine? |
|
351 | 351 | |
|
352 | 352 | alltags = {} # map tag name to (node, hist) |
|
353 | 353 | tagtypes = {} |
|
354 | 354 | |
|
355 | 355 | tagsmod.findglobaltags(self.ui, self, alltags, tagtypes) |
|
356 | 356 | tagsmod.readlocaltags(self.ui, self, alltags, tagtypes) |
|
357 | 357 | |
|
358 | 358 | # Build the return dicts. Have to re-encode tag names because |
|
359 | 359 | # the tags module always uses UTF-8 (in order not to lose info |
|
360 | 360 | # writing to the cache), but the rest of Mercurial wants them in |
|
361 | 361 | # local encoding. |
|
362 | 362 | tags = {} |
|
363 | 363 | for (name, (node, hist)) in alltags.iteritems(): |
|
364 | 364 | if node != nullid: |
|
365 | 365 | try: |
|
366 | 366 | # ignore tags to unknown nodes |
|
367 | 367 | self.changelog.lookup(node) |
|
368 | 368 | tags[encoding.tolocal(name)] = node |
|
369 | 369 | except error.LookupError: |
|
370 | 370 | pass |
|
371 | 371 | tags['tip'] = self.changelog.tip() |
|
372 | 372 | tagtypes = dict([(encoding.tolocal(name), value) |
|
373 | 373 | for (name, value) in tagtypes.iteritems()]) |
|
374 | 374 | return (tags, tagtypes) |
|
375 | 375 | |
|
376 | 376 | def tagtype(self, tagname): |
|
377 | 377 | ''' |
|
378 | 378 | return the type of the given tag. result can be: |
|
379 | 379 | |
|
380 | 380 | 'local' : a local tag |
|
381 | 381 | 'global' : a global tag |
|
382 | 382 | None : tag does not exist |
|
383 | 383 | ''' |
|
384 | 384 | |
|
385 | 385 | self.tags() |
|
386 | 386 | |
|
387 | 387 | return self._tagtypes.get(tagname) |
|
388 | 388 | |
|
389 | 389 | def tagslist(self): |
|
390 | 390 | '''return a list of tags ordered by revision''' |
|
391 | 391 | l = [] |
|
392 | 392 | for t, n in self.tags().iteritems(): |
|
393 | 393 | r = self.changelog.rev(n) |
|
394 | 394 | l.append((r, t, n)) |
|
395 | 395 | return [(t, n) for r, t, n in sorted(l)] |
|
396 | 396 | |
|
397 | 397 | def nodetags(self, node): |
|
398 | 398 | '''return the tags associated with a node''' |
|
399 | 399 | if not self.nodetagscache: |
|
400 | 400 | self.nodetagscache = {} |
|
401 | 401 | for t, n in self.tags().iteritems(): |
|
402 | 402 | self.nodetagscache.setdefault(n, []).append(t) |
|
403 | 403 | for tags in self.nodetagscache.itervalues(): |
|
404 | 404 | tags.sort() |
|
405 | 405 | return self.nodetagscache.get(node, []) |
|
406 | 406 | |
|
407 | 407 | def nodebookmarks(self, node): |
|
408 | 408 | marks = [] |
|
409 | 409 | for bookmark, n in self._bookmarks.iteritems(): |
|
410 | 410 | if n == node: |
|
411 | 411 | marks.append(bookmark) |
|
412 | 412 | return sorted(marks) |
|
413 | 413 | |
|
414 | 414 | def _branchtags(self, partial, lrev): |
|
415 | 415 | # TODO: rename this function? |
|
416 | 416 | tiprev = len(self) - 1 |
|
417 | 417 | if lrev != tiprev: |
|
418 | 418 | ctxgen = (self[r] for r in xrange(lrev + 1, tiprev + 1)) |
|
419 | 419 | self._updatebranchcache(partial, ctxgen) |
|
420 | 420 | self._writebranchcache(partial, self.changelog.tip(), tiprev) |
|
421 | 421 | |
|
422 | 422 | return partial |
|
423 | 423 | |
|
424 | 424 | def updatebranchcache(self): |
|
425 | 425 | tip = self.changelog.tip() |
|
426 | 426 | if self._branchcache is not None and self._branchcachetip == tip: |
|
427 | 427 | return self._branchcache |
|
428 | 428 | |
|
429 | 429 | oldtip = self._branchcachetip |
|
430 | 430 | self._branchcachetip = tip |
|
431 | 431 | if oldtip is None or oldtip not in self.changelog.nodemap: |
|
432 | 432 | partial, last, lrev = self._readbranchcache() |
|
433 | 433 | else: |
|
434 | 434 | lrev = self.changelog.rev(oldtip) |
|
435 | 435 | partial = self._branchcache |
|
436 | 436 | |
|
437 | 437 | self._branchtags(partial, lrev) |
|
438 | 438 | # this private cache holds all heads (not just tips) |
|
439 | 439 | self._branchcache = partial |
|
440 | 440 | |
|
441 | 441 | def branchmap(self): |
|
442 | 442 | '''returns a dictionary {branch: [branchheads]}''' |
|
443 | 443 | self.updatebranchcache() |
|
444 | 444 | return self._branchcache |
|
445 | 445 | |
|
446 | 446 | def branchtags(self): |
|
447 | 447 | '''return a dict where branch names map to the tipmost head of |
|
448 | 448 | the branch, open heads come before closed''' |
|
449 | 449 | bt = {} |
|
450 | 450 | for bn, heads in self.branchmap().iteritems(): |
|
451 | 451 | tip = heads[-1] |
|
452 | 452 | for h in reversed(heads): |
|
453 | 453 | if 'close' not in self.changelog.read(h)[5]: |
|
454 | 454 | tip = h |
|
455 | 455 | break |
|
456 | 456 | bt[bn] = tip |
|
457 | 457 | return bt |
|
458 | 458 | |
|
459 | 459 | def _readbranchcache(self): |
|
460 | 460 | partial = {} |
|
461 | 461 | try: |
|
462 | 462 | f = self.opener("cache/branchheads") |
|
463 | 463 | lines = f.read().split('\n') |
|
464 | 464 | f.close() |
|
465 | 465 | except (IOError, OSError): |
|
466 | 466 | return {}, nullid, nullrev |
|
467 | 467 | |
|
468 | 468 | try: |
|
469 | 469 | last, lrev = lines.pop(0).split(" ", 1) |
|
470 | 470 | last, lrev = bin(last), int(lrev) |
|
471 | 471 | if lrev >= len(self) or self[lrev].node() != last: |
|
472 | 472 | # invalidate the cache |
|
473 | 473 | raise ValueError('invalidating branch cache (tip differs)') |
|
474 | 474 | for l in lines: |
|
475 | 475 | if not l: |
|
476 | 476 | continue |
|
477 | 477 | node, label = l.split(" ", 1) |
|
478 | 478 | label = encoding.tolocal(label.strip()) |
|
479 | 479 | partial.setdefault(label, []).append(bin(node)) |
|
480 | 480 | except KeyboardInterrupt: |
|
481 | 481 | raise |
|
482 | 482 | except Exception, inst: |
|
483 | 483 | if self.ui.debugflag: |
|
484 | 484 | self.ui.warn(str(inst), '\n') |
|
485 | 485 | partial, last, lrev = {}, nullid, nullrev |
|
486 | 486 | return partial, last, lrev |
|
487 | 487 | |
|
488 | 488 | def _writebranchcache(self, branches, tip, tiprev): |
|
489 | 489 | try: |
|
490 | 490 | f = self.opener("cache/branchheads", "w", atomictemp=True) |
|
491 | 491 | f.write("%s %s\n" % (hex(tip), tiprev)) |
|
492 | 492 | for label, nodes in branches.iteritems(): |
|
493 | 493 | for node in nodes: |
|
494 | 494 | f.write("%s %s\n" % (hex(node), encoding.fromlocal(label))) |
|
495 | 495 | f.rename() |
|
496 | 496 | except (IOError, OSError): |
|
497 | 497 | pass |
|
498 | 498 | |
|
499 | 499 | def _updatebranchcache(self, partial, ctxgen): |
|
500 | 500 | # collect new branch entries |
|
501 | 501 | newbranches = {} |
|
502 | 502 | for c in ctxgen: |
|
503 | 503 | newbranches.setdefault(c.branch(), []).append(c.node()) |
|
504 | 504 | # if older branchheads are reachable from new ones, they aren't |
|
505 | 505 | # really branchheads. Note checking parents is insufficient: |
|
506 | 506 | # 1 (branch a) -> 2 (branch b) -> 3 (branch a) |
|
507 | 507 | for branch, newnodes in newbranches.iteritems(): |
|
508 | 508 | bheads = partial.setdefault(branch, []) |
|
509 | 509 | bheads.extend(newnodes) |
|
510 | 510 | if len(bheads) <= 1: |
|
511 | 511 | continue |
|
512 | 512 | # starting from tip means fewer passes over reachable |
|
513 | 513 | while newnodes: |
|
514 | 514 | latest = newnodes.pop() |
|
515 | 515 | if latest not in bheads: |
|
516 | 516 | continue |
|
517 | 517 | minbhrev = self[min([self[bh].rev() for bh in bheads])].node() |
|
518 | 518 | reachable = self.changelog.reachable(latest, minbhrev) |
|
519 | 519 | reachable.remove(latest) |
|
520 | 520 | bheads = [b for b in bheads if b not in reachable] |
|
521 | 521 | partial[branch] = bheads |
|
522 | 522 | |
|
523 | 523 | def lookup(self, key): |
|
524 | 524 | if isinstance(key, int): |
|
525 | 525 | return self.changelog.node(key) |
|
526 | 526 | elif key == '.': |
|
527 | 527 | return self.dirstate.p1() |
|
528 | 528 | elif key == 'null': |
|
529 | 529 | return nullid |
|
530 | 530 | elif key == 'tip': |
|
531 | 531 | return self.changelog.tip() |
|
532 | 532 | n = self.changelog._match(key) |
|
533 | 533 | if n: |
|
534 | 534 | return n |
|
535 | 535 | if key in self._bookmarks: |
|
536 | 536 | return self._bookmarks[key] |
|
537 | 537 | if key in self.tags(): |
|
538 | 538 | return self.tags()[key] |
|
539 | 539 | if key in self.branchtags(): |
|
540 | 540 | return self.branchtags()[key] |
|
541 | 541 | n = self.changelog._partialmatch(key) |
|
542 | 542 | if n: |
|
543 | 543 | return n |
|
544 | 544 | |
|
545 | 545 | # can't find key, check if it might have come from damaged dirstate |
|
546 | 546 | if key in self.dirstate.parents(): |
|
547 | 547 | raise error.Abort(_("working directory has unknown parent '%s'!") |
|
548 | 548 | % short(key)) |
|
549 | 549 | try: |
|
550 | 550 | if len(key) == 20: |
|
551 | 551 | key = hex(key) |
|
552 | 552 | except TypeError: |
|
553 | 553 | pass |
|
554 | 554 | raise error.RepoLookupError(_("unknown revision '%s'") % key) |
|
555 | 555 | |
|
556 | 556 | def lookupbranch(self, key, remote=None): |
|
557 | 557 | repo = remote or self |
|
558 | 558 | if key in repo.branchmap(): |
|
559 | 559 | return key |
|
560 | 560 | |
|
561 | 561 | repo = (remote and remote.local()) and remote or self |
|
562 | 562 | return repo[key].branch() |
|
563 | 563 | |
|
564 | 564 | def known(self, nodes): |
|
565 | 565 | nm = self.changelog.nodemap |
|
566 | 566 | return [(n in nm) for n in nodes] |
|
567 | 567 | |
|
568 | 568 | def local(self): |
|
569 | 569 | return True |
|
570 | 570 | |
|
571 | 571 | def join(self, f): |
|
572 | 572 | return os.path.join(self.path, f) |
|
573 | 573 | |
|
574 | 574 | def wjoin(self, f): |
|
575 | 575 | return os.path.join(self.root, f) |
|
576 | 576 | |
|
577 | 577 | def file(self, f): |
|
578 | 578 | if f[0] == '/': |
|
579 | 579 | f = f[1:] |
|
580 | 580 | return filelog.filelog(self.sopener, f) |
|
581 | 581 | |
|
582 | 582 | def changectx(self, changeid): |
|
583 | 583 | return self[changeid] |
|
584 | 584 | |
|
585 | 585 | def parents(self, changeid=None): |
|
586 | 586 | '''get list of changectxs for parents of changeid''' |
|
587 | 587 | return self[changeid].parents() |
|
588 | 588 | |
|
589 | 589 | def filectx(self, path, changeid=None, fileid=None): |
|
590 | 590 | """changeid can be a changeset revision, node, or tag. |
|
591 | 591 | fileid can be a file revision or node.""" |
|
592 | 592 | return context.filectx(self, path, changeid, fileid) |
|
593 | 593 | |
|
594 | 594 | def getcwd(self): |
|
595 | 595 | return self.dirstate.getcwd() |
|
596 | 596 | |
|
597 | 597 | def pathto(self, f, cwd=None): |
|
598 | 598 | return self.dirstate.pathto(f, cwd) |
|
599 | 599 | |
|
600 | 600 | def wfile(self, f, mode='r'): |
|
601 | 601 | return self.wopener(f, mode) |
|
602 | 602 | |
|
603 | 603 | def _link(self, f): |
|
604 | 604 | return os.path.islink(self.wjoin(f)) |
|
605 | 605 | |
|
606 | 606 | def _loadfilter(self, filter): |
|
607 | 607 | if filter not in self.filterpats: |
|
608 | 608 | l = [] |
|
609 | 609 | for pat, cmd in self.ui.configitems(filter): |
|
610 | 610 | if cmd == '!': |
|
611 | 611 | continue |
|
612 | 612 | mf = matchmod.match(self.root, '', [pat]) |
|
613 | 613 | fn = None |
|
614 | 614 | params = cmd |
|
615 | 615 | for name, filterfn in self._datafilters.iteritems(): |
|
616 | 616 | if cmd.startswith(name): |
|
617 | 617 | fn = filterfn |
|
618 | 618 | params = cmd[len(name):].lstrip() |
|
619 | 619 | break |
|
620 | 620 | if not fn: |
|
621 | 621 | fn = lambda s, c, **kwargs: util.filter(s, c) |
|
622 | 622 | # Wrap old filters not supporting keyword arguments |
|
623 | 623 | if not inspect.getargspec(fn)[2]: |
|
624 | 624 | oldfn = fn |
|
625 | 625 | fn = lambda s, c, **kwargs: oldfn(s, c) |
|
626 | 626 | l.append((mf, fn, params)) |
|
627 | 627 | self.filterpats[filter] = l |
|
628 | 628 | return self.filterpats[filter] |
|
629 | 629 | |
|
630 | 630 | def _filter(self, filterpats, filename, data): |
|
631 | 631 | for mf, fn, cmd in filterpats: |
|
632 | 632 | if mf(filename): |
|
633 | 633 | self.ui.debug("filtering %s through %s\n" % (filename, cmd)) |
|
634 | 634 | data = fn(data, cmd, ui=self.ui, repo=self, filename=filename) |
|
635 | 635 | break |
|
636 | 636 | |
|
637 | 637 | return data |
|
638 | 638 | |
|
639 | 639 | @propertycache |
|
640 | 640 | def _encodefilterpats(self): |
|
641 | 641 | return self._loadfilter('encode') |
|
642 | 642 | |
|
643 | 643 | @propertycache |
|
644 | 644 | def _decodefilterpats(self): |
|
645 | 645 | return self._loadfilter('decode') |
|
646 | 646 | |
|
647 | 647 | def adddatafilter(self, name, filter): |
|
648 | 648 | self._datafilters[name] = filter |
|
649 | 649 | |
|
650 | 650 | def wread(self, filename): |
|
651 | 651 | if self._link(filename): |
|
652 | 652 | data = os.readlink(self.wjoin(filename)) |
|
653 | 653 | else: |
|
654 | 654 | data = self.wopener(filename, 'r').read() |
|
655 | 655 | return self._filter(self._encodefilterpats, filename, data) |
|
656 | 656 | |
|
657 | 657 | def wwrite(self, filename, data, flags): |
|
658 | 658 | data = self._filter(self._decodefilterpats, filename, data) |
|
659 | 659 | if 'l' in flags: |
|
660 | 660 | self.wopener.symlink(data, filename) |
|
661 | 661 | else: |
|
662 | 662 | self.wopener(filename, 'w').write(data) |
|
663 | 663 | if 'x' in flags: |
|
664 | 664 | util.set_flags(self.wjoin(filename), False, True) |
|
665 | 665 | |
|
666 | 666 | def wwritedata(self, filename, data): |
|
667 | 667 | return self._filter(self._decodefilterpats, filename, data) |
|
668 | 668 | |
|
669 | 669 | def transaction(self, desc): |
|
670 | 670 | tr = self._transref and self._transref() or None |
|
671 | 671 | if tr and tr.running(): |
|
672 | 672 | return tr.nest() |
|
673 | 673 | |
|
674 | 674 | # abort here if the journal already exists |
|
675 | 675 | if os.path.exists(self.sjoin("journal")): |
|
676 | 676 | raise error.RepoError( |
|
677 | 677 | _("abandoned transaction found - run hg recover")) |
|
678 | 678 | |
|
679 | 679 | # save dirstate for rollback |
|
680 | 680 | try: |
|
681 | 681 | ds = self.opener("dirstate").read() |
|
682 | 682 | except IOError: |
|
683 | 683 | ds = "" |
|
684 | 684 | self.opener("journal.dirstate", "w").write(ds) |
|
685 | 685 | self.opener("journal.branch", "w").write( |
|
686 | 686 | encoding.fromlocal(self.dirstate.branch())) |
|
687 | 687 | self.opener("journal.desc", "w").write("%d\n%s\n" % (len(self), desc)) |
|
688 | 688 | |
|
689 | 689 | renames = [(self.sjoin("journal"), self.sjoin("undo")), |
|
690 | 690 | (self.join("journal.dirstate"), self.join("undo.dirstate")), |
|
691 | 691 | (self.join("journal.branch"), self.join("undo.branch")), |
|
692 | 692 | (self.join("journal.desc"), self.join("undo.desc"))] |
|
693 | 693 | tr = transaction.transaction(self.ui.warn, self.sopener, |
|
694 | 694 | self.sjoin("journal"), |
|
695 | 695 | aftertrans(renames), |
|
696 | 696 | self.store.createmode) |
|
697 | 697 | self._transref = weakref.ref(tr) |
|
698 | 698 | return tr |
|
699 | 699 | |
|
700 | 700 | def recover(self): |
|
701 | 701 | lock = self.lock() |
|
702 | 702 | try: |
|
703 | 703 | if os.path.exists(self.sjoin("journal")): |
|
704 | 704 | self.ui.status(_("rolling back interrupted transaction\n")) |
|
705 | 705 | transaction.rollback(self.sopener, self.sjoin("journal"), |
|
706 | 706 | self.ui.warn) |
|
707 | 707 | self.invalidate() |
|
708 | 708 | return True |
|
709 | 709 | else: |
|
710 | 710 | self.ui.warn(_("no interrupted transaction available\n")) |
|
711 | 711 | return False |
|
712 | 712 | finally: |
|
713 | 713 | lock.release() |
|
714 | 714 | |
|
715 | 715 | def rollback(self, dryrun=False): |
|
716 | 716 | wlock = lock = None |
|
717 | 717 | try: |
|
718 | 718 | wlock = self.wlock() |
|
719 | 719 | lock = self.lock() |
|
720 | 720 | if os.path.exists(self.sjoin("undo")): |
|
721 | 721 | try: |
|
722 | 722 | args = self.opener("undo.desc", "r").read().splitlines() |
|
723 | 723 | if len(args) >= 3 and self.ui.verbose: |
|
724 | 724 | desc = _("repository tip rolled back to revision %s" |
|
725 | 725 | " (undo %s: %s)\n") % ( |
|
726 | 726 | int(args[0]) - 1, args[1], args[2]) |
|
727 | 727 | elif len(args) >= 2: |
|
728 | 728 | desc = _("repository tip rolled back to revision %s" |
|
729 | 729 | " (undo %s)\n") % ( |
|
730 | 730 | int(args[0]) - 1, args[1]) |
|
731 | 731 | except IOError: |
|
732 | 732 | desc = _("rolling back unknown transaction\n") |
|
733 | 733 | self.ui.status(desc) |
|
734 | 734 | if dryrun: |
|
735 | 735 | return |
|
736 | 736 | transaction.rollback(self.sopener, self.sjoin("undo"), |
|
737 | 737 | self.ui.warn) |
|
738 | 738 | util.rename(self.join("undo.dirstate"), self.join("dirstate")) |
|
739 | 739 | if os.path.exists(self.join('undo.bookmarks')): |
|
740 | 740 | util.rename(self.join('undo.bookmarks'), |
|
741 | 741 | self.join('bookmarks')) |
|
742 | 742 | try: |
|
743 | 743 | branch = self.opener("undo.branch").read() |
|
744 | 744 | self.dirstate.setbranch(branch) |
|
745 | 745 | except IOError: |
|
746 | 746 | self.ui.warn(_("named branch could not be reset, " |
|
747 | 747 | "current branch is still: %s\n") |
|
748 | 748 | % self.dirstate.branch()) |
|
749 | 749 | self.invalidate() |
|
750 | 750 | self.dirstate.invalidate() |
|
751 | 751 | self.destroyed() |
|
752 | 752 | parents = tuple([p.rev() for p in self.parents()]) |
|
753 | 753 | if len(parents) > 1: |
|
754 | 754 | self.ui.status(_("working directory now based on " |
|
755 | 755 | "revisions %d and %d\n") % parents) |
|
756 | 756 | else: |
|
757 | 757 | self.ui.status(_("working directory now based on " |
|
758 | 758 | "revision %d\n") % parents) |
|
759 | 759 | else: |
|
760 | 760 | self.ui.warn(_("no rollback information available\n")) |
|
761 | 761 | return 1 |
|
762 | 762 | finally: |
|
763 | 763 | release(lock, wlock) |
|
764 | 764 | |
|
765 | 765 | def invalidatecaches(self): |
|
766 | 766 | self._tags = None |
|
767 | 767 | self._tagtypes = None |
|
768 | 768 | self.nodetagscache = None |
|
769 | 769 | self._branchcache = None # in UTF-8 |
|
770 | 770 | self._branchcachetip = None |
|
771 | 771 | |
|
772 | 772 | def invalidate(self): |
|
773 | 773 | for a in ("changelog", "manifest", "_bookmarks", "_bookmarkcurrent"): |
|
774 | 774 | if a in self.__dict__: |
|
775 | 775 | delattr(self, a) |
|
776 | 776 | self.invalidatecaches() |
|
777 | 777 | |
|
778 | 778 | def _lock(self, lockname, wait, releasefn, acquirefn, desc): |
|
779 | 779 | try: |
|
780 | 780 | l = lock.lock(lockname, 0, releasefn, desc=desc) |
|
781 | 781 | except error.LockHeld, inst: |
|
782 | 782 | if not wait: |
|
783 | 783 | raise |
|
784 | 784 | self.ui.warn(_("waiting for lock on %s held by %r\n") % |
|
785 | 785 | (desc, inst.locker)) |
|
786 | 786 | # default to 600 seconds timeout |
|
787 | 787 | l = lock.lock(lockname, int(self.ui.config("ui", "timeout", "600")), |
|
788 | 788 | releasefn, desc=desc) |
|
789 | 789 | if acquirefn: |
|
790 | 790 | acquirefn() |
|
791 | 791 | return l |
|
792 | 792 | |
|
793 | 793 | def lock(self, wait=True): |
|
794 | 794 | '''Lock the repository store (.hg/store) and return a weak reference |
|
795 | 795 | to the lock. Use this before modifying the store (e.g. committing or |
|
796 | 796 | stripping). If you are opening a transaction, get a lock as well.)''' |
|
797 | 797 | l = self._lockref and self._lockref() |
|
798 | 798 | if l is not None and l.held: |
|
799 | 799 | l.lock() |
|
800 | 800 | return l |
|
801 | 801 | |
|
802 | 802 | l = self._lock(self.sjoin("lock"), wait, self.store.write, |
|
803 | 803 | self.invalidate, _('repository %s') % self.origroot) |
|
804 | 804 | self._lockref = weakref.ref(l) |
|
805 | 805 | return l |
|
806 | 806 | |
|
807 | 807 | def wlock(self, wait=True): |
|
808 | 808 | '''Lock the non-store parts of the repository (everything under |
|
809 | 809 | .hg except .hg/store) and return a weak reference to the lock. |
|
810 | 810 | Use this before modifying files in .hg.''' |
|
811 | 811 | l = self._wlockref and self._wlockref() |
|
812 | 812 | if l is not None and l.held: |
|
813 | 813 | l.lock() |
|
814 | 814 | return l |
|
815 | 815 | |
|
816 | 816 | l = self._lock(self.join("wlock"), wait, self.dirstate.write, |
|
817 | 817 | self.dirstate.invalidate, _('working directory of %s') % |
|
818 | 818 | self.origroot) |
|
819 | 819 | self._wlockref = weakref.ref(l) |
|
820 | 820 | return l |
|
821 | 821 | |
|
822 | 822 | def _filecommit(self, fctx, manifest1, manifest2, linkrev, tr, changelist): |
|
823 | 823 | """ |
|
824 | 824 | commit an individual file as part of a larger transaction |
|
825 | 825 | """ |
|
826 | 826 | |
|
827 | 827 | fname = fctx.path() |
|
828 | 828 | text = fctx.data() |
|
829 | 829 | flog = self.file(fname) |
|
830 | 830 | fparent1 = manifest1.get(fname, nullid) |
|
831 | 831 | fparent2 = fparent2o = manifest2.get(fname, nullid) |
|
832 | 832 | |
|
833 | 833 | meta = {} |
|
834 | 834 | copy = fctx.renamed() |
|
835 | 835 | if copy and copy[0] != fname: |
|
836 | 836 | # Mark the new revision of this file as a copy of another |
|
837 | 837 | # file. This copy data will effectively act as a parent |
|
838 | 838 | # of this new revision. If this is a merge, the first |
|
839 | 839 | # parent will be the nullid (meaning "look up the copy data") |
|
840 | 840 | # and the second one will be the other parent. For example: |
|
841 | 841 | # |
|
842 | 842 | # 0 --- 1 --- 3 rev1 changes file foo |
|
843 | 843 | # \ / rev2 renames foo to bar and changes it |
|
844 | 844 | # \- 2 -/ rev3 should have bar with all changes and |
|
845 | 845 | # should record that bar descends from |
|
846 | 846 | # bar in rev2 and foo in rev1 |
|
847 | 847 | # |
|
848 | 848 | # this allows this merge to succeed: |
|
849 | 849 | # |
|
850 | 850 | # 0 --- 1 --- 3 rev4 reverts the content change from rev2 |
|
851 | 851 | # \ / merging rev3 and rev4 should use bar@rev2 |
|
852 | 852 | # \- 2 --- 4 as the merge base |
|
853 | 853 | # |
|
854 | 854 | |
|
855 | 855 | cfname = copy[0] |
|
856 | 856 | crev = manifest1.get(cfname) |
|
857 | 857 | newfparent = fparent2 |
|
858 | 858 | |
|
859 | 859 | if manifest2: # branch merge |
|
860 | 860 | if fparent2 == nullid or crev is None: # copied on remote side |
|
861 | 861 | if cfname in manifest2: |
|
862 | 862 | crev = manifest2[cfname] |
|
863 | 863 | newfparent = fparent1 |
|
864 | 864 | |
|
865 | 865 | # find source in nearest ancestor if we've lost track |
|
866 | 866 | if not crev: |
|
867 | 867 | self.ui.debug(" %s: searching for copy revision for %s\n" % |
|
868 | 868 | (fname, cfname)) |
|
869 | 869 | for ancestor in self[None].ancestors(): |
|
870 | 870 | if cfname in ancestor: |
|
871 | 871 | crev = ancestor[cfname].filenode() |
|
872 | 872 | break |
|
873 | 873 | |
|
874 | 874 | if crev: |
|
875 | 875 | self.ui.debug(" %s: copy %s:%s\n" % (fname, cfname, hex(crev))) |
|
876 | 876 | meta["copy"] = cfname |
|
877 | 877 | meta["copyrev"] = hex(crev) |
|
878 | 878 | fparent1, fparent2 = nullid, newfparent |
|
879 | 879 | else: |
|
880 | 880 | self.ui.warn(_("warning: can't find ancestor for '%s' " |
|
881 | 881 | "copied from '%s'!\n") % (fname, cfname)) |
|
882 | 882 | |
|
883 | 883 | elif fparent2 != nullid: |
|
884 | 884 | # is one parent an ancestor of the other? |
|
885 | 885 | fparentancestor = flog.ancestor(fparent1, fparent2) |
|
886 | 886 | if fparentancestor == fparent1: |
|
887 | 887 | fparent1, fparent2 = fparent2, nullid |
|
888 | 888 | elif fparentancestor == fparent2: |
|
889 | 889 | fparent2 = nullid |
|
890 | 890 | |
|
891 | 891 | # is the file changed? |
|
892 | 892 | if fparent2 != nullid or flog.cmp(fparent1, text) or meta: |
|
893 | 893 | changelist.append(fname) |
|
894 | 894 | return flog.add(text, meta, tr, linkrev, fparent1, fparent2) |
|
895 | 895 | |
|
896 | 896 | # are just the flags changed during merge? |
|
897 | 897 | if fparent1 != fparent2o and manifest1.flags(fname) != fctx.flags(): |
|
898 | 898 | changelist.append(fname) |
|
899 | 899 | |
|
900 | 900 | return fparent1 |
|
901 | 901 | |
|
902 | 902 | def commit(self, text="", user=None, date=None, match=None, force=False, |
|
903 | 903 | editor=False, extra={}): |
|
904 | 904 | """Add a new revision to current repository. |
|
905 | 905 | |
|
906 | 906 | Revision information is gathered from the working directory, |
|
907 | 907 | match can be used to filter the committed files. If editor is |
|
908 | 908 | supplied, it is called to get a commit message. |
|
909 | 909 | """ |
|
910 | 910 | |
|
911 | 911 | def fail(f, msg): |
|
912 | 912 | raise util.Abort('%s: %s' % (f, msg)) |
|
913 | 913 | |
|
914 | 914 | if not match: |
|
915 | 915 | match = matchmod.always(self.root, '') |
|
916 | 916 | |
|
917 | 917 | if not force: |
|
918 | 918 | vdirs = [] |
|
919 | 919 | match.dir = vdirs.append |
|
920 | 920 | match.bad = fail |
|
921 | 921 | |
|
922 | 922 | wlock = self.wlock() |
|
923 | 923 | try: |
|
924 | 924 | wctx = self[None] |
|
925 | 925 | merge = len(wctx.parents()) > 1 |
|
926 | 926 | |
|
927 | 927 | if (not force and merge and match and |
|
928 | 928 | (match.files() or match.anypats())): |
|
929 | 929 | raise util.Abort(_('cannot partially commit a merge ' |
|
930 | 930 | '(do not specify files or patterns)')) |
|
931 | 931 | |
|
932 | 932 | changes = self.status(match=match, clean=force) |
|
933 | 933 | if force: |
|
934 | 934 | changes[0].extend(changes[6]) # mq may commit unchanged files |
|
935 | 935 | |
|
936 | 936 | # check subrepos |
|
937 | 937 | subs = [] |
|
938 | 938 | removedsubs = set() |
|
939 | 939 | for p in wctx.parents(): |
|
940 | 940 | removedsubs.update(s for s in p.substate if match(s)) |
|
941 | 941 | for s in wctx.substate: |
|
942 | 942 | removedsubs.discard(s) |
|
943 | 943 | if match(s) and wctx.sub(s).dirty(): |
|
944 | 944 | subs.append(s) |
|
945 | 945 | if (subs or removedsubs): |
|
946 | 946 | if (not match('.hgsub') and |
|
947 | 947 | '.hgsub' in (wctx.modified() + wctx.added())): |
|
948 | 948 | raise util.Abort(_("can't commit subrepos without .hgsub")) |
|
949 | 949 | if '.hgsubstate' not in changes[0]: |
|
950 | 950 | changes[0].insert(0, '.hgsubstate') |
|
951 | 951 | |
|
952 | 952 | if subs and not self.ui.configbool('ui', 'commitsubrepos', True): |
|
953 | 953 | changedsubs = [s for s in subs if wctx.sub(s).dirty(True)] |
|
954 | 954 | if changedsubs: |
|
955 | 955 | raise util.Abort(_("uncommitted changes in subrepo %s") |
|
956 | 956 | % changedsubs[0]) |
|
957 | 957 | |
|
958 | 958 | # make sure all explicit patterns are matched |
|
959 | 959 | if not force and match.files(): |
|
960 | 960 | matched = set(changes[0] + changes[1] + changes[2]) |
|
961 | 961 | |
|
962 | 962 | for f in match.files(): |
|
963 | 963 | if f == '.' or f in matched or f in wctx.substate: |
|
964 | 964 | continue |
|
965 | 965 | if f in changes[3]: # missing |
|
966 | 966 | fail(f, _('file not found!')) |
|
967 | 967 | if f in vdirs: # visited directory |
|
968 | 968 | d = f + '/' |
|
969 | 969 | for mf in matched: |
|
970 | 970 | if mf.startswith(d): |
|
971 | 971 | break |
|
972 | 972 | else: |
|
973 | 973 | fail(f, _("no match under directory!")) |
|
974 | 974 | elif f not in self.dirstate: |
|
975 | 975 | fail(f, _("file not tracked!")) |
|
976 | 976 | |
|
977 | 977 | if (not force and not extra.get("close") and not merge |
|
978 | 978 | and not (changes[0] or changes[1] or changes[2]) |
|
979 | 979 | and wctx.branch() == wctx.p1().branch()): |
|
980 | 980 | return None |
|
981 | 981 | |
|
982 | 982 | ms = mergemod.mergestate(self) |
|
983 | 983 | for f in changes[0]: |
|
984 | 984 | if f in ms and ms[f] == 'u': |
|
985 | 985 | raise util.Abort(_("unresolved merge conflicts " |
|
986 | 986 | "(see hg help resolve)")) |
|
987 | 987 | |
|
988 | 988 | cctx = context.workingctx(self, text, user, date, extra, changes) |
|
989 | 989 | if editor: |
|
990 | 990 | cctx._text = editor(self, cctx, subs) |
|
991 | 991 | edited = (text != cctx._text) |
|
992 | 992 | |
|
993 | 993 | # commit subs |
|
994 | 994 | if subs or removedsubs: |
|
995 | 995 | state = wctx.substate.copy() |
|
996 | 996 | for s in sorted(subs): |
|
997 | 997 | sub = wctx.sub(s) |
|
998 | 998 | self.ui.status(_('committing subrepository %s\n') % |
|
999 | 999 | subrepo.subrelpath(sub)) |
|
1000 | 1000 | sr = sub.commit(cctx._text, user, date) |
|
1001 | 1001 | state[s] = (state[s][0], sr) |
|
1002 | 1002 | subrepo.writestate(self, state) |
|
1003 | 1003 | |
|
1004 | 1004 | # Save commit message in case this transaction gets rolled back |
|
1005 | 1005 | # (e.g. by a pretxncommit hook). Leave the content alone on |
|
1006 | 1006 | # the assumption that the user will use the same editor again. |
|
1007 | 1007 | msgfile = self.opener('last-message.txt', 'wb') |
|
1008 | 1008 | msgfile.write(cctx._text) |
|
1009 | 1009 | msgfile.close() |
|
1010 | 1010 | |
|
1011 | 1011 | p1, p2 = self.dirstate.parents() |
|
1012 | 1012 | hookp1, hookp2 = hex(p1), (p2 != nullid and hex(p2) or '') |
|
1013 | 1013 | try: |
|
1014 | 1014 | self.hook("precommit", throw=True, parent1=hookp1, parent2=hookp2) |
|
1015 | 1015 | ret = self.commitctx(cctx, True) |
|
1016 | 1016 | except: |
|
1017 | 1017 | if edited: |
|
1018 | 1018 | msgfn = self.pathto(msgfile.name[len(self.root)+1:]) |
|
1019 | 1019 | self.ui.write( |
|
1020 | 1020 | _('note: commit message saved in %s\n') % msgfn) |
|
1021 | 1021 | raise |
|
1022 | 1022 | |
|
1023 | 1023 | # update bookmarks, dirstate and mergestate |
|
1024 | 1024 | bookmarks.update(self, p1, ret) |
|
1025 | 1025 | for f in changes[0] + changes[1]: |
|
1026 | 1026 | self.dirstate.normal(f) |
|
1027 | 1027 | for f in changes[2]: |
|
1028 | 1028 | self.dirstate.forget(f) |
|
1029 | 1029 | self.dirstate.setparents(ret) |
|
1030 | 1030 | ms.reset() |
|
1031 | 1031 | finally: |
|
1032 | 1032 | wlock.release() |
|
1033 | 1033 | |
|
1034 | 1034 | self.hook("commit", node=hex(ret), parent1=hookp1, parent2=hookp2) |
|
1035 | 1035 | return ret |
|
1036 | 1036 | |
|
1037 | 1037 | def commitctx(self, ctx, error=False): |
|
1038 | 1038 | """Add a new revision to current repository. |
|
1039 | 1039 | Revision information is passed via the context argument. |
|
1040 | 1040 | """ |
|
1041 | 1041 | |
|
1042 | 1042 | tr = lock = None |
|
1043 | 1043 | removed = list(ctx.removed()) |
|
1044 | 1044 | p1, p2 = ctx.p1(), ctx.p2() |
|
1045 | 1045 | m1 = p1.manifest().copy() |
|
1046 | 1046 | m2 = p2.manifest() |
|
1047 | 1047 | user = ctx.user() |
|
1048 | 1048 | |
|
1049 | 1049 | lock = self.lock() |
|
1050 | 1050 | try: |
|
1051 | 1051 | tr = self.transaction("commit") |
|
1052 | 1052 | trp = weakref.proxy(tr) |
|
1053 | 1053 | |
|
1054 | 1054 | # check in files |
|
1055 | 1055 | new = {} |
|
1056 | 1056 | changed = [] |
|
1057 | 1057 | linkrev = len(self) |
|
1058 | 1058 | for f in sorted(ctx.modified() + ctx.added()): |
|
1059 | 1059 | self.ui.note(f + "\n") |
|
1060 | 1060 | try: |
|
1061 | 1061 | fctx = ctx[f] |
|
1062 | 1062 | new[f] = self._filecommit(fctx, m1, m2, linkrev, trp, |
|
1063 | 1063 | changed) |
|
1064 | 1064 | m1.set(f, fctx.flags()) |
|
1065 | 1065 | except OSError, inst: |
|
1066 | 1066 | self.ui.warn(_("trouble committing %s!\n") % f) |
|
1067 | 1067 | raise |
|
1068 | 1068 | except IOError, inst: |
|
1069 | 1069 | errcode = getattr(inst, 'errno', errno.ENOENT) |
|
1070 | 1070 | if error or errcode and errcode != errno.ENOENT: |
|
1071 | 1071 | self.ui.warn(_("trouble committing %s!\n") % f) |
|
1072 | 1072 | raise |
|
1073 | 1073 | else: |
|
1074 | 1074 | removed.append(f) |
|
1075 | 1075 | |
|
1076 | 1076 | # update manifest |
|
1077 | 1077 | m1.update(new) |
|
1078 | 1078 | removed = [f for f in sorted(removed) if f in m1 or f in m2] |
|
1079 | 1079 | drop = [f for f in removed if f in m1] |
|
1080 | 1080 | for f in drop: |
|
1081 | 1081 | del m1[f] |
|
1082 | 1082 | mn = self.manifest.add(m1, trp, linkrev, p1.manifestnode(), |
|
1083 | 1083 | p2.manifestnode(), (new, drop)) |
|
1084 | 1084 | |
|
1085 | 1085 | # update changelog |
|
1086 | 1086 | self.changelog.delayupdate() |
|
1087 | 1087 | n = self.changelog.add(mn, changed + removed, ctx.description(), |
|
1088 | 1088 | trp, p1.node(), p2.node(), |
|
1089 | 1089 | user, ctx.date(), ctx.extra().copy()) |
|
1090 | 1090 | p = lambda: self.changelog.writepending() and self.root or "" |
|
1091 | 1091 | xp1, xp2 = p1.hex(), p2 and p2.hex() or '' |
|
1092 | 1092 | self.hook('pretxncommit', throw=True, node=hex(n), parent1=xp1, |
|
1093 | 1093 | parent2=xp2, pending=p) |
|
1094 | 1094 | self.changelog.finalize(trp) |
|
1095 | 1095 | tr.close() |
|
1096 | 1096 | |
|
1097 | 1097 | if self._branchcache: |
|
1098 | 1098 | self.updatebranchcache() |
|
1099 | 1099 | return n |
|
1100 | 1100 | finally: |
|
1101 | 1101 | if tr: |
|
1102 | 1102 | tr.release() |
|
1103 | 1103 | lock.release() |
|
1104 | 1104 | |
|
1105 | 1105 | def destroyed(self): |
|
1106 | 1106 | '''Inform the repository that nodes have been destroyed. |
|
1107 | 1107 | Intended for use by strip and rollback, so there's a common |
|
1108 | 1108 | place for anything that has to be done after destroying history.''' |
|
1109 | 1109 | # XXX it might be nice if we could take the list of destroyed |
|
1110 | 1110 | # nodes, but I don't see an easy way for rollback() to do that |
|
1111 | 1111 | |
|
1112 | 1112 | # Ensure the persistent tag cache is updated. Doing it now |
|
1113 | 1113 | # means that the tag cache only has to worry about destroyed |
|
1114 | 1114 | # heads immediately after a strip/rollback. That in turn |
|
1115 | 1115 | # guarantees that "cachetip == currenttip" (comparing both rev |
|
1116 | 1116 | # and node) always means no nodes have been added or destroyed. |
|
1117 | 1117 | |
|
1118 | 1118 | # XXX this is suboptimal when qrefresh'ing: we strip the current |
|
1119 | 1119 | # head, refresh the tag cache, then immediately add a new head. |
|
1120 | 1120 | # But I think doing it this way is necessary for the "instant |
|
1121 | 1121 | # tag cache retrieval" case to work. |
|
1122 | 1122 | self.invalidatecaches() |
|
1123 | 1123 | |
|
1124 | 1124 | def walk(self, match, node=None): |
|
1125 | 1125 | ''' |
|
1126 | 1126 | walk recursively through the directory tree or a given |
|
1127 | 1127 | changeset, finding all files matched by the match |
|
1128 | 1128 | function |
|
1129 | 1129 | ''' |
|
1130 | 1130 | return self[node].walk(match) |
|
1131 | 1131 | |
|
1132 | 1132 | def status(self, node1='.', node2=None, match=None, |
|
1133 | 1133 | ignored=False, clean=False, unknown=False, |
|
1134 | 1134 | listsubrepos=False): |
|
1135 | 1135 | """return status of files between two nodes or node and working directory |
|
1136 | 1136 | |
|
1137 | 1137 | If node1 is None, use the first dirstate parent instead. |
|
1138 | 1138 | If node2 is None, compare node1 with working directory. |
|
1139 | 1139 | """ |
|
1140 | 1140 | |
|
1141 | 1141 | def mfmatches(ctx): |
|
1142 | 1142 | mf = ctx.manifest().copy() |
|
1143 | 1143 | for fn in mf.keys(): |
|
1144 | 1144 | if not match(fn): |
|
1145 | 1145 | del mf[fn] |
|
1146 | 1146 | return mf |
|
1147 | 1147 | |
|
1148 | 1148 | if isinstance(node1, context.changectx): |
|
1149 | 1149 | ctx1 = node1 |
|
1150 | 1150 | else: |
|
1151 | 1151 | ctx1 = self[node1] |
|
1152 | 1152 | if isinstance(node2, context.changectx): |
|
1153 | 1153 | ctx2 = node2 |
|
1154 | 1154 | else: |
|
1155 | 1155 | ctx2 = self[node2] |
|
1156 | 1156 | |
|
1157 | 1157 | working = ctx2.rev() is None |
|
1158 | 1158 | parentworking = working and ctx1 == self['.'] |
|
1159 | 1159 | match = match or matchmod.always(self.root, self.getcwd()) |
|
1160 | 1160 | listignored, listclean, listunknown = ignored, clean, unknown |
|
1161 | 1161 | |
|
1162 | 1162 | # load earliest manifest first for caching reasons |
|
1163 | 1163 | if not working and ctx2.rev() < ctx1.rev(): |
|
1164 | 1164 | ctx2.manifest() |
|
1165 | 1165 | |
|
1166 | 1166 | if not parentworking: |
|
1167 | 1167 | def bad(f, msg): |
|
1168 | 1168 | if f not in ctx1: |
|
1169 | 1169 | self.ui.warn('%s: %s\n' % (self.dirstate.pathto(f), msg)) |
|
1170 | 1170 | match.bad = bad |
|
1171 | 1171 | |
|
1172 | 1172 | if working: # we need to scan the working dir |
|
1173 | 1173 | subrepos = [] |
|
1174 | 1174 | if '.hgsub' in self.dirstate: |
|
1175 | 1175 | subrepos = ctx1.substate.keys() |
|
1176 | 1176 | s = self.dirstate.status(match, subrepos, listignored, |
|
1177 | 1177 | listclean, listunknown) |
|
1178 | 1178 | cmp, modified, added, removed, deleted, unknown, ignored, clean = s |
|
1179 | 1179 | |
|
1180 | 1180 | # check for any possibly clean files |
|
1181 | 1181 | if parentworking and cmp: |
|
1182 | 1182 | fixup = [] |
|
1183 | 1183 | # do a full compare of any files that might have changed |
|
1184 | 1184 | for f in sorted(cmp): |
|
1185 | 1185 | if (f not in ctx1 or ctx2.flags(f) != ctx1.flags(f) |
|
1186 | 1186 | or ctx1[f].cmp(ctx2[f])): |
|
1187 | 1187 | modified.append(f) |
|
1188 | 1188 | else: |
|
1189 | 1189 | fixup.append(f) |
|
1190 | 1190 | |
|
1191 | 1191 | # update dirstate for files that are actually clean |
|
1192 | 1192 | if fixup: |
|
1193 | 1193 | if listclean: |
|
1194 | 1194 | clean += fixup |
|
1195 | 1195 | |
|
1196 | 1196 | try: |
|
1197 | 1197 | # updating the dirstate is optional |
|
1198 | 1198 | # so we don't wait on the lock |
|
1199 | 1199 | wlock = self.wlock(False) |
|
1200 | 1200 | try: |
|
1201 | 1201 | for f in fixup: |
|
1202 | 1202 | self.dirstate.normal(f) |
|
1203 | 1203 | finally: |
|
1204 | 1204 | wlock.release() |
|
1205 | 1205 | except error.LockError: |
|
1206 | 1206 | pass |
|
1207 | 1207 | |
|
1208 | 1208 | if not parentworking: |
|
1209 | 1209 | mf1 = mfmatches(ctx1) |
|
1210 | 1210 | if working: |
|
1211 | 1211 | # we are comparing working dir against non-parent |
|
1212 | 1212 | # generate a pseudo-manifest for the working dir |
|
1213 | 1213 | mf2 = mfmatches(self['.']) |
|
1214 | 1214 | for f in cmp + modified + added: |
|
1215 | 1215 | mf2[f] = None |
|
1216 | 1216 | mf2.set(f, ctx2.flags(f)) |
|
1217 | 1217 | for f in removed: |
|
1218 | 1218 | if f in mf2: |
|
1219 | 1219 | del mf2[f] |
|
1220 | 1220 | else: |
|
1221 | 1221 | # we are comparing two revisions |
|
1222 | 1222 | deleted, unknown, ignored = [], [], [] |
|
1223 | 1223 | mf2 = mfmatches(ctx2) |
|
1224 | 1224 | |
|
1225 | 1225 | modified, added, clean = [], [], [] |
|
1226 | 1226 | for fn in mf2: |
|
1227 | 1227 | if fn in mf1: |
|
1228 | 1228 | if (fn not in deleted and |
|
1229 | 1229 | (mf1.flags(fn) != mf2.flags(fn) or |
|
1230 | 1230 | (mf1[fn] != mf2[fn] and |
|
1231 | 1231 | (mf2[fn] or ctx1[fn].cmp(ctx2[fn]))))): |
|
1232 | 1232 | modified.append(fn) |
|
1233 | 1233 | elif listclean: |
|
1234 | 1234 | clean.append(fn) |
|
1235 | 1235 | del mf1[fn] |
|
1236 | 1236 | elif fn not in deleted: |
|
1237 | 1237 | added.append(fn) |
|
1238 | 1238 | removed = mf1.keys() |
|
1239 | 1239 | |
|
1240 | 1240 | r = modified, added, removed, deleted, unknown, ignored, clean |
|
1241 | 1241 | |
|
1242 | 1242 | if listsubrepos: |
|
1243 | 1243 | for subpath, sub in subrepo.itersubrepos(ctx1, ctx2): |
|
1244 | 1244 | if working: |
|
1245 | 1245 | rev2 = None |
|
1246 | 1246 | else: |
|
1247 | 1247 | rev2 = ctx2.substate[subpath][1] |
|
1248 | 1248 | try: |
|
1249 | 1249 | submatch = matchmod.narrowmatcher(subpath, match) |
|
1250 | 1250 | s = sub.status(rev2, match=submatch, ignored=listignored, |
|
1251 | 1251 | clean=listclean, unknown=listunknown, |
|
1252 | 1252 | listsubrepos=True) |
|
1253 | 1253 | for rfiles, sfiles in zip(r, s): |
|
1254 | 1254 | rfiles.extend("%s/%s" % (subpath, f) for f in sfiles) |
|
1255 | 1255 | except error.LookupError: |
|
1256 | 1256 | self.ui.status(_("skipping missing subrepository: %s\n") |
|
1257 | 1257 | % subpath) |
|
1258 | 1258 | |
|
1259 | 1259 | for l in r: |
|
1260 | 1260 | l.sort() |
|
1261 | 1261 | return r |
|
1262 | 1262 | |
|
1263 | 1263 | def heads(self, start=None): |
|
1264 | 1264 | heads = self.changelog.heads(start) |
|
1265 | 1265 | # sort the output in rev descending order |
|
1266 | 1266 | return sorted(heads, key=self.changelog.rev, reverse=True) |
|
1267 | 1267 | |
|
1268 | 1268 | def branchheads(self, branch=None, start=None, closed=False): |
|
1269 | 1269 | '''return a (possibly filtered) list of heads for the given branch |
|
1270 | 1270 | |
|
1271 | 1271 | Heads are returned in topological order, from newest to oldest. |
|
1272 | 1272 | If branch is None, use the dirstate branch. |
|
1273 | 1273 | If start is not None, return only heads reachable from start. |
|
1274 | 1274 | If closed is True, return heads that are marked as closed as well. |
|
1275 | 1275 | ''' |
|
1276 | 1276 | if branch is None: |
|
1277 | 1277 | branch = self[None].branch() |
|
1278 | 1278 | branches = self.branchmap() |
|
1279 | 1279 | if branch not in branches: |
|
1280 | 1280 | return [] |
|
1281 | 1281 | # the cache returns heads ordered lowest to highest |
|
1282 | 1282 | bheads = list(reversed(branches[branch])) |
|
1283 | 1283 | if start is not None: |
|
1284 | 1284 | # filter out the heads that cannot be reached from startrev |
|
1285 | 1285 | fbheads = set(self.changelog.nodesbetween([start], bheads)[2]) |
|
1286 | 1286 | bheads = [h for h in bheads if h in fbheads] |
|
1287 | 1287 | if not closed: |
|
1288 | 1288 | bheads = [h for h in bheads if |
|
1289 | 1289 | ('close' not in self.changelog.read(h)[5])] |
|
1290 | 1290 | return bheads |
|
1291 | 1291 | |
|
1292 | 1292 | def branches(self, nodes): |
|
1293 | 1293 | if not nodes: |
|
1294 | 1294 | nodes = [self.changelog.tip()] |
|
1295 | 1295 | b = [] |
|
1296 | 1296 | for n in nodes: |
|
1297 | 1297 | t = n |
|
1298 | 1298 | while 1: |
|
1299 | 1299 | p = self.changelog.parents(n) |
|
1300 | 1300 | if p[1] != nullid or p[0] == nullid: |
|
1301 | 1301 | b.append((t, n, p[0], p[1])) |
|
1302 | 1302 | break |
|
1303 | 1303 | n = p[0] |
|
1304 | 1304 | return b |
|
1305 | 1305 | |
|
1306 | 1306 | def between(self, pairs): |
|
1307 | 1307 | r = [] |
|
1308 | 1308 | |
|
1309 | 1309 | for top, bottom in pairs: |
|
1310 | 1310 | n, l, i = top, [], 0 |
|
1311 | 1311 | f = 1 |
|
1312 | 1312 | |
|
1313 | 1313 | while n != bottom and n != nullid: |
|
1314 | 1314 | p = self.changelog.parents(n)[0] |
|
1315 | 1315 | if i == f: |
|
1316 | 1316 | l.append(n) |
|
1317 | 1317 | f = f * 2 |
|
1318 | 1318 | n = p |
|
1319 | 1319 | i += 1 |
|
1320 | 1320 | |
|
1321 | 1321 | r.append(l) |
|
1322 | 1322 | |
|
1323 | 1323 | return r |
|
1324 | 1324 | |
|
1325 | 1325 | def pull(self, remote, heads=None, force=False): |
|
1326 | 1326 | lock = self.lock() |
|
1327 | 1327 | try: |
|
1328 | 1328 | usecommon = remote.capable('getbundle') |
|
1329 | 1329 | tmp = discovery.findcommonincoming(self, remote, heads=heads, |
|
1330 | 1330 | force=force, commononly=usecommon) |
|
1331 | 1331 | common, fetch, rheads = tmp |
|
1332 | 1332 | if not fetch: |
|
1333 | 1333 | self.ui.status(_("no changes found\n")) |
|
1334 | 1334 | result = 0 |
|
1335 | 1335 | else: |
|
1336 | 1336 | if heads is None and list(common) == [nullid]: |
|
1337 | 1337 | self.ui.status(_("requesting all changes\n")) |
|
1338 | 1338 | elif heads is None and remote.capable('changegroupsubset'): |
|
1339 | 1339 | # issue1320, avoid a race if remote changed after discovery |
|
1340 | 1340 | heads = rheads |
|
1341 | 1341 | |
|
1342 | 1342 | if usecommon: |
|
1343 | 1343 | cg = remote.getbundle('pull', common=common, |
|
1344 | 1344 | heads=heads or rheads) |
|
1345 | 1345 | elif heads is None: |
|
1346 | 1346 | cg = remote.changegroup(fetch, 'pull') |
|
1347 | 1347 | elif not remote.capable('changegroupsubset'): |
|
1348 | 1348 | raise util.Abort(_("partial pull cannot be done because " |
|
1349 | 1349 | "other repository doesn't support " |
|
1350 | 1350 | "changegroupsubset.")) |
|
1351 | 1351 | else: |
|
1352 | 1352 | cg = remote.changegroupsubset(fetch, heads, 'pull') |
|
1353 | 1353 | result = self.addchangegroup(cg, 'pull', remote.url(), |
|
1354 | 1354 | lock=lock) |
|
1355 | 1355 | finally: |
|
1356 | 1356 | lock.release() |
|
1357 | 1357 | |
|
1358 | 1358 | return result |
|
1359 | 1359 | |
|
1360 | 1360 | def checkpush(self, force, revs): |
|
1361 | 1361 | """Extensions can override this function if additional checks have |
|
1362 | 1362 | to be performed before pushing, or call it if they override push |
|
1363 | 1363 | command. |
|
1364 | 1364 | """ |
|
1365 | 1365 | pass |
|
1366 | 1366 | |
|
1367 | 1367 | def push(self, remote, force=False, revs=None, newbranch=False): |
|
1368 | 1368 | '''Push outgoing changesets (limited by revs) from the current |
|
1369 | 1369 | repository to remote. Return an integer: |
|
1370 | 1370 | - 0 means HTTP error *or* nothing to push |
|
1371 | 1371 | - 1 means we pushed and remote head count is unchanged *or* |
|
1372 | 1372 | we have outgoing changesets but refused to push |
|
1373 | 1373 | - other values as described by addchangegroup() |
|
1374 | 1374 | ''' |
|
1375 | 1375 | # there are two ways to push to remote repo: |
|
1376 | 1376 | # |
|
1377 | 1377 | # addchangegroup assumes local user can lock remote |
|
1378 | 1378 | # repo (local filesystem, old ssh servers). |
|
1379 | 1379 | # |
|
1380 | 1380 | # unbundle assumes local user cannot lock remote repo (new ssh |
|
1381 | 1381 | # servers, http servers). |
|
1382 | 1382 | |
|
1383 | 1383 | self.checkpush(force, revs) |
|
1384 | 1384 | lock = None |
|
1385 | 1385 | unbundle = remote.capable('unbundle') |
|
1386 | 1386 | if not unbundle: |
|
1387 | 1387 | lock = remote.lock() |
|
1388 | 1388 | try: |
|
1389 | 1389 | cg, remote_heads = discovery.prepush(self, remote, force, revs, |
|
1390 | 1390 | newbranch) |
|
1391 | 1391 | ret = remote_heads |
|
1392 | 1392 | if cg is not None: |
|
1393 | 1393 | if unbundle: |
|
1394 | 1394 | # local repo finds heads on server, finds out what |
|
1395 | 1395 | # revs it must push. once revs transferred, if server |
|
1396 | 1396 | # finds it has different heads (someone else won |
|
1397 | 1397 | # commit/push race), server aborts. |
|
1398 | 1398 | if force: |
|
1399 | 1399 | remote_heads = ['force'] |
|
1400 | 1400 | # ssh: return remote's addchangegroup() |
|
1401 | 1401 | # http: return remote's addchangegroup() or 0 for error |
|
1402 | 1402 | ret = remote.unbundle(cg, remote_heads, 'push') |
|
1403 | 1403 | else: |
|
1404 | 1404 | # we return an integer indicating remote head count change |
|
1405 | 1405 | ret = remote.addchangegroup(cg, 'push', self.url(), |
|
1406 | 1406 | lock=lock) |
|
1407 | 1407 | finally: |
|
1408 | 1408 | if lock is not None: |
|
1409 | 1409 | lock.release() |
|
1410 | 1410 | |
|
1411 | 1411 | self.ui.debug("checking for updated bookmarks\n") |
|
1412 | 1412 | rb = remote.listkeys('bookmarks') |
|
1413 | 1413 | for k in rb.keys(): |
|
1414 | 1414 | if k in self._bookmarks: |
|
1415 | 1415 | nr, nl = rb[k], hex(self._bookmarks[k]) |
|
1416 | 1416 | if nr in self: |
|
1417 | 1417 | cr = self[nr] |
|
1418 | 1418 | cl = self[nl] |
|
1419 | 1419 | if cl in cr.descendants(): |
|
1420 | 1420 | r = remote.pushkey('bookmarks', k, nr, nl) |
|
1421 | 1421 | if r: |
|
1422 | 1422 | self.ui.status(_("updating bookmark %s\n") % k) |
|
1423 | 1423 | else: |
|
1424 | 1424 | self.ui.warn(_('updating bookmark %s' |
|
1425 | 1425 | ' failed!\n') % k) |
|
1426 | 1426 | |
|
1427 | 1427 | return ret |
|
1428 | 1428 | |
|
1429 | 1429 | def changegroupinfo(self, nodes, source): |
|
1430 | 1430 | if self.ui.verbose or source == 'bundle': |
|
1431 | 1431 | self.ui.status(_("%d changesets found\n") % len(nodes)) |
|
1432 | 1432 | if self.ui.debugflag: |
|
1433 | 1433 | self.ui.debug("list of changesets:\n") |
|
1434 | 1434 | for node in nodes: |
|
1435 | 1435 | self.ui.debug("%s\n" % hex(node)) |
|
1436 | 1436 | |
|
1437 | 1437 | def changegroupsubset(self, bases, heads, source): |
|
1438 | 1438 | """Compute a changegroup consisting of all the nodes that are |
|
1439 | 1439 | descendents of any of the bases and ancestors of any of the heads. |
|
1440 | 1440 | Return a chunkbuffer object whose read() method will return |
|
1441 | 1441 | successive changegroup chunks. |
|
1442 | 1442 | |
|
1443 | 1443 | It is fairly complex as determining which filenodes and which |
|
1444 | 1444 | manifest nodes need to be included for the changeset to be complete |
|
1445 | 1445 | is non-trivial. |
|
1446 | 1446 | |
|
1447 | 1447 | Another wrinkle is doing the reverse, figuring out which changeset in |
|
1448 | 1448 | the changegroup a particular filenode or manifestnode belongs to. |
|
1449 | 1449 | """ |
|
1450 | 1450 | cl = self.changelog |
|
1451 | 1451 | if not bases: |
|
1452 | 1452 | bases = [nullid] |
|
1453 | 1453 | csets, bases, heads = cl.nodesbetween(bases, heads) |
|
1454 | 1454 | # We assume that all ancestors of bases are known |
|
1455 | 1455 | common = set(cl.ancestors(*[cl.rev(n) for n in bases])) |
|
1456 | 1456 | return self._changegroupsubset(common, csets, heads, source) |
|
1457 | 1457 | |
|
1458 | 1458 | def getbundle(self, source, heads=None, common=None): |
|
1459 | 1459 | """Like changegroupsubset, but returns the set difference between the |
|
1460 | 1460 | ancestors of heads and the ancestors common. |
|
1461 | 1461 | |
|
1462 | 1462 | If heads is None, use the local heads. If common is None, use [nullid]. |
|
1463 | 1463 | |
|
1464 | 1464 | The nodes in common might not all be known locally due to the way the |
|
1465 | 1465 | current discovery protocol works. |
|
1466 | 1466 | """ |
|
1467 | 1467 | cl = self.changelog |
|
1468 | 1468 | if common: |
|
1469 | 1469 | nm = cl.nodemap |
|
1470 | 1470 | common = [n for n in common if n in nm] |
|
1471 | 1471 | else: |
|
1472 | 1472 | common = [nullid] |
|
1473 | 1473 | if not heads: |
|
1474 | 1474 | heads = cl.heads() |
|
1475 | 1475 | common, missing = cl.findcommonmissing(common, heads) |
|
1476 | 1476 | return self._changegroupsubset(common, missing, heads, source) |
|
1477 | 1477 | |
|
1478 | 1478 | def _changegroupsubset(self, commonrevs, csets, heads, source): |
|
1479 | 1479 | |
|
1480 | 1480 | cl = self.changelog |
|
1481 | 1481 | mf = self.manifest |
|
1482 | 1482 | mfs = {} # needed manifests |
|
1483 | 1483 | fnodes = {} # needed file nodes |
|
1484 | 1484 | changedfiles = set() |
|
1485 | 1485 | fstate = ['', {}] |
|
1486 | 1486 | count = [0] |
|
1487 | 1487 | |
|
1488 | 1488 | # can we go through the fast path ? |
|
1489 | 1489 | heads.sort() |
|
1490 | 1490 | if heads == sorted(self.heads()): |
|
1491 | 1491 | return self._changegroup(csets, source) |
|
1492 | 1492 | |
|
1493 | 1493 | # slow path |
|
1494 | 1494 | self.hook('preoutgoing', throw=True, source=source) |
|
1495 | 1495 | self.changegroupinfo(csets, source) |
|
1496 | 1496 | |
|
1497 | 1497 | # filter any nodes that claim to be part of the known set |
|
1498 | 1498 | def prune(revlog, missing): |
|
1499 | 1499 | for n in missing: |
|
1500 | 1500 | if revlog.linkrev(revlog.rev(n)) not in commonrevs: |
|
1501 | 1501 | yield n |
|
1502 | 1502 | |
|
1503 | 1503 | def lookup(revlog, x): |
|
1504 | 1504 | if revlog == cl: |
|
1505 | 1505 | c = cl.read(x) |
|
1506 | 1506 | changedfiles.update(c[3]) |
|
1507 | 1507 | mfs.setdefault(c[0], x) |
|
1508 | 1508 | count[0] += 1 |
|
1509 | 1509 | self.ui.progress(_('bundling'), count[0], unit=_('changesets')) |
|
1510 | 1510 | return x |
|
1511 | 1511 | elif revlog == mf: |
|
1512 | 1512 | clnode = mfs[x] |
|
1513 | 1513 | mdata = mf.readfast(x) |
|
1514 | 1514 | for f in changedfiles: |
|
1515 | 1515 | if f in mdata: |
|
1516 | 1516 | fnodes.setdefault(f, {}).setdefault(mdata[f], clnode) |
|
1517 | 1517 | count[0] += 1 |
|
1518 | 1518 | self.ui.progress(_('bundling'), count[0], |
|
1519 | 1519 | unit=_('manifests'), total=len(mfs)) |
|
1520 | 1520 | return mfs[x] |
|
1521 | 1521 | else: |
|
1522 | 1522 | self.ui.progress( |
|
1523 | 1523 | _('bundling'), count[0], item=fstate[0], |
|
1524 | 1524 | unit=_('files'), total=len(changedfiles)) |
|
1525 | 1525 | return fstate[1][x] |
|
1526 | 1526 | |
|
1527 | 1527 | bundler = changegroup.bundle10(lookup) |
|
1528 | 1528 | |
|
1529 | 1529 | def gengroup(): |
|
1530 | 1530 | # Create a changenode group generator that will call our functions |
|
1531 | 1531 | # back to lookup the owning changenode and collect information. |
|
1532 | 1532 | for chunk in cl.group(csets, bundler): |
|
1533 | 1533 | yield chunk |
|
1534 | 1534 | self.ui.progress(_('bundling'), None) |
|
1535 | 1535 | |
|
1536 | 1536 | # Create a generator for the manifestnodes that calls our lookup |
|
1537 | 1537 | # and data collection functions back. |
|
1538 | 1538 | count[0] = 0 |
|
1539 | 1539 | for chunk in mf.group(prune(mf, mfs), bundler): |
|
1540 | 1540 | yield chunk |
|
1541 | 1541 | self.ui.progress(_('bundling'), None) |
|
1542 | 1542 | |
|
1543 | 1543 | mfs.clear() |
|
1544 | 1544 | |
|
1545 | 1545 | # Go through all our files in order sorted by name. |
|
1546 | 1546 | count[0] = 0 |
|
1547 | 1547 | for fname in sorted(changedfiles): |
|
1548 | 1548 | filerevlog = self.file(fname) |
|
1549 | 1549 | if not len(filerevlog): |
|
1550 | 1550 | raise util.Abort(_("empty or missing revlog for %s") % fname) |
|
1551 | 1551 | fstate[0] = fname |
|
1552 | 1552 | fstate[1] = fnodes.pop(fname, {}) |
|
1553 | 1553 | first = True |
|
1554 | 1554 | |
|
1555 | 1555 | for chunk in filerevlog.group(prune(filerevlog, fstate[1]), |
|
1556 | 1556 | bundler): |
|
1557 | 1557 | if first: |
|
1558 | 1558 | if chunk == bundler.close(): |
|
1559 | 1559 | break |
|
1560 | 1560 | count[0] += 1 |
|
1561 | 1561 | yield bundler.fileheader(fname) |
|
1562 | 1562 | first = False |
|
1563 | 1563 | yield chunk |
|
1564 | 1564 | # Signal that no more groups are left. |
|
1565 | 1565 | yield bundler.close() |
|
1566 | 1566 | self.ui.progress(_('bundling'), None) |
|
1567 | 1567 | |
|
1568 | 1568 | if csets: |
|
1569 | 1569 | self.hook('outgoing', node=hex(csets[0]), source=source) |
|
1570 | 1570 | |
|
1571 | 1571 | return changegroup.unbundle10(util.chunkbuffer(gengroup()), 'UN') |
|
1572 | 1572 | |
|
1573 | 1573 | def changegroup(self, basenodes, source): |
|
1574 | 1574 | # to avoid a race we use changegroupsubset() (issue1320) |
|
1575 | 1575 | return self.changegroupsubset(basenodes, self.heads(), source) |
|
1576 | 1576 | |
|
1577 | 1577 | def _changegroup(self, nodes, source): |
|
1578 | 1578 | """Compute the changegroup of all nodes that we have that a recipient |
|
1579 | 1579 | doesn't. Return a chunkbuffer object whose read() method will return |
|
1580 | 1580 | successive changegroup chunks. |
|
1581 | 1581 | |
|
1582 | 1582 | This is much easier than the previous function as we can assume that |
|
1583 | 1583 | the recipient has any changenode we aren't sending them. |
|
1584 | 1584 | |
|
1585 | 1585 | nodes is the set of nodes to send""" |
|
1586 | 1586 | |
|
1587 | 1587 | cl = self.changelog |
|
1588 | 1588 | mf = self.manifest |
|
1589 | 1589 | mfs = {} |
|
1590 | 1590 | changedfiles = set() |
|
1591 | 1591 | fstate = [''] |
|
1592 | 1592 | count = [0] |
|
1593 | 1593 | |
|
1594 | 1594 | self.hook('preoutgoing', throw=True, source=source) |
|
1595 | 1595 | self.changegroupinfo(nodes, source) |
|
1596 | 1596 | |
|
1597 | 1597 | revset = set([cl.rev(n) for n in nodes]) |
|
1598 | 1598 | |
|
1599 | 1599 | def gennodelst(log): |
|
1600 | 1600 | for r in log: |
|
1601 | 1601 | if log.linkrev(r) in revset: |
|
1602 | 1602 | yield log.node(r) |
|
1603 | 1603 | |
|
1604 | 1604 | def lookup(revlog, x): |
|
1605 | 1605 | if revlog == cl: |
|
1606 | 1606 | c = cl.read(x) |
|
1607 | 1607 | changedfiles.update(c[3]) |
|
1608 | 1608 | mfs.setdefault(c[0], x) |
|
1609 | 1609 | count[0] += 1 |
|
1610 | 1610 | self.ui.progress(_('bundling'), count[0], unit=_('changesets')) |
|
1611 | 1611 | return x |
|
1612 | 1612 | elif revlog == mf: |
|
1613 | 1613 | count[0] += 1 |
|
1614 | 1614 | self.ui.progress(_('bundling'), count[0], |
|
1615 | 1615 | unit=_('manifests'), total=len(mfs)) |
|
1616 | 1616 | return cl.node(revlog.linkrev(revlog.rev(x))) |
|
1617 | 1617 | else: |
|
1618 | 1618 | self.ui.progress( |
|
1619 | 1619 | _('bundling'), count[0], item=fstate[0], |
|
1620 | 1620 | total=len(changedfiles), unit=_('files')) |
|
1621 | 1621 | return cl.node(revlog.linkrev(revlog.rev(x))) |
|
1622 | 1622 | |
|
1623 | 1623 | bundler = changegroup.bundle10(lookup) |
|
1624 | 1624 | |
|
1625 | 1625 | def gengroup(): |
|
1626 | 1626 | '''yield a sequence of changegroup chunks (strings)''' |
|
1627 | 1627 | # construct a list of all changed files |
|
1628 | 1628 | |
|
1629 | 1629 | for chunk in cl.group(nodes, bundler): |
|
1630 | 1630 | yield chunk |
|
1631 | 1631 | self.ui.progress(_('bundling'), None) |
|
1632 | 1632 | |
|
1633 | 1633 | count[0] = 0 |
|
1634 | 1634 | for chunk in mf.group(gennodelst(mf), bundler): |
|
1635 | 1635 | yield chunk |
|
1636 | 1636 | self.ui.progress(_('bundling'), None) |
|
1637 | 1637 | |
|
1638 | 1638 | count[0] = 0 |
|
1639 | 1639 | for fname in sorted(changedfiles): |
|
1640 | 1640 | filerevlog = self.file(fname) |
|
1641 | 1641 | if not len(filerevlog): |
|
1642 | 1642 | raise util.Abort(_("empty or missing revlog for %s") % fname) |
|
1643 | 1643 | fstate[0] = fname |
|
1644 | 1644 | first = True |
|
1645 | 1645 | for chunk in filerevlog.group(gennodelst(filerevlog), bundler): |
|
1646 | 1646 | if first: |
|
1647 | 1647 | if chunk == bundler.close(): |
|
1648 | 1648 | break |
|
1649 | 1649 | count[0] += 1 |
|
1650 | 1650 | yield bundler.fileheader(fname) |
|
1651 | 1651 | first = False |
|
1652 | 1652 | yield chunk |
|
1653 | 1653 | yield bundler.close() |
|
1654 | 1654 | self.ui.progress(_('bundling'), None) |
|
1655 | 1655 | |
|
1656 | 1656 | if nodes: |
|
1657 | 1657 | self.hook('outgoing', node=hex(nodes[0]), source=source) |
|
1658 | 1658 | |
|
1659 | 1659 | return changegroup.unbundle10(util.chunkbuffer(gengroup()), 'UN') |
|
1660 | 1660 | |
|
1661 | 1661 | def addchangegroup(self, source, srctype, url, emptyok=False, lock=None): |
|
1662 | 1662 | """Add the changegroup returned by source.read() to this repo. |
|
1663 | 1663 | srctype is a string like 'push', 'pull', or 'unbundle'. url is |
|
1664 | 1664 | the URL of the repo where this changegroup is coming from. |
|
1665 | 1665 | If lock is not None, the function takes ownership of the lock |
|
1666 | 1666 | and releases it after the changegroup is added. |
|
1667 | 1667 | |
|
1668 | 1668 | Return an integer summarizing the change to this repo: |
|
1669 | 1669 | - nothing changed or no source: 0 |
|
1670 | 1670 | - more heads than before: 1+added heads (2..n) |
|
1671 | 1671 | - fewer heads than before: -1-removed heads (-2..-n) |
|
1672 | 1672 | - number of heads stays the same: 1 |
|
1673 | 1673 | """ |
|
1674 | 1674 | def csmap(x): |
|
1675 | 1675 | self.ui.debug("add changeset %s\n" % short(x)) |
|
1676 | 1676 | return len(cl) |
|
1677 | 1677 | |
|
1678 | 1678 | def revmap(x): |
|
1679 | 1679 | return cl.rev(x) |
|
1680 | 1680 | |
|
1681 | 1681 | if not source: |
|
1682 | 1682 | return 0 |
|
1683 | 1683 | |
|
1684 | 1684 | self.hook('prechangegroup', throw=True, source=srctype, url=url) |
|
1685 | 1685 | |
|
1686 | 1686 | changesets = files = revisions = 0 |
|
1687 | 1687 | efiles = set() |
|
1688 | 1688 | |
|
1689 | 1689 | # write changelog data to temp files so concurrent readers will not see |
|
1690 | 1690 | # inconsistent view |
|
1691 | 1691 | cl = self.changelog |
|
1692 | 1692 | cl.delayupdate() |
|
1693 | 1693 | oldheads = cl.heads() |
|
1694 | 1694 | |
|
1695 | 1695 | tr = self.transaction("\n".join([srctype, urlmod.hidepassword(url)])) |
|
1696 | 1696 | try: |
|
1697 | 1697 | trp = weakref.proxy(tr) |
|
1698 | 1698 | # pull off the changeset group |
|
1699 | 1699 | self.ui.status(_("adding changesets\n")) |
|
1700 | 1700 | clstart = len(cl) |
|
1701 | 1701 | class prog(object): |
|
1702 | 1702 | step = _('changesets') |
|
1703 | 1703 | count = 1 |
|
1704 | 1704 | ui = self.ui |
|
1705 | 1705 | total = None |
|
1706 | 1706 | def __call__(self): |
|
1707 | 1707 | self.ui.progress(self.step, self.count, unit=_('chunks'), |
|
1708 | 1708 | total=self.total) |
|
1709 | 1709 | self.count += 1 |
|
1710 | 1710 | pr = prog() |
|
1711 | 1711 | source.callback = pr |
|
1712 | 1712 | |
|
1713 | 1713 | if (cl.addgroup(source, csmap, trp) is None |
|
1714 | 1714 | and not emptyok): |
|
1715 | 1715 | raise util.Abort(_("received changelog group is empty")) |
|
1716 | 1716 | clend = len(cl) |
|
1717 | 1717 | changesets = clend - clstart |
|
1718 | 1718 | for c in xrange(clstart, clend): |
|
1719 | 1719 | efiles.update(self[c].files()) |
|
1720 | 1720 | efiles = len(efiles) |
|
1721 | 1721 | self.ui.progress(_('changesets'), None) |
|
1722 | 1722 | |
|
1723 | 1723 | # pull off the manifest group |
|
1724 | 1724 | self.ui.status(_("adding manifests\n")) |
|
1725 | 1725 | pr.step = _('manifests') |
|
1726 | 1726 | pr.count = 1 |
|
1727 | 1727 | pr.total = changesets # manifests <= changesets |
|
1728 | 1728 | # no need to check for empty manifest group here: |
|
1729 | 1729 | # if the result of the merge of 1 and 2 is the same in 3 and 4, |
|
1730 | 1730 | # no new manifest will be created and the manifest group will |
|
1731 | 1731 | # be empty during the pull |
|
1732 | 1732 | self.manifest.addgroup(source, revmap, trp) |
|
1733 | 1733 | self.ui.progress(_('manifests'), None) |
|
1734 | 1734 | |
|
1735 | 1735 | needfiles = {} |
|
1736 | 1736 | if self.ui.configbool('server', 'validate', default=False): |
|
1737 | 1737 | # validate incoming csets have their manifests |
|
1738 | 1738 | for cset in xrange(clstart, clend): |
|
1739 | 1739 | mfest = self.changelog.read(self.changelog.node(cset))[0] |
|
1740 | 1740 | mfest = self.manifest.readdelta(mfest) |
|
1741 | 1741 | # store file nodes we must see |
|
1742 | 1742 | for f, n in mfest.iteritems(): |
|
1743 | 1743 | needfiles.setdefault(f, set()).add(n) |
|
1744 | 1744 | |
|
1745 | 1745 | # process the files |
|
1746 | 1746 | self.ui.status(_("adding file changes\n")) |
|
1747 | 1747 | pr.step = 'files' |
|
1748 | 1748 | pr.count = 1 |
|
1749 | 1749 | pr.total = efiles |
|
1750 | 1750 | source.callback = None |
|
1751 | 1751 | |
|
1752 | 1752 | while 1: |
|
1753 | 1753 | f = source.chunk() |
|
1754 | 1754 | if not f: |
|
1755 | 1755 | break |
|
1756 | 1756 | self.ui.debug("adding %s revisions\n" % f) |
|
1757 | 1757 | pr() |
|
1758 | 1758 | fl = self.file(f) |
|
1759 | 1759 | o = len(fl) |
|
1760 | 1760 | if fl.addgroup(source, revmap, trp) is None: |
|
1761 | 1761 | raise util.Abort(_("received file revlog group is empty")) |
|
1762 | 1762 | revisions += len(fl) - o |
|
1763 | 1763 | files += 1 |
|
1764 | 1764 | if f in needfiles: |
|
1765 | 1765 | needs = needfiles[f] |
|
1766 | 1766 | for new in xrange(o, len(fl)): |
|
1767 | 1767 | n = fl.node(new) |
|
1768 | 1768 | if n in needs: |
|
1769 | 1769 | needs.remove(n) |
|
1770 | 1770 | if not needs: |
|
1771 | 1771 | del needfiles[f] |
|
1772 | 1772 | self.ui.progress(_('files'), None) |
|
1773 | 1773 | |
|
1774 | 1774 | for f, needs in needfiles.iteritems(): |
|
1775 | 1775 | fl = self.file(f) |
|
1776 | 1776 | for n in needs: |
|
1777 | 1777 | try: |
|
1778 | 1778 | fl.rev(n) |
|
1779 | 1779 | except error.LookupError: |
|
1780 | 1780 | raise util.Abort( |
|
1781 | 1781 | _('missing file data for %s:%s - run hg verify') % |
|
1782 | 1782 | (f, hex(n))) |
|
1783 | 1783 | |
|
1784 | 1784 | dh = 0 |
|
1785 | 1785 | if oldheads: |
|
1786 | 1786 | heads = cl.heads() |
|
1787 | 1787 | dh = len(heads) - len(oldheads) |
|
1788 | 1788 | for h in heads: |
|
1789 | 1789 | if h not in oldheads and 'close' in self[h].extra(): |
|
1790 | 1790 | dh -= 1 |
|
1791 | 1791 | htext = "" |
|
1792 | 1792 | if dh: |
|
1793 | 1793 | htext = _(" (%+d heads)") % dh |
|
1794 | 1794 | |
|
1795 | 1795 | self.ui.status(_("added %d changesets" |
|
1796 | 1796 | " with %d changes to %d files%s\n") |
|
1797 | 1797 | % (changesets, revisions, files, htext)) |
|
1798 | 1798 | |
|
1799 | 1799 | if changesets > 0: |
|
1800 | 1800 | p = lambda: cl.writepending() and self.root or "" |
|
1801 | 1801 | self.hook('pretxnchangegroup', throw=True, |
|
1802 | 1802 | node=hex(cl.node(clstart)), source=srctype, |
|
1803 | 1803 | url=url, pending=p) |
|
1804 | 1804 | |
|
1805 | 1805 | # make changelog see real files again |
|
1806 | 1806 | cl.finalize(trp) |
|
1807 | 1807 | |
|
1808 | 1808 | tr.close() |
|
1809 | 1809 | finally: |
|
1810 | 1810 | tr.release() |
|
1811 | 1811 | if lock: |
|
1812 | 1812 | lock.release() |
|
1813 | 1813 | |
|
1814 | 1814 | if changesets > 0: |
|
1815 | 1815 | # forcefully update the on-disk branch cache |
|
1816 | 1816 | self.ui.debug("updating the branch cache\n") |
|
1817 | 1817 | self.updatebranchcache() |
|
1818 | 1818 | self.hook("changegroup", node=hex(cl.node(clstart)), |
|
1819 | 1819 | source=srctype, url=url) |
|
1820 | 1820 | |
|
1821 | 1821 | for i in xrange(clstart, clend): |
|
1822 | 1822 | self.hook("incoming", node=hex(cl.node(i)), |
|
1823 | 1823 | source=srctype, url=url) |
|
1824 | 1824 | |
|
1825 | 1825 | # never return 0 here: |
|
1826 | 1826 | if dh < 0: |
|
1827 | 1827 | return dh - 1 |
|
1828 | 1828 | else: |
|
1829 | 1829 | return dh + 1 |
|
1830 | 1830 | |
|
1831 | 1831 | def stream_in(self, remote, requirements): |
|
1832 | 1832 | lock = self.lock() |
|
1833 | 1833 | try: |
|
1834 | 1834 | fp = remote.stream_out() |
|
1835 | 1835 | l = fp.readline() |
|
1836 | 1836 | try: |
|
1837 | 1837 | resp = int(l) |
|
1838 | 1838 | except ValueError: |
|
1839 | 1839 | raise error.ResponseError( |
|
1840 | 1840 | _('Unexpected response from remote server:'), l) |
|
1841 | 1841 | if resp == 1: |
|
1842 | 1842 | raise util.Abort(_('operation forbidden by server')) |
|
1843 | 1843 | elif resp == 2: |
|
1844 | 1844 | raise util.Abort(_('locking the remote repository failed')) |
|
1845 | 1845 | elif resp != 0: |
|
1846 | 1846 | raise util.Abort(_('the server sent an unknown error code')) |
|
1847 | 1847 | self.ui.status(_('streaming all changes\n')) |
|
1848 | 1848 | l = fp.readline() |
|
1849 | 1849 | try: |
|
1850 | 1850 | total_files, total_bytes = map(int, l.split(' ', 1)) |
|
1851 | 1851 | except (ValueError, TypeError): |
|
1852 | 1852 | raise error.ResponseError( |
|
1853 | 1853 | _('Unexpected response from remote server:'), l) |
|
1854 | 1854 | self.ui.status(_('%d files to transfer, %s of data\n') % |
|
1855 | 1855 | (total_files, util.bytecount(total_bytes))) |
|
1856 | 1856 | start = time.time() |
|
1857 | 1857 | for i in xrange(total_files): |
|
1858 | 1858 | # XXX doesn't support '\n' or '\r' in filenames |
|
1859 | 1859 | l = fp.readline() |
|
1860 | 1860 | try: |
|
1861 | 1861 | name, size = l.split('\0', 1) |
|
1862 | 1862 | size = int(size) |
|
1863 | 1863 | except (ValueError, TypeError): |
|
1864 | 1864 | raise error.ResponseError( |
|
1865 | 1865 | _('Unexpected response from remote server:'), l) |
|
1866 | 1866 | self.ui.debug('adding %s (%s)\n' % (name, util.bytecount(size))) |
|
1867 | 1867 | # for backwards compat, name was partially encoded |
|
1868 | 1868 | ofp = self.sopener(store.decodedir(name), 'w') |
|
1869 | 1869 | for chunk in util.filechunkiter(fp, limit=size): |
|
1870 | 1870 | ofp.write(chunk) |
|
1871 | 1871 | ofp.close() |
|
1872 | 1872 | elapsed = time.time() - start |
|
1873 | 1873 | if elapsed <= 0: |
|
1874 | 1874 | elapsed = 0.001 |
|
1875 | 1875 | self.ui.status(_('transferred %s in %.1f seconds (%s/sec)\n') % |
|
1876 | 1876 | (util.bytecount(total_bytes), elapsed, |
|
1877 | 1877 | util.bytecount(total_bytes / elapsed))) |
|
1878 | 1878 | |
|
1879 | 1879 | # new requirements = old non-format requirements + new format-related |
|
1880 | 1880 | # requirements from the streamed-in repository |
|
1881 | 1881 | requirements.update(set(self.requirements) - self.supportedformats) |
|
1882 | 1882 | self._applyrequirements(requirements) |
|
1883 | 1883 | self._writerequirements() |
|
1884 | 1884 | |
|
1885 | 1885 | self.invalidate() |
|
1886 | 1886 | return len(self.heads()) + 1 |
|
1887 | 1887 | finally: |
|
1888 | 1888 | lock.release() |
|
1889 | 1889 | |
|
1890 | 1890 | def clone(self, remote, heads=[], stream=False): |
|
1891 | 1891 | '''clone remote repository. |
|
1892 | 1892 | |
|
1893 | 1893 | keyword arguments: |
|
1894 | 1894 | heads: list of revs to clone (forces use of pull) |
|
1895 | 1895 | stream: use streaming clone if possible''' |
|
1896 | 1896 | |
|
1897 | 1897 | # now, all clients that can request uncompressed clones can |
|
1898 | 1898 | # read repo formats supported by all servers that can serve |
|
1899 | 1899 | # them. |
|
1900 | 1900 | |
|
1901 | 1901 | # if revlog format changes, client will have to check version |
|
1902 | 1902 | # and format flags on "stream" capability, and use |
|
1903 | 1903 | # uncompressed only if compatible. |
|
1904 | 1904 | |
|
1905 | 1905 | if stream and not heads: |
|
1906 | 1906 | # 'stream' means remote revlog format is revlogv1 only |
|
1907 | 1907 | if remote.capable('stream'): |
|
1908 | 1908 | return self.stream_in(remote, set(('revlogv1',))) |
|
1909 | 1909 | # otherwise, 'streamreqs' contains the remote revlog format |
|
1910 | 1910 | streamreqs = remote.capable('streamreqs') |
|
1911 | 1911 | if streamreqs: |
|
1912 | 1912 | streamreqs = set(streamreqs.split(',')) |
|
1913 | 1913 | # if we support it, stream in and adjust our requirements |
|
1914 | 1914 | if not streamreqs - self.supportedformats: |
|
1915 | 1915 | return self.stream_in(remote, streamreqs) |
|
1916 | 1916 | return self.pull(remote, heads) |
|
1917 | 1917 | |
|
1918 | 1918 | def pushkey(self, namespace, key, old, new): |
|
1919 | 1919 | return pushkey.push(self, namespace, key, old, new) |
|
1920 | 1920 | |
|
1921 | 1921 | def listkeys(self, namespace): |
|
1922 | 1922 | return pushkey.list(self, namespace) |
|
1923 | 1923 | |
|
1924 | def debugwireargs(self, one, two, three=None, four=None): | |
|
1924 | def debugwireargs(self, one, two, three=None, four=None, five=None): | |
|
1925 | 1925 | '''used to test argument passing over the wire''' |
|
1926 | return "%s %s %s %s" % (one, two, three, four) | |
|
1926 | return "%s %s %s %s %s" % (one, two, three, four, five) | |
|
1927 | 1927 | |
|
1928 | 1928 | # used to avoid circular references so destructors work |
|
1929 | 1929 | def aftertrans(files): |
|
1930 | 1930 | renamefiles = [tuple(t) for t in files] |
|
1931 | 1931 | def a(): |
|
1932 | 1932 | for src, dest in renamefiles: |
|
1933 | 1933 | util.rename(src, dest) |
|
1934 | 1934 | return a |
|
1935 | 1935 | |
|
1936 | 1936 | def instance(ui, path, create): |
|
1937 | 1937 | return localrepository(ui, urlmod.localpath(path), create) |
|
1938 | 1938 | |
|
1939 | 1939 | def islocal(path): |
|
1940 | 1940 | return True |
@@ -1,420 +1,420 b'' | |||
|
1 | 1 | # wireproto.py - generic wire protocol support functions |
|
2 | 2 | # |
|
3 | 3 | # Copyright 2005-2010 Matt Mackall <mpm@selenic.com> |
|
4 | 4 | # |
|
5 | 5 | # This software may be used and distributed according to the terms of the |
|
6 | 6 | # GNU General Public License version 2 or any later version. |
|
7 | 7 | |
|
8 | 8 | import urllib, tempfile, os, sys |
|
9 | 9 | from i18n import _ |
|
10 | 10 | from node import bin, hex |
|
11 | 11 | import changegroup as changegroupmod |
|
12 | 12 | import repo, error, encoding, util, store |
|
13 | 13 | import pushkey as pushkeymod |
|
14 | 14 | |
|
15 | 15 | # list of nodes encoding / decoding |
|
16 | 16 | |
|
17 | 17 | def decodelist(l, sep=' '): |
|
18 | 18 | if l: |
|
19 | 19 | return map(bin, l.split(sep)) |
|
20 | 20 | return [] |
|
21 | 21 | |
|
22 | 22 | def encodelist(l, sep=' '): |
|
23 | 23 | return sep.join(map(hex, l)) |
|
24 | 24 | |
|
25 | 25 | # client side |
|
26 | 26 | |
|
27 | 27 | class wirerepository(repo.repository): |
|
28 | 28 | def lookup(self, key): |
|
29 | 29 | self.requirecap('lookup', _('look up remote revision')) |
|
30 | 30 | d = self._call("lookup", key=encoding.fromlocal(key)) |
|
31 | 31 | success, data = d[:-1].split(" ", 1) |
|
32 | 32 | if int(success): |
|
33 | 33 | return bin(data) |
|
34 | 34 | self._abort(error.RepoError(data)) |
|
35 | 35 | |
|
36 | 36 | def heads(self): |
|
37 | 37 | d = self._call("heads") |
|
38 | 38 | try: |
|
39 | 39 | return decodelist(d[:-1]) |
|
40 | 40 | except ValueError: |
|
41 | 41 | self._abort(error.ResponseError(_("unexpected response:"), d)) |
|
42 | 42 | |
|
43 | 43 | def known(self, nodes): |
|
44 | 44 | n = encodelist(nodes) |
|
45 | 45 | d = self._call("known", nodes=n) |
|
46 | 46 | try: |
|
47 | 47 | return [bool(int(f)) for f in d] |
|
48 | 48 | except ValueError: |
|
49 | 49 | self._abort(error.ResponseError(_("unexpected response:"), d)) |
|
50 | 50 | |
|
51 | 51 | def branchmap(self): |
|
52 | 52 | d = self._call("branchmap") |
|
53 | 53 | try: |
|
54 | 54 | branchmap = {} |
|
55 | 55 | for branchpart in d.splitlines(): |
|
56 | 56 | branchname, branchheads = branchpart.split(' ', 1) |
|
57 | 57 | branchname = encoding.tolocal(urllib.unquote(branchname)) |
|
58 | 58 | branchheads = decodelist(branchheads) |
|
59 | 59 | branchmap[branchname] = branchheads |
|
60 | 60 | return branchmap |
|
61 | 61 | except TypeError: |
|
62 | 62 | self._abort(error.ResponseError(_("unexpected response:"), d)) |
|
63 | 63 | |
|
64 | 64 | def branches(self, nodes): |
|
65 | 65 | n = encodelist(nodes) |
|
66 | 66 | d = self._call("branches", nodes=n) |
|
67 | 67 | try: |
|
68 | 68 | br = [tuple(decodelist(b)) for b in d.splitlines()] |
|
69 | 69 | return br |
|
70 | 70 | except ValueError: |
|
71 | 71 | self._abort(error.ResponseError(_("unexpected response:"), d)) |
|
72 | 72 | |
|
73 | 73 | def between(self, pairs): |
|
74 | 74 | batch = 8 # avoid giant requests |
|
75 | 75 | r = [] |
|
76 | 76 | for i in xrange(0, len(pairs), batch): |
|
77 | 77 | n = " ".join([encodelist(p, '-') for p in pairs[i:i + batch]]) |
|
78 | 78 | d = self._call("between", pairs=n) |
|
79 | 79 | try: |
|
80 | 80 | r.extend(l and decodelist(l) or [] for l in d.splitlines()) |
|
81 | 81 | except ValueError: |
|
82 | 82 | self._abort(error.ResponseError(_("unexpected response:"), d)) |
|
83 | 83 | return r |
|
84 | 84 | |
|
85 | 85 | def pushkey(self, namespace, key, old, new): |
|
86 | 86 | if not self.capable('pushkey'): |
|
87 | 87 | return False |
|
88 | 88 | d = self._call("pushkey", |
|
89 | 89 | namespace=encoding.fromlocal(namespace), |
|
90 | 90 | key=encoding.fromlocal(key), |
|
91 | 91 | old=encoding.fromlocal(old), |
|
92 | 92 | new=encoding.fromlocal(new)) |
|
93 | 93 | try: |
|
94 | 94 | d = bool(int(d)) |
|
95 | 95 | except ValueError: |
|
96 | 96 | raise error.ResponseError( |
|
97 | 97 | _('push failed (unexpected response):'), d) |
|
98 | 98 | return d |
|
99 | 99 | |
|
100 | 100 | def listkeys(self, namespace): |
|
101 | 101 | if not self.capable('pushkey'): |
|
102 | 102 | return {} |
|
103 | 103 | d = self._call("listkeys", namespace=encoding.fromlocal(namespace)) |
|
104 | 104 | r = {} |
|
105 | 105 | for l in d.splitlines(): |
|
106 | 106 | k, v = l.split('\t') |
|
107 | 107 | r[encoding.tolocal(k)] = encoding.tolocal(v) |
|
108 | 108 | return r |
|
109 | 109 | |
|
110 | 110 | def stream_out(self): |
|
111 | 111 | return self._callstream('stream_out') |
|
112 | 112 | |
|
113 | 113 | def changegroup(self, nodes, kind): |
|
114 | 114 | n = encodelist(nodes) |
|
115 | 115 | f = self._callstream("changegroup", roots=n) |
|
116 | 116 | return changegroupmod.unbundle10(self._decompress(f), 'UN') |
|
117 | 117 | |
|
118 | 118 | def changegroupsubset(self, bases, heads, kind): |
|
119 | 119 | self.requirecap('changegroupsubset', _('look up remote changes')) |
|
120 | 120 | bases = encodelist(bases) |
|
121 | 121 | heads = encodelist(heads) |
|
122 | 122 | f = self._callstream("changegroupsubset", |
|
123 | 123 | bases=bases, heads=heads) |
|
124 | 124 | return changegroupmod.unbundle10(self._decompress(f), 'UN') |
|
125 | 125 | |
|
126 | 126 | def getbundle(self, source, heads=None, common=None): |
|
127 | 127 | self.requirecap('getbundle', _('look up remote changes')) |
|
128 | 128 | opts = {} |
|
129 | 129 | if heads is not None: |
|
130 | 130 | opts['heads'] = encodelist(heads) |
|
131 | 131 | if common is not None: |
|
132 | 132 | opts['common'] = encodelist(common) |
|
133 | 133 | f = self._callstream("getbundle", **opts) |
|
134 | 134 | return changegroupmod.unbundle10(self._decompress(f), 'UN') |
|
135 | 135 | |
|
136 | 136 | def unbundle(self, cg, heads, source): |
|
137 | 137 | '''Send cg (a readable file-like object representing the |
|
138 | 138 | changegroup to push, typically a chunkbuffer object) to the |
|
139 | 139 | remote server as a bundle. Return an integer indicating the |
|
140 | 140 | result of the push (see localrepository.addchangegroup()).''' |
|
141 | 141 | |
|
142 | 142 | if self.capable('unbundlehash'): |
|
143 | 143 | heads = encodelist(['hashed', |
|
144 | 144 | util.sha1(''.join(sorted(heads))).digest()]) |
|
145 | 145 | else: |
|
146 | 146 | heads = encodelist(heads) |
|
147 | 147 | |
|
148 | 148 | ret, output = self._callpush("unbundle", cg, heads=heads) |
|
149 | 149 | if ret == "": |
|
150 | 150 | raise error.ResponseError( |
|
151 | 151 | _('push failed:'), output) |
|
152 | 152 | try: |
|
153 | 153 | ret = int(ret) |
|
154 | 154 | except ValueError: |
|
155 | 155 | raise error.ResponseError( |
|
156 | 156 | _('push failed (unexpected response):'), ret) |
|
157 | 157 | |
|
158 | 158 | for l in output.splitlines(True): |
|
159 | 159 | self.ui.status(_('remote: '), l) |
|
160 | 160 | return ret |
|
161 | 161 | |
|
162 | def debugwireargs(self, one, two, three=None, four=None): | |
|
162 | def debugwireargs(self, one, two, three=None, four=None, five=None): | |
|
163 | 163 | # don't pass optional arguments left at their default value |
|
164 | 164 | opts = {} |
|
165 | 165 | if three is not None: |
|
166 | 166 | opts['three'] = three |
|
167 | 167 | if four is not None: |
|
168 | 168 | opts['four'] = four |
|
169 | 169 | return self._call('debugwireargs', one=one, two=two, **opts) |
|
170 | 170 | |
|
171 | 171 | # server side |
|
172 | 172 | |
|
173 | 173 | class streamres(object): |
|
174 | 174 | def __init__(self, gen): |
|
175 | 175 | self.gen = gen |
|
176 | 176 | |
|
177 | 177 | class pushres(object): |
|
178 | 178 | def __init__(self, res): |
|
179 | 179 | self.res = res |
|
180 | 180 | |
|
181 | 181 | class pusherr(object): |
|
182 | 182 | def __init__(self, res): |
|
183 | 183 | self.res = res |
|
184 | 184 | |
|
185 | 185 | def dispatch(repo, proto, command): |
|
186 | 186 | func, spec = commands[command] |
|
187 | 187 | args = proto.getargs(spec) |
|
188 | 188 | return func(repo, proto, *args) |
|
189 | 189 | |
|
190 | 190 | def options(cmd, keys, others): |
|
191 | 191 | opts = {} |
|
192 | 192 | for k in keys: |
|
193 | 193 | if k in others: |
|
194 | 194 | opts[k] = others[k] |
|
195 | 195 | del others[k] |
|
196 | 196 | if others: |
|
197 | 197 | sys.stderr.write("abort: %s got unexpected arguments %s\n" |
|
198 | 198 | % (cmd, ",".join(others))) |
|
199 | 199 | return opts |
|
200 | 200 | |
|
201 | 201 | def between(repo, proto, pairs): |
|
202 | 202 | pairs = [decodelist(p, '-') for p in pairs.split(" ")] |
|
203 | 203 | r = [] |
|
204 | 204 | for b in repo.between(pairs): |
|
205 | 205 | r.append(encodelist(b) + "\n") |
|
206 | 206 | return "".join(r) |
|
207 | 207 | |
|
208 | 208 | def branchmap(repo, proto): |
|
209 | 209 | branchmap = repo.branchmap() |
|
210 | 210 | heads = [] |
|
211 | 211 | for branch, nodes in branchmap.iteritems(): |
|
212 | 212 | branchname = urllib.quote(encoding.fromlocal(branch)) |
|
213 | 213 | branchnodes = encodelist(nodes) |
|
214 | 214 | heads.append('%s %s' % (branchname, branchnodes)) |
|
215 | 215 | return '\n'.join(heads) |
|
216 | 216 | |
|
217 | 217 | def branches(repo, proto, nodes): |
|
218 | 218 | nodes = decodelist(nodes) |
|
219 | 219 | r = [] |
|
220 | 220 | for b in repo.branches(nodes): |
|
221 | 221 | r.append(encodelist(b) + "\n") |
|
222 | 222 | return "".join(r) |
|
223 | 223 | |
|
224 | 224 | def capabilities(repo, proto): |
|
225 | 225 | caps = ('lookup changegroupsubset branchmap pushkey known getbundle ' |
|
226 | 226 | 'unbundlehash').split() |
|
227 | 227 | if _allowstream(repo.ui): |
|
228 | 228 | requiredformats = repo.requirements & repo.supportedformats |
|
229 | 229 | # if our local revlogs are just revlogv1, add 'stream' cap |
|
230 | 230 | if not requiredformats - set(('revlogv1',)): |
|
231 | 231 | caps.append('stream') |
|
232 | 232 | # otherwise, add 'streamreqs' detailing our local revlog format |
|
233 | 233 | else: |
|
234 | 234 | caps.append('streamreqs=%s' % ','.join(requiredformats)) |
|
235 | 235 | caps.append('unbundle=%s' % ','.join(changegroupmod.bundlepriority)) |
|
236 | 236 | return ' '.join(caps) |
|
237 | 237 | |
|
238 | 238 | def changegroup(repo, proto, roots): |
|
239 | 239 | nodes = decodelist(roots) |
|
240 | 240 | cg = repo.changegroup(nodes, 'serve') |
|
241 | 241 | return streamres(proto.groupchunks(cg)) |
|
242 | 242 | |
|
243 | 243 | def changegroupsubset(repo, proto, bases, heads): |
|
244 | 244 | bases = decodelist(bases) |
|
245 | 245 | heads = decodelist(heads) |
|
246 | 246 | cg = repo.changegroupsubset(bases, heads, 'serve') |
|
247 | 247 | return streamres(proto.groupchunks(cg)) |
|
248 | 248 | |
|
249 | 249 | def debugwireargs(repo, proto, one, two, others): |
|
250 | 250 | # only accept optional args from the known set |
|
251 | 251 | opts = options('debugwireargs', ['three', 'four'], others) |
|
252 | 252 | return repo.debugwireargs(one, two, **opts) |
|
253 | 253 | |
|
254 | 254 | def getbundle(repo, proto, others): |
|
255 | 255 | opts = options('getbundle', ['heads', 'common'], others) |
|
256 | 256 | for k, v in opts.iteritems(): |
|
257 | 257 | opts[k] = decodelist(v) |
|
258 | 258 | cg = repo.getbundle('serve', **opts) |
|
259 | 259 | return streamres(proto.groupchunks(cg)) |
|
260 | 260 | |
|
261 | 261 | def heads(repo, proto): |
|
262 | 262 | h = repo.heads() |
|
263 | 263 | return encodelist(h) + "\n" |
|
264 | 264 | |
|
265 | 265 | def hello(repo, proto): |
|
266 | 266 | '''the hello command returns a set of lines describing various |
|
267 | 267 | interesting things about the server, in an RFC822-like format. |
|
268 | 268 | Currently the only one defined is "capabilities", which |
|
269 | 269 | consists of a line in the form: |
|
270 | 270 | |
|
271 | 271 | capabilities: space separated list of tokens |
|
272 | 272 | ''' |
|
273 | 273 | return "capabilities: %s\n" % (capabilities(repo, proto)) |
|
274 | 274 | |
|
275 | 275 | def listkeys(repo, proto, namespace): |
|
276 | 276 | d = pushkeymod.list(repo, encoding.tolocal(namespace)).items() |
|
277 | 277 | t = '\n'.join(['%s\t%s' % (encoding.fromlocal(k), encoding.fromlocal(v)) |
|
278 | 278 | for k, v in d]) |
|
279 | 279 | return t |
|
280 | 280 | |
|
281 | 281 | def lookup(repo, proto, key): |
|
282 | 282 | try: |
|
283 | 283 | r = hex(repo.lookup(encoding.tolocal(key))) |
|
284 | 284 | success = 1 |
|
285 | 285 | except Exception, inst: |
|
286 | 286 | r = str(inst) |
|
287 | 287 | success = 0 |
|
288 | 288 | return "%s %s\n" % (success, r) |
|
289 | 289 | |
|
290 | 290 | def known(repo, proto, nodes): |
|
291 | 291 | return ''.join(b and "1" or "0" for b in repo.known(decodelist(nodes))) |
|
292 | 292 | |
|
293 | 293 | def pushkey(repo, proto, namespace, key, old, new): |
|
294 | 294 | # compatibility with pre-1.8 clients which were accidentally |
|
295 | 295 | # sending raw binary nodes rather than utf-8-encoded hex |
|
296 | 296 | if len(new) == 20 and new.encode('string-escape') != new: |
|
297 | 297 | # looks like it could be a binary node |
|
298 | 298 | try: |
|
299 | 299 | u = new.decode('utf-8') |
|
300 | 300 | new = encoding.tolocal(new) # but cleanly decodes as UTF-8 |
|
301 | 301 | except UnicodeDecodeError: |
|
302 | 302 | pass # binary, leave unmodified |
|
303 | 303 | else: |
|
304 | 304 | new = encoding.tolocal(new) # normal path |
|
305 | 305 | |
|
306 | 306 | r = pushkeymod.push(repo, |
|
307 | 307 | encoding.tolocal(namespace), encoding.tolocal(key), |
|
308 | 308 | encoding.tolocal(old), new) |
|
309 | 309 | return '%s\n' % int(r) |
|
310 | 310 | |
|
311 | 311 | def _allowstream(ui): |
|
312 | 312 | return ui.configbool('server', 'uncompressed', True, untrusted=True) |
|
313 | 313 | |
|
314 | 314 | def stream(repo, proto): |
|
315 | 315 | '''If the server supports streaming clone, it advertises the "stream" |
|
316 | 316 | capability with a value representing the version and flags of the repo |
|
317 | 317 | it is serving. Client checks to see if it understands the format. |
|
318 | 318 | |
|
319 | 319 | The format is simple: the server writes out a line with the amount |
|
320 | 320 | of files, then the total amount of bytes to be transfered (separated |
|
321 | 321 | by a space). Then, for each file, the server first writes the filename |
|
322 | 322 | and filesize (separated by the null character), then the file contents. |
|
323 | 323 | ''' |
|
324 | 324 | |
|
325 | 325 | if not _allowstream(repo.ui): |
|
326 | 326 | return '1\n' |
|
327 | 327 | |
|
328 | 328 | entries = [] |
|
329 | 329 | total_bytes = 0 |
|
330 | 330 | try: |
|
331 | 331 | # get consistent snapshot of repo, lock during scan |
|
332 | 332 | lock = repo.lock() |
|
333 | 333 | try: |
|
334 | 334 | repo.ui.debug('scanning\n') |
|
335 | 335 | for name, ename, size in repo.store.walk(): |
|
336 | 336 | entries.append((name, size)) |
|
337 | 337 | total_bytes += size |
|
338 | 338 | finally: |
|
339 | 339 | lock.release() |
|
340 | 340 | except error.LockError: |
|
341 | 341 | return '2\n' # error: 2 |
|
342 | 342 | |
|
343 | 343 | def streamer(repo, entries, total): |
|
344 | 344 | '''stream out all metadata files in repository.''' |
|
345 | 345 | yield '0\n' # success |
|
346 | 346 | repo.ui.debug('%d files, %d bytes to transfer\n' % |
|
347 | 347 | (len(entries), total_bytes)) |
|
348 | 348 | yield '%d %d\n' % (len(entries), total_bytes) |
|
349 | 349 | for name, size in entries: |
|
350 | 350 | repo.ui.debug('sending %s (%d bytes)\n' % (name, size)) |
|
351 | 351 | # partially encode name over the wire for backwards compat |
|
352 | 352 | yield '%s\0%d\n' % (store.encodedir(name), size) |
|
353 | 353 | for chunk in util.filechunkiter(repo.sopener(name), limit=size): |
|
354 | 354 | yield chunk |
|
355 | 355 | |
|
356 | 356 | return streamres(streamer(repo, entries, total_bytes)) |
|
357 | 357 | |
|
358 | 358 | def unbundle(repo, proto, heads): |
|
359 | 359 | their_heads = decodelist(heads) |
|
360 | 360 | |
|
361 | 361 | def check_heads(): |
|
362 | 362 | heads = repo.heads() |
|
363 | 363 | heads_hash = util.sha1(''.join(sorted(heads))).digest() |
|
364 | 364 | return (their_heads == ['force'] or their_heads == heads or |
|
365 | 365 | their_heads == ['hashed', heads_hash]) |
|
366 | 366 | |
|
367 | 367 | proto.redirect() |
|
368 | 368 | |
|
369 | 369 | # fail early if possible |
|
370 | 370 | if not check_heads(): |
|
371 | 371 | return pusherr('unsynced changes') |
|
372 | 372 | |
|
373 | 373 | # write bundle data to temporary file because it can be big |
|
374 | 374 | fd, tempname = tempfile.mkstemp(prefix='hg-unbundle-') |
|
375 | 375 | fp = os.fdopen(fd, 'wb+') |
|
376 | 376 | r = 0 |
|
377 | 377 | try: |
|
378 | 378 | proto.getfile(fp) |
|
379 | 379 | lock = repo.lock() |
|
380 | 380 | try: |
|
381 | 381 | if not check_heads(): |
|
382 | 382 | # someone else committed/pushed/unbundled while we |
|
383 | 383 | # were transferring data |
|
384 | 384 | return pusherr('unsynced changes') |
|
385 | 385 | |
|
386 | 386 | # push can proceed |
|
387 | 387 | fp.seek(0) |
|
388 | 388 | gen = changegroupmod.readbundle(fp, None) |
|
389 | 389 | |
|
390 | 390 | try: |
|
391 | 391 | r = repo.addchangegroup(gen, 'serve', proto._client(), |
|
392 | 392 | lock=lock) |
|
393 | 393 | except util.Abort, inst: |
|
394 | 394 | sys.stderr.write("abort: %s\n" % inst) |
|
395 | 395 | finally: |
|
396 | 396 | lock.release() |
|
397 | 397 | return pushres(r) |
|
398 | 398 | |
|
399 | 399 | finally: |
|
400 | 400 | fp.close() |
|
401 | 401 | os.unlink(tempname) |
|
402 | 402 | |
|
403 | 403 | commands = { |
|
404 | 404 | 'between': (between, 'pairs'), |
|
405 | 405 | 'branchmap': (branchmap, ''), |
|
406 | 406 | 'branches': (branches, 'nodes'), |
|
407 | 407 | 'capabilities': (capabilities, ''), |
|
408 | 408 | 'changegroup': (changegroup, 'roots'), |
|
409 | 409 | 'changegroupsubset': (changegroupsubset, 'bases heads'), |
|
410 | 410 | 'debugwireargs': (debugwireargs, 'one two *'), |
|
411 | 411 | 'getbundle': (getbundle, '*'), |
|
412 | 412 | 'heads': (heads, ''), |
|
413 | 413 | 'hello': (hello, ''), |
|
414 | 414 | 'known': (known, 'nodes'), |
|
415 | 415 | 'listkeys': (listkeys, 'namespace'), |
|
416 | 416 | 'lookup': (lookup, 'key'), |
|
417 | 417 | 'pushkey': (pushkey, 'namespace key old new'), |
|
418 | 418 | 'stream_out': (stream, ''), |
|
419 | 419 | 'unbundle': (unbundle, 'heads'), |
|
420 | 420 | } |
@@ -1,60 +1,69 b'' | |||
|
1 | 1 | |
|
2 | 2 | Test wire protocol argument passing |
|
3 | 3 | |
|
4 | 4 | Setup repo: |
|
5 | 5 | |
|
6 | 6 | $ hg init repo |
|
7 | 7 | |
|
8 | 8 | Local: |
|
9 | 9 | |
|
10 | 10 | $ hg debugwireargs repo eins zwei --three drei --four vier |
|
11 | eins zwei drei vier | |
|
11 | eins zwei drei vier None | |
|
12 | 12 | $ hg debugwireargs repo eins zwei --four vier |
|
13 | eins zwei None vier | |
|
13 | eins zwei None vier None | |
|
14 | 14 | $ hg debugwireargs repo eins zwei |
|
15 | eins zwei None None | |
|
15 | eins zwei None None None | |
|
16 | $ hg debugwireargs repo eins zwei --five fuenf | |
|
17 | eins zwei None None fuenf | |
|
16 | 18 | |
|
17 | 19 | HTTP: |
|
18 | 20 | |
|
19 | 21 | $ hg serve -R repo -p $HGPORT -d --pid-file=hg1.pid -E error.log -A access.log |
|
20 | 22 | $ cat hg1.pid >> $DAEMON_PIDS |
|
21 | 23 | |
|
22 | 24 | $ hg debugwireargs http://localhost:$HGPORT/ un deux trois quatre |
|
23 | un deux trois quatre | |
|
25 | un deux trois quatre None | |
|
24 | 26 | $ hg debugwireargs http://localhost:$HGPORT/ eins zwei --four vier |
|
25 | eins zwei None vier | |
|
27 | eins zwei None vier None | |
|
26 | 28 | $ hg debugwireargs http://localhost:$HGPORT/ eins zwei |
|
27 | eins zwei None None | |
|
29 | eins zwei None None None | |
|
30 | $ hg debugwireargs http://localhost:$HGPORT/ eins zwei --five fuenf | |
|
31 | eins zwei None None None | |
|
28 | 32 | $ cat access.log |
|
29 | 33 | * - - [*] "GET /?cmd=capabilities HTTP/1.1" 200 - (glob) |
|
30 | 34 | * - - [*] "GET /?cmd=debugwireargs&four=quatre&one=un&three=trois&two=deux HTTP/1.1" 200 - (glob) |
|
31 | 35 | * - - [*] "GET /?cmd=debugwireargs&four=quatre&one=un&three=trois&two=deux HTTP/1.1" 200 - (glob) |
|
32 | 36 | * - - [*] "GET /?cmd=capabilities HTTP/1.1" 200 - (glob) |
|
33 | 37 | * - - [*] "GET /?cmd=debugwireargs&four=vier&one=eins&two=zwei HTTP/1.1" 200 - (glob) |
|
34 | 38 | * - - [*] "GET /?cmd=debugwireargs&four=vier&one=eins&two=zwei HTTP/1.1" 200 - (glob) |
|
35 | 39 | * - - [*] "GET /?cmd=capabilities HTTP/1.1" 200 - (glob) |
|
36 | 40 | * - - [*] "GET /?cmd=debugwireargs&one=eins&two=zwei HTTP/1.1" 200 - (glob) |
|
37 | 41 | * - - [*] "GET /?cmd=debugwireargs&one=eins&two=zwei HTTP/1.1" 200 - (glob) |
|
42 | * - - [*] "GET /?cmd=capabilities HTTP/1.1" 200 - (glob) | |
|
43 | * - - [*] "GET /?cmd=debugwireargs&one=eins&two=zwei HTTP/1.1" 200 - (glob) | |
|
44 | * - - [*] "GET /?cmd=debugwireargs&one=eins&two=zwei HTTP/1.1" 200 - (glob) | |
|
38 | 45 | |
|
39 | 46 | SSH (try to exercise the ssh functionality with a dummy script): |
|
40 | 47 | |
|
41 | 48 | $ cat <<EOF > dummyssh |
|
42 | 49 | > import sys |
|
43 | 50 | > import os |
|
44 | 51 | > os.chdir(os.path.dirname(sys.argv[0])) |
|
45 | 52 | > if sys.argv[1] != "user@dummy": |
|
46 | 53 | > sys.exit(-1) |
|
47 | 54 | > if not os.path.exists("dummyssh"): |
|
48 | 55 | > sys.exit(-1) |
|
49 | 56 | > os.environ["SSH_CLIENT"] = "127.0.0.1 1 2" |
|
50 | 57 | > r = os.system(sys.argv[2]) |
|
51 | 58 | > sys.exit(bool(r)) |
|
52 | 59 | > EOF |
|
53 | 60 | |
|
54 | 61 | $ hg debugwireargs --ssh "python ./dummyssh" ssh://user@dummy/repo uno due tre quattro |
|
55 | uno due tre quattro | |
|
62 | uno due tre quattro None | |
|
56 | 63 | $ hg debugwireargs --ssh "python ./dummyssh" ssh://user@dummy/repo eins zwei --four vier |
|
57 | eins zwei None vier | |
|
64 | eins zwei None vier None | |
|
58 | 65 | $ hg debugwireargs --ssh "python ./dummyssh" ssh://user@dummy/repo eins zwei |
|
59 | eins zwei None None | |
|
66 | eins zwei None None None | |
|
67 | $ hg debugwireargs --ssh "python ./dummyssh" ssh://user@dummy/repo eins zwei --five fuenf | |
|
68 | eins zwei None None None | |
|
60 | 69 |
General Comments 0
You need to be logged in to leave comments.
Login now