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