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