Mercurial > hg > pyhgsh

comparison mercurial/commands.py @ 1543:93a9298367e0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with Thomas Waldmann
author Thomas Arendsen Hein <thomas@intevation.de>
date Mon, 14 Nov 2005 15:09:34 +0100
parents 482b4efdf013 bf4e7ef08741
children d69070c2547a
comparison
equal deleted inserted replaced
1539:5e47e42b14ba 1543:93a9298367e0
642 if opts['rev']: 642 if opts['rev']:
643 try: 643 try:
644 n = mf[abs] 644 n = mf[abs]
645 except (hg.RepoError, KeyError): 645 except (hg.RepoError, KeyError):
646 try: 646 try:
647 n = r.lookup(rev) 647 n = r.lookup(rev) # XXX rev undefined!
648 except KeyError, inst: 648 except KeyError, inst:
649 raise util.Abort(_('cannot find file %s in rev %s'), rel, rev) 649 raise util.Abort(_('cannot find file %s in rev %s'), rel, rev)
650 else: 650 else:
651 n = r.tip() 651 n = r.tip()
652 fp = make_file(repo, r, opts['output'], node=n, pathname=abs) 652 fp = make_file(repo, r, opts['output'], node=n, pathname=abs)
1014 # assume all revision numbers are for changesets 1014 # assume all revision numbers are for changesets
1015 n = repo.lookup(rev) 1015 n = repo.lookup(rev)
1016 change = repo.changelog.read(n) 1016 change = repo.changelog.read(n)
1017 m = repo.manifest.read(change[0]) 1017 m = repo.manifest.read(change[0])
1018 n = m[relpath(repo, [file])[0]] 1018 n = m[relpath(repo, [file])[0]]
1019 except hg.RepoError, KeyError: 1019 except (hg.RepoError, KeyError):
1020 n = r.lookup(rev) 1020 n = r.lookup(rev)
1021 else: 1021 else:
1022 n = r.tip() 1022 n = r.tip()
1023 m = r.renamed(n) 1023 m = r.renamed(n)
1024 if m: 1024 if m:
2468 sys.stderr.write(_("abort: %s\n") % inst) 2468 sys.stderr.write(_("abort: %s\n") % inst)
2469 sys.exit(1) 2469 sys.exit(1)
2470 2470
2471 external = [] 2471 external = []
2472 for x in u.extensions(): 2472 for x in u.extensions():
2473 def on_exception(Exception, inst): 2473 def on_exception(Exception, inst): # XXX Exception is a builtin name!?
2474 u.warn(_("*** failed to import extension %s\n") % x[1]) 2474 u.warn(_("*** failed to import extension %s\n") % x[1])
2475 u.warn("%s\n" % inst) 2475 u.warn("%s\n" % inst)
2476 if "--traceback" in sys.argv[1:]: 2476 if "--traceback" in sys.argv[1:]:
2477 traceback.print_exc() 2477 traceback.print_exc()
2478 if x[1]: 2478 if x[1]: