Mercurial > hg > mercurial-crew-with-dirclash
diff mercurial/commands.py @ 3281:45b639607e52
Merge with crew
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Fri, 06 Oct 2006 17:14:18 -0500 |
parents | 23682d3e4111 |
children | d89e98840b08 |
line wrap: on
line diff
--- a/mercurial/commands.py +++ b/mercurial/commands.py @@ -1134,7 +1134,7 @@ def debugcheckstate(ui, repo): error = _(".hg/dirstate inconsistent with current parent's manifest") raise util.Abort(error) -def debugconfig(ui, repo, *values): +def showconfig(ui, repo, *values): """show combined config settings from all hgrc files With no args, print names and values of all config items. @@ -2834,7 +2834,6 @@ table = { [('r', 'rev', '', _('revision to rebuild to'))], _('debugrebuildstate [-r REV] [REV]')), "debugcheckstate": (debugcheckstate, [], _('debugcheckstate')), - "debugconfig": (debugconfig, [], _('debugconfig [NAME]...')), "debugsetparents": (debugsetparents, [], _('debugsetparents REV1 [REV2]')), "debugstate": (debugstate, [], _('debugstate')), "debugdata": (debugdata, [], _('debugdata FILE REV')), @@ -3017,6 +3016,7 @@ table = { _('hg revert [-r REV] [NAME]...')), "rollback": (rollback, [], _('hg rollback')), "root": (root, [], _('hg root')), + "showconfig|debugconfig": (showconfig, [], _('showconfig [NAME]...')), "^serve": (serve, [('A', 'accesslog', '', _('name of access log file to write to')), @@ -3086,7 +3086,7 @@ table = { norepo = ("clone init version help debugancestor debugcomplete debugdata" " debugindex debugindexdot") -optionalrepo = ("paths serve debugconfig") +optionalrepo = ("paths serve showconfig") def findpossible(ui, cmd): """ @@ -3283,6 +3283,8 @@ def dispatch(args): path = u.expandpath(options["repository"]) or "" repo = path and hg.repository(u, path=path) or None + if repo and not repo.local(): + raise util.Abort(_("repository '%s' is not local") % path) if options['help']: return help_(u, cmd, options['version'])