hg/pyhgsh: mercurial/commands.py comparison

comparison mercurial/commands.py @ 2085:f71e9656524f

merge revlogng with mpm tip

author	Chris Mason <mason@suse.com>
date	Tue, 18 Apr 2006 19:50:12 -0400
parents	345107e167a0 fef2d653beaf
children	1d3c6e63d703

comparison

equal deleted inserted replaced

-:d66278012853
+:f71e9656524f
 This command tries to fix the repository status after an interrupted
 operation. It should only be necessary when Mercurial suggests it.
 """
 if repo.recover():
 return repo.verify()
-return False
+return 1
 def remove(ui, repo, pat, *pats, **opts):
 """remove the specified files on the next commit
 Schedule the indicated files for removal from the repository.
 try:
 u = ui.ui()
 except util.Abort, inst:
 sys.stderr.write(_("abort: %s\n") % inst)
-sys.exit(1)
+return -1
 external = []
 for x in u.extensions():
-def on_exception(exc, inst):
+try:
-u.warn(_("*** failed to import extension %s\n") % x[1])
+if x[1]:
-u.warn("%s\n" % inst)
-if "--traceback" in sys.argv[1:]:
-traceback.print_exc()
-if x[1]:
-try:
 mod = imp.load_source(x[0], x[1])
-except Exception, inst:
+else:
-on_exception(Exception, inst)
+def importh(name):
-continue
+mod = __import__(name)
-else:
+components = name.split('.')
-def importh(name):
+for comp in components[1:]:
-mod = __import__(name)
+mod = getattr(mod, comp)
-components = name.split('.')
+return mod
-for comp in components[1:]:
-mod = getattr(mod, comp)
-return mod
-try:
 try:
 mod = importh("hgext." + x[0])
 except ImportError:
 mod = importh(x[0])
-except Exception, inst:
+external.append(mod)
-on_exception(Exception, inst)
+except Exception, inst:
-continue
+u.warn(_("*** failed to import extension %s: %s\n") % (x[0], inst))
+if "--traceback" in sys.argv[1:]:
-external.append(mod)
+traceback.print_exc()
+return 1
+continue
 for x in external:
 cmdtable = getattr(x, 'cmdtable', {})
 for t in cmdtable:
 if t in table:
 u.warn(_("module %s overrides %s\n") % (x.__name__, t))
 path = u.expandpath(options["repository"]) or ""
 repo = path and hg.repository(u, path=path) or None
 if options['help']:
-help_(u, cmd, options['version'])
+return help_(u, cmd, options['version'])
-sys.exit(0)
 elif options['version']:
-show_version(u)
+return show_version(u)
-sys.exit(0)
 elif not cmd:
-help_(u, 'shortlist')
+return help_(u, 'shortlist')
-sys.exit(0)
 if cmd not in norepo.split():
 try:
 if not repo:
 repo = hg.repository(u, path=path)
 u.warn(_("hg %s: %s\n") % (inst.args[0], inst.args[1]))
 help_(u, inst.args[0])
 else:
 u.warn(_("hg: %s\n") % inst.args[1])
 help_(u, 'shortlist')
-sys.exit(-1)
 except AmbiguousCommand, inst:
 u.warn(_("hg: command '%s' is ambiguous:\n    %s\n") %
 (inst.args[0], " ".join(inst.args[1])))
-sys.exit(1)
 except UnknownCommand, inst:
 u.warn(_("hg: unknown command '%s'\n") % inst.args[0])
 help_(u, 'shortlist')
-sys.exit(1)
 except hg.RepoError, inst:
 u.warn(_("abort: "), inst, "!\n")
 except lock.LockHeld, inst:
 if inst.errno == errno.ETIMEDOUT:
 reason = _('timed out waiting for lock held by %s') % inst.locker
 u.warn(_("abort: %s: %s\n") % (inst.strerror, inst.filename))
 else:
 u.warn(_("abort: %s\n") % inst.strerror)
 except util.Abort, inst:
 u.warn(_('abort: '), inst.args[0] % inst.args[1:], '\n')
-sys.exit(1)
 except TypeError, inst:
 # was this an argument error?
 tb = traceback.extract_tb(sys.exc_info()[2])
 if len(tb) > 2: # no
 raise
 u.debug(inst, "\n")
 u.warn(_("%s: invalid arguments\n") % cmd)
 help_(u, cmd)
-except SystemExit:
+except SystemExit, inst:
-# don't catch this in the catch-all below
+# Commands shouldn't sys.exit directly, but give a return code.
-raise
+# Just in case catch this and and pass exit code to caller.
+return inst.code
 except:
 u.warn(_("** unknown exception encountered, details follow\n"))
 u.warn(_("** report bug details to mercurial@selenic.com\n"))
 u.warn(_("** Mercurial Distributed SCM (version %s)\n")
 % version.get_version())
 raise
-sys.exit(-1)
+return -1

Mercurial > hg > pyhgsh

comparison mercurial/commands.py @ 2085:f71e9656524f