##// END OF EJS Templates
A fix for --prune.
Brendan Cully -
r2911:02e239bb default
parent child Browse files
Show More
@@ -1,3501 +1,3501 b''
1 1 # commands.py - command processing for mercurial
2 2 #
3 3 # Copyright 2005, 2006 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 templater bundlerepo")
13 13 demandload(globals(), "fnmatch difflib patch random signal tempfile time")
14 14 demandload(globals(), "traceback errno socket version struct atexit sets bz2")
15 15 demandload(globals(), "archival cStringIO changegroup")
16 16 demandload(globals(), "cmdutil hgweb.server sshserver")
17 17
18 18 class UnknownCommand(Exception):
19 19 """Exception raised if command is not in the command table."""
20 20 class AmbiguousCommand(Exception):
21 21 """Exception raised if command shortcut matches more than one command."""
22 22
23 23 def bail_if_changed(repo):
24 24 modified, added, removed, deleted = repo.status()[:4]
25 25 if modified or added or removed or deleted:
26 26 raise util.Abort(_("outstanding uncommitted changes"))
27 27
28 28 def relpath(repo, args):
29 29 cwd = repo.getcwd()
30 30 if cwd:
31 31 return [util.normpath(os.path.join(cwd, x)) for x in args]
32 32 return args
33 33
34 34 def logmessage(opts):
35 35 """ get the log message according to -m and -l option """
36 36 message = opts['message']
37 37 logfile = opts['logfile']
38 38
39 39 if message and logfile:
40 40 raise util.Abort(_('options --message and --logfile are mutually '
41 41 'exclusive'))
42 42 if not message and logfile:
43 43 try:
44 44 if logfile == '-':
45 45 message = sys.stdin.read()
46 46 else:
47 47 message = open(logfile).read()
48 48 except IOError, inst:
49 49 raise util.Abort(_("can't read commit message '%s': %s") %
50 50 (logfile, inst.strerror))
51 51 return message
52 52
53 53 def walkchangerevs(ui, repo, pats, opts):
54 54 '''Iterate over files and the revs they changed in.
55 55
56 56 Callers most commonly need to iterate backwards over the history
57 57 it is interested in. Doing so has awful (quadratic-looking)
58 58 performance, so we use iterators in a "windowed" way.
59 59
60 60 We walk a window of revisions in the desired order. Within the
61 61 window, we first walk forwards to gather data, then in the desired
62 62 order (usually backwards) to display it.
63 63
64 64 This function returns an (iterator, getchange, matchfn) tuple. The
65 65 getchange function returns the changelog entry for a numeric
66 66 revision. The iterator yields 3-tuples. They will be of one of
67 67 the following forms:
68 68
69 69 "window", incrementing, lastrev: stepping through a window,
70 70 positive if walking forwards through revs, last rev in the
71 71 sequence iterated over - use to reset state for the current window
72 72
73 73 "add", rev, fns: out-of-order traversal of the given file names
74 74 fns, which changed during revision rev - use to gather data for
75 75 possible display
76 76
77 77 "iter", rev, None: in-order traversal of the revs earlier iterated
78 78 over with "add" - use to display data'''
79 79
80 80 def increasing_windows(start, end, windowsize=8, sizelimit=512):
81 81 if start < end:
82 82 while start < end:
83 83 yield start, min(windowsize, end-start)
84 84 start += windowsize
85 85 if windowsize < sizelimit:
86 86 windowsize *= 2
87 87 else:
88 88 while start > end:
89 89 yield start, min(windowsize, start-end-1)
90 90 start -= windowsize
91 91 if windowsize < sizelimit:
92 92 windowsize *= 2
93 93
94 94
95 95 files, matchfn, anypats = cmdutil.matchpats(repo, pats, opts)
96 96 follow = opts.get('follow') or opts.get('follow_first')
97 97
98 98 if repo.changelog.count() == 0:
99 99 return [], False, matchfn
100 100
101 101 if follow:
102 102 p = repo.dirstate.parents()[0]
103 103 if p == nullid:
104 104 ui.warn(_('No working directory revision; defaulting to tip\n'))
105 105 start = 'tip'
106 106 else:
107 107 start = repo.changelog.rev(p)
108 108 defrange = '%s:0' % start
109 109 else:
110 110 defrange = 'tip:0'
111 111 revs = map(int, revrange(ui, repo, opts['rev'] or [defrange]))
112 112 wanted = {}
113 113 slowpath = anypats
114 114 fncache = {}
115 115
116 116 chcache = {}
117 117 def getchange(rev):
118 118 ch = chcache.get(rev)
119 119 if ch is None:
120 120 chcache[rev] = ch = repo.changelog.read(repo.lookup(str(rev)))
121 121 return ch
122 122
123 123 if not slowpath and not files:
124 124 # No files, no patterns. Display all revs.
125 125 wanted = dict(zip(revs, revs))
126 126 copies = []
127 127 if not slowpath:
128 128 # Only files, no patterns. Check the history of each file.
129 129 def filerevgen(filelog, node):
130 130 cl_count = repo.changelog.count()
131 131 if node is None:
132 132 last = filelog.count() - 1
133 133 else:
134 134 last = filelog.rev(node)
135 135 for i, window in increasing_windows(last, -1):
136 136 revs = []
137 137 for j in xrange(i - window, i + 1):
138 138 n = filelog.node(j)
139 139 revs.append((filelog.linkrev(n),
140 140 follow and filelog.renamed(n)))
141 141 revs.reverse()
142 142 for rev in revs:
143 143 # only yield rev for which we have the changelog, it can
144 144 # happen while doing "hg log" during a pull or commit
145 145 if rev[0] < cl_count:
146 146 yield rev
147 147 def iterfiles():
148 148 for filename in files:
149 149 yield filename, None
150 150 for filename_node in copies:
151 151 yield filename_node
152 152 minrev, maxrev = min(revs), max(revs)
153 153 for file_, node in iterfiles():
154 154 filelog = repo.file(file_)
155 155 # A zero count may be a directory or deleted file, so
156 156 # try to find matching entries on the slow path.
157 157 if filelog.count() == 0:
158 158 slowpath = True
159 159 break
160 160 for rev, copied in filerevgen(filelog, node):
161 161 if rev <= maxrev:
162 162 if rev < minrev:
163 163 break
164 164 fncache.setdefault(rev, [])
165 165 fncache[rev].append(file_)
166 166 wanted[rev] = 1
167 167 if follow and copied:
168 168 copies.append(copied)
169 169 if slowpath:
170 170 if follow:
171 171 raise util.Abort(_('can only follow copies/renames for explicit '
172 172 'file names'))
173 173
174 174 # The slow path checks files modified in every changeset.
175 175 def changerevgen():
176 176 for i, window in increasing_windows(repo.changelog.count()-1, -1):
177 177 for j in xrange(i - window, i + 1):
178 178 yield j, getchange(j)[3]
179 179
180 180 for rev, changefiles in changerevgen():
181 181 matches = filter(matchfn, changefiles)
182 182 if matches:
183 183 fncache[rev] = matches
184 184 wanted[rev] = 1
185 185
186 186 class followfilter:
187 187 def __init__(self, onlyfirst=False):
188 188 self.startrev = -1
189 189 self.roots = []
190 190 self.onlyfirst = onlyfirst
191 191
192 192 def match(self, rev):
193 193 def realparents(rev):
194 194 if self.onlyfirst:
195 195 return repo.changelog.parentrevs(rev)[0:1]
196 196 else:
197 197 return filter(lambda x: x != -1, repo.changelog.parentrevs(rev))
198 198
199 199 if self.startrev == -1:
200 200 self.startrev = rev
201 201 return True
202 202
203 203 if rev > self.startrev:
204 204 # forward: all descendants
205 205 if not self.roots:
206 206 self.roots.append(self.startrev)
207 207 for parent in realparents(rev):
208 208 if parent in self.roots:
209 209 self.roots.append(rev)
210 210 return True
211 211 else:
212 212 # backwards: all parents
213 213 if not self.roots:
214 214 self.roots.extend(realparents(self.startrev))
215 215 if rev in self.roots:
216 216 self.roots.remove(rev)
217 217 self.roots.extend(realparents(rev))
218 218 return True
219 219
220 220 return False
221 221
222 222 # it might be worthwhile to do this in the iterator if the rev range
223 223 # is descending and the prune args are all within that range
224 for rev in opts.get('prune'):
224 for rev in opts.get('prune', ()):
225 225 rev = repo.changelog.rev(repo.lookup(rev))
226 226 ff = followfilter()
227 227 stop = min(revs[0], revs[-1])
228 228 for x in range(rev, stop-1, -1):
229 229 if ff.match(x) and wanted.has_key(x):
230 230 del wanted[x]
231 231
232 232 def iterate():
233 233 if follow and not files:
234 234 ff = followfilter(onlyfirst=opts.get('follow_first'))
235 235 def want(rev):
236 236 if ff.match(rev) and rev in wanted:
237 237 return True
238 238 return False
239 239 else:
240 240 def want(rev):
241 241 return rev in wanted
242 242
243 243 for i, window in increasing_windows(0, len(revs)):
244 244 yield 'window', revs[0] < revs[-1], revs[-1]
245 245 nrevs = [rev for rev in revs[i:i+window] if want(rev)]
246 246 srevs = list(nrevs)
247 247 srevs.sort()
248 248 for rev in srevs:
249 249 fns = fncache.get(rev) or filter(matchfn, getchange(rev)[3])
250 250 yield 'add', rev, fns
251 251 for rev in nrevs:
252 252 yield 'iter', rev, None
253 253 return iterate(), getchange, matchfn
254 254
255 255 revrangesep = ':'
256 256
257 257 def revfix(repo, val, defval):
258 258 '''turn user-level id of changeset into rev number.
259 259 user-level id can be tag, changeset, rev number, or negative rev
260 260 number relative to number of revs (-1 is tip, etc).'''
261 261 if not val:
262 262 return defval
263 263 try:
264 264 num = int(val)
265 265 if str(num) != val:
266 266 raise ValueError
267 267 if num < 0:
268 268 num += repo.changelog.count()
269 269 if num < 0:
270 270 num = 0
271 271 elif num >= repo.changelog.count():
272 272 raise ValueError
273 273 except ValueError:
274 274 try:
275 275 num = repo.changelog.rev(repo.lookup(val))
276 276 except KeyError:
277 277 raise util.Abort(_('invalid revision identifier %s'), val)
278 278 return num
279 279
280 280 def revpair(ui, repo, revs):
281 281 '''return pair of nodes, given list of revisions. second item can
282 282 be None, meaning use working dir.'''
283 283 if not revs:
284 284 return repo.dirstate.parents()[0], None
285 285 end = None
286 286 if len(revs) == 1:
287 287 start = revs[0]
288 288 if revrangesep in start:
289 289 start, end = start.split(revrangesep, 1)
290 290 start = revfix(repo, start, 0)
291 291 end = revfix(repo, end, repo.changelog.count() - 1)
292 292 else:
293 293 start = revfix(repo, start, None)
294 294 elif len(revs) == 2:
295 295 if revrangesep in revs[0] or revrangesep in revs[1]:
296 296 raise util.Abort(_('too many revisions specified'))
297 297 start = revfix(repo, revs[0], None)
298 298 end = revfix(repo, revs[1], None)
299 299 else:
300 300 raise util.Abort(_('too many revisions specified'))
301 301 if end is not None: end = repo.lookup(str(end))
302 302 return repo.lookup(str(start)), end
303 303
304 304 def revrange(ui, repo, revs):
305 305 """Yield revision as strings from a list of revision specifications."""
306 306 seen = {}
307 307 for spec in revs:
308 308 if revrangesep in spec:
309 309 start, end = spec.split(revrangesep, 1)
310 310 start = revfix(repo, start, 0)
311 311 end = revfix(repo, end, repo.changelog.count() - 1)
312 312 step = start > end and -1 or 1
313 313 for rev in xrange(start, end+step, step):
314 314 if rev in seen:
315 315 continue
316 316 seen[rev] = 1
317 317 yield str(rev)
318 318 else:
319 319 rev = revfix(repo, spec, None)
320 320 if rev in seen:
321 321 continue
322 322 seen[rev] = 1
323 323 yield str(rev)
324 324
325 325 def write_bundle(cg, filename=None, compress=True):
326 326 """Write a bundle file and return its filename.
327 327
328 328 Existing files will not be overwritten.
329 329 If no filename is specified, a temporary file is created.
330 330 bz2 compression can be turned off.
331 331 The bundle file will be deleted in case of errors.
332 332 """
333 333 class nocompress(object):
334 334 def compress(self, x):
335 335 return x
336 336 def flush(self):
337 337 return ""
338 338
339 339 fh = None
340 340 cleanup = None
341 341 try:
342 342 if filename:
343 343 if os.path.exists(filename):
344 344 raise util.Abort(_("file '%s' already exists"), filename)
345 345 fh = open(filename, "wb")
346 346 else:
347 347 fd, filename = tempfile.mkstemp(prefix="hg-bundle-", suffix=".hg")
348 348 fh = os.fdopen(fd, "wb")
349 349 cleanup = filename
350 350
351 351 if compress:
352 352 fh.write("HG10")
353 353 z = bz2.BZ2Compressor(9)
354 354 else:
355 355 fh.write("HG10UN")
356 356 z = nocompress()
357 357 # parse the changegroup data, otherwise we will block
358 358 # in case of sshrepo because we don't know the end of the stream
359 359
360 360 # an empty chunkiter is the end of the changegroup
361 361 empty = False
362 362 while not empty:
363 363 empty = True
364 364 for chunk in changegroup.chunkiter(cg):
365 365 empty = False
366 366 fh.write(z.compress(changegroup.genchunk(chunk)))
367 367 fh.write(z.compress(changegroup.closechunk()))
368 368 fh.write(z.flush())
369 369 cleanup = None
370 370 return filename
371 371 finally:
372 372 if fh is not None:
373 373 fh.close()
374 374 if cleanup is not None:
375 375 os.unlink(cleanup)
376 376
377 377 def trimuser(ui, name, rev, revcache):
378 378 """trim the name of the user who committed a change"""
379 379 user = revcache.get(rev)
380 380 if user is None:
381 381 user = revcache[rev] = ui.shortuser(name)
382 382 return user
383 383
384 384 class changeset_printer(object):
385 385 '''show changeset information when templating not requested.'''
386 386
387 387 def __init__(self, ui, repo):
388 388 self.ui = ui
389 389 self.repo = repo
390 390
391 391 def show(self, rev=0, changenode=None, brinfo=None):
392 392 '''show a single changeset or file revision'''
393 393 log = self.repo.changelog
394 394 if changenode is None:
395 395 changenode = log.node(rev)
396 396 elif not rev:
397 397 rev = log.rev(changenode)
398 398
399 399 if self.ui.quiet:
400 400 self.ui.write("%d:%s\n" % (rev, short(changenode)))
401 401 return
402 402
403 403 changes = log.read(changenode)
404 404 date = util.datestr(changes[2])
405 405
406 406 parents = [(log.rev(p), self.ui.verbose and hex(p) or short(p))
407 407 for p in log.parents(changenode)
408 408 if self.ui.debugflag or p != nullid]
409 409 if (not self.ui.debugflag and len(parents) == 1 and
410 410 parents[0][0] == rev-1):
411 411 parents = []
412 412
413 413 if self.ui.verbose:
414 414 self.ui.write(_("changeset: %d:%s\n") % (rev, hex(changenode)))
415 415 else:
416 416 self.ui.write(_("changeset: %d:%s\n") % (rev, short(changenode)))
417 417
418 418 for tag in self.repo.nodetags(changenode):
419 419 self.ui.status(_("tag: %s\n") % tag)
420 420 for parent in parents:
421 421 self.ui.write(_("parent: %d:%s\n") % parent)
422 422
423 423 if brinfo and changenode in brinfo:
424 424 br = brinfo[changenode]
425 425 self.ui.write(_("branch: %s\n") % " ".join(br))
426 426
427 427 self.ui.debug(_("manifest: %d:%s\n") %
428 428 (self.repo.manifest.rev(changes[0]), hex(changes[0])))
429 429 self.ui.status(_("user: %s\n") % changes[1])
430 430 self.ui.status(_("date: %s\n") % date)
431 431
432 432 if self.ui.debugflag:
433 433 files = self.repo.status(log.parents(changenode)[0], changenode)[:3]
434 434 for key, value in zip([_("files:"), _("files+:"), _("files-:")],
435 435 files):
436 436 if value:
437 437 self.ui.note("%-12s %s\n" % (key, " ".join(value)))
438 438 else:
439 439 self.ui.note(_("files: %s\n") % " ".join(changes[3]))
440 440
441 441 description = changes[4].strip()
442 442 if description:
443 443 if self.ui.verbose:
444 444 self.ui.status(_("description:\n"))
445 445 self.ui.status(description)
446 446 self.ui.status("\n\n")
447 447 else:
448 448 self.ui.status(_("summary: %s\n") %
449 449 description.splitlines()[0])
450 450 self.ui.status("\n")
451 451
452 452 def show_changeset(ui, repo, opts):
453 453 '''show one changeset. uses template or regular display. caller
454 454 can pass in 'style' and 'template' options in opts.'''
455 455
456 456 tmpl = opts.get('template')
457 457 if tmpl:
458 458 tmpl = templater.parsestring(tmpl, quoted=False)
459 459 else:
460 460 tmpl = ui.config('ui', 'logtemplate')
461 461 if tmpl: tmpl = templater.parsestring(tmpl)
462 462 mapfile = opts.get('style') or ui.config('ui', 'style')
463 463 if tmpl or mapfile:
464 464 if mapfile:
465 465 if not os.path.isfile(mapfile):
466 466 mapname = templater.templatepath('map-cmdline.' + mapfile)
467 467 if not mapname: mapname = templater.templatepath(mapfile)
468 468 if mapname: mapfile = mapname
469 469 try:
470 470 t = templater.changeset_templater(ui, repo, mapfile)
471 471 except SyntaxError, inst:
472 472 raise util.Abort(inst.args[0])
473 473 if tmpl: t.use_template(tmpl)
474 474 return t
475 475 return changeset_printer(ui, repo)
476 476
477 477 def setremoteconfig(ui, opts):
478 478 "copy remote options to ui tree"
479 479 if opts.get('ssh'):
480 480 ui.setconfig("ui", "ssh", opts['ssh'])
481 481 if opts.get('remotecmd'):
482 482 ui.setconfig("ui", "remotecmd", opts['remotecmd'])
483 483
484 484 def show_version(ui):
485 485 """output version and copyright information"""
486 486 ui.write(_("Mercurial Distributed SCM (version %s)\n")
487 487 % version.get_version())
488 488 ui.status(_(
489 489 "\nCopyright (C) 2005, 2006 Matt Mackall <mpm@selenic.com>\n"
490 490 "This is free software; see the source for copying conditions. "
491 491 "There is NO\nwarranty; "
492 492 "not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
493 493 ))
494 494
495 495 def help_(ui, name=None, with_version=False):
496 496 """show help for a command, extension, or list of commands
497 497
498 498 With no arguments, print a list of commands and short help.
499 499
500 500 Given a command name, print help for that command.
501 501
502 502 Given an extension name, print help for that extension, and the
503 503 commands it provides."""
504 504 option_lists = []
505 505
506 506 def helpcmd(name):
507 507 if with_version:
508 508 show_version(ui)
509 509 ui.write('\n')
510 510 aliases, i = findcmd(name)
511 511 # synopsis
512 512 ui.write("%s\n\n" % i[2])
513 513
514 514 # description
515 515 doc = i[0].__doc__
516 516 if not doc:
517 517 doc = _("(No help text available)")
518 518 if ui.quiet:
519 519 doc = doc.splitlines(0)[0]
520 520 ui.write("%s\n" % doc.rstrip())
521 521
522 522 if not ui.quiet:
523 523 # aliases
524 524 if len(aliases) > 1:
525 525 ui.write(_("\naliases: %s\n") % ', '.join(aliases[1:]))
526 526
527 527 # options
528 528 if i[1]:
529 529 option_lists.append(("options", i[1]))
530 530
531 531 def helplist(select=None):
532 532 h = {}
533 533 cmds = {}
534 534 for c, e in table.items():
535 535 f = c.split("|", 1)[0]
536 536 if select and not select(f):
537 537 continue
538 538 if name == "shortlist" and not f.startswith("^"):
539 539 continue
540 540 f = f.lstrip("^")
541 541 if not ui.debugflag and f.startswith("debug"):
542 542 continue
543 543 doc = e[0].__doc__
544 544 if not doc:
545 545 doc = _("(No help text available)")
546 546 h[f] = doc.splitlines(0)[0].rstrip()
547 547 cmds[f] = c.lstrip("^")
548 548
549 549 fns = h.keys()
550 550 fns.sort()
551 551 m = max(map(len, fns))
552 552 for f in fns:
553 553 if ui.verbose:
554 554 commands = cmds[f].replace("|",", ")
555 555 ui.write(" %s:\n %s\n"%(commands, h[f]))
556 556 else:
557 557 ui.write(' %-*s %s\n' % (m, f, h[f]))
558 558
559 559 def helpext(name):
560 560 try:
561 561 mod = findext(name)
562 562 except KeyError:
563 563 raise UnknownCommand(name)
564 564
565 565 doc = (mod.__doc__ or _('No help text available')).splitlines(0)
566 566 ui.write(_('%s extension - %s\n') % (name.split('.')[-1], doc[0]))
567 567 for d in doc[1:]:
568 568 ui.write(d, '\n')
569 569
570 570 ui.status('\n')
571 571 if ui.verbose:
572 572 ui.status(_('list of commands:\n\n'))
573 573 else:
574 574 ui.status(_('list of commands (use "hg help -v %s" '
575 575 'to show aliases and global options):\n\n') % name)
576 576
577 577 modcmds = dict.fromkeys([c.split('|', 1)[0] for c in mod.cmdtable])
578 578 helplist(modcmds.has_key)
579 579
580 580 if name and name != 'shortlist':
581 581 try:
582 582 helpcmd(name)
583 583 except UnknownCommand:
584 584 helpext(name)
585 585
586 586 else:
587 587 # program name
588 588 if ui.verbose or with_version:
589 589 show_version(ui)
590 590 else:
591 591 ui.status(_("Mercurial Distributed SCM\n"))
592 592 ui.status('\n')
593 593
594 594 # list of commands
595 595 if name == "shortlist":
596 596 ui.status(_('basic commands (use "hg help" '
597 597 'for the full list or option "-v" for details):\n\n'))
598 598 elif ui.verbose:
599 599 ui.status(_('list of commands:\n\n'))
600 600 else:
601 601 ui.status(_('list of commands (use "hg help -v" '
602 602 'to show aliases and global options):\n\n'))
603 603
604 604 helplist()
605 605
606 606 # global options
607 607 if ui.verbose:
608 608 option_lists.append(("global options", globalopts))
609 609
610 610 # list all option lists
611 611 opt_output = []
612 612 for title, options in option_lists:
613 613 opt_output.append(("\n%s:\n" % title, None))
614 614 for shortopt, longopt, default, desc in options:
615 615 opt_output.append(("%2s%s" % (shortopt and "-%s" % shortopt,
616 616 longopt and " --%s" % longopt),
617 617 "%s%s" % (desc,
618 618 default
619 619 and _(" (default: %s)") % default
620 620 or "")))
621 621
622 622 if opt_output:
623 623 opts_len = max([len(line[0]) for line in opt_output if line[1]])
624 624 for first, second in opt_output:
625 625 if second:
626 626 ui.write(" %-*s %s\n" % (opts_len, first, second))
627 627 else:
628 628 ui.write("%s\n" % first)
629 629
630 630 # Commands start here, listed alphabetically
631 631
632 632 def add(ui, repo, *pats, **opts):
633 633 """add the specified files on the next commit
634 634
635 635 Schedule files to be version controlled and added to the repository.
636 636
637 637 The files will be added to the repository at the next commit.
638 638
639 639 If no names are given, add all files in the repository.
640 640 """
641 641
642 642 names = []
643 643 for src, abs, rel, exact in cmdutil.walk(repo, pats, opts):
644 644 if exact:
645 645 if ui.verbose:
646 646 ui.status(_('adding %s\n') % rel)
647 647 names.append(abs)
648 648 elif repo.dirstate.state(abs) == '?':
649 649 ui.status(_('adding %s\n') % rel)
650 650 names.append(abs)
651 651 if not opts.get('dry_run'):
652 652 repo.add(names)
653 653
654 654 def addremove(ui, repo, *pats, **opts):
655 655 """add all new files, delete all missing files (DEPRECATED)
656 656
657 657 (DEPRECATED)
658 658 Add all new files and remove all missing files from the repository.
659 659
660 660 New files are ignored if they match any of the patterns in .hgignore. As
661 661 with add, these changes take effect at the next commit.
662 662
663 663 This command is now deprecated and will be removed in a future
664 664 release. Please use add and remove --after instead.
665 665 """
666 666 ui.warn(_('(the addremove command is deprecated; use add and remove '
667 667 '--after instead)\n'))
668 668 return cmdutil.addremove(repo, pats, opts)
669 669
670 670 def annotate(ui, repo, *pats, **opts):
671 671 """show changeset information per file line
672 672
673 673 List changes in files, showing the revision id responsible for each line
674 674
675 675 This command is useful to discover who did a change or when a change took
676 676 place.
677 677
678 678 Without the -a option, annotate will avoid processing files it
679 679 detects as binary. With -a, annotate will generate an annotation
680 680 anyway, probably with undesirable results.
681 681 """
682 682 def getnode(rev):
683 683 return short(repo.changelog.node(rev))
684 684
685 685 ucache = {}
686 686 def getname(rev):
687 687 try:
688 688 return ucache[rev]
689 689 except:
690 690 u = trimuser(ui, repo.changectx(rev).user(), rev, ucache)
691 691 ucache[rev] = u
692 692 return u
693 693
694 694 dcache = {}
695 695 def getdate(rev):
696 696 datestr = dcache.get(rev)
697 697 if datestr is None:
698 698 datestr = dcache[rev] = util.datestr(repo.changectx(rev).date())
699 699 return datestr
700 700
701 701 if not pats:
702 702 raise util.Abort(_('at least one file name or pattern required'))
703 703
704 704 opmap = [['user', getname], ['number', str], ['changeset', getnode],
705 705 ['date', getdate]]
706 706 if not opts['user'] and not opts['changeset'] and not opts['date']:
707 707 opts['number'] = 1
708 708
709 709 ctx = repo.changectx(opts['rev'] or repo.dirstate.parents()[0])
710 710
711 711 for src, abs, rel, exact in cmdutil.walk(repo, pats, opts,
712 712 node=ctx.node()):
713 713 fctx = ctx.filectx(abs)
714 714 if not opts['text'] and util.binary(fctx.data()):
715 715 ui.write(_("%s: binary file\n") % ((pats and rel) or abs))
716 716 continue
717 717
718 718 lines = fctx.annotate()
719 719 pieces = []
720 720
721 721 for o, f in opmap:
722 722 if opts[o]:
723 723 l = [f(n) for n, dummy in lines]
724 724 if l:
725 725 m = max(map(len, l))
726 726 pieces.append(["%*s" % (m, x) for x in l])
727 727
728 728 if pieces:
729 729 for p, l in zip(zip(*pieces), lines):
730 730 ui.write("%s: %s" % (" ".join(p), l[1]))
731 731
732 732 def archive(ui, repo, dest, **opts):
733 733 '''create unversioned archive of a repository revision
734 734
735 735 By default, the revision used is the parent of the working
736 736 directory; use "-r" to specify a different revision.
737 737
738 738 To specify the type of archive to create, use "-t". Valid
739 739 types are:
740 740
741 741 "files" (default): a directory full of files
742 742 "tar": tar archive, uncompressed
743 743 "tbz2": tar archive, compressed using bzip2
744 744 "tgz": tar archive, compressed using gzip
745 745 "uzip": zip archive, uncompressed
746 746 "zip": zip archive, compressed using deflate
747 747
748 748 The exact name of the destination archive or directory is given
749 749 using a format string; see "hg help export" for details.
750 750
751 751 Each member added to an archive file has a directory prefix
752 752 prepended. Use "-p" to specify a format string for the prefix.
753 753 The default is the basename of the archive, with suffixes removed.
754 754 '''
755 755
756 756 if opts['rev']:
757 757 node = repo.lookup(opts['rev'])
758 758 else:
759 759 node, p2 = repo.dirstate.parents()
760 760 if p2 != nullid:
761 761 raise util.Abort(_('uncommitted merge - please provide a '
762 762 'specific revision'))
763 763
764 764 dest = cmdutil.make_filename(repo, dest, node)
765 765 if os.path.realpath(dest) == repo.root:
766 766 raise util.Abort(_('repository root cannot be destination'))
767 767 dummy, matchfn, dummy = cmdutil.matchpats(repo, [], opts)
768 768 kind = opts.get('type') or 'files'
769 769 prefix = opts['prefix']
770 770 if dest == '-':
771 771 if kind == 'files':
772 772 raise util.Abort(_('cannot archive plain files to stdout'))
773 773 dest = sys.stdout
774 774 if not prefix: prefix = os.path.basename(repo.root) + '-%h'
775 775 prefix = cmdutil.make_filename(repo, prefix, node)
776 776 archival.archive(repo, dest, node, kind, not opts['no_decode'],
777 777 matchfn, prefix)
778 778
779 779 def backout(ui, repo, rev, **opts):
780 780 '''reverse effect of earlier changeset
781 781
782 782 Commit the backed out changes as a new changeset. The new
783 783 changeset is a child of the backed out changeset.
784 784
785 785 If you back out a changeset other than the tip, a new head is
786 786 created. This head is the parent of the working directory. If
787 787 you back out an old changeset, your working directory will appear
788 788 old after the backout. You should merge the backout changeset
789 789 with another head.
790 790
791 791 The --merge option remembers the parent of the working directory
792 792 before starting the backout, then merges the new head with that
793 793 changeset afterwards. This saves you from doing the merge by
794 794 hand. The result of this merge is not committed, as for a normal
795 795 merge.'''
796 796
797 797 bail_if_changed(repo)
798 798 op1, op2 = repo.dirstate.parents()
799 799 if op2 != nullid:
800 800 raise util.Abort(_('outstanding uncommitted merge'))
801 801 node = repo.lookup(rev)
802 802 p1, p2 = repo.changelog.parents(node)
803 803 if p1 == nullid:
804 804 raise util.Abort(_('cannot back out a change with no parents'))
805 805 if p2 != nullid:
806 806 if not opts['parent']:
807 807 raise util.Abort(_('cannot back out a merge changeset without '
808 808 '--parent'))
809 809 p = repo.lookup(opts['parent'])
810 810 if p not in (p1, p2):
811 811 raise util.Abort(_('%s is not a parent of %s' %
812 812 (short(p), short(node))))
813 813 parent = p
814 814 else:
815 815 if opts['parent']:
816 816 raise util.Abort(_('cannot use --parent on non-merge changeset'))
817 817 parent = p1
818 818 hg.clean(repo, node, show_stats=False)
819 819 revert_opts = opts.copy()
820 820 revert_opts['rev'] = hex(parent)
821 821 revert(ui, repo, **revert_opts)
822 822 commit_opts = opts.copy()
823 823 commit_opts['addremove'] = False
824 824 if not commit_opts['message'] and not commit_opts['logfile']:
825 825 commit_opts['message'] = _("Backed out changeset %s") % (hex(node))
826 826 commit_opts['force_editor'] = True
827 827 commit(ui, repo, **commit_opts)
828 828 def nice(node):
829 829 return '%d:%s' % (repo.changelog.rev(node), short(node))
830 830 ui.status(_('changeset %s backs out changeset %s\n') %
831 831 (nice(repo.changelog.tip()), nice(node)))
832 832 if op1 != node:
833 833 if opts['merge']:
834 834 ui.status(_('merging with changeset %s\n') % nice(op1))
835 835 n = _lookup(repo, hex(op1))
836 836 hg.merge(repo, n)
837 837 else:
838 838 ui.status(_('the backout changeset is a new head - '
839 839 'do not forget to merge\n'))
840 840 ui.status(_('(use "backout --merge" '
841 841 'if you want to auto-merge)\n'))
842 842
843 843 def bundle(ui, repo, fname, dest=None, **opts):
844 844 """create a changegroup file
845 845
846 846 Generate a compressed changegroup file collecting all changesets
847 847 not found in the other repository.
848 848
849 849 This file can then be transferred using conventional means and
850 850 applied to another repository with the unbundle command. This is
851 851 useful when native push and pull are not available or when
852 852 exporting an entire repository is undesirable. The standard file
853 853 extension is ".hg".
854 854
855 855 Unlike import/export, this exactly preserves all changeset
856 856 contents including permissions, rename data, and revision history.
857 857 """
858 858 dest = ui.expandpath(dest or 'default-push', dest or 'default')
859 859 other = hg.repository(ui, dest)
860 860 o = repo.findoutgoing(other, force=opts['force'])
861 861 cg = repo.changegroup(o, 'bundle')
862 862 write_bundle(cg, fname)
863 863
864 864 def cat(ui, repo, file1, *pats, **opts):
865 865 """output the latest or given revisions of files
866 866
867 867 Print the specified files as they were at the given revision.
868 868 If no revision is given then the tip is used.
869 869
870 870 Output may be to a file, in which case the name of the file is
871 871 given using a format string. The formatting rules are the same as
872 872 for the export command, with the following additions:
873 873
874 874 %s basename of file being printed
875 875 %d dirname of file being printed, or '.' if in repo root
876 876 %p root-relative path name of file being printed
877 877 """
878 878 ctx = repo.changectx(opts['rev'] or "-1")
879 879 for src, abs, rel, exact in cmdutil.walk(repo, (file1,) + pats, opts,
880 880 ctx.node()):
881 881 fp = cmdutil.make_file(repo, opts['output'], ctx.node(), pathname=abs)
882 882 fp.write(ctx.filectx(abs).data())
883 883
884 884 def clone(ui, source, dest=None, **opts):
885 885 """make a copy of an existing repository
886 886
887 887 Create a copy of an existing repository in a new directory.
888 888
889 889 If no destination directory name is specified, it defaults to the
890 890 basename of the source.
891 891
892 892 The location of the source is added to the new repository's
893 893 .hg/hgrc file, as the default to be used for future pulls.
894 894
895 895 For efficiency, hardlinks are used for cloning whenever the source
896 896 and destination are on the same filesystem (note this applies only
897 897 to the repository data, not to the checked out files). Some
898 898 filesystems, such as AFS, implement hardlinking incorrectly, but
899 899 do not report errors. In these cases, use the --pull option to
900 900 avoid hardlinking.
901 901
902 902 You can safely clone repositories and checked out files using full
903 903 hardlinks with
904 904
905 905 $ cp -al REPO REPOCLONE
906 906
907 907 which is the fastest way to clone. However, the operation is not
908 908 atomic (making sure REPO is not modified during the operation is
909 909 up to you) and you have to make sure your editor breaks hardlinks
910 910 (Emacs and most Linux Kernel tools do so).
911 911
912 912 If you use the -r option to clone up to a specific revision, no
913 913 subsequent revisions will be present in the cloned repository.
914 914 This option implies --pull, even on local repositories.
915 915
916 916 See pull for valid source format details.
917 917
918 918 It is possible to specify an ssh:// URL as the destination, but no
919 919 .hg/hgrc will be created on the remote side. Look at the help text
920 920 for the pull command for important details about ssh:// URLs.
921 921 """
922 922 setremoteconfig(ui, opts)
923 923 hg.clone(ui, ui.expandpath(source), dest,
924 924 pull=opts['pull'],
925 925 stream=opts['uncompressed'],
926 926 rev=opts['rev'],
927 927 update=not opts['noupdate'])
928 928
929 929 def commit(ui, repo, *pats, **opts):
930 930 """commit the specified files or all outstanding changes
931 931
932 932 Commit changes to the given files into the repository.
933 933
934 934 If a list of files is omitted, all changes reported by "hg status"
935 935 will be committed.
936 936
937 937 If no commit message is specified, the editor configured in your hgrc
938 938 or in the EDITOR environment variable is started to enter a message.
939 939 """
940 940 message = logmessage(opts)
941 941
942 942 if opts['addremove']:
943 943 cmdutil.addremove(repo, pats, opts)
944 944 fns, match, anypats = cmdutil.matchpats(repo, pats, opts)
945 945 if pats:
946 946 modified, added, removed = repo.status(files=fns, match=match)[:3]
947 947 files = modified + added + removed
948 948 else:
949 949 files = []
950 950 try:
951 951 repo.commit(files, message, opts['user'], opts['date'], match,
952 952 force_editor=opts.get('force_editor'))
953 953 except ValueError, inst:
954 954 raise util.Abort(str(inst))
955 955
956 956 def docopy(ui, repo, pats, opts, wlock):
957 957 # called with the repo lock held
958 958 cwd = repo.getcwd()
959 959 errors = 0
960 960 copied = []
961 961 targets = {}
962 962
963 963 def okaytocopy(abs, rel, exact):
964 964 reasons = {'?': _('is not managed'),
965 965 'a': _('has been marked for add'),
966 966 'r': _('has been marked for remove')}
967 967 state = repo.dirstate.state(abs)
968 968 reason = reasons.get(state)
969 969 if reason:
970 970 if state == 'a':
971 971 origsrc = repo.dirstate.copied(abs)
972 972 if origsrc is not None:
973 973 return origsrc
974 974 if exact:
975 975 ui.warn(_('%s: not copying - file %s\n') % (rel, reason))
976 976 else:
977 977 return abs
978 978
979 979 def copy(origsrc, abssrc, relsrc, target, exact):
980 980 abstarget = util.canonpath(repo.root, cwd, target)
981 981 reltarget = util.pathto(cwd, abstarget)
982 982 prevsrc = targets.get(abstarget)
983 983 if prevsrc is not None:
984 984 ui.warn(_('%s: not overwriting - %s collides with %s\n') %
985 985 (reltarget, abssrc, prevsrc))
986 986 return
987 987 if (not opts['after'] and os.path.exists(reltarget) or
988 988 opts['after'] and repo.dirstate.state(abstarget) not in '?r'):
989 989 if not opts['force']:
990 990 ui.warn(_('%s: not overwriting - file exists\n') %
991 991 reltarget)
992 992 return
993 993 if not opts['after'] and not opts.get('dry_run'):
994 994 os.unlink(reltarget)
995 995 if opts['after']:
996 996 if not os.path.exists(reltarget):
997 997 return
998 998 else:
999 999 targetdir = os.path.dirname(reltarget) or '.'
1000 1000 if not os.path.isdir(targetdir) and not opts.get('dry_run'):
1001 1001 os.makedirs(targetdir)
1002 1002 try:
1003 1003 restore = repo.dirstate.state(abstarget) == 'r'
1004 1004 if restore and not opts.get('dry_run'):
1005 1005 repo.undelete([abstarget], wlock)
1006 1006 try:
1007 1007 if not opts.get('dry_run'):
1008 1008 shutil.copyfile(relsrc, reltarget)
1009 1009 shutil.copymode(relsrc, reltarget)
1010 1010 restore = False
1011 1011 finally:
1012 1012 if restore:
1013 1013 repo.remove([abstarget], wlock)
1014 1014 except shutil.Error, inst:
1015 1015 raise util.Abort(str(inst))
1016 1016 except IOError, inst:
1017 1017 if inst.errno == errno.ENOENT:
1018 1018 ui.warn(_('%s: deleted in working copy\n') % relsrc)
1019 1019 else:
1020 1020 ui.warn(_('%s: cannot copy - %s\n') %
1021 1021 (relsrc, inst.strerror))
1022 1022 errors += 1
1023 1023 return
1024 1024 if ui.verbose or not exact:
1025 1025 ui.status(_('copying %s to %s\n') % (relsrc, reltarget))
1026 1026 targets[abstarget] = abssrc
1027 1027 if abstarget != origsrc and not opts.get('dry_run'):
1028 1028 repo.copy(origsrc, abstarget, wlock)
1029 1029 copied.append((abssrc, relsrc, exact))
1030 1030
1031 1031 def targetpathfn(pat, dest, srcs):
1032 1032 if os.path.isdir(pat):
1033 1033 abspfx = util.canonpath(repo.root, cwd, pat)
1034 1034 if destdirexists:
1035 1035 striplen = len(os.path.split(abspfx)[0])
1036 1036 else:
1037 1037 striplen = len(abspfx)
1038 1038 if striplen:
1039 1039 striplen += len(os.sep)
1040 1040 res = lambda p: os.path.join(dest, p[striplen:])
1041 1041 elif destdirexists:
1042 1042 res = lambda p: os.path.join(dest, os.path.basename(p))
1043 1043 else:
1044 1044 res = lambda p: dest
1045 1045 return res
1046 1046
1047 1047 def targetpathafterfn(pat, dest, srcs):
1048 1048 if util.patkind(pat, None)[0]:
1049 1049 # a mercurial pattern
1050 1050 res = lambda p: os.path.join(dest, os.path.basename(p))
1051 1051 else:
1052 1052 abspfx = util.canonpath(repo.root, cwd, pat)
1053 1053 if len(abspfx) < len(srcs[0][0]):
1054 1054 # A directory. Either the target path contains the last
1055 1055 # component of the source path or it does not.
1056 1056 def evalpath(striplen):
1057 1057 score = 0
1058 1058 for s in srcs:
1059 1059 t = os.path.join(dest, s[0][striplen:])
1060 1060 if os.path.exists(t):
1061 1061 score += 1
1062 1062 return score
1063 1063
1064 1064 striplen = len(abspfx)
1065 1065 if striplen:
1066 1066 striplen += len(os.sep)
1067 1067 if os.path.isdir(os.path.join(dest, os.path.split(abspfx)[1])):
1068 1068 score = evalpath(striplen)
1069 1069 striplen1 = len(os.path.split(abspfx)[0])
1070 1070 if striplen1:
1071 1071 striplen1 += len(os.sep)
1072 1072 if evalpath(striplen1) > score:
1073 1073 striplen = striplen1
1074 1074 res = lambda p: os.path.join(dest, p[striplen:])
1075 1075 else:
1076 1076 # a file
1077 1077 if destdirexists:
1078 1078 res = lambda p: os.path.join(dest, os.path.basename(p))
1079 1079 else:
1080 1080 res = lambda p: dest
1081 1081 return res
1082 1082
1083 1083
1084 1084 pats = list(pats)
1085 1085 if not pats:
1086 1086 raise util.Abort(_('no source or destination specified'))
1087 1087 if len(pats) == 1:
1088 1088 raise util.Abort(_('no destination specified'))
1089 1089 dest = pats.pop()
1090 1090 destdirexists = os.path.isdir(dest)
1091 1091 if (len(pats) > 1 or util.patkind(pats[0], None)[0]) and not destdirexists:
1092 1092 raise util.Abort(_('with multiple sources, destination must be an '
1093 1093 'existing directory'))
1094 1094 if opts['after']:
1095 1095 tfn = targetpathafterfn
1096 1096 else:
1097 1097 tfn = targetpathfn
1098 1098 copylist = []
1099 1099 for pat in pats:
1100 1100 srcs = []
1101 1101 for tag, abssrc, relsrc, exact in cmdutil.walk(repo, [pat], opts):
1102 1102 origsrc = okaytocopy(abssrc, relsrc, exact)
1103 1103 if origsrc:
1104 1104 srcs.append((origsrc, abssrc, relsrc, exact))
1105 1105 if not srcs:
1106 1106 continue
1107 1107 copylist.append((tfn(pat, dest, srcs), srcs))
1108 1108 if not copylist:
1109 1109 raise util.Abort(_('no files to copy'))
1110 1110
1111 1111 for targetpath, srcs in copylist:
1112 1112 for origsrc, abssrc, relsrc, exact in srcs:
1113 1113 copy(origsrc, abssrc, relsrc, targetpath(abssrc), exact)
1114 1114
1115 1115 if errors:
1116 1116 ui.warn(_('(consider using --after)\n'))
1117 1117 return errors, copied
1118 1118
1119 1119 def copy(ui, repo, *pats, **opts):
1120 1120 """mark files as copied for the next commit
1121 1121
1122 1122 Mark dest as having copies of source files. If dest is a
1123 1123 directory, copies are put in that directory. If dest is a file,
1124 1124 there can only be one source.
1125 1125
1126 1126 By default, this command copies the contents of files as they
1127 1127 stand in the working directory. If invoked with --after, the
1128 1128 operation is recorded, but no copying is performed.
1129 1129
1130 1130 This command takes effect in the next commit.
1131 1131
1132 1132 NOTE: This command should be treated as experimental. While it
1133 1133 should properly record copied files, this information is not yet
1134 1134 fully used by merge, nor fully reported by log.
1135 1135 """
1136 1136 wlock = repo.wlock(0)
1137 1137 errs, copied = docopy(ui, repo, pats, opts, wlock)
1138 1138 return errs
1139 1139
1140 1140 def debugancestor(ui, index, rev1, rev2):
1141 1141 """find the ancestor revision of two revisions in a given index"""
1142 1142 r = revlog.revlog(util.opener(os.getcwd(), audit=False), index, "", 0)
1143 1143 a = r.ancestor(r.lookup(rev1), r.lookup(rev2))
1144 1144 ui.write("%d:%s\n" % (r.rev(a), hex(a)))
1145 1145
1146 1146 def debugcomplete(ui, cmd='', **opts):
1147 1147 """returns the completion list associated with the given command"""
1148 1148
1149 1149 if opts['options']:
1150 1150 options = []
1151 1151 otables = [globalopts]
1152 1152 if cmd:
1153 1153 aliases, entry = findcmd(cmd)
1154 1154 otables.append(entry[1])
1155 1155 for t in otables:
1156 1156 for o in t:
1157 1157 if o[0]:
1158 1158 options.append('-%s' % o[0])
1159 1159 options.append('--%s' % o[1])
1160 1160 ui.write("%s\n" % "\n".join(options))
1161 1161 return
1162 1162
1163 1163 clist = findpossible(cmd).keys()
1164 1164 clist.sort()
1165 1165 ui.write("%s\n" % "\n".join(clist))
1166 1166
1167 1167 def debugrebuildstate(ui, repo, rev=None):
1168 1168 """rebuild the dirstate as it would look like for the given revision"""
1169 1169 if not rev:
1170 1170 rev = repo.changelog.tip()
1171 1171 else:
1172 1172 rev = repo.lookup(rev)
1173 1173 change = repo.changelog.read(rev)
1174 1174 n = change[0]
1175 1175 files = repo.manifest.read(n)
1176 1176 wlock = repo.wlock()
1177 1177 repo.dirstate.rebuild(rev, files)
1178 1178
1179 1179 def debugcheckstate(ui, repo):
1180 1180 """validate the correctness of the current dirstate"""
1181 1181 parent1, parent2 = repo.dirstate.parents()
1182 1182 repo.dirstate.read()
1183 1183 dc = repo.dirstate.map
1184 1184 keys = dc.keys()
1185 1185 keys.sort()
1186 1186 m1n = repo.changelog.read(parent1)[0]
1187 1187 m2n = repo.changelog.read(parent2)[0]
1188 1188 m1 = repo.manifest.read(m1n)
1189 1189 m2 = repo.manifest.read(m2n)
1190 1190 errors = 0
1191 1191 for f in dc:
1192 1192 state = repo.dirstate.state(f)
1193 1193 if state in "nr" and f not in m1:
1194 1194 ui.warn(_("%s in state %s, but not in manifest1\n") % (f, state))
1195 1195 errors += 1
1196 1196 if state in "a" and f in m1:
1197 1197 ui.warn(_("%s in state %s, but also in manifest1\n") % (f, state))
1198 1198 errors += 1
1199 1199 if state in "m" and f not in m1 and f not in m2:
1200 1200 ui.warn(_("%s in state %s, but not in either manifest\n") %
1201 1201 (f, state))
1202 1202 errors += 1
1203 1203 for f in m1:
1204 1204 state = repo.dirstate.state(f)
1205 1205 if state not in "nrm":
1206 1206 ui.warn(_("%s in manifest1, but listed as state %s") % (f, state))
1207 1207 errors += 1
1208 1208 if errors:
1209 1209 error = _(".hg/dirstate inconsistent with current parent's manifest")
1210 1210 raise util.Abort(error)
1211 1211
1212 1212 def debugconfig(ui, repo, *values):
1213 1213 """show combined config settings from all hgrc files
1214 1214
1215 1215 With no args, print names and values of all config items.
1216 1216
1217 1217 With one arg of the form section.name, print just the value of
1218 1218 that config item.
1219 1219
1220 1220 With multiple args, print names and values of all config items
1221 1221 with matching section names."""
1222 1222
1223 1223 if values:
1224 1224 if len([v for v in values if '.' in v]) > 1:
1225 1225 raise util.Abort(_('only one config item permitted'))
1226 1226 for section, name, value in ui.walkconfig():
1227 1227 sectname = section + '.' + name
1228 1228 if values:
1229 1229 for v in values:
1230 1230 if v == section:
1231 1231 ui.write('%s=%s\n' % (sectname, value))
1232 1232 elif v == sectname:
1233 1233 ui.write(value, '\n')
1234 1234 else:
1235 1235 ui.write('%s=%s\n' % (sectname, value))
1236 1236
1237 1237 def debugsetparents(ui, repo, rev1, rev2=None):
1238 1238 """manually set the parents of the current working directory
1239 1239
1240 1240 This is useful for writing repository conversion tools, but should
1241 1241 be used with care.
1242 1242 """
1243 1243
1244 1244 if not rev2:
1245 1245 rev2 = hex(nullid)
1246 1246
1247 1247 repo.dirstate.setparents(repo.lookup(rev1), repo.lookup(rev2))
1248 1248
1249 1249 def debugstate(ui, repo):
1250 1250 """show the contents of the current dirstate"""
1251 1251 repo.dirstate.read()
1252 1252 dc = repo.dirstate.map
1253 1253 keys = dc.keys()
1254 1254 keys.sort()
1255 1255 for file_ in keys:
1256 1256 ui.write("%c %3o %10d %s %s\n"
1257 1257 % (dc[file_][0], dc[file_][1] & 0777, dc[file_][2],
1258 1258 time.strftime("%x %X",
1259 1259 time.localtime(dc[file_][3])), file_))
1260 1260 for f in repo.dirstate.copies:
1261 1261 ui.write(_("copy: %s -> %s\n") % (repo.dirstate.copies[f], f))
1262 1262
1263 1263 def debugdata(ui, file_, rev):
1264 1264 """dump the contents of an data file revision"""
1265 1265 r = revlog.revlog(util.opener(os.getcwd(), audit=False),
1266 1266 file_[:-2] + ".i", file_, 0)
1267 1267 try:
1268 1268 ui.write(r.revision(r.lookup(rev)))
1269 1269 except KeyError:
1270 1270 raise util.Abort(_('invalid revision identifier %s'), rev)
1271 1271
1272 1272 def debugindex(ui, file_):
1273 1273 """dump the contents of an index file"""
1274 1274 r = revlog.revlog(util.opener(os.getcwd(), audit=False), file_, "", 0)
1275 1275 ui.write(" rev offset length base linkrev" +
1276 1276 " nodeid p1 p2\n")
1277 1277 for i in range(r.count()):
1278 1278 node = r.node(i)
1279 1279 pp = r.parents(node)
1280 1280 ui.write("% 6d % 9d % 7d % 6d % 7d %s %s %s\n" % (
1281 1281 i, r.start(i), r.length(i), r.base(i), r.linkrev(node),
1282 1282 short(node), short(pp[0]), short(pp[1])))
1283 1283
1284 1284 def debugindexdot(ui, file_):
1285 1285 """dump an index DAG as a .dot file"""
1286 1286 r = revlog.revlog(util.opener(os.getcwd(), audit=False), file_, "", 0)
1287 1287 ui.write("digraph G {\n")
1288 1288 for i in range(r.count()):
1289 1289 node = r.node(i)
1290 1290 pp = r.parents(node)
1291 1291 ui.write("\t%d -> %d\n" % (r.rev(pp[0]), i))
1292 1292 if pp[1] != nullid:
1293 1293 ui.write("\t%d -> %d\n" % (r.rev(pp[1]), i))
1294 1294 ui.write("}\n")
1295 1295
1296 1296 def debugrename(ui, repo, file, rev=None):
1297 1297 """dump rename information"""
1298 1298 r = repo.file(relpath(repo, [file])[0])
1299 1299 if rev:
1300 1300 try:
1301 1301 # assume all revision numbers are for changesets
1302 1302 n = repo.lookup(rev)
1303 1303 change = repo.changelog.read(n)
1304 1304 m = repo.manifest.read(change[0])
1305 1305 n = m[relpath(repo, [file])[0]]
1306 1306 except (hg.RepoError, KeyError):
1307 1307 n = r.lookup(rev)
1308 1308 else:
1309 1309 n = r.tip()
1310 1310 m = r.renamed(n)
1311 1311 if m:
1312 1312 ui.write(_("renamed from %s:%s\n") % (m[0], hex(m[1])))
1313 1313 else:
1314 1314 ui.write(_("not renamed\n"))
1315 1315
1316 1316 def debugwalk(ui, repo, *pats, **opts):
1317 1317 """show how files match on given patterns"""
1318 1318 items = list(cmdutil.walk(repo, pats, opts))
1319 1319 if not items:
1320 1320 return
1321 1321 fmt = '%%s %%-%ds %%-%ds %%s' % (
1322 1322 max([len(abs) for (src, abs, rel, exact) in items]),
1323 1323 max([len(rel) for (src, abs, rel, exact) in items]))
1324 1324 for src, abs, rel, exact in items:
1325 1325 line = fmt % (src, abs, rel, exact and 'exact' or '')
1326 1326 ui.write("%s\n" % line.rstrip())
1327 1327
1328 1328 def diff(ui, repo, *pats, **opts):
1329 1329 """diff repository (or selected files)
1330 1330
1331 1331 Show differences between revisions for the specified files.
1332 1332
1333 1333 Differences between files are shown using the unified diff format.
1334 1334
1335 1335 When two revision arguments are given, then changes are shown
1336 1336 between those revisions. If only one revision is specified then
1337 1337 that revision is compared to the working directory, and, when no
1338 1338 revisions are specified, the working directory files are compared
1339 1339 to its parent.
1340 1340
1341 1341 Without the -a option, diff will avoid generating diffs of files
1342 1342 it detects as binary. With -a, diff will generate a diff anyway,
1343 1343 probably with undesirable results.
1344 1344 """
1345 1345 node1, node2 = revpair(ui, repo, opts['rev'])
1346 1346
1347 1347 fns, matchfn, anypats = cmdutil.matchpats(repo, pats, opts)
1348 1348
1349 1349 patch.diff(repo, node1, node2, fns, match=matchfn,
1350 1350 opts=ui.diffopts(opts))
1351 1351
1352 1352 def export(ui, repo, *changesets, **opts):
1353 1353 """dump the header and diffs for one or more changesets
1354 1354
1355 1355 Print the changeset header and diffs for one or more revisions.
1356 1356
1357 1357 The information shown in the changeset header is: author,
1358 1358 changeset hash, parent and commit comment.
1359 1359
1360 1360 Output may be to a file, in which case the name of the file is
1361 1361 given using a format string. The formatting rules are as follows:
1362 1362
1363 1363 %% literal "%" character
1364 1364 %H changeset hash (40 bytes of hexadecimal)
1365 1365 %N number of patches being generated
1366 1366 %R changeset revision number
1367 1367 %b basename of the exporting repository
1368 1368 %h short-form changeset hash (12 bytes of hexadecimal)
1369 1369 %n zero-padded sequence number, starting at 1
1370 1370 %r zero-padded changeset revision number
1371 1371
1372 1372 Without the -a option, export will avoid generating diffs of files
1373 1373 it detects as binary. With -a, export will generate a diff anyway,
1374 1374 probably with undesirable results.
1375 1375
1376 1376 With the --switch-parent option, the diff will be against the second
1377 1377 parent. It can be useful to review a merge.
1378 1378 """
1379 1379 if not changesets:
1380 1380 raise util.Abort(_("export requires at least one changeset"))
1381 1381 revs = list(revrange(ui, repo, changesets))
1382 1382 if len(revs) > 1:
1383 1383 ui.note(_('exporting patches:\n'))
1384 1384 else:
1385 1385 ui.note(_('exporting patch:\n'))
1386 1386 patch.export(repo, map(repo.lookup, revs), template=opts['output'],
1387 1387 switch_parent=opts['switch_parent'], opts=ui.diffopts(opts))
1388 1388
1389 1389 def forget(ui, repo, *pats, **opts):
1390 1390 """don't add the specified files on the next commit (DEPRECATED)
1391 1391
1392 1392 (DEPRECATED)
1393 1393 Undo an 'hg add' scheduled for the next commit.
1394 1394
1395 1395 This command is now deprecated and will be removed in a future
1396 1396 release. Please use revert instead.
1397 1397 """
1398 1398 ui.warn(_("(the forget command is deprecated; use revert instead)\n"))
1399 1399 forget = []
1400 1400 for src, abs, rel, exact in cmdutil.walk(repo, pats, opts):
1401 1401 if repo.dirstate.state(abs) == 'a':
1402 1402 forget.append(abs)
1403 1403 if ui.verbose or not exact:
1404 1404 ui.status(_('forgetting %s\n') % ((pats and rel) or abs))
1405 1405 repo.forget(forget)
1406 1406
1407 1407 def grep(ui, repo, pattern, *pats, **opts):
1408 1408 """search for a pattern in specified files and revisions
1409 1409
1410 1410 Search revisions of files for a regular expression.
1411 1411
1412 1412 This command behaves differently than Unix grep. It only accepts
1413 1413 Python/Perl regexps. It searches repository history, not the
1414 1414 working directory. It always prints the revision number in which
1415 1415 a match appears.
1416 1416
1417 1417 By default, grep only prints output for the first revision of a
1418 1418 file in which it finds a match. To get it to print every revision
1419 1419 that contains a change in match status ("-" for a match that
1420 1420 becomes a non-match, or "+" for a non-match that becomes a match),
1421 1421 use the --all flag.
1422 1422 """
1423 1423 reflags = 0
1424 1424 if opts['ignore_case']:
1425 1425 reflags |= re.I
1426 1426 regexp = re.compile(pattern, reflags)
1427 1427 sep, eol = ':', '\n'
1428 1428 if opts['print0']:
1429 1429 sep = eol = '\0'
1430 1430
1431 1431 fcache = {}
1432 1432 def getfile(fn):
1433 1433 if fn not in fcache:
1434 1434 fcache[fn] = repo.file(fn)
1435 1435 return fcache[fn]
1436 1436
1437 1437 def matchlines(body):
1438 1438 begin = 0
1439 1439 linenum = 0
1440 1440 while True:
1441 1441 match = regexp.search(body, begin)
1442 1442 if not match:
1443 1443 break
1444 1444 mstart, mend = match.span()
1445 1445 linenum += body.count('\n', begin, mstart) + 1
1446 1446 lstart = body.rfind('\n', begin, mstart) + 1 or begin
1447 1447 lend = body.find('\n', mend)
1448 1448 yield linenum, mstart - lstart, mend - lstart, body[lstart:lend]
1449 1449 begin = lend + 1
1450 1450
1451 1451 class linestate(object):
1452 1452 def __init__(self, line, linenum, colstart, colend):
1453 1453 self.line = line
1454 1454 self.linenum = linenum
1455 1455 self.colstart = colstart
1456 1456 self.colend = colend
1457 1457
1458 1458 def __eq__(self, other):
1459 1459 return self.line == other.line
1460 1460
1461 1461 matches = {}
1462 1462 copies = {}
1463 1463 def grepbody(fn, rev, body):
1464 1464 matches[rev].setdefault(fn, [])
1465 1465 m = matches[rev][fn]
1466 1466 for lnum, cstart, cend, line in matchlines(body):
1467 1467 s = linestate(line, lnum, cstart, cend)
1468 1468 m.append(s)
1469 1469
1470 1470 def difflinestates(a, b):
1471 1471 sm = difflib.SequenceMatcher(None, a, b)
1472 1472 for tag, alo, ahi, blo, bhi in sm.get_opcodes():
1473 1473 if tag == 'insert':
1474 1474 for i in range(blo, bhi):
1475 1475 yield ('+', b[i])
1476 1476 elif tag == 'delete':
1477 1477 for i in range(alo, ahi):
1478 1478 yield ('-', a[i])
1479 1479 elif tag == 'replace':
1480 1480 for i in range(alo, ahi):
1481 1481 yield ('-', a[i])
1482 1482 for i in range(blo, bhi):
1483 1483 yield ('+', b[i])
1484 1484
1485 1485 prev = {}
1486 1486 ucache = {}
1487 1487 def display(fn, rev, states, prevstates):
1488 1488 counts = {'-': 0, '+': 0}
1489 1489 filerevmatches = {}
1490 1490 if incrementing or not opts['all']:
1491 1491 a, b = prevstates, states
1492 1492 else:
1493 1493 a, b = states, prevstates
1494 1494 for change, l in difflinestates(a, b):
1495 1495 if incrementing or not opts['all']:
1496 1496 r = rev
1497 1497 else:
1498 1498 r = prev[fn]
1499 1499 cols = [fn, str(r)]
1500 1500 if opts['line_number']:
1501 1501 cols.append(str(l.linenum))
1502 1502 if opts['all']:
1503 1503 cols.append(change)
1504 1504 if opts['user']:
1505 1505 cols.append(trimuser(ui, getchange(r)[1], rev,
1506 1506 ucache))
1507 1507 if opts['files_with_matches']:
1508 1508 c = (fn, rev)
1509 1509 if c in filerevmatches:
1510 1510 continue
1511 1511 filerevmatches[c] = 1
1512 1512 else:
1513 1513 cols.append(l.line)
1514 1514 ui.write(sep.join(cols), eol)
1515 1515 counts[change] += 1
1516 1516 return counts['+'], counts['-']
1517 1517
1518 1518 fstate = {}
1519 1519 skip = {}
1520 1520 changeiter, getchange, matchfn = walkchangerevs(ui, repo, pats, opts)
1521 1521 count = 0
1522 1522 incrementing = False
1523 1523 follow = opts.get('follow')
1524 1524 for st, rev, fns in changeiter:
1525 1525 if st == 'window':
1526 1526 incrementing = rev
1527 1527 matches.clear()
1528 1528 copies.clear()
1529 1529 elif st == 'add':
1530 1530 change = repo.changelog.read(repo.lookup(str(rev)))
1531 1531 mf = repo.manifest.read(change[0])
1532 1532 matches[rev] = {}
1533 1533 for fn in fns:
1534 1534 if fn in skip:
1535 1535 continue
1536 1536 fstate.setdefault(fn, {})
1537 1537 copies.setdefault(rev, {})
1538 1538 try:
1539 1539 grepbody(fn, rev, getfile(fn).read(mf[fn]))
1540 1540 if follow:
1541 1541 copied = getfile(fn).renamed(mf[fn])
1542 1542 if copied:
1543 1543 copies[rev][fn] = copied[0]
1544 1544 except KeyError:
1545 1545 pass
1546 1546 elif st == 'iter':
1547 1547 states = matches[rev].items()
1548 1548 states.sort()
1549 1549 for fn, m in states:
1550 1550 copy = copies[rev].get(fn)
1551 1551 if fn in skip:
1552 1552 if copy:
1553 1553 skip[copy] = True
1554 1554 continue
1555 1555 if incrementing or not opts['all'] or fstate[fn]:
1556 1556 pos, neg = display(fn, rev, m, fstate[fn])
1557 1557 count += pos + neg
1558 1558 if pos and not opts['all']:
1559 1559 skip[fn] = True
1560 1560 if copy:
1561 1561 skip[copy] = True
1562 1562 fstate[fn] = m
1563 1563 if copy:
1564 1564 fstate[copy] = m
1565 1565 prev[fn] = rev
1566 1566
1567 1567 if not incrementing:
1568 1568 fstate = fstate.items()
1569 1569 fstate.sort()
1570 1570 for fn, state in fstate:
1571 1571 if fn in skip:
1572 1572 continue
1573 1573 if fn not in copies[prev[fn]]:
1574 1574 display(fn, rev, {}, state)
1575 1575 return (count == 0 and 1) or 0
1576 1576
1577 1577 def heads(ui, repo, **opts):
1578 1578 """show current repository heads
1579 1579
1580 1580 Show all repository head changesets.
1581 1581
1582 1582 Repository "heads" are changesets that don't have children
1583 1583 changesets. They are where development generally takes place and
1584 1584 are the usual targets for update and merge operations.
1585 1585 """
1586 1586 if opts['rev']:
1587 1587 heads = repo.heads(repo.lookup(opts['rev']))
1588 1588 else:
1589 1589 heads = repo.heads()
1590 1590 br = None
1591 1591 if opts['branches']:
1592 1592 br = repo.branchlookup(heads)
1593 1593 displayer = show_changeset(ui, repo, opts)
1594 1594 for n in heads:
1595 1595 displayer.show(changenode=n, brinfo=br)
1596 1596
1597 1597 def identify(ui, repo):
1598 1598 """print information about the working copy
1599 1599
1600 1600 Print a short summary of the current state of the repo.
1601 1601
1602 1602 This summary identifies the repository state using one or two parent
1603 1603 hash identifiers, followed by a "+" if there are uncommitted changes
1604 1604 in the working directory, followed by a list of tags for this revision.
1605 1605 """
1606 1606 parents = [p for p in repo.dirstate.parents() if p != nullid]
1607 1607 if not parents:
1608 1608 ui.write(_("unknown\n"))
1609 1609 return
1610 1610
1611 1611 hexfunc = ui.verbose and hex or short
1612 1612 modified, added, removed, deleted = repo.status()[:4]
1613 1613 output = ["%s%s" %
1614 1614 ('+'.join([hexfunc(parent) for parent in parents]),
1615 1615 (modified or added or removed or deleted) and "+" or "")]
1616 1616
1617 1617 if not ui.quiet:
1618 1618 # multiple tags for a single parent separated by '/'
1619 1619 parenttags = ['/'.join(tags)
1620 1620 for tags in map(repo.nodetags, parents) if tags]
1621 1621 # tags for multiple parents separated by ' + '
1622 1622 if parenttags:
1623 1623 output.append(' + '.join(parenttags))
1624 1624
1625 1625 ui.write("%s\n" % ' '.join(output))
1626 1626
1627 1627 def import_(ui, repo, patch1, *patches, **opts):
1628 1628 """import an ordered set of patches
1629 1629
1630 1630 Import a list of patches and commit them individually.
1631 1631
1632 1632 If there are outstanding changes in the working directory, import
1633 1633 will abort unless given the -f flag.
1634 1634
1635 1635 You can import a patch straight from a mail message. Even patches
1636 1636 as attachments work (body part must be type text/plain or
1637 1637 text/x-patch to be used). From and Subject headers of email
1638 1638 message are used as default committer and commit message. All
1639 1639 text/plain body parts before first diff are added to commit
1640 1640 message.
1641 1641
1642 1642 If imported patch was generated by hg export, user and description
1643 1643 from patch override values from message headers and body. Values
1644 1644 given on command line with -m and -u override these.
1645 1645
1646 1646 To read a patch from standard input, use patch name "-".
1647 1647 """
1648 1648 patches = (patch1,) + patches
1649 1649
1650 1650 if not opts['force']:
1651 1651 bail_if_changed(repo)
1652 1652
1653 1653 d = opts["base"]
1654 1654 strip = opts["strip"]
1655 1655
1656 1656 wlock = repo.wlock()
1657 1657 lock = repo.lock()
1658 1658
1659 1659 for p in patches:
1660 1660 pf = os.path.join(d, p)
1661 1661
1662 1662 if pf == '-':
1663 1663 ui.status(_("applying patch from stdin\n"))
1664 1664 tmpname, message, user, date = patch.extract(ui, sys.stdin)
1665 1665 else:
1666 1666 ui.status(_("applying %s\n") % p)
1667 1667 tmpname, message, user, date = patch.extract(ui, file(pf))
1668 1668
1669 1669 if tmpname is None:
1670 1670 raise util.Abort(_('no diffs found'))
1671 1671
1672 1672 try:
1673 1673 if opts['message']:
1674 1674 # pickup the cmdline msg
1675 1675 message = opts['message']
1676 1676 elif message:
1677 1677 # pickup the patch msg
1678 1678 message = message.strip()
1679 1679 else:
1680 1680 # launch the editor
1681 1681 message = None
1682 1682 ui.debug(_('message:\n%s\n') % message)
1683 1683
1684 1684 files = patch.patch(strip, tmpname, ui, cwd=repo.root)
1685 1685 removes = []
1686 1686 if len(files) > 0:
1687 1687 cfiles = files.keys()
1688 1688 copies = []
1689 1689 copts = {'after': False, 'force': False}
1690 1690 cwd = repo.getcwd()
1691 1691 if cwd:
1692 1692 cfiles = [util.pathto(cwd, f) for f in files.keys()]
1693 1693 for f in files:
1694 1694 ctype, gp = files[f]
1695 1695 if ctype == 'RENAME':
1696 1696 copies.append((gp.oldpath, gp.path, gp.copymod))
1697 1697 removes.append(gp.oldpath)
1698 1698 elif ctype == 'COPY':
1699 1699 copies.append((gp.oldpath, gp.path, gp.copymod))
1700 1700 elif ctype == 'DELETE':
1701 1701 removes.append(gp.path)
1702 1702 for src, dst, after in copies:
1703 1703 absdst = os.path.join(repo.root, dst)
1704 1704 if not after and os.path.exists(absdst):
1705 1705 raise util.Abort(_('patch creates existing file %s') % dst)
1706 1706 if cwd:
1707 1707 src, dst = [util.pathto(cwd, f) for f in (src, dst)]
1708 1708 copts['after'] = after
1709 1709 errs, copied = docopy(ui, repo, (src, dst), copts, wlock=wlock)
1710 1710 if errs:
1711 1711 raise util.Abort(errs)
1712 1712 if removes:
1713 1713 repo.remove(removes, True, wlock=wlock)
1714 1714 for f in files:
1715 1715 ctype, gp = files[f]
1716 1716 if gp and gp.mode:
1717 1717 x = gp.mode & 0100 != 0
1718 1718 dst = os.path.join(repo.root, gp.path)
1719 1719 util.set_exec(dst, x)
1720 1720 cmdutil.addremove(repo, cfiles, wlock=wlock)
1721 1721 files = files.keys()
1722 1722 files.extend([r for r in removes if r not in files])
1723 1723 repo.commit(files, message, user, date, wlock=wlock, lock=lock)
1724 1724 finally:
1725 1725 os.unlink(tmpname)
1726 1726
1727 1727 def incoming(ui, repo, source="default", **opts):
1728 1728 """show new changesets found in source
1729 1729
1730 1730 Show new changesets found in the specified path/URL or the default
1731 1731 pull location. These are the changesets that would be pulled if a pull
1732 1732 was requested.
1733 1733
1734 1734 For remote repository, using --bundle avoids downloading the changesets
1735 1735 twice if the incoming is followed by a pull.
1736 1736
1737 1737 See pull for valid source format details.
1738 1738 """
1739 1739 source = ui.expandpath(source)
1740 1740 setremoteconfig(ui, opts)
1741 1741
1742 1742 other = hg.repository(ui, source)
1743 1743 incoming = repo.findincoming(other, force=opts["force"])
1744 1744 if not incoming:
1745 1745 ui.status(_("no changes found\n"))
1746 1746 return
1747 1747
1748 1748 cleanup = None
1749 1749 try:
1750 1750 fname = opts["bundle"]
1751 1751 if fname or not other.local():
1752 1752 # create a bundle (uncompressed if other repo is not local)
1753 1753 cg = other.changegroup(incoming, "incoming")
1754 1754 fname = cleanup = write_bundle(cg, fname, compress=other.local())
1755 1755 # keep written bundle?
1756 1756 if opts["bundle"]:
1757 1757 cleanup = None
1758 1758 if not other.local():
1759 1759 # use the created uncompressed bundlerepo
1760 1760 other = bundlerepo.bundlerepository(ui, repo.root, fname)
1761 1761
1762 1762 revs = None
1763 1763 if opts['rev']:
1764 1764 revs = [other.lookup(rev) for rev in opts['rev']]
1765 1765 o = other.changelog.nodesbetween(incoming, revs)[0]
1766 1766 if opts['newest_first']:
1767 1767 o.reverse()
1768 1768 displayer = show_changeset(ui, other, opts)
1769 1769 for n in o:
1770 1770 parents = [p for p in other.changelog.parents(n) if p != nullid]
1771 1771 if opts['no_merges'] and len(parents) == 2:
1772 1772 continue
1773 1773 displayer.show(changenode=n)
1774 1774 if opts['patch']:
1775 1775 prev = (parents and parents[0]) or nullid
1776 1776 patch.diff(repo, other, prev, n)
1777 1777 ui.write("\n")
1778 1778 finally:
1779 1779 if hasattr(other, 'close'):
1780 1780 other.close()
1781 1781 if cleanup:
1782 1782 os.unlink(cleanup)
1783 1783
1784 1784 def init(ui, dest=".", **opts):
1785 1785 """create a new repository in the given directory
1786 1786
1787 1787 Initialize a new repository in the given directory. If the given
1788 1788 directory does not exist, it is created.
1789 1789
1790 1790 If no directory is given, the current directory is used.
1791 1791
1792 1792 It is possible to specify an ssh:// URL as the destination.
1793 1793 Look at the help text for the pull command for important details
1794 1794 about ssh:// URLs.
1795 1795 """
1796 1796 setremoteconfig(ui, opts)
1797 1797 hg.repository(ui, dest, create=1)
1798 1798
1799 1799 def locate(ui, repo, *pats, **opts):
1800 1800 """locate files matching specific patterns
1801 1801
1802 1802 Print all files under Mercurial control whose names match the
1803 1803 given patterns.
1804 1804
1805 1805 This command searches the current directory and its
1806 1806 subdirectories. To search an entire repository, move to the root
1807 1807 of the repository.
1808 1808
1809 1809 If no patterns are given to match, this command prints all file
1810 1810 names.
1811 1811
1812 1812 If you want to feed the output of this command into the "xargs"
1813 1813 command, use the "-0" option to both this command and "xargs".
1814 1814 This will avoid the problem of "xargs" treating single filenames
1815 1815 that contain white space as multiple filenames.
1816 1816 """
1817 1817 end = opts['print0'] and '\0' or '\n'
1818 1818 rev = opts['rev']
1819 1819 if rev:
1820 1820 node = repo.lookup(rev)
1821 1821 else:
1822 1822 node = None
1823 1823
1824 1824 for src, abs, rel, exact in cmdutil.walk(repo, pats, opts, node=node,
1825 1825 head='(?:.*/|)'):
1826 1826 if not node and repo.dirstate.state(abs) == '?':
1827 1827 continue
1828 1828 if opts['fullpath']:
1829 1829 ui.write(os.path.join(repo.root, abs), end)
1830 1830 else:
1831 1831 ui.write(((pats and rel) or abs), end)
1832 1832
1833 1833 def log(ui, repo, *pats, **opts):
1834 1834 """show revision history of entire repository or files
1835 1835
1836 1836 Print the revision history of the specified files or the entire
1837 1837 project.
1838 1838
1839 1839 File history is shown without following rename or copy history of
1840 1840 files. Use -f/--follow with a file name to follow history across
1841 1841 renames and copies. --follow without a file name will only show
1842 1842 ancestors or descendants of the starting revision. --follow-first
1843 1843 only follows the first parent of merge revisions.
1844 1844
1845 1845 If no revision range is specified, the default is tip:0 unless
1846 1846 --follow is set, in which case the working directory parent is
1847 1847 used as the starting revision.
1848 1848
1849 1849 By default this command outputs: changeset id and hash, tags,
1850 1850 non-trivial parents, user, date and time, and a summary for each
1851 1851 commit. When the -v/--verbose switch is used, the list of changed
1852 1852 files and full commit message is shown.
1853 1853 """
1854 1854 class dui(object):
1855 1855 # Implement and delegate some ui protocol. Save hunks of
1856 1856 # output for later display in the desired order.
1857 1857 def __init__(self, ui):
1858 1858 self.ui = ui
1859 1859 self.hunk = {}
1860 1860 self.header = {}
1861 1861 def bump(self, rev):
1862 1862 self.rev = rev
1863 1863 self.hunk[rev] = []
1864 1864 self.header[rev] = []
1865 1865 def note(self, *args):
1866 1866 if self.verbose:
1867 1867 self.write(*args)
1868 1868 def status(self, *args):
1869 1869 if not self.quiet:
1870 1870 self.write(*args)
1871 1871 def write(self, *args):
1872 1872 self.hunk[self.rev].append(args)
1873 1873 def write_header(self, *args):
1874 1874 self.header[self.rev].append(args)
1875 1875 def debug(self, *args):
1876 1876 if self.debugflag:
1877 1877 self.write(*args)
1878 1878 def __getattr__(self, key):
1879 1879 return getattr(self.ui, key)
1880 1880
1881 1881 changeiter, getchange, matchfn = walkchangerevs(ui, repo, pats, opts)
1882 1882
1883 1883 if opts['limit']:
1884 1884 try:
1885 1885 limit = int(opts['limit'])
1886 1886 except ValueError:
1887 1887 raise util.Abort(_('limit must be a positive integer'))
1888 1888 if limit <= 0: raise util.Abort(_('limit must be positive'))
1889 1889 else:
1890 1890 limit = sys.maxint
1891 1891 count = 0
1892 1892
1893 1893 displayer = show_changeset(ui, repo, opts)
1894 1894 for st, rev, fns in changeiter:
1895 1895 if st == 'window':
1896 1896 du = dui(ui)
1897 1897 displayer.ui = du
1898 1898 elif st == 'add':
1899 1899 du.bump(rev)
1900 1900 changenode = repo.changelog.node(rev)
1901 1901 parents = [p for p in repo.changelog.parents(changenode)
1902 1902 if p != nullid]
1903 1903 if opts['no_merges'] and len(parents) == 2:
1904 1904 continue
1905 1905 if opts['only_merges'] and len(parents) != 2:
1906 1906 continue
1907 1907
1908 1908 if opts['keyword']:
1909 1909 changes = getchange(rev)
1910 1910 miss = 0
1911 1911 for k in [kw.lower() for kw in opts['keyword']]:
1912 1912 if not (k in changes[1].lower() or
1913 1913 k in changes[4].lower() or
1914 1914 k in " ".join(changes[3][:20]).lower()):
1915 1915 miss = 1
1916 1916 break
1917 1917 if miss:
1918 1918 continue
1919 1919
1920 1920 br = None
1921 1921 if opts['branches']:
1922 1922 br = repo.branchlookup([repo.changelog.node(rev)])
1923 1923
1924 1924 displayer.show(rev, brinfo=br)
1925 1925 if opts['patch']:
1926 1926 prev = (parents and parents[0]) or nullid
1927 1927 patch.diff(repo, prev, changenode, match=matchfn, fp=du)
1928 1928 du.write("\n\n")
1929 1929 elif st == 'iter':
1930 1930 if count == limit: break
1931 1931 if du.header[rev]:
1932 1932 for args in du.header[rev]:
1933 1933 ui.write_header(*args)
1934 1934 if du.hunk[rev]:
1935 1935 count += 1
1936 1936 for args in du.hunk[rev]:
1937 1937 ui.write(*args)
1938 1938
1939 1939 def manifest(ui, repo, rev=None):
1940 1940 """output the latest or given revision of the project manifest
1941 1941
1942 1942 Print a list of version controlled files for the given revision.
1943 1943
1944 1944 The manifest is the list of files being version controlled. If no revision
1945 1945 is given then the tip is used.
1946 1946 """
1947 1947 if rev:
1948 1948 try:
1949 1949 # assume all revision numbers are for changesets
1950 1950 n = repo.lookup(rev)
1951 1951 change = repo.changelog.read(n)
1952 1952 n = change[0]
1953 1953 except hg.RepoError:
1954 1954 n = repo.manifest.lookup(rev)
1955 1955 else:
1956 1956 n = repo.manifest.tip()
1957 1957 m = repo.manifest.read(n)
1958 1958 files = m.keys()
1959 1959 files.sort()
1960 1960
1961 1961 for f in files:
1962 1962 ui.write("%40s %3s %s\n" % (hex(m[f]),
1963 1963 m.execf(f) and "755" or "644", f))
1964 1964
1965 1965 def merge(ui, repo, node=None, force=None, branch=None):
1966 1966 """Merge working directory with another revision
1967 1967
1968 1968 Merge the contents of the current working directory and the
1969 1969 requested revision. Files that changed between either parent are
1970 1970 marked as changed for the next commit and a commit must be
1971 1971 performed before any further updates are allowed.
1972 1972 """
1973 1973
1974 1974 node = _lookup(repo, node, branch)
1975 1975 return hg.merge(repo, node, force=force)
1976 1976
1977 1977 def outgoing(ui, repo, dest=None, **opts):
1978 1978 """show changesets not found in destination
1979 1979
1980 1980 Show changesets not found in the specified destination repository or
1981 1981 the default push location. These are the changesets that would be pushed
1982 1982 if a push was requested.
1983 1983
1984 1984 See pull for valid destination format details.
1985 1985 """
1986 1986 dest = ui.expandpath(dest or 'default-push', dest or 'default')
1987 1987 setremoteconfig(ui, opts)
1988 1988 revs = None
1989 1989 if opts['rev']:
1990 1990 revs = [repo.lookup(rev) for rev in opts['rev']]
1991 1991
1992 1992 other = hg.repository(ui, dest)
1993 1993 o = repo.findoutgoing(other, force=opts['force'])
1994 1994 if not o:
1995 1995 ui.status(_("no changes found\n"))
1996 1996 return
1997 1997 o = repo.changelog.nodesbetween(o, revs)[0]
1998 1998 if opts['newest_first']:
1999 1999 o.reverse()
2000 2000 displayer = show_changeset(ui, repo, opts)
2001 2001 for n in o:
2002 2002 parents = [p for p in repo.changelog.parents(n) if p != nullid]
2003 2003 if opts['no_merges'] and len(parents) == 2:
2004 2004 continue
2005 2005 displayer.show(changenode=n)
2006 2006 if opts['patch']:
2007 2007 prev = (parents and parents[0]) or nullid
2008 2008 patch.diff(repo, prev, n)
2009 2009 ui.write("\n")
2010 2010
2011 2011 def parents(ui, repo, file_=None, rev=None, branches=None, **opts):
2012 2012 """show the parents of the working dir or revision
2013 2013
2014 2014 Print the working directory's parent revisions.
2015 2015 """
2016 2016 # legacy
2017 2017 if file_ and not rev:
2018 2018 try:
2019 2019 rev = repo.lookup(file_)
2020 2020 file_ = None
2021 2021 except hg.RepoError:
2022 2022 pass
2023 2023 else:
2024 2024 ui.warn(_("'hg parent REV' is deprecated, "
2025 2025 "please use 'hg parents -r REV instead\n"))
2026 2026
2027 2027 if rev:
2028 2028 if file_:
2029 2029 ctx = repo.filectx(file_, changeid=rev)
2030 2030 else:
2031 2031 ctx = repo.changectx(rev)
2032 2032 p = [cp.node() for cp in ctx.parents()]
2033 2033 else:
2034 2034 p = repo.dirstate.parents()
2035 2035
2036 2036 br = None
2037 2037 if branches is not None:
2038 2038 br = repo.branchlookup(p)
2039 2039 displayer = show_changeset(ui, repo, opts)
2040 2040 for n in p:
2041 2041 if n != nullid:
2042 2042 displayer.show(changenode=n, brinfo=br)
2043 2043
2044 2044 def paths(ui, repo, search=None):
2045 2045 """show definition of symbolic path names
2046 2046
2047 2047 Show definition of symbolic path name NAME. If no name is given, show
2048 2048 definition of available names.
2049 2049
2050 2050 Path names are defined in the [paths] section of /etc/mercurial/hgrc
2051 2051 and $HOME/.hgrc. If run inside a repository, .hg/hgrc is used, too.
2052 2052 """
2053 2053 if search:
2054 2054 for name, path in ui.configitems("paths"):
2055 2055 if name == search:
2056 2056 ui.write("%s\n" % path)
2057 2057 return
2058 2058 ui.warn(_("not found!\n"))
2059 2059 return 1
2060 2060 else:
2061 2061 for name, path in ui.configitems("paths"):
2062 2062 ui.write("%s = %s\n" % (name, path))
2063 2063
2064 2064 def postincoming(ui, repo, modheads, optupdate):
2065 2065 if modheads == 0:
2066 2066 return
2067 2067 if optupdate:
2068 2068 if modheads == 1:
2069 2069 return hg.update(repo, repo.changelog.tip()) # update
2070 2070 else:
2071 2071 ui.status(_("not updating, since new heads added\n"))
2072 2072 if modheads > 1:
2073 2073 ui.status(_("(run 'hg heads' to see heads, 'hg merge' to merge)\n"))
2074 2074 else:
2075 2075 ui.status(_("(run 'hg update' to get a working copy)\n"))
2076 2076
2077 2077 def pull(ui, repo, source="default", **opts):
2078 2078 """pull changes from the specified source
2079 2079
2080 2080 Pull changes from a remote repository to a local one.
2081 2081
2082 2082 This finds all changes from the repository at the specified path
2083 2083 or URL and adds them to the local repository. By default, this
2084 2084 does not update the copy of the project in the working directory.
2085 2085
2086 2086 Valid URLs are of the form:
2087 2087
2088 2088 local/filesystem/path
2089 2089 http://[user@]host[:port]/[path]
2090 2090 https://[user@]host[:port]/[path]
2091 2091 ssh://[user@]host[:port]/[path]
2092 2092
2093 2093 Some notes about using SSH with Mercurial:
2094 2094 - SSH requires an accessible shell account on the destination machine
2095 2095 and a copy of hg in the remote path or specified with as remotecmd.
2096 2096 - path is relative to the remote user's home directory by default.
2097 2097 Use an extra slash at the start of a path to specify an absolute path:
2098 2098 ssh://example.com//tmp/repository
2099 2099 - Mercurial doesn't use its own compression via SSH; the right thing
2100 2100 to do is to configure it in your ~/.ssh/ssh_config, e.g.:
2101 2101 Host *.mylocalnetwork.example.com
2102 2102 Compression off
2103 2103 Host *
2104 2104 Compression on
2105 2105 Alternatively specify "ssh -C" as your ssh command in your hgrc or
2106 2106 with the --ssh command line option.
2107 2107 """
2108 2108 source = ui.expandpath(source)
2109 2109 setremoteconfig(ui, opts)
2110 2110
2111 2111 other = hg.repository(ui, source)
2112 2112 ui.status(_('pulling from %s\n') % (source))
2113 2113 revs = None
2114 2114 if opts['rev'] and not other.local():
2115 2115 raise util.Abort(_("pull -r doesn't work for remote repositories yet"))
2116 2116 elif opts['rev']:
2117 2117 revs = [other.lookup(rev) for rev in opts['rev']]
2118 2118 modheads = repo.pull(other, heads=revs, force=opts['force'])
2119 2119 return postincoming(ui, repo, modheads, opts['update'])
2120 2120
2121 2121 def push(ui, repo, dest=None, **opts):
2122 2122 """push changes to the specified destination
2123 2123
2124 2124 Push changes from the local repository to the given destination.
2125 2125
2126 2126 This is the symmetrical operation for pull. It helps to move
2127 2127 changes from the current repository to a different one. If the
2128 2128 destination is local this is identical to a pull in that directory
2129 2129 from the current one.
2130 2130
2131 2131 By default, push will refuse to run if it detects the result would
2132 2132 increase the number of remote heads. This generally indicates the
2133 2133 the client has forgotten to sync and merge before pushing.
2134 2134
2135 2135 Valid URLs are of the form:
2136 2136
2137 2137 local/filesystem/path
2138 2138 ssh://[user@]host[:port]/[path]
2139 2139
2140 2140 Look at the help text for the pull command for important details
2141 2141 about ssh:// URLs.
2142 2142
2143 2143 Pushing to http:// and https:// URLs is possible, too, if this
2144 2144 feature is enabled on the remote Mercurial server.
2145 2145 """
2146 2146 dest = ui.expandpath(dest or 'default-push', dest or 'default')
2147 2147 setremoteconfig(ui, opts)
2148 2148
2149 2149 other = hg.repository(ui, dest)
2150 2150 ui.status('pushing to %s\n' % (dest))
2151 2151 revs = None
2152 2152 if opts['rev']:
2153 2153 revs = [repo.lookup(rev) for rev in opts['rev']]
2154 2154 r = repo.push(other, opts['force'], revs=revs)
2155 2155 return r == 0
2156 2156
2157 2157 def rawcommit(ui, repo, *flist, **rc):
2158 2158 """raw commit interface (DEPRECATED)
2159 2159
2160 2160 (DEPRECATED)
2161 2161 Lowlevel commit, for use in helper scripts.
2162 2162
2163 2163 This command is not intended to be used by normal users, as it is
2164 2164 primarily useful for importing from other SCMs.
2165 2165
2166 2166 This command is now deprecated and will be removed in a future
2167 2167 release, please use debugsetparents and commit instead.
2168 2168 """
2169 2169
2170 2170 ui.warn(_("(the rawcommit command is deprecated)\n"))
2171 2171
2172 2172 message = rc['message']
2173 2173 if not message and rc['logfile']:
2174 2174 try:
2175 2175 message = open(rc['logfile']).read()
2176 2176 except IOError:
2177 2177 pass
2178 2178 if not message and not rc['logfile']:
2179 2179 raise util.Abort(_("missing commit message"))
2180 2180
2181 2181 files = relpath(repo, list(flist))
2182 2182 if rc['files']:
2183 2183 files += open(rc['files']).read().splitlines()
2184 2184
2185 2185 rc['parent'] = map(repo.lookup, rc['parent'])
2186 2186
2187 2187 try:
2188 2188 repo.rawcommit(files, message, rc['user'], rc['date'], *rc['parent'])
2189 2189 except ValueError, inst:
2190 2190 raise util.Abort(str(inst))
2191 2191
2192 2192 def recover(ui, repo):
2193 2193 """roll back an interrupted transaction
2194 2194
2195 2195 Recover from an interrupted commit or pull.
2196 2196
2197 2197 This command tries to fix the repository status after an interrupted
2198 2198 operation. It should only be necessary when Mercurial suggests it.
2199 2199 """
2200 2200 if repo.recover():
2201 2201 return hg.verify(repo)
2202 2202 return 1
2203 2203
2204 2204 def remove(ui, repo, *pats, **opts):
2205 2205 """remove the specified files on the next commit
2206 2206
2207 2207 Schedule the indicated files for removal from the repository.
2208 2208
2209 2209 This command schedules the files to be removed at the next commit.
2210 2210 This only removes files from the current branch, not from the
2211 2211 entire project history. If the files still exist in the working
2212 2212 directory, they will be deleted from it. If invoked with --after,
2213 2213 files that have been manually deleted are marked as removed.
2214 2214
2215 2215 Modified files and added files are not removed by default. To
2216 2216 remove them, use the -f/--force option.
2217 2217 """
2218 2218 names = []
2219 2219 if not opts['after'] and not pats:
2220 2220 raise util.Abort(_('no files specified'))
2221 2221 files, matchfn, anypats = cmdutil.matchpats(repo, pats, opts)
2222 2222 exact = dict.fromkeys(files)
2223 2223 mardu = map(dict.fromkeys, repo.status(files=files, match=matchfn))[:5]
2224 2224 modified, added, removed, deleted, unknown = mardu
2225 2225 remove, forget = [], []
2226 2226 for src, abs, rel, exact in cmdutil.walk(repo, pats, opts):
2227 2227 reason = None
2228 2228 if abs not in deleted and opts['after']:
2229 2229 reason = _('is still present')
2230 2230 elif abs in modified and not opts['force']:
2231 2231 reason = _('is modified (use -f to force removal)')
2232 2232 elif abs in added:
2233 2233 if opts['force']:
2234 2234 forget.append(abs)
2235 2235 continue
2236 2236 reason = _('has been marked for add (use -f to force removal)')
2237 2237 elif abs in unknown:
2238 2238 reason = _('is not managed')
2239 2239 elif abs in removed:
2240 2240 continue
2241 2241 if reason:
2242 2242 if exact:
2243 2243 ui.warn(_('not removing %s: file %s\n') % (rel, reason))
2244 2244 else:
2245 2245 if ui.verbose or not exact:
2246 2246 ui.status(_('removing %s\n') % rel)
2247 2247 remove.append(abs)
2248 2248 repo.forget(forget)
2249 2249 repo.remove(remove, unlink=not opts['after'])
2250 2250
2251 2251 def rename(ui, repo, *pats, **opts):
2252 2252 """rename files; equivalent of copy + remove
2253 2253
2254 2254 Mark dest as copies of sources; mark sources for deletion. If
2255 2255 dest is a directory, copies are put in that directory. If dest is
2256 2256 a file, there can only be one source.
2257 2257
2258 2258 By default, this command copies the contents of files as they
2259 2259 stand in the working directory. If invoked with --after, the
2260 2260 operation is recorded, but no copying is performed.
2261 2261
2262 2262 This command takes effect in the next commit.
2263 2263
2264 2264 NOTE: This command should be treated as experimental. While it
2265 2265 should properly record rename files, this information is not yet
2266 2266 fully used by merge, nor fully reported by log.
2267 2267 """
2268 2268 wlock = repo.wlock(0)
2269 2269 errs, copied = docopy(ui, repo, pats, opts, wlock)
2270 2270 names = []
2271 2271 for abs, rel, exact in copied:
2272 2272 if ui.verbose or not exact:
2273 2273 ui.status(_('removing %s\n') % rel)
2274 2274 names.append(abs)
2275 2275 if not opts.get('dry_run'):
2276 2276 repo.remove(names, True, wlock)
2277 2277 return errs
2278 2278
2279 2279 def revert(ui, repo, *pats, **opts):
2280 2280 """revert files or dirs to their states as of some revision
2281 2281
2282 2282 With no revision specified, revert the named files or directories
2283 2283 to the contents they had in the parent of the working directory.
2284 2284 This restores the contents of the affected files to an unmodified
2285 2285 state. If the working directory has two parents, you must
2286 2286 explicitly specify the revision to revert to.
2287 2287
2288 2288 Modified files are saved with a .orig suffix before reverting.
2289 2289 To disable these backups, use --no-backup.
2290 2290
2291 2291 Using the -r option, revert the given files or directories to
2292 2292 their contents as of a specific revision. This can be helpful to"roll
2293 2293 back" some or all of a change that should not have been committed.
2294 2294
2295 2295 Revert modifies the working directory. It does not commit any
2296 2296 changes, or change the parent of the working directory. If you
2297 2297 revert to a revision other than the parent of the working
2298 2298 directory, the reverted files will thus appear modified
2299 2299 afterwards.
2300 2300
2301 2301 If a file has been deleted, it is recreated. If the executable
2302 2302 mode of a file was changed, it is reset.
2303 2303
2304 2304 If names are given, all files matching the names are reverted.
2305 2305
2306 2306 If no arguments are given, all files in the repository are reverted.
2307 2307 """
2308 2308 parent, p2 = repo.dirstate.parents()
2309 2309 if opts['rev']:
2310 2310 node = repo.lookup(opts['rev'])
2311 2311 elif p2 != nullid:
2312 2312 raise util.Abort(_('working dir has two parents; '
2313 2313 'you must specify the revision to revert to'))
2314 2314 else:
2315 2315 node = parent
2316 2316 mf = repo.manifest.read(repo.changelog.read(node)[0])
2317 2317 if node == parent:
2318 2318 pmf = mf
2319 2319 else:
2320 2320 pmf = None
2321 2321
2322 2322 wlock = repo.wlock()
2323 2323
2324 2324 # need all matching names in dirstate and manifest of target rev,
2325 2325 # so have to walk both. do not print errors if files exist in one
2326 2326 # but not other.
2327 2327
2328 2328 names = {}
2329 2329 target_only = {}
2330 2330
2331 2331 # walk dirstate.
2332 2332
2333 2333 for src, abs, rel, exact in cmdutil.walk(repo, pats, opts,
2334 2334 badmatch=mf.has_key):
2335 2335 names[abs] = (rel, exact)
2336 2336 if src == 'b':
2337 2337 target_only[abs] = True
2338 2338
2339 2339 # walk target manifest.
2340 2340
2341 2341 for src, abs, rel, exact in cmdutil.walk(repo, pats, opts, node=node,
2342 2342 badmatch=names.has_key):
2343 2343 if abs in names: continue
2344 2344 names[abs] = (rel, exact)
2345 2345 target_only[abs] = True
2346 2346
2347 2347 changes = repo.status(match=names.has_key, wlock=wlock)[:5]
2348 2348 modified, added, removed, deleted, unknown = map(dict.fromkeys, changes)
2349 2349
2350 2350 revert = ([], _('reverting %s\n'))
2351 2351 add = ([], _('adding %s\n'))
2352 2352 remove = ([], _('removing %s\n'))
2353 2353 forget = ([], _('forgetting %s\n'))
2354 2354 undelete = ([], _('undeleting %s\n'))
2355 2355 update = {}
2356 2356
2357 2357 disptable = (
2358 2358 # dispatch table:
2359 2359 # file state
2360 2360 # action if in target manifest
2361 2361 # action if not in target manifest
2362 2362 # make backup if in target manifest
2363 2363 # make backup if not in target manifest
2364 2364 (modified, revert, remove, True, True),
2365 2365 (added, revert, forget, True, False),
2366 2366 (removed, undelete, None, False, False),
2367 2367 (deleted, revert, remove, False, False),
2368 2368 (unknown, add, None, True, False),
2369 2369 (target_only, add, None, False, False),
2370 2370 )
2371 2371
2372 2372 entries = names.items()
2373 2373 entries.sort()
2374 2374
2375 2375 for abs, (rel, exact) in entries:
2376 2376 mfentry = mf.get(abs)
2377 2377 def handle(xlist, dobackup):
2378 2378 xlist[0].append(abs)
2379 2379 update[abs] = 1
2380 2380 if dobackup and not opts['no_backup'] and os.path.exists(rel):
2381 2381 bakname = "%s.orig" % rel
2382 2382 ui.note(_('saving current version of %s as %s\n') %
2383 2383 (rel, bakname))
2384 2384 if not opts.get('dry_run'):
2385 2385 shutil.copyfile(rel, bakname)
2386 2386 shutil.copymode(rel, bakname)
2387 2387 if ui.verbose or not exact:
2388 2388 ui.status(xlist[1] % rel)
2389 2389 for table, hitlist, misslist, backuphit, backupmiss in disptable:
2390 2390 if abs not in table: continue
2391 2391 # file has changed in dirstate
2392 2392 if mfentry:
2393 2393 handle(hitlist, backuphit)
2394 2394 elif misslist is not None:
2395 2395 handle(misslist, backupmiss)
2396 2396 else:
2397 2397 if exact: ui.warn(_('file not managed: %s\n' % rel))
2398 2398 break
2399 2399 else:
2400 2400 # file has not changed in dirstate
2401 2401 if node == parent:
2402 2402 if exact: ui.warn(_('no changes needed to %s\n' % rel))
2403 2403 continue
2404 2404 if pmf is None:
2405 2405 # only need parent manifest in this unlikely case,
2406 2406 # so do not read by default
2407 2407 pmf = repo.manifest.read(repo.changelog.read(parent)[0])
2408 2408 if abs in pmf:
2409 2409 if mfentry:
2410 2410 # if version of file is same in parent and target
2411 2411 # manifests, do nothing
2412 2412 if pmf[abs] != mfentry:
2413 2413 handle(revert, False)
2414 2414 else:
2415 2415 handle(remove, False)
2416 2416
2417 2417 if not opts.get('dry_run'):
2418 2418 repo.dirstate.forget(forget[0])
2419 2419 r = hg.revert(repo, node, update.has_key, wlock)
2420 2420 repo.dirstate.update(add[0], 'a')
2421 2421 repo.dirstate.update(undelete[0], 'n')
2422 2422 repo.dirstate.update(remove[0], 'r')
2423 2423 return r
2424 2424
2425 2425 def rollback(ui, repo):
2426 2426 """roll back the last transaction in this repository
2427 2427
2428 2428 Roll back the last transaction in this repository, restoring the
2429 2429 project to its state prior to the transaction.
2430 2430
2431 2431 Transactions are used to encapsulate the effects of all commands
2432 2432 that create new changesets or propagate existing changesets into a
2433 2433 repository. For example, the following commands are transactional,
2434 2434 and their effects can be rolled back:
2435 2435
2436 2436 commit
2437 2437 import
2438 2438 pull
2439 2439 push (with this repository as destination)
2440 2440 unbundle
2441 2441
2442 2442 This command should be used with care. There is only one level of
2443 2443 rollback, and there is no way to undo a rollback.
2444 2444
2445 2445 This command is not intended for use on public repositories. Once
2446 2446 changes are visible for pull by other users, rolling a transaction
2447 2447 back locally is ineffective (someone else may already have pulled
2448 2448 the changes). Furthermore, a race is possible with readers of the
2449 2449 repository; for example an in-progress pull from the repository
2450 2450 may fail if a rollback is performed.
2451 2451 """
2452 2452 repo.rollback()
2453 2453
2454 2454 def root(ui, repo):
2455 2455 """print the root (top) of the current working dir
2456 2456
2457 2457 Print the root directory of the current repository.
2458 2458 """
2459 2459 ui.write(repo.root + "\n")
2460 2460
2461 2461 def serve(ui, repo, **opts):
2462 2462 """export the repository via HTTP
2463 2463
2464 2464 Start a local HTTP repository browser and pull server.
2465 2465
2466 2466 By default, the server logs accesses to stdout and errors to
2467 2467 stderr. Use the "-A" and "-E" options to log to files.
2468 2468 """
2469 2469
2470 2470 if opts["stdio"]:
2471 2471 if repo is None:
2472 2472 raise hg.RepoError(_('no repo found'))
2473 2473 s = sshserver.sshserver(ui, repo)
2474 2474 s.serve_forever()
2475 2475
2476 2476 optlist = ("name templates style address port ipv6"
2477 2477 " accesslog errorlog webdir_conf")
2478 2478 for o in optlist.split():
2479 2479 if opts[o]:
2480 2480 ui.setconfig("web", o, opts[o])
2481 2481
2482 2482 if repo is None and not ui.config("web", "webdir_conf"):
2483 2483 raise hg.RepoError(_('no repo found'))
2484 2484
2485 2485 if opts['daemon'] and not opts['daemon_pipefds']:
2486 2486 rfd, wfd = os.pipe()
2487 2487 args = sys.argv[:]
2488 2488 args.append('--daemon-pipefds=%d,%d' % (rfd, wfd))
2489 2489 pid = os.spawnvp(os.P_NOWAIT | getattr(os, 'P_DETACH', 0),
2490 2490 args[0], args)
2491 2491 os.close(wfd)
2492 2492 os.read(rfd, 1)
2493 2493 os._exit(0)
2494 2494
2495 2495 try:
2496 2496 httpd = hgweb.server.create_server(ui, repo)
2497 2497 except socket.error, inst:
2498 2498 raise util.Abort(_('cannot start server: ') + inst.args[1])
2499 2499
2500 2500 if ui.verbose:
2501 2501 addr, port = httpd.socket.getsockname()
2502 2502 if addr == '0.0.0.0':
2503 2503 addr = socket.gethostname()
2504 2504 else:
2505 2505 try:
2506 2506 addr = socket.gethostbyaddr(addr)[0]
2507 2507 except socket.error:
2508 2508 pass
2509 2509 if port != 80:
2510 2510 ui.status(_('listening at http://%s:%d/\n') % (addr, port))
2511 2511 else:
2512 2512 ui.status(_('listening at http://%s/\n') % addr)
2513 2513
2514 2514 if opts['pid_file']:
2515 2515 fp = open(opts['pid_file'], 'w')
2516 2516 fp.write(str(os.getpid()) + '\n')
2517 2517 fp.close()
2518 2518
2519 2519 if opts['daemon_pipefds']:
2520 2520 rfd, wfd = [int(x) for x in opts['daemon_pipefds'].split(',')]
2521 2521 os.close(rfd)
2522 2522 os.write(wfd, 'y')
2523 2523 os.close(wfd)
2524 2524 sys.stdout.flush()
2525 2525 sys.stderr.flush()
2526 2526 fd = os.open(util.nulldev, os.O_RDWR)
2527 2527 if fd != 0: os.dup2(fd, 0)
2528 2528 if fd != 1: os.dup2(fd, 1)
2529 2529 if fd != 2: os.dup2(fd, 2)
2530 2530 if fd not in (0, 1, 2): os.close(fd)
2531 2531
2532 2532 httpd.serve_forever()
2533 2533
2534 2534 def status(ui, repo, *pats, **opts):
2535 2535 """show changed files in the working directory
2536 2536
2537 2537 Show status of files in the repository. If names are given, only
2538 2538 files that match are shown. Files that are clean or ignored, are
2539 2539 not listed unless -c (clean), -i (ignored) or -A is given.
2540 2540
2541 2541 The codes used to show the status of files are:
2542 2542 M = modified
2543 2543 A = added
2544 2544 R = removed
2545 2545 C = clean
2546 2546 ! = deleted, but still tracked
2547 2547 ? = not tracked
2548 2548 I = ignored (not shown by default)
2549 2549 = the previous added file was copied from here
2550 2550 """
2551 2551
2552 2552 all = opts['all']
2553 2553
2554 2554 files, matchfn, anypats = cmdutil.matchpats(repo, pats, opts)
2555 2555 cwd = (pats and repo.getcwd()) or ''
2556 2556 modified, added, removed, deleted, unknown, ignored, clean = [
2557 2557 [util.pathto(cwd, x) for x in n]
2558 2558 for n in repo.status(files=files, match=matchfn,
2559 2559 list_ignored=all or opts['ignored'],
2560 2560 list_clean=all or opts['clean'])]
2561 2561
2562 2562 changetypes = (('modified', 'M', modified),
2563 2563 ('added', 'A', added),
2564 2564 ('removed', 'R', removed),
2565 2565 ('deleted', '!', deleted),
2566 2566 ('unknown', '?', unknown),
2567 2567 ('ignored', 'I', ignored))
2568 2568
2569 2569 explicit_changetypes = changetypes + (('clean', 'C', clean),)
2570 2570
2571 2571 end = opts['print0'] and '\0' or '\n'
2572 2572
2573 2573 for opt, char, changes in ([ct for ct in explicit_changetypes
2574 2574 if all or opts[ct[0]]]
2575 2575 or changetypes):
2576 2576 if opts['no_status']:
2577 2577 format = "%%s%s" % end
2578 2578 else:
2579 2579 format = "%s %%s%s" % (char, end)
2580 2580
2581 2581 for f in changes:
2582 2582 ui.write(format % f)
2583 2583 if ((all or opts.get('copies')) and not opts.get('no_status')
2584 2584 and opt == 'added' and repo.dirstate.copies.has_key(f)):
2585 2585 ui.write(' %s%s' % (repo.dirstate.copies[f], end))
2586 2586
2587 2587 def tag(ui, repo, name, rev_=None, **opts):
2588 2588 """add a tag for the current tip or a given revision
2589 2589
2590 2590 Name a particular revision using <name>.
2591 2591
2592 2592 Tags are used to name particular revisions of the repository and are
2593 2593 very useful to compare different revision, to go back to significant
2594 2594 earlier versions or to mark branch points as releases, etc.
2595 2595
2596 2596 If no revision is given, the parent of the working directory is used.
2597 2597
2598 2598 To facilitate version control, distribution, and merging of tags,
2599 2599 they are stored as a file named ".hgtags" which is managed
2600 2600 similarly to other project files and can be hand-edited if
2601 2601 necessary. The file '.hg/localtags' is used for local tags (not
2602 2602 shared among repositories).
2603 2603 """
2604 2604 if name in ['tip', '.']:
2605 2605 raise util.Abort(_("the name '%s' is reserved") % name)
2606 2606 if rev_ is not None:
2607 2607 ui.warn(_("use of 'hg tag NAME [REV]' is deprecated, "
2608 2608 "please use 'hg tag [-r REV] NAME' instead\n"))
2609 2609 if opts['rev']:
2610 2610 raise util.Abort(_("use only one form to specify the revision"))
2611 2611 if opts['rev']:
2612 2612 rev_ = opts['rev']
2613 2613 if rev_:
2614 2614 r = hex(repo.lookup(rev_))
2615 2615 else:
2616 2616 p1, p2 = repo.dirstate.parents()
2617 2617 if p1 == nullid:
2618 2618 raise util.Abort(_('no revision to tag'))
2619 2619 if p2 != nullid:
2620 2620 raise util.Abort(_('outstanding uncommitted merges'))
2621 2621 r = hex(p1)
2622 2622
2623 2623 repo.tag(name, r, opts['local'], opts['message'], opts['user'],
2624 2624 opts['date'])
2625 2625
2626 2626 def tags(ui, repo):
2627 2627 """list repository tags
2628 2628
2629 2629 List the repository tags.
2630 2630
2631 2631 This lists both regular and local tags.
2632 2632 """
2633 2633
2634 2634 l = repo.tagslist()
2635 2635 l.reverse()
2636 2636 for t, n in l:
2637 2637 try:
2638 2638 r = "%5d:%s" % (repo.changelog.rev(n), hex(n))
2639 2639 except KeyError:
2640 2640 r = " ?:?"
2641 2641 if ui.quiet:
2642 2642 ui.write("%s\n" % t)
2643 2643 else:
2644 2644 ui.write("%-30s %s\n" % (t, r))
2645 2645
2646 2646 def tip(ui, repo, **opts):
2647 2647 """show the tip revision
2648 2648
2649 2649 Show the tip revision.
2650 2650 """
2651 2651 n = repo.changelog.tip()
2652 2652 br = None
2653 2653 if opts['branches']:
2654 2654 br = repo.branchlookup([n])
2655 2655 show_changeset(ui, repo, opts).show(changenode=n, brinfo=br)
2656 2656 if opts['patch']:
2657 2657 patch.diff(repo, repo.changelog.parents(n)[0], n)
2658 2658
2659 2659 def unbundle(ui, repo, fname, **opts):
2660 2660 """apply a changegroup file
2661 2661
2662 2662 Apply a compressed changegroup file generated by the bundle
2663 2663 command.
2664 2664 """
2665 2665 f = urllib.urlopen(fname)
2666 2666
2667 2667 header = f.read(6)
2668 2668 if not header.startswith("HG"):
2669 2669 raise util.Abort(_("%s: not a Mercurial bundle file") % fname)
2670 2670 elif not header.startswith("HG10"):
2671 2671 raise util.Abort(_("%s: unknown bundle version") % fname)
2672 2672 elif header == "HG10BZ":
2673 2673 def generator(f):
2674 2674 zd = bz2.BZ2Decompressor()
2675 2675 zd.decompress("BZ")
2676 2676 for chunk in f:
2677 2677 yield zd.decompress(chunk)
2678 2678 elif header == "HG10UN":
2679 2679 def generator(f):
2680 2680 for chunk in f:
2681 2681 yield chunk
2682 2682 else:
2683 2683 raise util.Abort(_("%s: unknown bundle compression type")
2684 2684 % fname)
2685 2685 gen = generator(util.filechunkiter(f, 4096))
2686 2686 modheads = repo.addchangegroup(util.chunkbuffer(gen), 'unbundle',
2687 2687 'bundle:' + fname)
2688 2688 return postincoming(ui, repo, modheads, opts['update'])
2689 2689
2690 2690 def undo(ui, repo):
2691 2691 """undo the last commit or pull (DEPRECATED)
2692 2692
2693 2693 (DEPRECATED)
2694 2694 This command is now deprecated and will be removed in a future
2695 2695 release. Please use the rollback command instead. For usage
2696 2696 instructions, see the rollback command.
2697 2697 """
2698 2698 ui.warn(_('(the undo command is deprecated; use rollback instead)\n'))
2699 2699 repo.rollback()
2700 2700
2701 2701 def update(ui, repo, node=None, merge=False, clean=False, force=None,
2702 2702 branch=None):
2703 2703 """update or merge working directory
2704 2704
2705 2705 Update the working directory to the specified revision.
2706 2706
2707 2707 If there are no outstanding changes in the working directory and
2708 2708 there is a linear relationship between the current version and the
2709 2709 requested version, the result is the requested version.
2710 2710
2711 2711 To merge the working directory with another revision, use the
2712 2712 merge command.
2713 2713
2714 2714 By default, update will refuse to run if doing so would require
2715 2715 merging or discarding local changes.
2716 2716 """
2717 2717 node = _lookup(repo, node, branch)
2718 2718 if merge:
2719 2719 ui.warn(_('(the -m/--merge option is deprecated; '
2720 2720 'use the merge command instead)\n'))
2721 2721 return hg.merge(repo, node, force=force)
2722 2722 elif clean:
2723 2723 return hg.clean(repo, node)
2724 2724 else:
2725 2725 return hg.update(repo, node)
2726 2726
2727 2727 def _lookup(repo, node, branch=None):
2728 2728 if branch:
2729 2729 br = repo.branchlookup(branch=branch)
2730 2730 found = []
2731 2731 for x in br:
2732 2732 if branch in br[x]:
2733 2733 found.append(x)
2734 2734 if len(found) > 1:
2735 2735 repo.ui.warn(_("Found multiple heads for %s\n") % branch)
2736 2736 for x in found:
2737 2737 show_changeset(ui, repo, {}).show(changenode=x, brinfo=br)
2738 2738 raise util.Abort("")
2739 2739 if len(found) == 1:
2740 2740 node = found[0]
2741 2741 repo.ui.warn(_("Using head %s for branch %s\n")
2742 2742 % (short(node), branch))
2743 2743 else:
2744 2744 raise util.Abort(_("branch %s not found\n") % (branch))
2745 2745 else:
2746 2746 node = node and repo.lookup(node) or repo.changelog.tip()
2747 2747 return node
2748 2748
2749 2749 def verify(ui, repo):
2750 2750 """verify the integrity of the repository
2751 2751
2752 2752 Verify the integrity of the current repository.
2753 2753
2754 2754 This will perform an extensive check of the repository's
2755 2755 integrity, validating the hashes and checksums of each entry in
2756 2756 the changelog, manifest, and tracked files, as well as the
2757 2757 integrity of their crosslinks and indices.
2758 2758 """
2759 2759 return hg.verify(repo)
2760 2760
2761 2761 # Command options and aliases are listed here, alphabetically
2762 2762
2763 2763 table = {
2764 2764 "^add":
2765 2765 (add,
2766 2766 [('I', 'include', [], _('include names matching the given patterns')),
2767 2767 ('X', 'exclude', [], _('exclude names matching the given patterns')),
2768 2768 ('n', 'dry-run', None, _('do not perform actions, just print output'))],
2769 2769 _('hg add [OPTION]... [FILE]...')),
2770 2770 "debugaddremove|addremove":
2771 2771 (addremove,
2772 2772 [('I', 'include', [], _('include names matching the given patterns')),
2773 2773 ('X', 'exclude', [], _('exclude names matching the given patterns')),
2774 2774 ('n', 'dry-run', None, _('do not perform actions, just print output'))],
2775 2775 _('hg addremove [OPTION]... [FILE]...')),
2776 2776 "^annotate":
2777 2777 (annotate,
2778 2778 [('r', 'rev', '', _('annotate the specified revision')),
2779 2779 ('a', 'text', None, _('treat all files as text')),
2780 2780 ('u', 'user', None, _('list the author')),
2781 2781 ('d', 'date', None, _('list the date')),
2782 2782 ('n', 'number', None, _('list the revision number (default)')),
2783 2783 ('c', 'changeset', None, _('list the changeset')),
2784 2784 ('I', 'include', [], _('include names matching the given patterns')),
2785 2785 ('X', 'exclude', [], _('exclude names matching the given patterns'))],
2786 2786 _('hg annotate [-r REV] [-a] [-u] [-d] [-n] [-c] FILE...')),
2787 2787 "archive":
2788 2788 (archive,
2789 2789 [('', 'no-decode', None, _('do not pass files through decoders')),
2790 2790 ('p', 'prefix', '', _('directory prefix for files in archive')),
2791 2791 ('r', 'rev', '', _('revision to distribute')),
2792 2792 ('t', 'type', '', _('type of distribution to create')),
2793 2793 ('I', 'include', [], _('include names matching the given patterns')),
2794 2794 ('X', 'exclude', [], _('exclude names matching the given patterns'))],
2795 2795 _('hg archive [OPTION]... DEST')),
2796 2796 "backout":
2797 2797 (backout,
2798 2798 [('', 'merge', None,
2799 2799 _('merge with old dirstate parent after backout')),
2800 2800 ('m', 'message', '', _('use <text> as commit message')),
2801 2801 ('l', 'logfile', '', _('read commit message from <file>')),
2802 2802 ('d', 'date', '', _('record datecode as commit date')),
2803 2803 ('', 'parent', '', _('parent to choose when backing out merge')),
2804 2804 ('u', 'user', '', _('record user as committer')),
2805 2805 ('I', 'include', [], _('include names matching the given patterns')),
2806 2806 ('X', 'exclude', [], _('exclude names matching the given patterns'))],
2807 2807 _('hg backout [OPTION]... REV')),
2808 2808 "bundle":
2809 2809 (bundle,
2810 2810 [('f', 'force', None,
2811 2811 _('run even when remote repository is unrelated'))],
2812 2812 _('hg bundle FILE DEST')),
2813 2813 "cat":
2814 2814 (cat,
2815 2815 [('o', 'output', '', _('print output to file with formatted name')),
2816 2816 ('r', 'rev', '', _('print the given revision')),
2817 2817 ('I', 'include', [], _('include names matching the given patterns')),
2818 2818 ('X', 'exclude', [], _('exclude names matching the given patterns'))],
2819 2819 _('hg cat [OPTION]... FILE...')),
2820 2820 "^clone":
2821 2821 (clone,
2822 2822 [('U', 'noupdate', None, _('do not update the new working directory')),
2823 2823 ('r', 'rev', [],
2824 2824 _('a changeset you would like to have after cloning')),
2825 2825 ('', 'pull', None, _('use pull protocol to copy metadata')),
2826 2826 ('', 'uncompressed', None,
2827 2827 _('use uncompressed transfer (fast over LAN)')),
2828 2828 ('e', 'ssh', '', _('specify ssh command to use')),
2829 2829 ('', 'remotecmd', '',
2830 2830 _('specify hg command to run on the remote side'))],
2831 2831 _('hg clone [OPTION]... SOURCE [DEST]')),
2832 2832 "^commit|ci":
2833 2833 (commit,
2834 2834 [('A', 'addremove', None,
2835 2835 _('mark new/missing files as added/removed before committing')),
2836 2836 ('m', 'message', '', _('use <text> as commit message')),
2837 2837 ('l', 'logfile', '', _('read the commit message from <file>')),
2838 2838 ('d', 'date', '', _('record datecode as commit date')),
2839 2839 ('u', 'user', '', _('record user as commiter')),
2840 2840 ('I', 'include', [], _('include names matching the given patterns')),
2841 2841 ('X', 'exclude', [], _('exclude names matching the given patterns'))],
2842 2842 _('hg commit [OPTION]... [FILE]...')),
2843 2843 "copy|cp":
2844 2844 (copy,
2845 2845 [('A', 'after', None, _('record a copy that has already occurred')),
2846 2846 ('f', 'force', None,
2847 2847 _('forcibly copy over an existing managed file')),
2848 2848 ('I', 'include', [], _('include names matching the given patterns')),
2849 2849 ('X', 'exclude', [], _('exclude names matching the given patterns')),
2850 2850 ('n', 'dry-run', None, _('do not perform actions, just print output'))],
2851 2851 _('hg copy [OPTION]... [SOURCE]... DEST')),
2852 2852 "debugancestor": (debugancestor, [], _('debugancestor INDEX REV1 REV2')),
2853 2853 "debugcomplete":
2854 2854 (debugcomplete,
2855 2855 [('o', 'options', None, _('show the command options'))],
2856 2856 _('debugcomplete [-o] CMD')),
2857 2857 "debugrebuildstate":
2858 2858 (debugrebuildstate,
2859 2859 [('r', 'rev', '', _('revision to rebuild to'))],
2860 2860 _('debugrebuildstate [-r REV] [REV]')),
2861 2861 "debugcheckstate": (debugcheckstate, [], _('debugcheckstate')),
2862 2862 "debugconfig": (debugconfig, [], _('debugconfig [NAME]...')),
2863 2863 "debugsetparents": (debugsetparents, [], _('debugsetparents REV1 [REV2]')),
2864 2864 "debugstate": (debugstate, [], _('debugstate')),
2865 2865 "debugdata": (debugdata, [], _('debugdata FILE REV')),
2866 2866 "debugindex": (debugindex, [], _('debugindex FILE')),
2867 2867 "debugindexdot": (debugindexdot, [], _('debugindexdot FILE')),
2868 2868 "debugrename": (debugrename, [], _('debugrename FILE [REV]')),
2869 2869 "debugwalk":
2870 2870 (debugwalk,
2871 2871 [('I', 'include', [], _('include names matching the given patterns')),
2872 2872 ('X', 'exclude', [], _('exclude names matching the given patterns'))],
2873 2873 _('debugwalk [OPTION]... [FILE]...')),
2874 2874 "^diff":
2875 2875 (diff,
2876 2876 [('r', 'rev', [], _('revision')),
2877 2877 ('a', 'text', None, _('treat all files as text')),
2878 2878 ('p', 'show-function', None,
2879 2879 _('show which function each change is in')),
2880 2880 ('g', 'git', None, _('use git extended diff format')),
2881 2881 ('w', 'ignore-all-space', None,
2882 2882 _('ignore white space when comparing lines')),
2883 2883 ('b', 'ignore-space-change', None,
2884 2884 _('ignore changes in the amount of white space')),
2885 2885 ('B', 'ignore-blank-lines', None,
2886 2886 _('ignore changes whose lines are all blank')),
2887 2887 ('I', 'include', [], _('include names matching the given patterns')),
2888 2888 ('X', 'exclude', [], _('exclude names matching the given patterns'))],
2889 2889 _('hg diff [-a] [-I] [-X] [-r REV1 [-r REV2]] [FILE]...')),
2890 2890 "^export":
2891 2891 (export,
2892 2892 [('o', 'output', '', _('print output to file with formatted name')),
2893 2893 ('a', 'text', None, _('treat all files as text')),
2894 2894 ('', 'switch-parent', None, _('diff against the second parent'))],
2895 2895 _('hg export [-a] [-o OUTFILESPEC] REV...')),
2896 2896 "debugforget|forget":
2897 2897 (forget,
2898 2898 [('I', 'include', [], _('include names matching the given patterns')),
2899 2899 ('X', 'exclude', [], _('exclude names matching the given patterns'))],
2900 2900 _('hg forget [OPTION]... FILE...')),
2901 2901 "grep":
2902 2902 (grep,
2903 2903 [('0', 'print0', None, _('end fields with NUL')),
2904 2904 ('', 'all', None, _('print all revisions that match')),
2905 2905 ('f', 'follow', None,
2906 2906 _('follow changeset history, or file history across copies and renames')),
2907 2907 ('i', 'ignore-case', None, _('ignore case when matching')),
2908 2908 ('l', 'files-with-matches', None,
2909 2909 _('print only filenames and revs that match')),
2910 2910 ('n', 'line-number', None, _('print matching line numbers')),
2911 2911 ('r', 'rev', [], _('search in given revision range')),
2912 2912 ('u', 'user', None, _('print user who committed change')),
2913 2913 ('I', 'include', [], _('include names matching the given patterns')),
2914 2914 ('X', 'exclude', [], _('exclude names matching the given patterns'))],
2915 2915 _('hg grep [OPTION]... PATTERN [FILE]...')),
2916 2916 "heads":
2917 2917 (heads,
2918 2918 [('b', 'branches', None, _('show branches')),
2919 2919 ('', 'style', '', _('display using template map file')),
2920 2920 ('r', 'rev', '', _('show only heads which are descendants of rev')),
2921 2921 ('', 'template', '', _('display with template'))],
2922 2922 _('hg heads [-b] [-r <rev>]')),
2923 2923 "help": (help_, [], _('hg help [COMMAND]')),
2924 2924 "identify|id": (identify, [], _('hg identify')),
2925 2925 "import|patch":
2926 2926 (import_,
2927 2927 [('p', 'strip', 1,
2928 2928 _('directory strip option for patch. This has the same\n'
2929 2929 'meaning as the corresponding patch option')),
2930 2930 ('m', 'message', '', _('use <text> as commit message')),
2931 2931 ('b', 'base', '', _('base path')),
2932 2932 ('f', 'force', None,
2933 2933 _('skip check for outstanding uncommitted changes'))],
2934 2934 _('hg import [-p NUM] [-b BASE] [-m MESSAGE] [-f] PATCH...')),
2935 2935 "incoming|in": (incoming,
2936 2936 [('M', 'no-merges', None, _('do not show merges')),
2937 2937 ('f', 'force', None,
2938 2938 _('run even when remote repository is unrelated')),
2939 2939 ('', 'style', '', _('display using template map file')),
2940 2940 ('n', 'newest-first', None, _('show newest record first')),
2941 2941 ('', 'bundle', '', _('file to store the bundles into')),
2942 2942 ('p', 'patch', None, _('show patch')),
2943 2943 ('r', 'rev', [], _('a specific revision up to which you would like to pull')),
2944 2944 ('', 'template', '', _('display with template')),
2945 2945 ('e', 'ssh', '', _('specify ssh command to use')),
2946 2946 ('', 'remotecmd', '',
2947 2947 _('specify hg command to run on the remote side'))],
2948 2948 _('hg incoming [-p] [-n] [-M] [-r REV]...'
2949 2949 ' [--bundle FILENAME] [SOURCE]')),
2950 2950 "^init":
2951 2951 (init,
2952 2952 [('e', 'ssh', '', _('specify ssh command to use')),
2953 2953 ('', 'remotecmd', '',
2954 2954 _('specify hg command to run on the remote side'))],
2955 2955 _('hg init [-e FILE] [--remotecmd FILE] [DEST]')),
2956 2956 "locate":
2957 2957 (locate,
2958 2958 [('r', 'rev', '', _('search the repository as it stood at rev')),
2959 2959 ('0', 'print0', None,
2960 2960 _('end filenames with NUL, for use with xargs')),
2961 2961 ('f', 'fullpath', None,
2962 2962 _('print complete paths from the filesystem root')),
2963 2963 ('I', 'include', [], _('include names matching the given patterns')),
2964 2964 ('X', 'exclude', [], _('exclude names matching the given patterns'))],
2965 2965 _('hg locate [OPTION]... [PATTERN]...')),
2966 2966 "^log|history":
2967 2967 (log,
2968 2968 [('b', 'branches', None, _('show branches')),
2969 2969 ('f', 'follow', None,
2970 2970 _('follow changeset history, or file history across copies and renames')),
2971 2971 ('', 'follow-first', None,
2972 2972 _('only follow the first parent of merge changesets')),
2973 2973 ('k', 'keyword', [], _('search for a keyword')),
2974 2974 ('l', 'limit', '', _('limit number of changes displayed')),
2975 2975 ('r', 'rev', [], _('show the specified revision or range')),
2976 2976 ('M', 'no-merges', None, _('do not show merges')),
2977 2977 ('', 'style', '', _('display using template map file')),
2978 2978 ('m', 'only-merges', None, _('show only merges')),
2979 2979 ('p', 'patch', None, _('show patch')),
2980 2980 ('P', 'prune', [], _('do not display revision or any of its ancestors')),
2981 2981 ('', 'template', '', _('display with template')),
2982 2982 ('I', 'include', [], _('include names matching the given patterns')),
2983 2983 ('X', 'exclude', [], _('exclude names matching the given patterns'))],
2984 2984 _('hg log [OPTION]... [FILE]')),
2985 2985 "manifest": (manifest, [], _('hg manifest [REV]')),
2986 2986 "merge":
2987 2987 (merge,
2988 2988 [('b', 'branch', '', _('merge with head of a specific branch')),
2989 2989 ('f', 'force', None, _('force a merge with outstanding changes'))],
2990 2990 _('hg merge [-b TAG] [-f] [REV]')),
2991 2991 "outgoing|out": (outgoing,
2992 2992 [('M', 'no-merges', None, _('do not show merges')),
2993 2993 ('f', 'force', None,
2994 2994 _('run even when remote repository is unrelated')),
2995 2995 ('p', 'patch', None, _('show patch')),
2996 2996 ('', 'style', '', _('display using template map file')),
2997 2997 ('r', 'rev', [], _('a specific revision you would like to push')),
2998 2998 ('n', 'newest-first', None, _('show newest record first')),
2999 2999 ('', 'template', '', _('display with template')),
3000 3000 ('e', 'ssh', '', _('specify ssh command to use')),
3001 3001 ('', 'remotecmd', '',
3002 3002 _('specify hg command to run on the remote side'))],
3003 3003 _('hg outgoing [-M] [-p] [-n] [-r REV]... [DEST]')),
3004 3004 "^parents":
3005 3005 (parents,
3006 3006 [('b', 'branches', None, _('show branches')),
3007 3007 ('r', 'rev', '', _('show parents from the specified rev')),
3008 3008 ('', 'style', '', _('display using template map file')),
3009 3009 ('', 'template', '', _('display with template'))],
3010 3010 _('hg parents [-b] [-r REV] [FILE]')),
3011 3011 "paths": (paths, [], _('hg paths [NAME]')),
3012 3012 "^pull":
3013 3013 (pull,
3014 3014 [('u', 'update', None,
3015 3015 _('update the working directory to tip after pull')),
3016 3016 ('e', 'ssh', '', _('specify ssh command to use')),
3017 3017 ('f', 'force', None,
3018 3018 _('run even when remote repository is unrelated')),
3019 3019 ('r', 'rev', [], _('a specific revision up to which you would like to pull')),
3020 3020 ('', 'remotecmd', '',
3021 3021 _('specify hg command to run on the remote side'))],
3022 3022 _('hg pull [-u] [-r REV]... [-e FILE] [--remotecmd FILE] [SOURCE]')),
3023 3023 "^push":
3024 3024 (push,
3025 3025 [('f', 'force', None, _('force push')),
3026 3026 ('e', 'ssh', '', _('specify ssh command to use')),
3027 3027 ('r', 'rev', [], _('a specific revision you would like to push')),
3028 3028 ('', 'remotecmd', '',
3029 3029 _('specify hg command to run on the remote side'))],
3030 3030 _('hg push [-f] [-r REV]... [-e FILE] [--remotecmd FILE] [DEST]')),
3031 3031 "debugrawcommit|rawcommit":
3032 3032 (rawcommit,
3033 3033 [('p', 'parent', [], _('parent')),
3034 3034 ('d', 'date', '', _('date code')),
3035 3035 ('u', 'user', '', _('user')),
3036 3036 ('F', 'files', '', _('file list')),
3037 3037 ('m', 'message', '', _('commit message')),
3038 3038 ('l', 'logfile', '', _('commit message file'))],
3039 3039 _('hg debugrawcommit [OPTION]... [FILE]...')),
3040 3040 "recover": (recover, [], _('hg recover')),
3041 3041 "^remove|rm":
3042 3042 (remove,
3043 3043 [('A', 'after', None, _('record remove that has already occurred')),
3044 3044 ('f', 'force', None, _('remove file even if modified')),
3045 3045 ('I', 'include', [], _('include names matching the given patterns')),
3046 3046 ('X', 'exclude', [], _('exclude names matching the given patterns'))],
3047 3047 _('hg remove [OPTION]... FILE...')),
3048 3048 "rename|mv":
3049 3049 (rename,
3050 3050 [('A', 'after', None, _('record a rename that has already occurred')),
3051 3051 ('f', 'force', None,
3052 3052 _('forcibly copy over an existing managed file')),
3053 3053 ('I', 'include', [], _('include names matching the given patterns')),
3054 3054 ('X', 'exclude', [], _('exclude names matching the given patterns')),
3055 3055 ('n', 'dry-run', None, _('do not perform actions, just print output'))],
3056 3056 _('hg rename [OPTION]... SOURCE... DEST')),
3057 3057 "^revert":
3058 3058 (revert,
3059 3059 [('r', 'rev', '', _('revision to revert to')),
3060 3060 ('', 'no-backup', None, _('do not save backup copies of files')),
3061 3061 ('I', 'include', [], _('include names matching given patterns')),
3062 3062 ('X', 'exclude', [], _('exclude names matching given patterns')),
3063 3063 ('n', 'dry-run', None, _('do not perform actions, just print output'))],
3064 3064 _('hg revert [-r REV] [NAME]...')),
3065 3065 "rollback": (rollback, [], _('hg rollback')),
3066 3066 "root": (root, [], _('hg root')),
3067 3067 "^serve":
3068 3068 (serve,
3069 3069 [('A', 'accesslog', '', _('name of access log file to write to')),
3070 3070 ('d', 'daemon', None, _('run server in background')),
3071 3071 ('', 'daemon-pipefds', '', _('used internally by daemon mode')),
3072 3072 ('E', 'errorlog', '', _('name of error log file to write to')),
3073 3073 ('p', 'port', 0, _('port to use (default: 8000)')),
3074 3074 ('a', 'address', '', _('address to use')),
3075 3075 ('n', 'name', '',
3076 3076 _('name to show in web pages (default: working dir)')),
3077 3077 ('', 'webdir-conf', '', _('name of the webdir config file'
3078 3078 ' (serve more than one repo)')),
3079 3079 ('', 'pid-file', '', _('name of file to write process ID to')),
3080 3080 ('', 'stdio', None, _('for remote clients')),
3081 3081 ('t', 'templates', '', _('web templates to use')),
3082 3082 ('', 'style', '', _('template style to use')),
3083 3083 ('6', 'ipv6', None, _('use IPv6 in addition to IPv4'))],
3084 3084 _('hg serve [OPTION]...')),
3085 3085 "^status|st":
3086 3086 (status,
3087 3087 [('A', 'all', None, _('show status of all files')),
3088 3088 ('m', 'modified', None, _('show only modified files')),
3089 3089 ('a', 'added', None, _('show only added files')),
3090 3090 ('r', 'removed', None, _('show only removed files')),
3091 3091 ('d', 'deleted', None, _('show only deleted (but tracked) files')),
3092 3092 ('c', 'clean', None, _('show only files without changes')),
3093 3093 ('u', 'unknown', None, _('show only unknown (not tracked) files')),
3094 3094 ('i', 'ignored', None, _('show ignored files')),
3095 3095 ('n', 'no-status', None, _('hide status prefix')),
3096 3096 ('C', 'copies', None, _('show source of copied files')),
3097 3097 ('0', 'print0', None,
3098 3098 _('end filenames with NUL, for use with xargs')),
3099 3099 ('I', 'include', [], _('include names matching the given patterns')),
3100 3100 ('X', 'exclude', [], _('exclude names matching the given patterns'))],
3101 3101 _('hg status [OPTION]... [FILE]...')),
3102 3102 "tag":
3103 3103 (tag,
3104 3104 [('l', 'local', None, _('make the tag local')),
3105 3105 ('m', 'message', '', _('message for tag commit log entry')),
3106 3106 ('d', 'date', '', _('record datecode as commit date')),
3107 3107 ('u', 'user', '', _('record user as commiter')),
3108 3108 ('r', 'rev', '', _('revision to tag'))],
3109 3109 _('hg tag [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME')),
3110 3110 "tags": (tags, [], _('hg tags')),
3111 3111 "tip":
3112 3112 (tip,
3113 3113 [('b', 'branches', None, _('show branches')),
3114 3114 ('', 'style', '', _('display using template map file')),
3115 3115 ('p', 'patch', None, _('show patch')),
3116 3116 ('', 'template', '', _('display with template'))],
3117 3117 _('hg tip [-b] [-p]')),
3118 3118 "unbundle":
3119 3119 (unbundle,
3120 3120 [('u', 'update', None,
3121 3121 _('update the working directory to tip after unbundle'))],
3122 3122 _('hg unbundle [-u] FILE')),
3123 3123 "debugundo|undo": (undo, [], _('hg undo')),
3124 3124 "^update|up|checkout|co":
3125 3125 (update,
3126 3126 [('b', 'branch', '', _('checkout the head of a specific branch')),
3127 3127 ('m', 'merge', None, _('allow merging of branches (DEPRECATED)')),
3128 3128 ('C', 'clean', None, _('overwrite locally modified files')),
3129 3129 ('f', 'force', None, _('force a merge with outstanding changes'))],
3130 3130 _('hg update [-b TAG] [-m] [-C] [-f] [REV]')),
3131 3131 "verify": (verify, [], _('hg verify')),
3132 3132 "version": (show_version, [], _('hg version')),
3133 3133 }
3134 3134
3135 3135 globalopts = [
3136 3136 ('R', 'repository', '',
3137 3137 _('repository root directory or symbolic path name')),
3138 3138 ('', 'cwd', '', _('change working directory')),
3139 3139 ('y', 'noninteractive', None,
3140 3140 _('do not prompt, assume \'yes\' for any required answers')),
3141 3141 ('q', 'quiet', None, _('suppress output')),
3142 3142 ('v', 'verbose', None, _('enable additional output')),
3143 3143 ('', 'config', [], _('set/override config option')),
3144 3144 ('', 'debug', None, _('enable debugging output')),
3145 3145 ('', 'debugger', None, _('start debugger')),
3146 3146 ('', 'lsprof', None, _('print improved command execution profile')),
3147 3147 ('', 'traceback', None, _('print traceback on exception')),
3148 3148 ('', 'time', None, _('time how long the command takes')),
3149 3149 ('', 'profile', None, _('print command execution profile')),
3150 3150 ('', 'version', None, _('output version information and exit')),
3151 3151 ('h', 'help', None, _('display help and exit')),
3152 3152 ]
3153 3153
3154 3154 norepo = ("clone init version help debugancestor debugcomplete debugdata"
3155 3155 " debugindex debugindexdot")
3156 3156 optionalrepo = ("paths serve debugconfig")
3157 3157
3158 3158 def findpossible(cmd):
3159 3159 """
3160 3160 Return cmd -> (aliases, command table entry)
3161 3161 for each matching command.
3162 3162 Return debug commands (or their aliases) only if no normal command matches.
3163 3163 """
3164 3164 choice = {}
3165 3165 debugchoice = {}
3166 3166 for e in table.keys():
3167 3167 aliases = e.lstrip("^").split("|")
3168 3168 found = None
3169 3169 if cmd in aliases:
3170 3170 found = cmd
3171 3171 else:
3172 3172 for a in aliases:
3173 3173 if a.startswith(cmd):
3174 3174 found = a
3175 3175 break
3176 3176 if found is not None:
3177 3177 if aliases[0].startswith("debug"):
3178 3178 debugchoice[found] = (aliases, table[e])
3179 3179 else:
3180 3180 choice[found] = (aliases, table[e])
3181 3181
3182 3182 if not choice and debugchoice:
3183 3183 choice = debugchoice
3184 3184
3185 3185 return choice
3186 3186
3187 3187 def findcmd(cmd):
3188 3188 """Return (aliases, command table entry) for command string."""
3189 3189 choice = findpossible(cmd)
3190 3190
3191 3191 if choice.has_key(cmd):
3192 3192 return choice[cmd]
3193 3193
3194 3194 if len(choice) > 1:
3195 3195 clist = choice.keys()
3196 3196 clist.sort()
3197 3197 raise AmbiguousCommand(cmd, clist)
3198 3198
3199 3199 if choice:
3200 3200 return choice.values()[0]
3201 3201
3202 3202 raise UnknownCommand(cmd)
3203 3203
3204 3204 def catchterm(*args):
3205 3205 raise util.SignalInterrupt
3206 3206
3207 3207 def run():
3208 3208 sys.exit(dispatch(sys.argv[1:]))
3209 3209
3210 3210 class ParseError(Exception):
3211 3211 """Exception raised on errors in parsing the command line."""
3212 3212
3213 3213 def parse(ui, args):
3214 3214 options = {}
3215 3215 cmdoptions = {}
3216 3216
3217 3217 try:
3218 3218 args = fancyopts.fancyopts(args, globalopts, options)
3219 3219 except fancyopts.getopt.GetoptError, inst:
3220 3220 raise ParseError(None, inst)
3221 3221
3222 3222 if args:
3223 3223 cmd, args = args[0], args[1:]
3224 3224 aliases, i = findcmd(cmd)
3225 3225 cmd = aliases[0]
3226 3226 defaults = ui.config("defaults", cmd)
3227 3227 if defaults:
3228 3228 args = defaults.split() + args
3229 3229 c = list(i[1])
3230 3230 else:
3231 3231 cmd = None
3232 3232 c = []
3233 3233
3234 3234 # combine global options into local
3235 3235 for o in globalopts:
3236 3236 c.append((o[0], o[1], options[o[1]], o[3]))
3237 3237
3238 3238 try:
3239 3239 args = fancyopts.fancyopts(args, c, cmdoptions)
3240 3240 except fancyopts.getopt.GetoptError, inst:
3241 3241 raise ParseError(cmd, inst)
3242 3242
3243 3243 # separate global options back out
3244 3244 for o in globalopts:
3245 3245 n = o[1]
3246 3246 options[n] = cmdoptions[n]
3247 3247 del cmdoptions[n]
3248 3248
3249 3249 return (cmd, cmd and i[0] or None, args, options, cmdoptions)
3250 3250
3251 3251 external = {}
3252 3252
3253 3253 def findext(name):
3254 3254 '''return module with given extension name'''
3255 3255 try:
3256 3256 return sys.modules[external[name]]
3257 3257 except KeyError:
3258 3258 for k, v in external.iteritems():
3259 3259 if k.endswith('.' + name) or k.endswith('/' + name) or v == name:
3260 3260 return sys.modules[v]
3261 3261 raise KeyError(name)
3262 3262
3263 3263 def dispatch(args):
3264 3264 for name in 'SIGBREAK', 'SIGHUP', 'SIGTERM':
3265 3265 num = getattr(signal, name, None)
3266 3266 if num: signal.signal(num, catchterm)
3267 3267
3268 3268 try:
3269 3269 u = ui.ui(traceback='--traceback' in sys.argv[1:])
3270 3270 except util.Abort, inst:
3271 3271 sys.stderr.write(_("abort: %s\n") % inst)
3272 3272 return -1
3273 3273
3274 3274 for ext_name, load_from_name in u.extensions():
3275 3275 try:
3276 3276 if load_from_name:
3277 3277 # the module will be loaded in sys.modules
3278 3278 # choose an unique name so that it doesn't
3279 3279 # conflicts with other modules
3280 3280 module_name = "hgext_%s" % ext_name.replace('.', '_')
3281 3281 mod = imp.load_source(module_name, load_from_name)
3282 3282 else:
3283 3283 def importh(name):
3284 3284 mod = __import__(name)
3285 3285 components = name.split('.')
3286 3286 for comp in components[1:]:
3287 3287 mod = getattr(mod, comp)
3288 3288 return mod
3289 3289 try:
3290 3290 mod = importh("hgext.%s" % ext_name)
3291 3291 except ImportError:
3292 3292 mod = importh(ext_name)
3293 3293 external[ext_name] = mod.__name__
3294 3294 except (util.SignalInterrupt, KeyboardInterrupt):
3295 3295 raise
3296 3296 except Exception, inst:
3297 3297 u.warn(_("*** failed to import extension %s: %s\n") % (ext_name, inst))
3298 3298 if u.print_exc():
3299 3299 return 1
3300 3300
3301 3301 for name in external.itervalues():
3302 3302 mod = sys.modules[name]
3303 3303 uisetup = getattr(mod, 'uisetup', None)
3304 3304 if uisetup:
3305 3305 uisetup(u)
3306 3306 cmdtable = getattr(mod, 'cmdtable', {})
3307 3307 for t in cmdtable:
3308 3308 if t in table:
3309 3309 u.warn(_("module %s overrides %s\n") % (name, t))
3310 3310 table.update(cmdtable)
3311 3311
3312 3312 try:
3313 3313 cmd, func, args, options, cmdoptions = parse(u, args)
3314 3314 if options["time"]:
3315 3315 def get_times():
3316 3316 t = os.times()
3317 3317 if t[4] == 0.0: # Windows leaves this as zero, so use time.clock()
3318 3318 t = (t[0], t[1], t[2], t[3], time.clock())
3319 3319 return t
3320 3320 s = get_times()
3321 3321 def print_time():
3322 3322 t = get_times()
3323 3323 u.warn(_("Time: real %.3f secs (user %.3f+%.3f sys %.3f+%.3f)\n") %
3324 3324 (t[4]-s[4], t[0]-s[0], t[2]-s[2], t[1]-s[1], t[3]-s[3]))
3325 3325 atexit.register(print_time)
3326 3326
3327 3327 u.updateopts(options["verbose"], options["debug"], options["quiet"],
3328 3328 not options["noninteractive"], options["traceback"],
3329 3329 options["config"])
3330 3330
3331 3331 # enter the debugger before command execution
3332 3332 if options['debugger']:
3333 3333 pdb.set_trace()
3334 3334
3335 3335 try:
3336 3336 if options['cwd']:
3337 3337 try:
3338 3338 os.chdir(options['cwd'])
3339 3339 except OSError, inst:
3340 3340 raise util.Abort('%s: %s' %
3341 3341 (options['cwd'], inst.strerror))
3342 3342
3343 3343 path = u.expandpath(options["repository"]) or ""
3344 3344 repo = path and hg.repository(u, path=path) or None
3345 3345
3346 3346 if options['help']:
3347 3347 return help_(u, cmd, options['version'])
3348 3348 elif options['version']:
3349 3349 return show_version(u)
3350 3350 elif not cmd:
3351 3351 return help_(u, 'shortlist')
3352 3352
3353 3353 if cmd not in norepo.split():
3354 3354 try:
3355 3355 if not repo:
3356 3356 repo = hg.repository(u, path=path)
3357 3357 u = repo.ui
3358 3358 for name in external.itervalues():
3359 3359 mod = sys.modules[name]
3360 3360 if hasattr(mod, 'reposetup'):
3361 3361 mod.reposetup(u, repo)
3362 3362 hg.repo_setup_hooks.append(mod.reposetup)
3363 3363 except hg.RepoError:
3364 3364 if cmd not in optionalrepo.split():
3365 3365 raise
3366 3366 d = lambda: func(u, repo, *args, **cmdoptions)
3367 3367 else:
3368 3368 d = lambda: func(u, *args, **cmdoptions)
3369 3369
3370 3370 # reupdate the options, repo/.hg/hgrc may have changed them
3371 3371 u.updateopts(options["verbose"], options["debug"], options["quiet"],
3372 3372 not options["noninteractive"], options["traceback"],
3373 3373 options["config"])
3374 3374
3375 3375 try:
3376 3376 if options['profile']:
3377 3377 import hotshot, hotshot.stats
3378 3378 prof = hotshot.Profile("hg.prof")
3379 3379 try:
3380 3380 try:
3381 3381 return prof.runcall(d)
3382 3382 except:
3383 3383 try:
3384 3384 u.warn(_('exception raised - generating '
3385 3385 'profile anyway\n'))
3386 3386 except:
3387 3387 pass
3388 3388 raise
3389 3389 finally:
3390 3390 prof.close()
3391 3391 stats = hotshot.stats.load("hg.prof")
3392 3392 stats.strip_dirs()
3393 3393 stats.sort_stats('time', 'calls')
3394 3394 stats.print_stats(40)
3395 3395 elif options['lsprof']:
3396 3396 try:
3397 3397 from mercurial import lsprof
3398 3398 except ImportError:
3399 3399 raise util.Abort(_(
3400 3400 'lsprof not available - install from '
3401 3401 'http://codespeak.net/svn/user/arigo/hack/misc/lsprof/'))
3402 3402 p = lsprof.Profiler()
3403 3403 p.enable(subcalls=True)
3404 3404 try:
3405 3405 return d()
3406 3406 finally:
3407 3407 p.disable()
3408 3408 stats = lsprof.Stats(p.getstats())
3409 3409 stats.sort()
3410 3410 stats.pprint(top=10, file=sys.stderr, climit=5)
3411 3411 else:
3412 3412 return d()
3413 3413 finally:
3414 3414 u.flush()
3415 3415 except:
3416 3416 # enter the debugger when we hit an exception
3417 3417 if options['debugger']:
3418 3418 pdb.post_mortem(sys.exc_info()[2])
3419 3419 u.print_exc()
3420 3420 raise
3421 3421 except ParseError, inst:
3422 3422 if inst.args[0]:
3423 3423 u.warn(_("hg %s: %s\n") % (inst.args[0], inst.args[1]))
3424 3424 help_(u, inst.args[0])
3425 3425 else:
3426 3426 u.warn(_("hg: %s\n") % inst.args[1])
3427 3427 help_(u, 'shortlist')
3428 3428 except AmbiguousCommand, inst:
3429 3429 u.warn(_("hg: command '%s' is ambiguous:\n %s\n") %
3430 3430 (inst.args[0], " ".join(inst.args[1])))
3431 3431 except UnknownCommand, inst:
3432 3432 u.warn(_("hg: unknown command '%s'\n") % inst.args[0])
3433 3433 help_(u, 'shortlist')
3434 3434 except hg.RepoError, inst:
3435 3435 u.warn(_("abort: %s!\n") % inst)
3436 3436 except lock.LockHeld, inst:
3437 3437 if inst.errno == errno.ETIMEDOUT:
3438 3438 reason = _('timed out waiting for lock held by %s') % inst.locker
3439 3439 else:
3440 3440 reason = _('lock held by %s') % inst.locker
3441 3441 u.warn(_("abort: %s: %s\n") % (inst.desc or inst.filename, reason))
3442 3442 except lock.LockUnavailable, inst:
3443 3443 u.warn(_("abort: could not lock %s: %s\n") %
3444 3444 (inst.desc or inst.filename, inst.strerror))
3445 3445 except revlog.RevlogError, inst:
3446 3446 u.warn(_("abort: "), inst, "!\n")
3447 3447 except util.SignalInterrupt:
3448 3448 u.warn(_("killed!\n"))
3449 3449 except KeyboardInterrupt:
3450 3450 try:
3451 3451 u.warn(_("interrupted!\n"))
3452 3452 except IOError, inst:
3453 3453 if inst.errno == errno.EPIPE:
3454 3454 if u.debugflag:
3455 3455 u.warn(_("\nbroken pipe\n"))
3456 3456 else:
3457 3457 raise
3458 3458 except IOError, inst:
3459 3459 if hasattr(inst, "code"):
3460 3460 u.warn(_("abort: %s\n") % inst)
3461 3461 elif hasattr(inst, "reason"):
3462 3462 u.warn(_("abort: error: %s\n") % inst.reason[1])
3463 3463 elif hasattr(inst, "args") and inst[0] == errno.EPIPE:
3464 3464 if u.debugflag:
3465 3465 u.warn(_("broken pipe\n"))
3466 3466 elif getattr(inst, "strerror", None):
3467 3467 if getattr(inst, "filename", None):
3468 3468 u.warn(_("abort: %s - %s\n") % (inst.strerror, inst.filename))
3469 3469 else:
3470 3470 u.warn(_("abort: %s\n") % inst.strerror)
3471 3471 else:
3472 3472 raise
3473 3473 except OSError, inst:
3474 3474 if hasattr(inst, "filename"):
3475 3475 u.warn(_("abort: %s: %s\n") % (inst.strerror, inst.filename))
3476 3476 else:
3477 3477 u.warn(_("abort: %s\n") % inst.strerror)
3478 3478 except util.Abort, inst:
3479 3479 u.warn(_('abort: '), inst.args[0] % inst.args[1:], '\n')
3480 3480 except TypeError, inst:
3481 3481 # was this an argument error?
3482 3482 tb = traceback.extract_tb(sys.exc_info()[2])
3483 3483 if len(tb) > 2: # no
3484 3484 raise
3485 3485 u.debug(inst, "\n")
3486 3486 u.warn(_("%s: invalid arguments\n") % cmd)
3487 3487 help_(u, cmd)
3488 3488 except SystemExit, inst:
3489 3489 # Commands shouldn't sys.exit directly, but give a return code.
3490 3490 # Just in case catch this and and pass exit code to caller.
3491 3491 return inst.code
3492 3492 except:
3493 3493 u.warn(_("** unknown exception encountered, details follow\n"))
3494 3494 u.warn(_("** report bug details to "
3495 3495 "http://www.selenic.com/mercurial/bts\n"))
3496 3496 u.warn(_("** or mercurial@selenic.com\n"))
3497 3497 u.warn(_("** Mercurial Distributed SCM (version %s)\n")
3498 3498 % version.get_version())
3499 3499 raise
3500 3500
3501 3501 return -1
General Comments 0
You need to be logged in to leave comments. Login now