##// END OF EJS Templates
Merge with TAH
Matt Mackall -
r1525:c85e5bbf merge default
parent child Browse files
Show More
@@ -1,2653 +1,2654 b''
1 1 # commands.py - command processing for mercurial
2 2 #
3 3 # Copyright 2005 Matt Mackall <mpm@selenic.com>
4 4 #
5 5 # This software may be used and distributed according to the terms
6 6 # of the GNU General Public License, incorporated herein by reference.
7 7
8 8 from demandload import demandload
9 9 from node import *
10 10 from i18n import gettext as _
11 11 demandload(globals(), "os re sys signal shutil imp urllib pdb")
12 12 demandload(globals(), "fancyopts ui hg util lock revlog")
13 13 demandload(globals(), "fnmatch hgweb mdiff random signal time traceback")
14 14 demandload(globals(), "errno socket version struct atexit sets bz2")
15 15
16 16 class UnknownCommand(Exception):
17 17 """Exception raised if command is not in the command table."""
18 18 class AmbiguousCommand(Exception):
19 19 """Exception raised if command shortcut matches more than one command."""
20 20
21 21 def filterfiles(filters, files):
22 22 l = [x for x in files if x in filters]
23 23
24 24 for t in filters:
25 25 if t and t[-1] != "/":
26 26 t += "/"
27 27 l += [x for x in files if x.startswith(t)]
28 28 return l
29 29
30 30 def relpath(repo, args):
31 31 cwd = repo.getcwd()
32 32 if cwd:
33 33 return [util.normpath(os.path.join(cwd, x)) for x in args]
34 34 return args
35 35
36 36 def matchpats(repo, cwd, pats=[], opts={}, head=''):
37 37 return util.cmdmatcher(repo.root, cwd, pats or ['.'], opts.get('include'),
38 38 opts.get('exclude'), head)
39 39
40 40 def makewalk(repo, pats, opts, head=''):
41 41 cwd = repo.getcwd()
42 42 files, matchfn, anypats = matchpats(repo, cwd, pats, opts, head)
43 43 exact = dict(zip(files, files))
44 44 def walk():
45 45 for src, fn in repo.walk(files=files, match=matchfn):
46 46 yield src, fn, util.pathto(cwd, fn), fn in exact
47 47 return files, matchfn, walk()
48 48
49 49 def walk(repo, pats, opts, head=''):
50 50 files, matchfn, results = makewalk(repo, pats, opts, head)
51 51 for r in results:
52 52 yield r
53 53
54 54 def walkchangerevs(ui, repo, cwd, pats, opts):
55 55 '''Iterate over files and the revs they changed in.
56 56
57 57 Callers most commonly need to iterate backwards over the history
58 58 it is interested in. Doing so has awful (quadratic-looking)
59 59 performance, so we use iterators in a "windowed" way.
60 60
61 61 We walk a window of revisions in the desired order. Within the
62 62 window, we first walk forwards to gather data, then in the desired
63 63 order (usually backwards) to display it.
64 64
65 65 This function returns an (iterator, getchange) pair. The
66 66 getchange function returns the changelog entry for a numeric
67 67 revision. The iterator yields 3-tuples. They will be of one of
68 68 the following forms:
69 69
70 70 "window", incrementing, lastrev: stepping through a window,
71 71 positive if walking forwards through revs, last rev in the
72 72 sequence iterated over - use to reset state for the current window
73 73
74 74 "add", rev, fns: out-of-order traversal of the given file names
75 75 fns, which changed during revision rev - use to gather data for
76 76 possible display
77 77
78 78 "iter", rev, None: in-order traversal of the revs earlier iterated
79 79 over with "add" - use to display data'''
80 80
81 81 if repo.changelog.count() == 0:
82 82 return [], False
83 83
84 84 cwd = repo.getcwd()
85 85 if not pats and cwd:
86 86 opts['include'] = [os.path.join(cwd, i) for i in opts['include']]
87 87 opts['exclude'] = [os.path.join(cwd, x) for x in opts['exclude']]
88 88 files, matchfn, anypats = matchpats(repo, (pats and cwd) or '',
89 89 pats, opts)
90 90 revs = map(int, revrange(ui, repo, opts['rev'] or ['tip:0']))
91 91 wanted = {}
92 92 slowpath = anypats
93 93 window = 300
94 94 fncache = {}
95 95
96 96 chcache = {}
97 97 def getchange(rev):
98 98 ch = chcache.get(rev)
99 99 if ch is None:
100 100 chcache[rev] = ch = repo.changelog.read(repo.lookup(str(rev)))
101 101 return ch
102 102
103 103 if not slowpath and not files:
104 104 # No files, no patterns. Display all revs.
105 105 wanted = dict(zip(revs, revs))
106 106 if not slowpath:
107 107 # Only files, no patterns. Check the history of each file.
108 108 def filerevgen(filelog):
109 109 for i in xrange(filelog.count() - 1, -1, -window):
110 110 revs = []
111 111 for j in xrange(max(0, i - window), i + 1):
112 112 revs.append(filelog.linkrev(filelog.node(j)))
113 113 revs.reverse()
114 114 for rev in revs:
115 115 yield rev
116 116
117 117 minrev, maxrev = min(revs), max(revs)
118 118 for file in files:
119 119 filelog = repo.file(file)
120 120 # A zero count may be a directory or deleted file, so
121 121 # try to find matching entries on the slow path.
122 122 if filelog.count() == 0:
123 123 slowpath = True
124 124 break
125 125 for rev in filerevgen(filelog):
126 126 if rev <= maxrev:
127 127 if rev < minrev:
128 128 break
129 129 fncache.setdefault(rev, [])
130 130 fncache[rev].append(file)
131 131 wanted[rev] = 1
132 132 if slowpath:
133 133 # The slow path checks files modified in every changeset.
134 134 def changerevgen():
135 135 for i in xrange(repo.changelog.count() - 1, -1, -window):
136 136 for j in xrange(max(0, i - window), i + 1):
137 137 yield j, getchange(j)[3]
138 138
139 139 for rev, changefiles in changerevgen():
140 140 matches = filter(matchfn, changefiles)
141 141 if matches:
142 142 fncache[rev] = matches
143 143 wanted[rev] = 1
144 144
145 145 def iterate():
146 146 for i in xrange(0, len(revs), window):
147 147 yield 'window', revs[0] < revs[-1], revs[-1]
148 148 nrevs = [rev for rev in revs[i:min(i+window, len(revs))]
149 149 if rev in wanted]
150 150 srevs = list(nrevs)
151 151 srevs.sort()
152 152 for rev in srevs:
153 153 fns = fncache.get(rev) or filter(matchfn, getchange(rev)[3])
154 154 yield 'add', rev, fns
155 155 for rev in nrevs:
156 156 yield 'iter', rev, None
157 157 return iterate(), getchange
158 158
159 159 revrangesep = ':'
160 160
161 161 def revrange(ui, repo, revs, revlog=None):
162 162 """Yield revision as strings from a list of revision specifications."""
163 163 if revlog is None:
164 164 revlog = repo.changelog
165 165 revcount = revlog.count()
166 166 def fix(val, defval):
167 167 if not val:
168 168 return defval
169 169 try:
170 170 num = int(val)
171 171 if str(num) != val:
172 172 raise ValueError
173 173 if num < 0: num += revcount
174 174 if num < 0: num = 0
175 175 elif num >= revcount:
176 176 raise ValueError
177 177 except ValueError:
178 178 try:
179 179 num = repo.changelog.rev(repo.lookup(val))
180 180 except KeyError:
181 181 try:
182 182 num = revlog.rev(revlog.lookup(val))
183 183 except KeyError:
184 184 raise util.Abort(_('invalid revision identifier %s'), val)
185 185 return num
186 186 seen = {}
187 187 for spec in revs:
188 188 if spec.find(revrangesep) >= 0:
189 189 start, end = spec.split(revrangesep, 1)
190 190 start = fix(start, 0)
191 191 end = fix(end, revcount - 1)
192 192 step = start > end and -1 or 1
193 193 for rev in xrange(start, end+step, step):
194 194 if rev in seen: continue
195 195 seen[rev] = 1
196 196 yield str(rev)
197 197 else:
198 198 rev = fix(spec, None)
199 199 if rev in seen: continue
200 200 seen[rev] = 1
201 201 yield str(rev)
202 202
203 203 def make_filename(repo, r, pat, node=None,
204 204 total=None, seqno=None, revwidth=None, pathname=None):
205 205 node_expander = {
206 206 'H': lambda: hex(node),
207 207 'R': lambda: str(r.rev(node)),
208 208 'h': lambda: short(node),
209 209 }
210 210 expander = {
211 211 '%': lambda: '%',
212 212 'b': lambda: os.path.basename(repo.root),
213 213 }
214 214
215 215 try:
216 216 if node:
217 217 expander.update(node_expander)
218 218 if node and revwidth is not None:
219 219 expander['r'] = lambda: str(r.rev(node)).zfill(revwidth)
220 220 if total is not None:
221 221 expander['N'] = lambda: str(total)
222 222 if seqno is not None:
223 223 expander['n'] = lambda: str(seqno)
224 224 if total is not None and seqno is not None:
225 225 expander['n'] = lambda:str(seqno).zfill(len(str(total)))
226 226 if pathname is not None:
227 227 expander['s'] = lambda: os.path.basename(pathname)
228 228 expander['d'] = lambda: os.path.dirname(pathname) or '.'
229 229 expander['p'] = lambda: pathname
230 230
231 231 newname = []
232 232 patlen = len(pat)
233 233 i = 0
234 234 while i < patlen:
235 235 c = pat[i]
236 236 if c == '%':
237 237 i += 1
238 238 c = pat[i]
239 239 c = expander[c]()
240 240 newname.append(c)
241 241 i += 1
242 242 return ''.join(newname)
243 243 except KeyError, inst:
244 244 raise util.Abort(_("invalid format spec '%%%s' in output file name"),
245 245 inst.args[0])
246 246
247 247 def make_file(repo, r, pat, node=None,
248 248 total=None, seqno=None, revwidth=None, mode='wb', pathname=None):
249 249 if not pat or pat == '-':
250 250 return 'w' in mode and sys.stdout or sys.stdin
251 251 if hasattr(pat, 'write') and 'w' in mode:
252 252 return pat
253 253 if hasattr(pat, 'read') and 'r' in mode:
254 254 return pat
255 255 return open(make_filename(repo, r, pat, node, total, seqno, revwidth,
256 256 pathname),
257 257 mode)
258 258
259 259 def dodiff(fp, ui, repo, node1, node2, files=None, match=util.always,
260 260 changes=None, text=False):
261 261 if not changes:
262 262 (c, a, d, u) = repo.changes(node1, node2, files, match=match)
263 263 else:
264 264 (c, a, d, u) = changes
265 265 if files:
266 266 c, a, d = map(lambda x: filterfiles(files, x), (c, a, d))
267 267
268 268 if not c and not a and not d:
269 269 return
270 270
271 271 if node2:
272 272 change = repo.changelog.read(node2)
273 273 mmap2 = repo.manifest.read(change[0])
274 274 date2 = util.datestr(change[2])
275 275 def read(f):
276 276 return repo.file(f).read(mmap2[f])
277 277 else:
278 278 date2 = util.datestr()
279 279 if not node1:
280 280 node1 = repo.dirstate.parents()[0]
281 281 def read(f):
282 282 return repo.wfile(f).read()
283 283
284 284 if ui.quiet:
285 285 r = None
286 286 else:
287 287 hexfunc = ui.verbose and hex or short
288 288 r = [hexfunc(node) for node in [node1, node2] if node]
289 289
290 290 change = repo.changelog.read(node1)
291 291 mmap = repo.manifest.read(change[0])
292 292 date1 = util.datestr(change[2])
293 293
294 294 for f in c:
295 295 to = None
296 296 if f in mmap:
297 297 to = repo.file(f).read(mmap[f])
298 298 tn = read(f)
299 299 fp.write(mdiff.unidiff(to, date1, tn, date2, f, r, text=text))
300 300 for f in a:
301 301 to = None
302 302 tn = read(f)
303 303 fp.write(mdiff.unidiff(to, date1, tn, date2, f, r, text=text))
304 304 for f in d:
305 305 to = repo.file(f).read(mmap[f])
306 306 tn = None
307 307 fp.write(mdiff.unidiff(to, date1, tn, date2, f, r, text=text))
308 308
309 309 def trimuser(ui, name, rev, revcache):
310 310 """trim the name of the user who committed a change"""
311 311 user = revcache.get(rev)
312 312 if user is None:
313 313 user = revcache[rev] = ui.shortuser(name)
314 314 return user
315 315
316 316 def show_changeset(ui, repo, rev=0, changenode=None, brinfo=None):
317 317 """show a single changeset or file revision"""
318 318 log = repo.changelog
319 319 if changenode is None:
320 320 changenode = log.node(rev)
321 321 elif not rev:
322 322 rev = log.rev(changenode)
323 323
324 324 if ui.quiet:
325 325 ui.write("%d:%s\n" % (rev, short(changenode)))
326 326 return
327 327
328 328 changes = log.read(changenode)
329 329 date = util.datestr(changes[2])
330 330
331 331 parents = [(log.rev(p), ui.verbose and hex(p) or short(p))
332 332 for p in log.parents(changenode)
333 333 if ui.debugflag or p != nullid]
334 334 if not ui.debugflag and len(parents) == 1 and parents[0][0] == rev-1:
335 335 parents = []
336 336
337 337 if ui.verbose:
338 338 ui.write(_("changeset: %d:%s\n") % (rev, hex(changenode)))
339 339 else:
340 340 ui.write(_("changeset: %d:%s\n") % (rev, short(changenode)))
341 341
342 342 for tag in repo.nodetags(changenode):
343 343 ui.status(_("tag: %s\n") % tag)
344 344 for parent in parents:
345 345 ui.write(_("parent: %d:%s\n") % parent)
346 346
347 347 if brinfo and changenode in brinfo:
348 348 br = brinfo[changenode]
349 349 ui.write(_("branch: %s\n") % " ".join(br))
350 350
351 351 ui.debug(_("manifest: %d:%s\n") % (repo.manifest.rev(changes[0]),
352 352 hex(changes[0])))
353 353 ui.status(_("user: %s\n") % changes[1])
354 354 ui.status(_("date: %s\n") % date)
355 355
356 356 if ui.debugflag:
357 357 files = repo.changes(log.parents(changenode)[0], changenode)
358 358 for key, value in zip([_("files:"), _("files+:"), _("files-:")], files):
359 359 if value:
360 360 ui.note("%-12s %s\n" % (key, " ".join(value)))
361 361 else:
362 362 ui.note(_("files: %s\n") % " ".join(changes[3]))
363 363
364 364 description = changes[4].strip()
365 365 if description:
366 366 if ui.verbose:
367 367 ui.status(_("description:\n"))
368 368 ui.status(description)
369 369 ui.status("\n\n")
370 370 else:
371 371 ui.status(_("summary: %s\n") % description.splitlines()[0])
372 372 ui.status("\n")
373 373
374 374 def show_version(ui):
375 375 """output version and copyright information"""
376 376 ui.write(_("Mercurial Distributed SCM (version %s)\n")
377 377 % version.get_version())
378 378 ui.status(_(
379 379 "\nCopyright (C) 2005 Matt Mackall <mpm@selenic.com>\n"
380 380 "This is free software; see the source for copying conditions. "
381 381 "There is NO\nwarranty; "
382 382 "not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
383 383 ))
384 384
385 385 def help_(ui, cmd=None, with_version=False):
386 386 """show help for a given command or all commands"""
387 387 option_lists = []
388 388 if cmd and cmd != 'shortlist':
389 389 if with_version:
390 390 show_version(ui)
391 391 ui.write('\n')
392 392 aliases, i = find(cmd)
393 393 # synopsis
394 394 ui.write("%s\n\n" % i[2])
395 395
396 396 # description
397 397 doc = i[0].__doc__
398 398 if ui.quiet:
399 399 doc = doc.splitlines(0)[0]
400 400 ui.write("%s\n" % doc.rstrip())
401 401
402 402 if not ui.quiet:
403 403 # aliases
404 404 if len(aliases) > 1:
405 405 ui.write(_("\naliases: %s\n") % ', '.join(aliases[1:]))
406 406
407 407 # options
408 408 if i[1]:
409 409 option_lists.append(("options", i[1]))
410 410
411 411 else:
412 412 # program name
413 413 if ui.verbose or with_version:
414 414 show_version(ui)
415 415 else:
416 416 ui.status(_("Mercurial Distributed SCM\n"))
417 417 ui.status('\n')
418 418
419 419 # list of commands
420 420 if cmd == "shortlist":
421 421 ui.status(_('basic commands (use "hg help" '
422 422 'for the full list or option "-v" for details):\n\n'))
423 423 elif ui.verbose:
424 424 ui.status(_('list of commands:\n\n'))
425 425 else:
426 426 ui.status(_('list of commands (use "hg help -v" '
427 427 'to show aliases and global options):\n\n'))
428 428
429 429 h = {}
430 430 cmds = {}
431 431 for c, e in table.items():
432 432 f = c.split("|")[0]
433 433 if cmd == "shortlist" and not f.startswith("^"):
434 434 continue
435 435 f = f.lstrip("^")
436 436 if not ui.debugflag and f.startswith("debug"):
437 437 continue
438 438 d = ""
439 439 if e[0].__doc__:
440 440 d = e[0].__doc__.splitlines(0)[0].rstrip()
441 441 h[f] = d
442 442 cmds[f]=c.lstrip("^")
443 443
444 444 fns = h.keys()
445 445 fns.sort()
446 446 m = max(map(len, fns))
447 447 for f in fns:
448 448 if ui.verbose:
449 449 commands = cmds[f].replace("|",", ")
450 450 ui.write(" %s:\n %s\n"%(commands,h[f]))
451 451 else:
452 452 ui.write(' %-*s %s\n' % (m, f, h[f]))
453 453
454 454 # global options
455 455 if ui.verbose:
456 456 option_lists.append(("global options", globalopts))
457 457
458 458 # list all option lists
459 459 opt_output = []
460 460 for title, options in option_lists:
461 461 opt_output.append(("\n%s:\n" % title, None))
462 462 for shortopt, longopt, default, desc in options:
463 463 opt_output.append(("%2s%s" % (shortopt and "-%s" % shortopt,
464 464 longopt and " --%s" % longopt),
465 465 "%s%s" % (desc,
466 466 default and _(" (default: %s)") % default
467 467 or "")))
468 468
469 469 if opt_output:
470 470 opts_len = max([len(line[0]) for line in opt_output if line[1]])
471 471 for first, second in opt_output:
472 472 if second:
473 473 ui.write(" %-*s %s\n" % (opts_len, first, second))
474 474 else:
475 475 ui.write("%s\n" % first)
476 476
477 477 # Commands start here, listed alphabetically
478 478
479 479 def add(ui, repo, *pats, **opts):
480 480 """add the specified files on the next commit
481 481
482 482 Schedule files to be version controlled and added to the repository.
483 483
484 484 The files will be added to the repository at the next commit.
485 485
486 486 If no names are given, add all files in the current directory and
487 487 its subdirectories.
488 488 """
489 489
490 490 names = []
491 491 for src, abs, rel, exact in walk(repo, pats, opts):
492 492 if exact:
493 493 if ui.verbose: ui.status(_('adding %s\n') % rel)
494 494 names.append(abs)
495 495 elif repo.dirstate.state(abs) == '?':
496 496 ui.status(_('adding %s\n') % rel)
497 497 names.append(abs)
498 498 repo.add(names)
499 499
500 500 def addremove(ui, repo, *pats, **opts):
501 501 """add all new files, delete all missing files
502 502
503 503 Add all new files and remove all missing files from the repository.
504 504
505 505 New files are ignored if they match any of the patterns in .hgignore. As
506 506 with add, these changes take effect at the next commit.
507 507 """
508 508 add, remove = [], []
509 509 for src, abs, rel, exact in walk(repo, pats, opts):
510 510 if src == 'f' and repo.dirstate.state(abs) == '?':
511 511 add.append(abs)
512 512 if ui.verbose or not exact:
513 513 ui.status(_('adding %s\n') % rel)
514 514 if repo.dirstate.state(abs) != 'r' and not os.path.exists(rel):
515 515 remove.append(abs)
516 516 if ui.verbose or not exact:
517 517 ui.status(_('removing %s\n') % rel)
518 518 repo.add(add)
519 519 repo.remove(remove)
520 520
521 521 def annotate(ui, repo, *pats, **opts):
522 522 """show changeset information per file line
523 523
524 524 List changes in files, showing the revision id responsible for each line
525 525
526 526 This command is useful to discover who did a change or when a change took
527 527 place.
528 528
529 529 Without the -a option, annotate will avoid processing files it
530 530 detects as binary. With -a, annotate will generate an annotation
531 531 anyway, probably with undesirable results.
532 532 """
533 533 def getnode(rev):
534 534 return short(repo.changelog.node(rev))
535 535
536 536 ucache = {}
537 537 def getname(rev):
538 538 cl = repo.changelog.read(repo.changelog.node(rev))
539 539 return trimuser(ui, cl[1], rev, ucache)
540 540
541 541 dcache = {}
542 542 def getdate(rev):
543 543 datestr = dcache.get(rev)
544 544 if datestr is None:
545 545 cl = repo.changelog.read(repo.changelog.node(rev))
546 546 datestr = dcache[rev] = util.datestr(cl[2])
547 547 return datestr
548 548
549 549 if not pats:
550 550 raise util.Abort(_('at least one file name or pattern required'))
551 551
552 552 opmap = [['user', getname], ['number', str], ['changeset', getnode],
553 553 ['date', getdate]]
554 554 if not opts['user'] and not opts['changeset'] and not opts['date']:
555 555 opts['number'] = 1
556 556
557 557 if opts['rev']:
558 558 node = repo.changelog.lookup(opts['rev'])
559 559 else:
560 560 node = repo.dirstate.parents()[0]
561 561 change = repo.changelog.read(node)
562 562 mmap = repo.manifest.read(change[0])
563 563
564 564 for src, abs, rel, exact in walk(repo, pats, opts):
565 565 if abs not in mmap:
566 566 ui.warn(_("warning: %s is not in the repository!\n") % rel)
567 567 continue
568 568
569 569 f = repo.file(abs)
570 570 if not opts['text'] and util.binary(f.read(mmap[abs])):
571 571 ui.write(_("%s: binary file\n") % rel)
572 572 continue
573 573
574 574 lines = f.annotate(mmap[abs])
575 575 pieces = []
576 576
577 577 for o, f in opmap:
578 578 if opts[o]:
579 579 l = [f(n) for n, dummy in lines]
580 580 if l:
581 581 m = max(map(len, l))
582 582 pieces.append(["%*s" % (m, x) for x in l])
583 583
584 584 if pieces:
585 585 for p, l in zip(zip(*pieces), lines):
586 586 ui.write("%s: %s" % (" ".join(p), l[1]))
587 587
588 588 def bundle(ui, repo, fname, dest="default-push", **opts):
589 589 """create a changegroup file
590 590
591 591 Generate a compressed changegroup file collecting all changesets
592 592 not found in the other repository.
593 593
594 594 This file can then be transferred using conventional means and
595 595 applied to another repository with the unbundle command. This is
596 596 useful when native push and pull are not available or when
597 597 exporting an entire repository is undesirable. The standard file
598 598 extension is ".hg".
599 599
600 600 Unlike import/export, this exactly preserves all changeset
601 601 contents including permissions, rename data, and revision history.
602 602 """
603 603 f = open(fname, "wb")
604 604 dest = ui.expandpath(dest, repo.root)
605 605 other = hg.repository(ui, dest)
606 606 o = repo.findoutgoing(other)
607 607 cg = repo.changegroup(o)
608 608
609 609 try:
610 610 f.write("HG10")
611 611 z = bz2.BZ2Compressor(9)
612 612 while 1:
613 613 chunk = cg.read(4096)
614 614 if not chunk:
615 615 break
616 616 f.write(z.compress(chunk))
617 617 f.write(z.flush())
618 618 except:
619 619 os.unlink(fname)
620 620 raise
621 621
622 622 def cat(ui, repo, file1, *pats, **opts):
623 623 """output the latest or given revisions of files
624 624
625 625 Print the specified files as they were at the given revision.
626 626 If no revision is given then the tip is used.
627 627
628 628 Output may be to a file, in which case the name of the file is
629 629 given using a format string. The formatting rules are the same as
630 630 for the export command, with the following additions:
631 631
632 632 %s basename of file being printed
633 633 %d dirname of file being printed, or '.' if in repo root
634 634 %p root-relative path name of file being printed
635 635 """
636 636 mf = {}
637 637 if opts['rev']:
638 638 change = repo.changelog.read(repo.lookup(opts['rev']))
639 639 mf = repo.manifest.read(change[0])
640 640 for src, abs, rel, exact in walk(repo, (file1,) + pats, opts):
641 641 r = repo.file(abs)
642 642 if opts['rev']:
643 643 try:
644 644 n = mf[abs]
645 645 except (hg.RepoError, KeyError):
646 646 try:
647 647 n = r.lookup(rev)
648 648 except KeyError, inst:
649 649 raise util.Abort(_('cannot find file %s in rev %s'), rel, rev)
650 650 else:
651 651 n = r.tip()
652 652 fp = make_file(repo, r, opts['output'], node=n, pathname=abs)
653 653 fp.write(r.read(n))
654 654
655 655 def clone(ui, source, dest=None, **opts):
656 656 """make a copy of an existing repository
657 657
658 658 Create a copy of an existing repository in a new directory.
659 659
660 660 If no destination directory name is specified, it defaults to the
661 661 basename of the source.
662 662
663 663 The location of the source is added to the new repository's
664 664 .hg/hgrc file, as the default to be used for future pulls.
665 665
666 666 For efficiency, hardlinks are used for cloning whenever the source
667 667 and destination are on the same filesystem. Some filesystems,
668 668 such as AFS, implement hardlinking incorrectly, but do not report
669 669 errors. In these cases, use the --pull option to avoid
670 670 hardlinking.
671 671 """
672 672 if dest is None:
673 673 dest = os.path.basename(os.path.normpath(source))
674 674
675 675 if os.path.exists(dest):
676 676 raise util.Abort(_("destination '%s' already exists"), dest)
677 677
678 678 dest = os.path.realpath(dest)
679 679
680 680 class Dircleanup:
681 681 def __init__(self, dir_):
682 682 self.rmtree = shutil.rmtree
683 683 self.dir_ = dir_
684 684 os.mkdir(dir_)
685 685 def close(self):
686 686 self.dir_ = None
687 687 def __del__(self):
688 688 if self.dir_:
689 689 self.rmtree(self.dir_, True)
690 690
691 691 if opts['ssh']:
692 692 ui.setconfig("ui", "ssh", opts['ssh'])
693 693 if opts['remotecmd']:
694 694 ui.setconfig("ui", "remotecmd", opts['remotecmd'])
695 695
696 696 if not os.path.exists(source):
697 697 source = ui.expandpath(source)
698 698
699 699 d = Dircleanup(dest)
700 700 abspath = source
701 701 other = hg.repository(ui, source)
702 702
703 703 copy = False
704 704 if other.dev() != -1:
705 705 abspath = os.path.abspath(source)
706 706 if not opts['pull'] and not opts['rev']:
707 707 copy = True
708 708
709 709 if copy:
710 710 try:
711 711 # we use a lock here because if we race with commit, we
712 712 # can end up with extra data in the cloned revlogs that's
713 713 # not pointed to by changesets, thus causing verify to
714 714 # fail
715 715 l1 = lock.lock(os.path.join(source, ".hg", "lock"))
716 716 except OSError:
717 717 copy = False
718 718
719 719 if copy:
720 720 # we lock here to avoid premature writing to the target
721 721 os.mkdir(os.path.join(dest, ".hg"))
722 722 l2 = lock.lock(os.path.join(dest, ".hg", "lock"))
723 723
724 724 files = "data 00manifest.d 00manifest.i 00changelog.d 00changelog.i"
725 725 for f in files.split():
726 726 src = os.path.join(source, ".hg", f)
727 727 dst = os.path.join(dest, ".hg", f)
728 728 try:
729 729 util.copyfiles(src, dst)
730 730 except OSError, inst:
731 731 if inst.errno != errno.ENOENT: raise
732 732
733 733 repo = hg.repository(ui, dest)
734 734
735 735 else:
736 736 revs = None
737 737 if opts['rev']:
738 738 if not other.local():
739 739 raise util.Abort("clone -r not supported yet for remote repositories.")
740 740 else:
741 741 revs = [other.lookup(rev) for rev in opts['rev']]
742 742 repo = hg.repository(ui, dest, create=1)
743 743 repo.pull(other, heads = revs)
744 744
745 745 f = repo.opener("hgrc", "w", text=True)
746 746 f.write("[paths]\n")
747 747 f.write("default = %s\n" % abspath)
748 748
749 749 if not opts['noupdate']:
750 750 update(ui, repo)
751 751
752 752 d.close()
753 753
754 754 def commit(ui, repo, *pats, **opts):
755 755 """commit the specified files or all outstanding changes
756 756
757 757 Commit changes to the given files into the repository.
758 758
759 759 If a list of files is omitted, all changes reported by "hg status"
760 760 from the root of the repository will be commited.
761 761
762 762 The HGEDITOR or EDITOR environment variables are used to start an
763 763 editor to add a commit comment.
764 764 """
765 765 message = opts['message']
766 766 logfile = opts['logfile']
767 767
768 768 if message and logfile:
769 769 raise util.Abort(_('options --message and --logfile are mutually '
770 770 'exclusive'))
771 771 if not message and logfile:
772 772 try:
773 773 if logfile == '-':
774 774 message = sys.stdin.read()
775 775 else:
776 776 message = open(logfile).read()
777 777 except IOError, inst:
778 778 raise util.Abort(_("can't read commit message '%s': %s") %
779 779 (logfile, inst.strerror))
780 780
781 781 if opts['addremove']:
782 782 addremove(ui, repo, *pats, **opts)
783 783 cwd = repo.getcwd()
784 784 if not pats and cwd:
785 785 opts['include'] = [os.path.join(cwd, i) for i in opts['include']]
786 786 opts['exclude'] = [os.path.join(cwd, x) for x in opts['exclude']]
787 787 fns, match, anypats = matchpats(repo, (pats and repo.getcwd()) or '',
788 788 pats, opts)
789 789 if pats:
790 790 c, a, d, u = repo.changes(files=fns, match=match)
791 791 files = c + a + [fn for fn in d if repo.dirstate.state(fn) == 'r']
792 792 else:
793 793 files = []
794 794 try:
795 795 repo.commit(files, message, opts['user'], opts['date'], match)
796 796 except ValueError, inst:
797 797 raise util.Abort(str(inst))
798 798
799 799 def docopy(ui, repo, pats, opts):
800 800 cwd = repo.getcwd()
801 801 errors = 0
802 802 copied = []
803 803 targets = {}
804 804
805 805 def okaytocopy(abs, rel, exact):
806 806 reasons = {'?': _('is not managed'),
807 807 'a': _('has been marked for add')}
808 808 reason = reasons.get(repo.dirstate.state(abs))
809 809 if reason:
810 810 if exact: ui.warn(_('%s: not copying - file %s\n') % (rel, reason))
811 811 else:
812 812 return True
813 813
814 814 def copy(abssrc, relsrc, target, exact):
815 815 abstarget = util.canonpath(repo.root, cwd, target)
816 816 reltarget = util.pathto(cwd, abstarget)
817 817 prevsrc = targets.get(abstarget)
818 818 if prevsrc is not None:
819 819 ui.warn(_('%s: not overwriting - %s collides with %s\n') %
820 820 (reltarget, abssrc, prevsrc))
821 821 return
822 822 elif os.path.exists(reltarget):
823 823 if opts['force']:
824 824 os.unlink(reltarget)
825 825 else:
826 826 ui.warn(_('%s: not overwriting - file exists\n') %
827 827 reltarget)
828 828 return
829 829 if ui.verbose or not exact:
830 830 ui.status(_('copying %s to %s\n') % (relsrc, reltarget))
831 831 if not opts['after']:
832 832 targetdir = os.path.dirname(reltarget) or '.'
833 833 if not os.path.isdir(targetdir):
834 834 os.makedirs(targetdir)
835 835 try:
836 836 shutil.copyfile(relsrc, reltarget)
837 837 shutil.copymode(relsrc, reltarget)
838 838 except shutil.Error, inst:
839 839 raise util.Abort(str(inst))
840 840 except IOError, inst:
841 841 if inst.errno == errno.ENOENT:
842 842 ui.warn(_('%s: deleted in working copy\n') % relsrc)
843 843 else:
844 844 ui.warn(_('%s: cannot copy - %s\n') %
845 845 (relsrc, inst.strerror))
846 846 errors += 1
847 847 return
848 848 targets[abstarget] = abssrc
849 849 repo.copy(abssrc, abstarget)
850 850 copied.append((abssrc, relsrc, exact))
851 851
852 852 pats = list(pats)
853 853 if not pats:
854 854 raise util.Abort(_('no source or destination specified'))
855 855 if len(pats) == 1:
856 856 raise util.Abort(_('no destination specified'))
857 857 dest = pats.pop()
858 858 destdirexists = os.path.isdir(dest)
859 859 if (len(pats) > 1 or not os.path.exists(pats[0])) and not destdirexists:
860 860 raise util.Abort(_('with multiple sources, destination must be an '
861 861 'existing directory'))
862 862
863 863 for pat in pats:
864 864 if os.path.isdir(pat):
865 865 if destdirexists:
866 866 striplen = len(os.path.split(pat)[0])
867 867 else:
868 868 striplen = len(pat)
869 869 if striplen:
870 870 striplen += len(os.sep)
871 871 targetpath = lambda p: os.path.join(dest, p[striplen:])
872 872 elif destdirexists:
873 873 targetpath = lambda p: os.path.join(dest, os.path.basename(p))
874 874 else:
875 875 targetpath = lambda p: dest
876 876 for tag, abssrc, relsrc, exact in walk(repo, [pat], opts):
877 877 if okaytocopy(abssrc, relsrc, exact):
878 878 copy(abssrc, relsrc, targetpath(abssrc), exact)
879 879
880 880 if errors:
881 881 ui.warn(_('(consider using --after)\n'))
882 882 if len(copied) == 0:
883 883 raise util.Abort(_('no files to copy'))
884 884 return errors, copied
885 885
886 886 def copy(ui, repo, *pats, **opts):
887 887 """mark files as copied for the next commit
888 888
889 889 Mark dest as having copies of source files. If dest is a
890 890 directory, copies are put in that directory. If dest is a file,
891 891 there can only be one source.
892 892
893 893 By default, this command copies the contents of files as they
894 894 stand in the working directory. If invoked with --after, the
895 895 operation is recorded, but no copying is performed.
896 896
897 897 This command takes effect in the next commit.
898 898
899 899 NOTE: This command should be treated as experimental. While it
900 900 should properly record copied files, this information is not yet
901 901 fully used by merge, nor fully reported by log.
902 902 """
903 903 errs, copied = docopy(ui, repo, pats, opts)
904 904 return errs
905 905
906 906 def debugancestor(ui, index, rev1, rev2):
907 907 """find the ancestor revision of two revisions in a given index"""
908 908 r = revlog.revlog(util.opener(os.getcwd()), index, "")
909 909 a = r.ancestor(r.lookup(rev1), r.lookup(rev2))
910 910 ui.write("%d:%s\n" % (r.rev(a), hex(a)))
911 911
912 912 def debugcheckstate(ui, repo):
913 913 """validate the correctness of the current dirstate"""
914 914 parent1, parent2 = repo.dirstate.parents()
915 915 repo.dirstate.read()
916 916 dc = repo.dirstate.map
917 917 keys = dc.keys()
918 918 keys.sort()
919 919 m1n = repo.changelog.read(parent1)[0]
920 920 m2n = repo.changelog.read(parent2)[0]
921 921 m1 = repo.manifest.read(m1n)
922 922 m2 = repo.manifest.read(m2n)
923 923 errors = 0
924 924 for f in dc:
925 925 state = repo.dirstate.state(f)
926 926 if state in "nr" and f not in m1:
927 927 ui.warn(_("%s in state %s, but not in manifest1\n") % (f, state))
928 928 errors += 1
929 929 if state in "a" and f in m1:
930 930 ui.warn(_("%s in state %s, but also in manifest1\n") % (f, state))
931 931 errors += 1
932 932 if state in "m" and f not in m1 and f not in m2:
933 933 ui.warn(_("%s in state %s, but not in either manifest\n") %
934 934 (f, state))
935 935 errors += 1
936 936 for f in m1:
937 937 state = repo.dirstate.state(f)
938 938 if state not in "nrm":
939 939 ui.warn(_("%s in manifest1, but listed as state %s") % (f, state))
940 940 errors += 1
941 941 if errors:
942 942 raise util.Abort(_(".hg/dirstate inconsistent with current parent's manifest"))
943 943
944 944 def debugconfig(ui):
945 945 """show combined config settings from all hgrc files"""
946 946 try:
947 947 repo = hg.repository(ui)
948 948 except hg.RepoError:
949 949 pass
950 950 for section, name, value in ui.walkconfig():
951 951 ui.write('%s.%s=%s\n' % (section, name, value))
952 952
953 953 def debugsetparents(ui, repo, rev1, rev2=None):
954 954 """manually set the parents of the current working directory
955 955
956 956 This is useful for writing repository conversion tools, but should
957 957 be used with care.
958 958 """
959 959
960 960 if not rev2:
961 961 rev2 = hex(nullid)
962 962
963 963 repo.dirstate.setparents(repo.lookup(rev1), repo.lookup(rev2))
964 964
965 965 def debugstate(ui, repo):
966 966 """show the contents of the current dirstate"""
967 967 repo.dirstate.read()
968 968 dc = repo.dirstate.map
969 969 keys = dc.keys()
970 970 keys.sort()
971 971 for file_ in keys:
972 972 ui.write("%c %3o %10d %s %s\n"
973 973 % (dc[file_][0], dc[file_][1] & 0777, dc[file_][2],
974 974 time.strftime("%x %X",
975 975 time.localtime(dc[file_][3])), file_))
976 976 for f in repo.dirstate.copies:
977 977 ui.write(_("copy: %s -> %s\n") % (repo.dirstate.copies[f], f))
978 978
979 979 def debugdata(ui, file_, rev):
980 980 """dump the contents of an data file revision"""
981 981 r = revlog.revlog(util.opener(os.getcwd()), file_[:-2] + ".i", file_)
982 982 try:
983 983 ui.write(r.revision(r.lookup(rev)))
984 984 except KeyError:
985 985 raise util.Abort(_('invalid revision identifier %s'), rev)
986 986
987 987 def debugindex(ui, file_):
988 988 """dump the contents of an index file"""
989 989 r = revlog.revlog(util.opener(os.getcwd()), file_, "")
990 990 ui.write(" rev offset length base linkrev" +
991 991 " nodeid p1 p2\n")
992 992 for i in range(r.count()):
993 993 e = r.index[i]
994 994 ui.write("% 6d % 9d % 7d % 6d % 7d %s %s %s\n" % (
995 995 i, e[0], e[1], e[2], e[3],
996 996 short(e[6]), short(e[4]), short(e[5])))
997 997
998 998 def debugindexdot(ui, file_):
999 999 """dump an index DAG as a .dot file"""
1000 1000 r = revlog.revlog(util.opener(os.getcwd()), file_, "")
1001 1001 ui.write("digraph G {\n")
1002 1002 for i in range(r.count()):
1003 1003 e = r.index[i]
1004 1004 ui.write("\t%d -> %d\n" % (r.rev(e[4]), i))
1005 1005 if e[5] != nullid:
1006 1006 ui.write("\t%d -> %d\n" % (r.rev(e[5]), i))
1007 1007 ui.write("}\n")
1008 1008
1009 1009 def debugrename(ui, repo, file, rev=None):
1010 1010 """dump rename information"""
1011 1011 r = repo.file(relpath(repo, [file])[0])
1012 1012 if rev:
1013 1013 try:
1014 1014 # assume all revision numbers are for changesets
1015 1015 n = repo.lookup(rev)
1016 1016 change = repo.changelog.read(n)
1017 1017 m = repo.manifest.read(change[0])
1018 1018 n = m[relpath(repo, [file])[0]]
1019 1019 except hg.RepoError, KeyError:
1020 1020 n = r.lookup(rev)
1021 1021 else:
1022 1022 n = r.tip()
1023 1023 m = r.renamed(n)
1024 1024 if m:
1025 1025 ui.write(_("renamed from %s:%s\n") % (m[0], hex(m[1])))
1026 1026 else:
1027 1027 ui.write(_("not renamed\n"))
1028 1028
1029 1029 def debugwalk(ui, repo, *pats, **opts):
1030 1030 """show how files match on given patterns"""
1031 1031 items = list(walk(repo, pats, opts))
1032 1032 if not items:
1033 1033 return
1034 1034 fmt = '%%s %%-%ds %%-%ds %%s' % (
1035 1035 max([len(abs) for (src, abs, rel, exact) in items]),
1036 1036 max([len(rel) for (src, abs, rel, exact) in items]))
1037 1037 for src, abs, rel, exact in items:
1038 1038 line = fmt % (src, abs, rel, exact and 'exact' or '')
1039 1039 ui.write("%s\n" % line.rstrip())
1040 1040
1041 1041 def diff(ui, repo, *pats, **opts):
1042 1042 """diff working directory (or selected files)
1043 1043
1044 1044 Show differences between revisions for the specified files.
1045 1045
1046 1046 Differences between files are shown using the unified diff format.
1047 1047
1048 1048 When two revision arguments are given, then changes are shown
1049 1049 between those revisions. If only one revision is specified then
1050 1050 that revision is compared to the working directory, and, when no
1051 1051 revisions are specified, the working directory files are compared
1052 1052 to its parent.
1053 1053
1054 1054 Without the -a option, diff will avoid generating diffs of files
1055 1055 it detects as binary. With -a, diff will generate a diff anyway,
1056 1056 probably with undesirable results.
1057 1057 """
1058 1058 node1, node2 = None, None
1059 1059 revs = [repo.lookup(x) for x in opts['rev']]
1060 1060
1061 1061 if len(revs) > 0:
1062 1062 node1 = revs[0]
1063 1063 if len(revs) > 1:
1064 1064 node2 = revs[1]
1065 1065 if len(revs) > 2:
1066 1066 raise util.Abort(_("too many revisions to diff"))
1067 1067
1068 1068 fns, matchfn, anypats = matchpats(repo, repo.getcwd(), pats, opts)
1069 1069
1070 1070 dodiff(sys.stdout, ui, repo, node1, node2, fns, match=matchfn,
1071 1071 text=opts['text'])
1072 1072
1073 1073 def doexport(ui, repo, changeset, seqno, total, revwidth, opts):
1074 1074 node = repo.lookup(changeset)
1075 1075 prev, other = repo.changelog.parents(node)
1076 1076 change = repo.changelog.read(node)
1077 1077
1078 1078 fp = make_file(repo, repo.changelog, opts['output'],
1079 1079 node=node, total=total, seqno=seqno,
1080 1080 revwidth=revwidth)
1081 1081 if fp != sys.stdout:
1082 1082 ui.note("%s\n" % fp.name)
1083 1083
1084 1084 fp.write("# HG changeset patch\n")
1085 1085 fp.write("# User %s\n" % change[1])
1086 1086 fp.write("# Node ID %s\n" % hex(node))
1087 1087 fp.write("# Parent %s\n" % hex(prev))
1088 1088 if other != nullid:
1089 1089 fp.write("# Parent %s\n" % hex(other))
1090 1090 fp.write(change[4].rstrip())
1091 1091 fp.write("\n\n")
1092 1092
1093 1093 dodiff(fp, ui, repo, prev, node, text=opts['text'])
1094 1094 if fp != sys.stdout:
1095 1095 fp.close()
1096 1096
1097 1097 def export(ui, repo, *changesets, **opts):
1098 1098 """dump the header and diffs for one or more changesets
1099 1099
1100 1100 Print the changeset header and diffs for one or more revisions.
1101 1101
1102 1102 The information shown in the changeset header is: author,
1103 1103 changeset hash, parent and commit comment.
1104 1104
1105 1105 Output may be to a file, in which case the name of the file is
1106 1106 given using a format string. The formatting rules are as follows:
1107 1107
1108 1108 %% literal "%" character
1109 1109 %H changeset hash (40 bytes of hexadecimal)
1110 1110 %N number of patches being generated
1111 1111 %R changeset revision number
1112 1112 %b basename of the exporting repository
1113 1113 %h short-form changeset hash (12 bytes of hexadecimal)
1114 1114 %n zero-padded sequence number, starting at 1
1115 1115 %r zero-padded changeset revision number
1116 1116
1117 1117 Without the -a option, export will avoid generating diffs of files
1118 1118 it detects as binary. With -a, export will generate a diff anyway,
1119 1119 probably with undesirable results.
1120 1120 """
1121 1121 if not changesets:
1122 1122 raise util.Abort(_("export requires at least one changeset"))
1123 1123 seqno = 0
1124 1124 revs = list(revrange(ui, repo, changesets))
1125 1125 total = len(revs)
1126 1126 revwidth = max(map(len, revs))
1127 1127 ui.note(len(revs) > 1 and _("Exporting patches:\n") or _("Exporting patch:\n"))
1128 1128 for cset in revs:
1129 1129 seqno += 1
1130 1130 doexport(ui, repo, cset, seqno, total, revwidth, opts)
1131 1131
1132 1132 def forget(ui, repo, *pats, **opts):
1133 1133 """don't add the specified files on the next commit
1134 1134
1135 1135 Undo an 'hg add' scheduled for the next commit.
1136 1136 """
1137 1137 forget = []
1138 1138 for src, abs, rel, exact in walk(repo, pats, opts):
1139 1139 if repo.dirstate.state(abs) == 'a':
1140 1140 forget.append(abs)
1141 1141 if ui.verbose or not exact:
1142 1142 ui.status(_('forgetting %s\n') % rel)
1143 1143 repo.forget(forget)
1144 1144
1145 1145 def grep(ui, repo, pattern, *pats, **opts):
1146 1146 """search for a pattern in specified files and revisions
1147 1147
1148 1148 Search revisions of files for a regular expression.
1149 1149
1150 1150 This command behaves differently than Unix grep. It only accepts
1151 1151 Python/Perl regexps. It searches repository history, not the
1152 1152 working directory. It always prints the revision number in which
1153 1153 a match appears.
1154 1154
1155 1155 By default, grep only prints output for the first revision of a
1156 1156 file in which it finds a match. To get it to print every revision
1157 1157 that contains a change in match status ("-" for a match that
1158 1158 becomes a non-match, or "+" for a non-match that becomes a match),
1159 1159 use the --all flag.
1160 1160 """
1161 1161 reflags = 0
1162 1162 if opts['ignore_case']:
1163 1163 reflags |= re.I
1164 1164 regexp = re.compile(pattern, reflags)
1165 1165 sep, eol = ':', '\n'
1166 1166 if opts['print0']:
1167 1167 sep = eol = '\0'
1168 1168
1169 1169 fcache = {}
1170 1170 def getfile(fn):
1171 1171 if fn not in fcache:
1172 1172 fcache[fn] = repo.file(fn)
1173 1173 return fcache[fn]
1174 1174
1175 1175 def matchlines(body):
1176 1176 begin = 0
1177 1177 linenum = 0
1178 1178 while True:
1179 1179 match = regexp.search(body, begin)
1180 1180 if not match:
1181 1181 break
1182 1182 mstart, mend = match.span()
1183 1183 linenum += body.count('\n', begin, mstart) + 1
1184 1184 lstart = body.rfind('\n', begin, mstart) + 1 or begin
1185 1185 lend = body.find('\n', mend)
1186 1186 yield linenum, mstart - lstart, mend - lstart, body[lstart:lend]
1187 1187 begin = lend + 1
1188 1188
1189 1189 class linestate:
1190 1190 def __init__(self, line, linenum, colstart, colend):
1191 1191 self.line = line
1192 1192 self.linenum = linenum
1193 1193 self.colstart = colstart
1194 1194 self.colend = colend
1195 1195 def __eq__(self, other):
1196 1196 return self.line == other.line
1197 1197 def __hash__(self):
1198 1198 return hash(self.line)
1199 1199
1200 1200 matches = {}
1201 1201 def grepbody(fn, rev, body):
1202 1202 matches[rev].setdefault(fn, {})
1203 1203 m = matches[rev][fn]
1204 1204 for lnum, cstart, cend, line in matchlines(body):
1205 1205 s = linestate(line, lnum, cstart, cend)
1206 1206 m[s] = s
1207 1207
1208 1208 prev = {}
1209 1209 ucache = {}
1210 1210 def display(fn, rev, states, prevstates):
1211 1211 diff = list(sets.Set(states).symmetric_difference(sets.Set(prevstates)))
1212 1212 diff.sort(lambda x, y: cmp(x.linenum, y.linenum))
1213 1213 counts = {'-': 0, '+': 0}
1214 1214 filerevmatches = {}
1215 1215 for l in diff:
1216 1216 if incrementing or not opts['all']:
1217 1217 change = ((l in prevstates) and '-') or '+'
1218 1218 r = rev
1219 1219 else:
1220 1220 change = ((l in states) and '-') or '+'
1221 1221 r = prev[fn]
1222 1222 cols = [fn, str(rev)]
1223 1223 if opts['line_number']: cols.append(str(l.linenum))
1224 1224 if opts['all']: cols.append(change)
1225 1225 if opts['user']: cols.append(trimuser(ui, getchange(rev)[1], rev,
1226 1226 ucache))
1227 1227 if opts['files_with_matches']:
1228 1228 c = (fn, rev)
1229 1229 if c in filerevmatches: continue
1230 1230 filerevmatches[c] = 1
1231 1231 else:
1232 1232 cols.append(l.line)
1233 1233 ui.write(sep.join(cols), eol)
1234 1234 counts[change] += 1
1235 1235 return counts['+'], counts['-']
1236 1236
1237 1237 fstate = {}
1238 1238 skip = {}
1239 1239 changeiter, getchange = walkchangerevs(ui, repo, repo.getcwd(), pats, opts)
1240 1240 count = 0
1241 1241 incrementing = False
1242 1242 for st, rev, fns in changeiter:
1243 1243 if st == 'window':
1244 1244 incrementing = rev
1245 1245 matches.clear()
1246 1246 elif st == 'add':
1247 1247 change = repo.changelog.read(repo.lookup(str(rev)))
1248 1248 mf = repo.manifest.read(change[0])
1249 1249 matches[rev] = {}
1250 1250 for fn in fns:
1251 1251 if fn in skip: continue
1252 1252 fstate.setdefault(fn, {})
1253 1253 try:
1254 1254 grepbody(fn, rev, getfile(fn).read(mf[fn]))
1255 1255 except KeyError:
1256 1256 pass
1257 1257 elif st == 'iter':
1258 1258 states = matches[rev].items()
1259 1259 states.sort()
1260 1260 for fn, m in states:
1261 1261 if fn in skip: continue
1262 1262 if incrementing or not opts['all'] or fstate[fn]:
1263 1263 pos, neg = display(fn, rev, m, fstate[fn])
1264 1264 count += pos + neg
1265 1265 if pos and not opts['all']:
1266 1266 skip[fn] = True
1267 1267 fstate[fn] = m
1268 1268 prev[fn] = rev
1269 1269
1270 1270 if not incrementing:
1271 1271 fstate = fstate.items()
1272 1272 fstate.sort()
1273 1273 for fn, state in fstate:
1274 1274 if fn in skip: continue
1275 1275 display(fn, rev, {}, state)
1276 1276 return (count == 0 and 1) or 0
1277 1277
1278 1278 def heads(ui, repo, **opts):
1279 1279 """show current repository heads
1280 1280
1281 1281 Show all repository head changesets.
1282 1282
1283 1283 Repository "heads" are changesets that don't have children
1284 1284 changesets. They are where development generally takes place and
1285 1285 are the usual targets for update and merge operations.
1286 1286 """
1287 1287 heads = repo.changelog.heads()
1288 1288 br = None
1289 1289 if opts['branches']:
1290 1290 br = repo.branchlookup(heads)
1291 1291 for n in repo.changelog.heads():
1292 1292 show_changeset(ui, repo, changenode=n, brinfo=br)
1293 1293
1294 1294 def identify(ui, repo):
1295 1295 """print information about the working copy
1296 1296
1297 1297 Print a short summary of the current state of the repo.
1298 1298
1299 1299 This summary identifies the repository state using one or two parent
1300 1300 hash identifiers, followed by a "+" if there are uncommitted changes
1301 1301 in the working directory, followed by a list of tags for this revision.
1302 1302 """
1303 1303 parents = [p for p in repo.dirstate.parents() if p != nullid]
1304 1304 if not parents:
1305 1305 ui.write(_("unknown\n"))
1306 1306 return
1307 1307
1308 1308 hexfunc = ui.verbose and hex or short
1309 1309 (c, a, d, u) = repo.changes()
1310 1310 output = ["%s%s" % ('+'.join([hexfunc(parent) for parent in parents]),
1311 1311 (c or a or d) and "+" or "")]
1312 1312
1313 1313 if not ui.quiet:
1314 1314 # multiple tags for a single parent separated by '/'
1315 1315 parenttags = ['/'.join(tags)
1316 1316 for tags in map(repo.nodetags, parents) if tags]
1317 1317 # tags for multiple parents separated by ' + '
1318 1318 if parenttags:
1319 1319 output.append(' + '.join(parenttags))
1320 1320
1321 1321 ui.write("%s\n" % ' '.join(output))
1322 1322
1323 1323 def import_(ui, repo, patch1, *patches, **opts):
1324 1324 """import an ordered set of patches
1325 1325
1326 1326 Import a list of patches and commit them individually.
1327 1327
1328 1328 If there are outstanding changes in the working directory, import
1329 1329 will abort unless given the -f flag.
1330 1330
1331 1331 If a patch looks like a mail message (its first line starts with
1332 1332 "From " or looks like an RFC822 header), it will not be applied
1333 1333 unless the -f option is used. The importer neither parses nor
1334 1334 discards mail headers, so use -f only to override the "mailness"
1335 1335 safety check, not to import a real mail message.
1336 1336 """
1337 1337 patches = (patch1,) + patches
1338 1338
1339 1339 if not opts['force']:
1340 1340 (c, a, d, u) = repo.changes()
1341 1341 if c or a or d:
1342 1342 raise util.Abort(_("outstanding uncommitted changes"))
1343 1343
1344 1344 d = opts["base"]
1345 1345 strip = opts["strip"]
1346 1346
1347 1347 mailre = re.compile(r'(?:From |[\w-]+:)')
1348 1348
1349 1349 # attempt to detect the start of a patch
1350 1350 # (this heuristic is borrowed from quilt)
1351 1351 diffre = re.compile(r'(?:Index:[ \t]|diff[ \t]|RCS file: |' +
1352 1352 'retrieving revision [0-9]+(\.[0-9]+)*$|' +
1353 1353 '(---|\*\*\*)[ \t])')
1354 1354
1355 1355 for patch in patches:
1356 1356 ui.status(_("applying %s\n") % patch)
1357 1357 pf = os.path.join(d, patch)
1358 1358
1359 1359 message = []
1360 1360 user = None
1361 1361 hgpatch = False
1362 1362 for line in file(pf):
1363 1363 line = line.rstrip()
1364 1364 if (not message and not hgpatch and
1365 1365 mailre.match(line) and not opts['force']):
1366 1366 if len(line) > 35: line = line[:32] + '...'
1367 1367 raise util.Abort(_('first line looks like a '
1368 1368 'mail header: ') + line)
1369 1369 if diffre.match(line):
1370 1370 break
1371 1371 elif hgpatch:
1372 1372 # parse values when importing the result of an hg export
1373 1373 if line.startswith("# User "):
1374 1374 user = line[7:]
1375 1375 ui.debug(_('User: %s\n') % user)
1376 1376 elif not line.startswith("# ") and line:
1377 1377 message.append(line)
1378 1378 hgpatch = False
1379 1379 elif line == '# HG changeset patch':
1380 1380 hgpatch = True
1381 1381 message = [] # We may have collected garbage
1382 1382 else:
1383 1383 message.append(line)
1384 1384
1385 1385 # make sure message isn't empty
1386 1386 if not message:
1387 1387 message = _("imported patch %s\n") % patch
1388 1388 else:
1389 1389 message = "%s\n" % '\n'.join(message)
1390 1390 ui.debug(_('message:\n%s\n') % message)
1391 1391
1392 1392 files = util.patch(strip, pf, ui)
1393 1393
1394 1394 if len(files) > 0:
1395 1395 addremove(ui, repo, *files)
1396 1396 repo.commit(files, message, user)
1397 1397
1398 1398 def incoming(ui, repo, source="default", **opts):
1399 1399 """show new changesets found in source
1400 1400
1401 1401 Show new changesets found in the specified repo or the default
1402 1402 pull repo. These are the changesets that would be pulled if a pull
1403 1403 was requested.
1404 1404
1405 1405 Currently only local repositories are supported.
1406 1406 """
1407 1407 source = ui.expandpath(source, repo.root)
1408 1408 other = hg.repository(ui, source)
1409 1409 if not other.local():
1410 1410 raise util.Abort(_("incoming doesn't work for remote repositories yet"))
1411 1411 o = repo.findincoming(other)
1412 1412 if not o:
1413 1413 return
1414 1414 o = other.changelog.nodesbetween(o)[0]
1415 1415 if opts['newest_first']:
1416 1416 o.reverse()
1417 1417 for n in o:
1418 1418 parents = [p for p in other.changelog.parents(n) if p != nullid]
1419 1419 if opts['no_merges'] and len(parents) == 2:
1420 1420 continue
1421 1421 show_changeset(ui, other, changenode=n)
1422 1422 if opts['patch']:
1423 1423 prev = (parents and parents[0]) or nullid
1424 1424 dodiff(ui, ui, other, prev, n)
1425 1425 ui.write("\n")
1426 1426
1427 1427 def init(ui, dest="."):
1428 1428 """create a new repository in the given directory
1429 1429
1430 1430 Initialize a new repository in the given directory. If the given
1431 1431 directory does not exist, it is created.
1432 1432
1433 1433 If no directory is given, the current directory is used.
1434 1434 """
1435 1435 if not os.path.exists(dest):
1436 1436 os.mkdir(dest)
1437 1437 hg.repository(ui, dest, create=1)
1438 1438
1439 1439 def locate(ui, repo, *pats, **opts):
1440 1440 """locate files matching specific patterns
1441 1441
1442 1442 Print all files under Mercurial control whose names match the
1443 1443 given patterns.
1444 1444
1445 1445 This command searches the current directory and its
1446 1446 subdirectories. To search an entire repository, move to the root
1447 1447 of the repository.
1448 1448
1449 1449 If no patterns are given to match, this command prints all file
1450 1450 names.
1451 1451
1452 1452 If you want to feed the output of this command into the "xargs"
1453 1453 command, use the "-0" option to both this command and "xargs".
1454 1454 This will avoid the problem of "xargs" treating single filenames
1455 1455 that contain white space as multiple filenames.
1456 1456 """
1457 1457 end = opts['print0'] and '\0' or '\n'
1458 1458
1459 1459 for src, abs, rel, exact in walk(repo, pats, opts, '(?:.*/|)'):
1460 1460 if repo.dirstate.state(abs) == '?':
1461 1461 continue
1462 1462 if opts['fullpath']:
1463 1463 ui.write(os.path.join(repo.root, abs), end)
1464 1464 else:
1465 1465 ui.write(rel, end)
1466 1466
1467 1467 def log(ui, repo, *pats, **opts):
1468 1468 """show revision history of entire repository or files
1469 1469
1470 1470 Print the revision history of the specified files or the entire project.
1471 1471
1472 1472 By default this command outputs: changeset id and hash, tags,
1473 1473 parents, user, date and time, and a summary for each commit. The
1474 1474 -v switch adds some more detail, such as changed files, manifest
1475 1475 hashes or message signatures.
1476 1476 """
1477 1477 class dui:
1478 1478 # Implement and delegate some ui protocol. Save hunks of
1479 1479 # output for later display in the desired order.
1480 1480 def __init__(self, ui):
1481 1481 self.ui = ui
1482 1482 self.hunk = {}
1483 1483 def bump(self, rev):
1484 1484 self.rev = rev
1485 1485 self.hunk[rev] = []
1486 1486 def note(self, *args):
1487 1487 if self.verbose:
1488 1488 self.write(*args)
1489 1489 def status(self, *args):
1490 1490 if not self.quiet:
1491 1491 self.write(*args)
1492 1492 def write(self, *args):
1493 1493 self.hunk[self.rev].append(args)
1494 1494 def debug(self, *args):
1495 1495 if self.debugflag:
1496 1496 self.write(*args)
1497 1497 def __getattr__(self, key):
1498 1498 return getattr(self.ui, key)
1499 1499 cwd = repo.getcwd()
1500 1500 if not pats and cwd:
1501 1501 opts['include'] = [os.path.join(cwd, i) for i in opts['include']]
1502 1502 opts['exclude'] = [os.path.join(cwd, x) for x in opts['exclude']]
1503 1503 changeiter, getchange = walkchangerevs(ui, repo, (pats and cwd) or '',
1504 1504 pats, opts)
1505 1505 for st, rev, fns in changeiter:
1506 1506 if st == 'window':
1507 1507 du = dui(ui)
1508 1508 elif st == 'add':
1509 1509 du.bump(rev)
1510 1510 changenode = repo.changelog.node(rev)
1511 1511 parents = [p for p in repo.changelog.parents(changenode)
1512 1512 if p != nullid]
1513 1513 if opts['no_merges'] and len(parents) == 2:
1514 1514 continue
1515 1515 if opts['only_merges'] and len(parents) != 2:
1516 1516 continue
1517 1517
1518 1518 br = None
1519 1519 if opts['keyword']:
1520 1520 changes = repo.changelog.read(repo.changelog.node(rev))
1521 1521 miss = 0
1522 1522 for k in [kw.lower() for kw in opts['keyword']]:
1523 1523 if not (k in changes[1].lower() or
1524 1524 k in changes[4].lower() or
1525 1525 k in " ".join(changes[3][:20]).lower()):
1526 1526 miss = 1
1527 1527 break
1528 1528 if miss:
1529 1529 continue
1530 1530
1531 1531 if opts['branch']:
1532 1532 br = repo.branchlookup([repo.changelog.node(rev)])
1533 1533
1534 1534 show_changeset(du, repo, rev, brinfo=br)
1535 1535 if opts['patch']:
1536 1536 prev = (parents and parents[0]) or nullid
1537 1537 dodiff(du, du, repo, prev, changenode, fns)
1538 1538 du.write("\n\n")
1539 1539 elif st == 'iter':
1540 1540 for args in du.hunk[rev]:
1541 1541 ui.write(*args)
1542 1542
1543 1543 def manifest(ui, repo, rev=None):
1544 1544 """output the latest or given revision of the project manifest
1545 1545
1546 1546 Print a list of version controlled files for the given revision.
1547 1547
1548 1548 The manifest is the list of files being version controlled. If no revision
1549 1549 is given then the tip is used.
1550 1550 """
1551 1551 if rev:
1552 1552 try:
1553 1553 # assume all revision numbers are for changesets
1554 1554 n = repo.lookup(rev)
1555 1555 change = repo.changelog.read(n)
1556 1556 n = change[0]
1557 1557 except hg.RepoError:
1558 1558 n = repo.manifest.lookup(rev)
1559 1559 else:
1560 1560 n = repo.manifest.tip()
1561 1561 m = repo.manifest.read(n)
1562 1562 mf = repo.manifest.readflags(n)
1563 1563 files = m.keys()
1564 1564 files.sort()
1565 1565
1566 1566 for f in files:
1567 1567 ui.write("%40s %3s %s\n" % (hex(m[f]), mf[f] and "755" or "644", f))
1568 1568
1569 1569 def outgoing(ui, repo, dest="default-push", **opts):
1570 1570 """show changesets not found in destination
1571 1571
1572 1572 Show changesets not found in the specified destination repo or the
1573 1573 default push repo. These are the changesets that would be pushed
1574 1574 if a push was requested.
1575 1575 """
1576 1576 dest = ui.expandpath(dest, repo.root)
1577 1577 other = hg.repository(ui, dest)
1578 1578 o = repo.findoutgoing(other)
1579 1579 o = repo.changelog.nodesbetween(o)[0]
1580 1580 if opts['newest_first']:
1581 1581 o.reverse()
1582 1582 for n in o:
1583 1583 parents = [p for p in repo.changelog.parents(n) if p != nullid]
1584 1584 if opts['no_merges'] and len(parents) == 2:
1585 1585 continue
1586 1586 show_changeset(ui, repo, changenode=n)
1587 1587 if opts['patch']:
1588 1588 prev = (parents and parents[0]) or nullid
1589 1589 dodiff(ui, ui, repo, prev, n)
1590 1590 ui.write("\n")
1591 1591
1592 1592 def parents(ui, repo, rev=None):
1593 1593 """show the parents of the working dir or revision
1594 1594
1595 1595 Print the working directory's parent revisions.
1596 1596 """
1597 1597 if rev:
1598 1598 p = repo.changelog.parents(repo.lookup(rev))
1599 1599 else:
1600 1600 p = repo.dirstate.parents()
1601 1601
1602 1602 for n in p:
1603 1603 if n != nullid:
1604 1604 show_changeset(ui, repo, changenode=n)
1605 1605
1606 1606 def paths(ui, search=None):
1607 1607 """show definition of symbolic path names
1608 1608
1609 1609 Show definition of symbolic path name NAME. If no name is given, show
1610 1610 definition of available names.
1611 1611
1612 1612 Path names are defined in the [paths] section of /etc/mercurial/hgrc
1613 1613 and $HOME/.hgrc. If run inside a repository, .hg/hgrc is used, too.
1614 1614 """
1615 1615 try:
1616 1616 repo = hg.repository(ui=ui)
1617 1617 except hg.RepoError:
1618 1618 pass
1619 1619
1620 1620 if search:
1621 1621 for name, path in ui.configitems("paths"):
1622 1622 if name == search:
1623 1623 ui.write("%s\n" % path)
1624 1624 return
1625 1625 ui.warn(_("not found!\n"))
1626 1626 return 1
1627 1627 else:
1628 1628 for name, path in ui.configitems("paths"):
1629 1629 ui.write("%s = %s\n" % (name, path))
1630 1630
1631 1631 def pull(ui, repo, source="default", **opts):
1632 1632 """pull changes from the specified source
1633 1633
1634 1634 Pull changes from a remote repository to a local one.
1635 1635
1636 1636 This finds all changes from the repository at the specified path
1637 1637 or URL and adds them to the local repository. By default, this
1638 1638 does not update the copy of the project in the working directory.
1639 1639
1640 1640 Valid URLs are of the form:
1641 1641
1642 1642 local/filesystem/path
1643 1643 http://[user@]host[:port][/path]
1644 1644 https://[user@]host[:port][/path]
1645 1645 ssh://[user@]host[:port][/path]
1646 1646
1647 1647 SSH requires an accessible shell account on the destination machine
1648 1648 and a copy of hg in the remote path. With SSH, paths are relative
1649 1649 to the remote user's home directory by default; use two slashes at
1650 1650 the start of a path to specify it as relative to the filesystem root.
1651 1651 """
1652 1652 source = ui.expandpath(source, repo.root)
1653 1653 ui.status(_('pulling from %s\n') % (source))
1654 1654
1655 1655 if opts['ssh']:
1656 1656 ui.setconfig("ui", "ssh", opts['ssh'])
1657 1657 if opts['remotecmd']:
1658 1658 ui.setconfig("ui", "remotecmd", opts['remotecmd'])
1659 1659
1660 1660 other = hg.repository(ui, source)
1661 1661 revs = None
1662 1662 if opts['rev'] and not other.local():
1663 1663 raise util.Abort("pull -r doesn't work for remote repositories yet")
1664 1664 elif opts['rev']:
1665 1665 revs = [other.lookup(rev) for rev in opts['rev']]
1666 1666 r = repo.pull(other, heads=revs)
1667 1667 if not r:
1668 1668 if opts['update']:
1669 1669 return update(ui, repo)
1670 1670 else:
1671 1671 ui.status(_("(run 'hg update' to get a working copy)\n"))
1672 1672
1673 1673 return r
1674 1674
1675 1675 def push(ui, repo, dest="default-push", force=False, ssh=None, remotecmd=None):
1676 1676 """push changes to the specified destination
1677 1677
1678 1678 Push changes from the local repository to the given destination.
1679 1679
1680 1680 This is the symmetrical operation for pull. It helps to move
1681 1681 changes from the current repository to a different one. If the
1682 1682 destination is local this is identical to a pull in that directory
1683 1683 from the current one.
1684 1684
1685 1685 By default, push will refuse to run if it detects the result would
1686 1686 increase the number of remote heads. This generally indicates the
1687 1687 the client has forgotten to sync and merge before pushing.
1688 1688
1689 1689 Valid URLs are of the form:
1690 1690
1691 1691 local/filesystem/path
1692 1692 ssh://[user@]host[:port][/path]
1693 1693
1694 1694 SSH requires an accessible shell account on the destination
1695 1695 machine and a copy of hg in the remote path.
1696 1696 """
1697 1697 dest = ui.expandpath(dest, repo.root)
1698 1698 ui.status('pushing to %s\n' % (dest))
1699 1699
1700 1700 if ssh:
1701 1701 ui.setconfig("ui", "ssh", ssh)
1702 1702 if remotecmd:
1703 1703 ui.setconfig("ui", "remotecmd", remotecmd)
1704 1704
1705 1705 other = hg.repository(ui, dest)
1706 1706 r = repo.push(other, force)
1707 1707 return r
1708 1708
1709 1709 def rawcommit(ui, repo, *flist, **rc):
1710 1710 """raw commit interface
1711 1711
1712 1712 Lowlevel commit, for use in helper scripts.
1713 1713
1714 1714 This command is not intended to be used by normal users, as it is
1715 1715 primarily useful for importing from other SCMs.
1716 1716 """
1717 1717 message = rc['message']
1718 1718 if not message and rc['logfile']:
1719 1719 try:
1720 1720 message = open(rc['logfile']).read()
1721 1721 except IOError:
1722 1722 pass
1723 1723 if not message and not rc['logfile']:
1724 1724 raise util.Abort(_("missing commit message"))
1725 1725
1726 1726 files = relpath(repo, list(flist))
1727 1727 if rc['files']:
1728 1728 files += open(rc['files']).read().splitlines()
1729 1729
1730 1730 rc['parent'] = map(repo.lookup, rc['parent'])
1731 1731
1732 1732 try:
1733 1733 repo.rawcommit(files, message, rc['user'], rc['date'], *rc['parent'])
1734 1734 except ValueError, inst:
1735 1735 raise util.Abort(str(inst))
1736 1736
1737 1737 def recover(ui, repo):
1738 1738 """roll back an interrupted transaction
1739 1739
1740 1740 Recover from an interrupted commit or pull.
1741 1741
1742 1742 This command tries to fix the repository status after an interrupted
1743 1743 operation. It should only be necessary when Mercurial suggests it.
1744 1744 """
1745 1745 if repo.recover():
1746 1746 return repo.verify()
1747 1747 return False
1748 1748
1749 1749 def remove(ui, repo, pat, *pats, **opts):
1750 1750 """remove the specified files on the next commit
1751 1751
1752 1752 Schedule the indicated files for removal from the repository.
1753 1753
1754 1754 This command schedules the files to be removed at the next commit.
1755 1755 This only removes files from the current branch, not from the
1756 1756 entire project history. If the files still exist in the working
1757 1757 directory, they will be deleted from it.
1758 1758 """
1759 1759 names = []
1760 1760 def okaytoremove(abs, rel, exact):
1761 1761 c, a, d, u = repo.changes(files = [abs])
1762 1762 reason = None
1763 1763 if c: reason = _('is modified')
1764 1764 elif a: reason = _('has been marked for add')
1765 1765 elif u: reason = _('is not managed')
1766 1766 if reason:
1767 1767 if exact: ui.warn(_('not removing %s: file %s\n') % (rel, reason))
1768 1768 else:
1769 1769 return True
1770 1770 for src, abs, rel, exact in walk(repo, (pat,) + pats, opts):
1771 1771 if okaytoremove(abs, rel, exact):
1772 1772 if ui.verbose or not exact: ui.status(_('removing %s\n') % rel)
1773 1773 names.append(abs)
1774 1774 repo.remove(names, unlink=True)
1775 1775
1776 1776 def rename(ui, repo, *pats, **opts):
1777 1777 """rename files; equivalent of copy + remove
1778 1778
1779 1779 Mark dest as copies of sources; mark sources for deletion. If
1780 1780 dest is a directory, copies are put in that directory. If dest is
1781 1781 a file, there can only be one source.
1782 1782
1783 1783 By default, this command copies the contents of files as they
1784 1784 stand in the working directory. If invoked with --after, the
1785 1785 operation is recorded, but no copying is performed.
1786 1786
1787 1787 This command takes effect in the next commit.
1788 1788
1789 1789 NOTE: This command should be treated as experimental. While it
1790 1790 should properly record rename files, this information is not yet
1791 1791 fully used by merge, nor fully reported by log.
1792 1792 """
1793 1793 errs, copied = docopy(ui, repo, pats, opts)
1794 1794 names = []
1795 1795 for abs, rel, exact in copied:
1796 1796 if ui.verbose or not exact: ui.status(_('removing %s\n') % rel)
1797 1797 names.append(abs)
1798 1798 repo.remove(names, unlink=True)
1799 1799 return errs
1800 1800
1801 1801 def revert(ui, repo, *pats, **opts):
1802 1802 """revert modified files or dirs back to their unmodified states
1803 1803
1804 1804 Revert any uncommitted modifications made to the named files or
1805 1805 directories. This restores the contents of the affected files to
1806 1806 an unmodified state.
1807 1807
1808 1808 If a file has been deleted, it is recreated. If the executable
1809 1809 mode of a file was changed, it is reset.
1810 1810
1811 1811 If names are given, all files matching the names are reverted.
1812 1812
1813 1813 If no names are given, all files in the current directory and
1814 1814 its subdirectories are reverted.
1815 1815 """
1816 1816 node = opts['rev'] and repo.lookup(opts['rev']) or \
1817 1817 repo.dirstate.parents()[0]
1818 1818
1819 1819 files, choose, anypats = matchpats(repo, repo.getcwd(), pats, opts)
1820 1820 (c, a, d, u) = repo.changes(match=choose)
1821 1821 repo.forget(a)
1822 1822 repo.undelete(d)
1823 1823
1824 1824 return repo.update(node, False, True, choose, False)
1825 1825
1826 1826 def root(ui, repo):
1827 1827 """print the root (top) of the current working dir
1828 1828
1829 1829 Print the root directory of the current repository.
1830 1830 """
1831 1831 ui.write(repo.root + "\n")
1832 1832
1833 1833 def serve(ui, repo, **opts):
1834 1834 """export the repository via HTTP
1835 1835
1836 1836 Start a local HTTP repository browser and pull server.
1837 1837
1838 1838 By default, the server logs accesses to stdout and errors to
1839 1839 stderr. Use the "-A" and "-E" options to log to files.
1840 1840 """
1841 1841
1842 1842 if opts["stdio"]:
1843 1843 fin, fout = sys.stdin, sys.stdout
1844 1844 sys.stdout = sys.stderr
1845 1845
1846 1846 # Prevent insertion/deletion of CRs
1847 1847 util.set_binary(fin)
1848 1848 util.set_binary(fout)
1849 1849
1850 1850 def getarg():
1851 1851 argline = fin.readline()[:-1]
1852 1852 arg, l = argline.split()
1853 1853 val = fin.read(int(l))
1854 1854 return arg, val
1855 1855 def respond(v):
1856 1856 fout.write("%d\n" % len(v))
1857 1857 fout.write(v)
1858 1858 fout.flush()
1859 1859
1860 1860 lock = None
1861 1861
1862 1862 while 1:
1863 1863 cmd = fin.readline()[:-1]
1864 1864 if cmd == '':
1865 1865 return
1866 1866 if cmd == "heads":
1867 1867 h = repo.heads()
1868 1868 respond(" ".join(map(hex, h)) + "\n")
1869 1869 if cmd == "lock":
1870 1870 lock = repo.lock()
1871 1871 respond("")
1872 1872 if cmd == "unlock":
1873 1873 if lock:
1874 1874 lock.release()
1875 1875 lock = None
1876 1876 respond("")
1877 1877 elif cmd == "branches":
1878 1878 arg, nodes = getarg()
1879 1879 nodes = map(bin, nodes.split(" "))
1880 1880 r = []
1881 1881 for b in repo.branches(nodes):
1882 1882 r.append(" ".join(map(hex, b)) + "\n")
1883 1883 respond("".join(r))
1884 1884 elif cmd == "between":
1885 1885 arg, pairs = getarg()
1886 1886 pairs = [map(bin, p.split("-")) for p in pairs.split(" ")]
1887 1887 r = []
1888 1888 for b in repo.between(pairs):
1889 1889 r.append(" ".join(map(hex, b)) + "\n")
1890 1890 respond("".join(r))
1891 1891 elif cmd == "changegroup":
1892 1892 nodes = []
1893 1893 arg, roots = getarg()
1894 1894 nodes = map(bin, roots.split(" "))
1895 1895
1896 1896 cg = repo.changegroup(nodes)
1897 1897 while 1:
1898 1898 d = cg.read(4096)
1899 1899 if not d:
1900 1900 break
1901 1901 fout.write(d)
1902 1902
1903 1903 fout.flush()
1904 1904
1905 1905 elif cmd == "addchangegroup":
1906 1906 if not lock:
1907 1907 respond("not locked")
1908 1908 continue
1909 1909 respond("")
1910 1910
1911 1911 r = repo.addchangegroup(fin)
1912 1912 respond("")
1913 1913
1914 1914 optlist = "name templates style address port ipv6 accesslog errorlog"
1915 1915 for o in optlist.split():
1916 1916 if opts[o]:
1917 1917 ui.setconfig("web", o, opts[o])
1918 1918
1919 1919 try:
1920 1920 httpd = hgweb.create_server(repo)
1921 1921 except socket.error, inst:
1922 1922 raise util.Abort('cannot start server: ' + inst.args[1])
1923 1923
1924 1924 if ui.verbose:
1925 1925 addr, port = httpd.socket.getsockname()
1926 1926 if addr == '0.0.0.0':
1927 1927 addr = socket.gethostname()
1928 1928 else:
1929 1929 try:
1930 1930 addr = socket.gethostbyaddr(addr)[0]
1931 1931 except socket.error:
1932 1932 pass
1933 1933 if port != 80:
1934 1934 ui.status(_('listening at http://%s:%d/\n') % (addr, port))
1935 1935 else:
1936 1936 ui.status(_('listening at http://%s/\n') % addr)
1937 1937 httpd.serve_forever()
1938 1938
1939 1939 def status(ui, repo, *pats, **opts):
1940 1940 """show changed files in the working directory
1941 1941
1942 1942 Show changed files in the working directory. If no names are
1943 1943 given, all files are shown. Otherwise, only files matching the
1944 1944 given names are shown.
1945 1945
1946 1946 The codes used to show the status of files are:
1947 1947 M = modified
1948 1948 A = added
1949 1949 R = removed
1950 1950 ? = not tracked
1951 1951 """
1952 1952
1953 1953 cwd = repo.getcwd()
1954 1954 files, matchfn, anypats = matchpats(repo, cwd, pats, opts)
1955 1955 (c, a, d, u) = [[util.pathto(cwd, x) for x in n]
1956 1956 for n in repo.changes(files=files, match=matchfn)]
1957 1957
1958 1958 changetypes = [(_('modified'), 'M', c),
1959 1959 (_('added'), 'A', a),
1960 1960 (_('removed'), 'R', d),
1961 1961 (_('unknown'), '?', u)]
1962 1962
1963 1963 end = opts['print0'] and '\0' or '\n'
1964 1964
1965 1965 for opt, char, changes in ([ct for ct in changetypes if opts[ct[0]]]
1966 1966 or changetypes):
1967 1967 if opts['no_status']:
1968 1968 format = "%%s%s" % end
1969 1969 else:
1970 1970 format = "%s %%s%s" % (char, end);
1971 1971
1972 1972 for f in changes:
1973 1973 ui.write(format % f)
1974 1974
1975 1975 def tag(ui, repo, name, rev=None, **opts):
1976 1976 """add a tag for the current tip or a given revision
1977 1977
1978 1978 Name a particular revision using <name>.
1979 1979
1980 1980 Tags are used to name particular revisions of the repository and are
1981 1981 very useful to compare different revision, to go back to significant
1982 1982 earlier versions or to mark branch points as releases, etc.
1983 1983
1984 1984 If no revision is given, the tip is used.
1985 1985
1986 1986 To facilitate version control, distribution, and merging of tags,
1987 1987 they are stored as a file named ".hgtags" which is managed
1988 1988 similarly to other project files and can be hand-edited if
1989 1989 necessary.
1990 1990 """
1991 1991 if name == "tip":
1992 1992 raise util.Abort(_("the name 'tip' is reserved"))
1993 1993 if 'rev' in opts:
1994 1994 rev = opts['rev']
1995 1995 if rev:
1996 1996 r = hex(repo.lookup(rev))
1997 1997 else:
1998 1998 r = hex(repo.changelog.tip())
1999 1999
2000 2000 if name.find(revrangesep) >= 0:
2001 2001 raise util.Abort(_("'%s' cannot be used in a tag name") % revrangesep)
2002 2002
2003 2003 if opts['local']:
2004 2004 repo.opener("localtags", "a").write("%s %s\n" % (r, name))
2005 2005 return
2006 2006
2007 2007 (c, a, d, u) = repo.changes()
2008 2008 for x in (c, a, d, u):
2009 2009 if ".hgtags" in x:
2010 2010 raise util.Abort(_("working copy of .hgtags is changed "
2011 2011 "(please commit .hgtags manually)"))
2012 2012
2013 2013 repo.wfile(".hgtags", "ab").write("%s %s\n" % (r, name))
2014 2014 if repo.dirstate.state(".hgtags") == '?':
2015 2015 repo.add([".hgtags"])
2016 2016
2017 2017 message = (opts['message'] or
2018 2018 _("Added tag %s for changeset %s") % (name, r))
2019 2019 try:
2020 2020 repo.commit([".hgtags"], message, opts['user'], opts['date'])
2021 2021 except ValueError, inst:
2022 2022 raise util.Abort(str(inst))
2023 2023
2024 2024 def tags(ui, repo):
2025 2025 """list repository tags
2026 2026
2027 2027 List the repository tags.
2028 2028
2029 2029 This lists both regular and local tags.
2030 2030 """
2031 2031
2032 2032 l = repo.tagslist()
2033 2033 l.reverse()
2034 2034 for t, n in l:
2035 2035 try:
2036 2036 r = "%5d:%s" % (repo.changelog.rev(n), hex(n))
2037 2037 except KeyError:
2038 2038 r = " ?:?"
2039 2039 ui.write("%-30s %s\n" % (t, r))
2040 2040
2041 2041 def tip(ui, repo):
2042 2042 """show the tip revision
2043 2043
2044 2044 Show the tip revision.
2045 2045 """
2046 2046 n = repo.changelog.tip()
2047 2047 show_changeset(ui, repo, changenode=n)
2048 2048
2049 2049 def unbundle(ui, repo, fname):
2050 2050 """apply a changegroup file
2051 2051
2052 2052 Apply a compressed changegroup file generated by the bundle
2053 2053 command.
2054 2054 """
2055 2055 f = urllib.urlopen(fname)
2056 2056
2057 2057 if f.read(4) != "HG10":
2058 2058 raise util.Abort(_("%s: not a Mercurial bundle file") % fname)
2059 2059
2060 2060 def bzgenerator(f):
2061 2061 zd = bz2.BZ2Decompressor()
2062 2062 for chunk in f:
2063 2063 yield zd.decompress(chunk)
2064 2064
2065 2065 bzgen = bzgenerator(util.filechunkiter(f, 4096))
2066 2066 repo.addchangegroup(util.chunkbuffer(bzgen))
2067 2067
2068 2068 def undo(ui, repo):
2069 2069 """undo the last commit or pull
2070 2070
2071 2071 Roll back the last pull or commit transaction on the
2072 2072 repository, restoring the project to its earlier state.
2073 2073
2074 2074 This command should be used with care. There is only one level of
2075 2075 undo and there is no redo.
2076 2076
2077 2077 This command is not intended for use on public repositories. Once
2078 2078 a change is visible for pull by other users, undoing it locally is
2079 2079 ineffective.
2080 2080 """
2081 2081 repo.undo()
2082 2082
2083 2083 def update(ui, repo, node=None, merge=False, clean=False, branch=None):
2084 2084 """update or merge working directory
2085 2085
2086 2086 Update the working directory to the specified revision.
2087 2087
2088 2088 If there are no outstanding changes in the working directory and
2089 2089 there is a linear relationship between the current version and the
2090 2090 requested version, the result is the requested version.
2091 2091
2092 2092 Otherwise the result is a merge between the contents of the
2093 2093 current working directory and the requested version. Files that
2094 2094 changed between either parent are marked as changed for the next
2095 2095 commit and a commit must be performed before any further updates
2096 2096 are allowed.
2097 2097
2098 2098 By default, update will refuse to run if doing so would require
2099 2099 merging or discarding local changes.
2100 2100 """
2101 2101 if branch:
2102 2102 br = repo.branchlookup(branch=branch)
2103 2103 found = []
2104 2104 for x in br:
2105 2105 if branch in br[x]:
2106 2106 found.append(x)
2107 2107 if len(found) > 1:
2108 2108 ui.warn(_("Found multiple heads for %s\n") % branch)
2109 2109 for x in found:
2110 2110 show_changeset(ui, repo, changenode=x, brinfo=br)
2111 2111 return 1
2112 2112 if len(found) == 1:
2113 2113 node = found[0]
2114 2114 ui.warn(_("Using head %s for branch %s\n") % (short(node), branch))
2115 2115 else:
2116 2116 ui.warn(_("branch %s not found\n") % (branch))
2117 2117 return 1
2118 2118 else:
2119 2119 node = node and repo.lookup(node) or repo.changelog.tip()
2120 2120 return repo.update(node, allow=merge, force=clean)
2121 2121
2122 2122 def verify(ui, repo):
2123 2123 """verify the integrity of the repository
2124 2124
2125 2125 Verify the integrity of the current repository.
2126 2126
2127 2127 This will perform an extensive check of the repository's
2128 2128 integrity, validating the hashes and checksums of each entry in
2129 2129 the changelog, manifest, and tracked files, as well as the
2130 2130 integrity of their crosslinks and indices.
2131 2131 """
2132 2132 return repo.verify()
2133 2133
2134 2134 # Command options and aliases are listed here, alphabetically
2135 2135
2136 2136 table = {
2137 2137 "^add":
2138 2138 (add,
2139 2139 [('I', 'include', [], _('include names matching the given patterns')),
2140 2140 ('X', 'exclude', [], _('exclude names matching the given patterns'))],
2141 2141 "hg add [OPTION]... [FILE]..."),
2142 2142 "addremove":
2143 2143 (addremove,
2144 2144 [('I', 'include', [], _('include names matching the given patterns')),
2145 2145 ('X', 'exclude', [], _('exclude names matching the given patterns'))],
2146 2146 "hg addremove [OPTION]... [FILE]..."),
2147 2147 "^annotate":
2148 2148 (annotate,
2149 2149 [('r', 'rev', '', _('annotate the specified revision')),
2150 2150 ('a', 'text', None, _('treat all files as text')),
2151 2151 ('u', 'user', None, _('list the author')),
2152 2152 ('d', 'date', None, _('list the date')),
2153 2153 ('n', 'number', None, _('list the revision number (default)')),
2154 2154 ('c', 'changeset', None, _('list the changeset')),
2155 2155 ('I', 'include', [], _('include names matching the given patterns')),
2156 2156 ('X', 'exclude', [], _('exclude names matching the given patterns'))],
2157 2157 _('hg annotate [OPTION]... FILE...')),
2158 2158 "bundle":
2159 2159 (bundle,
2160 2160 [],
2161 2161 _('hg bundle FILE DEST')),
2162 2162 "cat":
2163 2163 (cat,
2164 2164 [('I', 'include', [], _('include names matching the given patterns')),
2165 2165 ('X', 'exclude', [], _('exclude names matching the given patterns')),
2166 2166 ('o', 'output', "", _('print output to file with formatted name')),
2167 2167 ('r', 'rev', '', _('print the given revision'))],
2168 2168 _('hg cat [OPTION]... FILE...')),
2169 2169 "^clone":
2170 2170 (clone,
2171 2171 [('U', 'noupdate', None, _('do not update the new working directory')),
2172 2172 ('e', 'ssh', "", _('specify ssh command to use')),
2173 2173 ('', 'pull', None, _('use pull protocol to copy metadata')),
2174 2174 ('r', 'rev', [], _('a changeset you would like to have after cloning')),
2175 2175 ('', 'remotecmd', "", _('specify hg command to run on the remote side'))],
2176 2176 _('hg clone [OPTION]... SOURCE [DEST]')),
2177 2177 "^commit|ci":
2178 2178 (commit,
2179 2179 [('A', 'addremove', None, _('run addremove during commit')),
2180 2180 ('I', 'include', [], _('include names matching the given patterns')),
2181 2181 ('X', 'exclude', [], _('exclude names matching the given patterns')),
2182 2182 ('m', 'message', "", _('use <text> as commit message')),
2183 2183 ('l', 'logfile', "", _('read the commit message from <file>')),
2184 2184 ('d', 'date', "", _('record datecode as commit date')),
2185 2185 ('u', 'user', "", _('record user as commiter'))],
2186 2186 _('hg commit [OPTION]... [FILE]...')),
2187 2187 "copy|cp": (copy,
2188 2188 [('I', 'include', [], _('include names matching the given patterns')),
2189 2189 ('X', 'exclude', [], _('exclude names matching the given patterns')),
2190 2190 ('A', 'after', None, _('record a copy that has already occurred')),
2191 2191 ('f', 'force', None, _('forcibly copy over an existing managed file'))],
2192 2192 _('hg copy [OPTION]... [SOURCE]... DEST')),
2193 2193 "debugancestor": (debugancestor, [], _('debugancestor INDEX REV1 REV2')),
2194 2194 "debugcheckstate": (debugcheckstate, [], _('debugcheckstate')),
2195 2195 "debugconfig": (debugconfig, [], _('debugconfig')),
2196 2196 "debugsetparents": (debugsetparents, [], _('debugsetparents REV1 [REV2]')),
2197 2197 "debugstate": (debugstate, [], _('debugstate')),
2198 2198 "debugdata": (debugdata, [], _('debugdata FILE REV')),
2199 2199 "debugindex": (debugindex, [], _('debugindex FILE')),
2200 2200 "debugindexdot": (debugindexdot, [], _('debugindexdot FILE')),
2201 2201 "debugrename": (debugrename, [], _('debugrename FILE [REV]')),
2202 2202 "debugwalk":
2203 2203 (debugwalk,
2204 2204 [('I', 'include', [], _('include names matching the given patterns')),
2205 2205 ('X', 'exclude', [], _('exclude names matching the given patterns'))],
2206 2206 _('debugwalk [OPTION]... [FILE]...')),
2207 2207 "^diff":
2208 2208 (diff,
2209 2209 [('r', 'rev', [], _('revision')),
2210 2210 ('a', 'text', None, _('treat all files as text')),
2211 2211 ('I', 'include', [], _('include names matching the given patterns')),
2212 2212 ('X', 'exclude', [], _('exclude names matching the given patterns'))],
2213 2213 _('hg diff [-a] [-I] [-X] [-r REV1 [-r REV2]] [FILE]...')),
2214 2214 "^export":
2215 2215 (export,
2216 2216 [('o', 'output', "", _('print output to file with formatted name')),
2217 2217 ('a', 'text', None, _('treat all files as text'))],
2218 2218 "hg export [-a] [-o OUTFILE] REV..."),
2219 2219 "forget":
2220 2220 (forget,
2221 2221 [('I', 'include', [], _('include names matching the given patterns')),
2222 2222 ('X', 'exclude', [], _('exclude names matching the given patterns'))],
2223 2223 "hg forget [OPTION]... FILE..."),
2224 2224 "grep":
2225 2225 (grep,
2226 2226 [('0', 'print0', None, _('end fields with NUL')),
2227 2227 ('I', 'include', [], _('include names matching the given patterns')),
2228 2228 ('X', 'exclude', [], _('exclude names matching the given patterns')),
2229 2229 ('', 'all', None, _('print all revisions that match')),
2230 2230 ('i', 'ignore-case', None, _('ignore case when matching')),
2231 2231 ('l', 'files-with-matches', None, _('print only filenames and revs that match')),
2232 2232 ('n', 'line-number', None, _('print matching line numbers')),
2233 2233 ('r', 'rev', [], _('search in given revision range')),
2234 2234 ('u', 'user', None, _('print user who committed change'))],
2235 2235 "hg grep [OPTION]... PATTERN [FILE]..."),
2236 2236 "heads":
2237 2237 (heads,
2238 2238 [('b', 'branches', None, _('find branch info'))],
2239 2239 _('hg heads [-b]')),
2240 2240 "help": (help_, [], _('hg help [COMMAND]')),
2241 2241 "identify|id": (identify, [], _('hg identify')),
2242 2242 "import|patch":
2243 2243 (import_,
2244 2244 [('p', 'strip', 1, _('directory strip option for patch. This has the same\n') +
2245 2245 _('meaning as the corresponding patch option')),
2246 2246 ('f', 'force', None, _('skip check for outstanding uncommitted changes')),
2247 2247 ('b', 'base', "", _('base path'))],
2248 2248 "hg import [-f] [-p NUM] [-b BASE] PATCH..."),
2249 2249 "incoming|in": (incoming,
2250 2250 [('M', 'no-merges', None, _("do not show merges")),
2251 2251 ('p', 'patch', None, _('show patch')),
2252 2252 ('n', 'newest-first', None, _('show newest record first'))],
2253 2253 _('hg incoming [-p] [-n] [-M] [SOURCE]')),
2254 2254 "^init": (init, [], _('hg init [DEST]')),
2255 2255 "locate":
2256 2256 (locate,
2257 2257 [('r', 'rev', '', _('search the repository as it stood at rev')),
2258 2258 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
2259 2259 ('f', 'fullpath', None, _('print complete paths from the filesystem root')),
2260 2260 ('I', 'include', [], _('include names matching the given patterns')),
2261 2261 ('X', 'exclude', [], _('exclude names matching the given patterns'))],
2262 2262 _('hg locate [OPTION]... [PATTERN]...')),
2263 2263 "^log|history":
2264 2264 (log,
2265 2265 [('I', 'include', [], _('include names matching the given patterns')),
2266 2266 ('X', 'exclude', [], _('exclude names matching the given patterns')),
2267 2267 ('b', 'branch', None, _('show branches')),
2268 2268 ('k', 'keyword', [], _('search for a keyword')),
2269 2269 ('r', 'rev', [], _('show the specified revision or range')),
2270 2270 ('M', 'no-merges', None, _("do not show merges")),
2271 2271 ('m', 'only-merges', None, _("show only merges")),
2272 2272 ('p', 'patch', None, _('show patch'))],
2273 2273 _('hg log [-I] [-X] [-r REV]... [-p] [FILE]')),
2274 2274 "manifest": (manifest, [], _('hg manifest [REV]')),
2275 2275 "outgoing|out": (outgoing,
2276 2276 [('M', 'no-merges', None, _("do not show merges")),
2277 2277 ('p', 'patch', None, _('show patch')),
2278 2278 ('n', 'newest-first', None, _('show newest record first'))],
2279 2279 _('hg outgoing [-p] [-n] [-M] [DEST]')),
2280 2280 "^parents": (parents, [], _('hg parents [REV]')),
2281 2281 "paths": (paths, [], _('hg paths [NAME]')),
2282 2282 "^pull":
2283 2283 (pull,
2284 2284 [('u', 'update', None, _('update the working directory to tip after pull')),
2285 2285 ('e', 'ssh', "", _('specify ssh command to use')),
2286 2286 ('r', 'rev', [], _('a specific revision you would like to pull')),
2287 2287 ('', 'remotecmd', "", _('specify hg command to run on the remote side'))],
2288 2288 _('hg pull [-u] [-e FILE] [-r rev] [--remotecmd FILE] [SOURCE]')),
2289 2289 "^push":
2290 2290 (push,
2291 2291 [('f', 'force', None, _('force push')),
2292 2292 ('e', 'ssh', "", _('specify ssh command to use')),
2293 2293 ('', 'remotecmd', "", _('specify hg command to run on the remote side'))],
2294 2294 _('hg push [-f] [-e FILE] [--remotecmd FILE] [DEST]')),
2295 2295 "rawcommit":
2296 2296 (rawcommit,
2297 2297 [('p', 'parent', [], _('parent')),
2298 2298 ('d', 'date', "", _('date code')),
2299 2299 ('u', 'user', "", _('user')),
2300 2300 ('F', 'files', "", _('file list')),
2301 2301 ('m', 'message', "", _('commit message')),
2302 2302 ('l', 'logfile', "", _('commit message file'))],
2303 2303 _('hg rawcommit [OPTION]... [FILE]...')),
2304 2304 "recover": (recover, [], _("hg recover")),
2305 2305 "^remove|rm": (remove,
2306 2306 [('I', 'include', [], _('include names matching the given patterns')),
2307 2307 ('X', 'exclude', [], _('exclude names matching the given patterns'))],
2308 2308 _("hg remove [OPTION]... FILE...")),
2309 2309 "rename|mv": (rename,
2310 2310 [('I', 'include', [], _('include names matching the given patterns')),
2311 2311 ('X', 'exclude', [], _('exclude names matching the given patterns')),
2312 2312 ('A', 'after', None, _('record a rename that has already occurred')),
2313 2313 ('f', 'force', None, _('forcibly copy over an existing managed file'))],
2314 2314 _('hg rename [OPTION]... [SOURCE]... DEST')),
2315 2315 "^revert":
2316 2316 (revert,
2317 2317 [('I', 'include', [], _('include names matching the given patterns')),
2318 2318 ('X', 'exclude', [], _('exclude names matching the given patterns')),
2319 2319 ("r", "rev", "", _("revision to revert to"))],
2320 2320 _("hg revert [-n] [-r REV] [NAME]...")),
2321 2321 "root": (root, [], _("hg root")),
2322 2322 "^serve":
2323 2323 (serve,
2324 2324 [('A', 'accesslog', '', _('name of access log file to write to')),
2325 2325 ('E', 'errorlog', '', _('name of error log file to write to')),
2326 2326 ('p', 'port', 0, _('port to use (default: 8000)')),
2327 2327 ('a', 'address', '', _('address to use')),
2328 2328 ('n', 'name', "", _('name to show in web pages (default: working dir)')),
2329 2329 ('', 'stdio', None, _('for remote clients')),
2330 2330 ('t', 'templates', "", _('web templates to use')),
2331 2331 ('', 'style', "", _('template style to use')),
2332 2332 ('6', 'ipv6', None, _('use IPv6 in addition to IPv4'))],
2333 2333 _("hg serve [OPTION]...")),
2334 2334 "^status|st":
2335 2335 (status,
2336 2336 [('m', 'modified', None, _('show only modified files')),
2337 2337 ('a', 'added', None, _('show only added files')),
2338 2338 ('r', 'removed', None, _('show only removed files')),
2339 2339 ('u', 'unknown', None, _('show only unknown (not tracked) files')),
2340 2340 ('n', 'no-status', None, _('hide status prefix')),
2341 2341 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
2342 2342 ('I', 'include', [], _('include names matching the given patterns')),
2343 2343 ('X', 'exclude', [], _('exclude names matching the given patterns'))],
2344 2344 _("hg status [OPTION]... [FILE]...")),
2345 2345 "tag":
2346 2346 (tag,
2347 2347 [('l', 'local', None, _('make the tag local')),
2348 2348 ('m', 'message', "", _('message for tag commit log entry')),
2349 2349 ('d', 'date', "", _('record datecode as commit date')),
2350 2350 ('u', 'user', "", _('record user as commiter')),
2351 2351 ('r', 'rev', "", _('revision to tag'))],
2352 2352 _('hg tag [OPTION]... NAME [REV]')),
2353 2353 "tags": (tags, [], _('hg tags')),
2354 2354 "tip": (tip, [], _('hg tip')),
2355 2355 "unbundle":
2356 2356 (unbundle,
2357 2357 [],
2358 2358 _('hg unbundle FILE')),
2359 2359 "undo": (undo, [], _('hg undo')),
2360 2360 "^update|up|checkout|co":
2361 2361 (update,
2362 2362 [('b', 'branch', "", _('checkout the head of a specific branch')),
2363 2363 ('m', 'merge', None, _('allow merging of branches')),
2364 2364 ('C', 'clean', None, _('overwrite locally modified files'))],
2365 2365 _('hg update [-b TAG] [-m] [-C] [REV]')),
2366 2366 "verify": (verify, [], _('hg verify')),
2367 2367 "version": (show_version, [], _('hg version')),
2368 2368 }
2369 2369
2370 2370 globalopts = [
2371 2371 ('R', 'repository', "", _("repository root directory")),
2372 2372 ('', 'cwd', '', _("change working directory")),
2373 2373 ('y', 'noninteractive', None, _("do not prompt, assume 'yes' for any required answers")),
2374 2374 ('q', 'quiet', None, _("suppress output")),
2375 2375 ('v', 'verbose', None, _("enable additional output")),
2376 2376 ('', 'debug', None, _("enable debugging output")),
2377 2377 ('', 'debugger', None, _("start debugger")),
2378 2378 ('', 'traceback', None, _("print traceback on exception")),
2379 2379 ('', 'time', None, _("time how long the command takes")),
2380 2380 ('', 'profile', None, _("print command execution profile")),
2381 2381 ('', 'version', None, _("output version information and exit")),
2382 2382 ('h', 'help', None, _("display help and exit")),
2383 2383 ]
2384 2384
2385 2385 norepo = ("clone init version help debugancestor debugconfig debugdata"
2386 2386 " debugindex debugindexdot paths")
2387 2387
2388 2388 def find(cmd):
2389 2389 """Return (aliases, command table entry) for command string."""
2390 2390 choice = None
2391 2391 for e in table.keys():
2392 2392 aliases = e.lstrip("^").split("|")
2393 2393 if cmd in aliases:
2394 2394 return aliases, table[e]
2395 2395 for a in aliases:
2396 2396 if a.startswith(cmd):
2397 2397 if choice:
2398 2398 raise AmbiguousCommand(cmd)
2399 2399 else:
2400 2400 choice = aliases, table[e]
2401 break
2401 2402 if choice:
2402 2403 return choice
2403 2404
2404 2405 raise UnknownCommand(cmd)
2405 2406
2406 2407 class SignalInterrupt(Exception):
2407 2408 """Exception raised on SIGTERM and SIGHUP."""
2408 2409
2409 2410 def catchterm(*args):
2410 2411 raise SignalInterrupt
2411 2412
2412 2413 def run():
2413 2414 sys.exit(dispatch(sys.argv[1:]))
2414 2415
2415 2416 class ParseError(Exception):
2416 2417 """Exception raised on errors in parsing the command line."""
2417 2418
2418 2419 def parse(ui, args):
2419 2420 options = {}
2420 2421 cmdoptions = {}
2421 2422
2422 2423 try:
2423 2424 args = fancyopts.fancyopts(args, globalopts, options)
2424 2425 except fancyopts.getopt.GetoptError, inst:
2425 2426 raise ParseError(None, inst)
2426 2427
2427 2428 if args:
2428 2429 cmd, args = args[0], args[1:]
2429 2430 defaults = ui.config("defaults", cmd)
2430 2431 if defaults:
2431 2432 # reparse with command defaults added
2432 2433 args = [cmd] + defaults.split() + args
2433 2434 try:
2434 2435 args = fancyopts.fancyopts(args, globalopts, options)
2435 2436 except fancyopts.getopt.GetoptError, inst:
2436 2437 raise ParseError(None, inst)
2437 2438
2438 2439 cmd, args = args[0], args[1:]
2439 2440
2440 2441 aliases, i = find(cmd)
2441 2442 cmd = aliases[0]
2442 2443 c = list(i[1])
2443 2444 else:
2444 2445 cmd = None
2445 2446 c = []
2446 2447
2447 2448 # combine global options into local
2448 2449 for o in globalopts:
2449 2450 c.append((o[0], o[1], options[o[1]], o[3]))
2450 2451
2451 2452 try:
2452 2453 args = fancyopts.fancyopts(args, c, cmdoptions)
2453 2454 except fancyopts.getopt.GetoptError, inst:
2454 2455 raise ParseError(cmd, inst)
2455 2456
2456 2457 # separate global options back out
2457 2458 for o in globalopts:
2458 2459 n = o[1]
2459 2460 options[n] = cmdoptions[n]
2460 2461 del cmdoptions[n]
2461 2462
2462 2463 return (cmd, cmd and i[0] or None, args, options, cmdoptions)
2463 2464
2464 2465 def dispatch(args):
2465 2466 signal.signal(signal.SIGTERM, catchterm)
2466 2467 try:
2467 2468 signal.signal(signal.SIGHUP, catchterm)
2468 2469 except AttributeError:
2469 2470 pass
2470 2471
2471 2472 try:
2472 2473 u = ui.ui()
2473 2474 except util.Abort, inst:
2474 2475 sys.stderr.write(_("abort: %s\n") % inst)
2475 2476 sys.exit(1)
2476 2477
2477 2478 external = []
2478 2479 for x in u.extensions():
2479 2480 def on_exception(Exception, inst):
2480 2481 u.warn(_("*** failed to import extension %s\n") % x[1])
2481 2482 u.warn("%s\n" % inst)
2482 2483 if "--traceback" in sys.argv[1:]:
2483 2484 traceback.print_exc()
2484 2485 if x[1]:
2485 2486 try:
2486 2487 mod = imp.load_source(x[0], x[1])
2487 2488 except Exception, inst:
2488 2489 on_exception(Exception, inst)
2489 2490 continue
2490 2491 else:
2491 2492 def importh(name):
2492 2493 mod = __import__(name)
2493 2494 components = name.split('.')
2494 2495 for comp in components[1:]:
2495 2496 mod = getattr(mod, comp)
2496 2497 return mod
2497 2498 try:
2498 2499 mod = importh(x[0])
2499 2500 except Exception, inst:
2500 2501 on_exception(Exception, inst)
2501 2502 continue
2502 2503
2503 2504 external.append(mod)
2504 2505 for x in external:
2505 2506 cmdtable = getattr(x, 'cmdtable', {})
2506 2507 for t in cmdtable:
2507 2508 if t in table:
2508 2509 u.warn(_("module %s overrides %s\n") % (x.__name__, t))
2509 2510 table.update(cmdtable)
2510 2511
2511 2512 try:
2512 2513 cmd, func, args, options, cmdoptions = parse(u, args)
2513 2514 except ParseError, inst:
2514 2515 if inst.args[0]:
2515 2516 u.warn(_("hg %s: %s\n") % (inst.args[0], inst.args[1]))
2516 2517 help_(u, inst.args[0])
2517 2518 else:
2518 2519 u.warn(_("hg: %s\n") % inst.args[1])
2519 2520 help_(u, 'shortlist')
2520 2521 sys.exit(-1)
2521 2522 except AmbiguousCommand, inst:
2522 2523 u.warn(_("hg: command '%s' is ambiguous.\n") % inst.args[0])
2523 2524 sys.exit(1)
2524 2525 except UnknownCommand, inst:
2525 2526 u.warn(_("hg: unknown command '%s'\n") % inst.args[0])
2526 2527 help_(u, 'shortlist')
2527 2528 sys.exit(1)
2528 2529
2529 2530 if options["time"]:
2530 2531 def get_times():
2531 2532 t = os.times()
2532 2533 if t[4] == 0.0: # Windows leaves this as zero, so use time.clock()
2533 2534 t = (t[0], t[1], t[2], t[3], time.clock())
2534 2535 return t
2535 2536 s = get_times()
2536 2537 def print_time():
2537 2538 t = get_times()
2538 2539 u.warn(_("Time: real %.3f secs (user %.3f+%.3f sys %.3f+%.3f)\n") %
2539 2540 (t[4]-s[4], t[0]-s[0], t[2]-s[2], t[1]-s[1], t[3]-s[3]))
2540 2541 atexit.register(print_time)
2541 2542
2542 2543 u.updateopts(options["verbose"], options["debug"], options["quiet"],
2543 2544 not options["noninteractive"])
2544 2545
2545 2546 # enter the debugger before command execution
2546 2547 if options['debugger']:
2547 2548 pdb.set_trace()
2548 2549
2549 2550 try:
2550 2551 try:
2551 2552 if options['help']:
2552 2553 help_(u, cmd, options['version'])
2553 2554 sys.exit(0)
2554 2555 elif options['version']:
2555 2556 show_version(u)
2556 2557 sys.exit(0)
2557 2558 elif not cmd:
2558 2559 help_(u, 'shortlist')
2559 2560 sys.exit(0)
2560 2561
2561 2562 if options['cwd']:
2562 2563 try:
2563 2564 os.chdir(options['cwd'])
2564 2565 except OSError, inst:
2565 2566 raise util.Abort('%s: %s' %
2566 2567 (options['cwd'], inst.strerror))
2567 2568
2568 2569 if cmd not in norepo.split():
2569 2570 path = options["repository"] or ""
2570 2571 repo = hg.repository(ui=u, path=path)
2571 2572 for x in external:
2572 2573 if hasattr(x, 'reposetup'): x.reposetup(u, repo)
2573 2574 d = lambda: func(u, repo, *args, **cmdoptions)
2574 2575 else:
2575 2576 d = lambda: func(u, *args, **cmdoptions)
2576 2577
2577 2578 if options['profile']:
2578 2579 import hotshot, hotshot.stats
2579 2580 prof = hotshot.Profile("hg.prof")
2580 2581 r = prof.runcall(d)
2581 2582 prof.close()
2582 2583 stats = hotshot.stats.load("hg.prof")
2583 2584 stats.strip_dirs()
2584 2585 stats.sort_stats('time', 'calls')
2585 2586 stats.print_stats(40)
2586 2587 return r
2587 2588 else:
2588 2589 return d()
2589 2590 except:
2590 2591 # enter the debugger when we hit an exception
2591 2592 if options['debugger']:
2592 2593 pdb.post_mortem(sys.exc_info()[2])
2593 2594 if options['traceback']:
2594 2595 traceback.print_exc()
2595 2596 raise
2596 2597 except hg.RepoError, inst:
2597 2598 u.warn(_("abort: "), inst, "!\n")
2598 2599 except revlog.RevlogError, inst:
2599 2600 u.warn(_("abort: "), inst, "!\n")
2600 2601 except SignalInterrupt:
2601 2602 u.warn(_("killed!\n"))
2602 2603 except KeyboardInterrupt:
2603 2604 try:
2604 2605 u.warn(_("interrupted!\n"))
2605 2606 except IOError, inst:
2606 2607 if inst.errno == errno.EPIPE:
2607 2608 if u.debugflag:
2608 2609 u.warn(_("\nbroken pipe\n"))
2609 2610 else:
2610 2611 raise
2611 2612 except IOError, inst:
2612 2613 if hasattr(inst, "code"):
2613 2614 u.warn(_("abort: %s\n") % inst)
2614 2615 elif hasattr(inst, "reason"):
2615 2616 u.warn(_("abort: error: %s\n") % inst.reason[1])
2616 2617 elif hasattr(inst, "args") and inst[0] == errno.EPIPE:
2617 2618 if u.debugflag:
2618 2619 u.warn(_("broken pipe\n"))
2619 2620 elif getattr(inst, "strerror", None):
2620 2621 if getattr(inst, "filename", None):
2621 2622 u.warn(_("abort: %s - %s\n") % (inst.strerror, inst.filename))
2622 2623 else:
2623 2624 u.warn(_("abort: %s\n") % inst.strerror)
2624 2625 else:
2625 2626 raise
2626 2627 except OSError, inst:
2627 2628 if hasattr(inst, "filename"):
2628 2629 u.warn(_("abort: %s: %s\n") % (inst.strerror, inst.filename))
2629 2630 else:
2630 2631 u.warn(_("abort: %s\n") % inst.strerror)
2631 2632 except util.Abort, inst:
2632 2633 u.warn(_('abort: '), inst.args[0] % inst.args[1:], '\n')
2633 2634 sys.exit(1)
2634 2635 except TypeError, inst:
2635 2636 # was this an argument error?
2636 2637 tb = traceback.extract_tb(sys.exc_info()[2])
2637 2638 if len(tb) > 2: # no
2638 2639 raise
2639 2640 u.debug(inst, "\n")
2640 2641 u.warn(_("%s: invalid arguments\n") % cmd)
2641 2642 help_(u, cmd)
2642 2643 except UnknownCommand, inst:
2643 2644 u.warn(_("hg: unknown command '%s'\n") % inst.args[0])
2644 2645 help_(u, 'shortlist')
2645 2646 except SystemExit:
2646 2647 # don't catch this in the catch-all below
2647 2648 raise
2648 2649 except:
2649 2650 u.warn(_("** unknown exception encountered, details follow\n"))
2650 2651 u.warn(_("** report bug details to mercurial@selenic.com\n"))
2651 2652 raise
2652 2653
2653 2654 sys.exit(-1)
General Comments 0
You need to be logged in to leave comments. Login now