Mercurial > hgsubversion
comparison __init__.py @ 273:e0f9fa0acc03
Fix the nourl check to use the command name, instead of the function
| author | Daniel Tang <dytang@cs.purdue.edu> |
|---|---|
| date | Thu, 23 Apr 2009 01:33:38 -0400 |
| parents | 112d57bb736e |
| children | ba8e91a7c077 |
comparison
equal
deleted
inserted
replaced
| 272:25d843281127 | 273:e0f9fa0acc03 |
|---|---|
| 91 subcommand = candidates[0] | 91 subcommand = candidates[0] |
| 92 | 92 |
| 93 path = os.path.dirname(repo.path) | 93 path = os.path.dirname(repo.path) |
| 94 try: | 94 try: |
| 95 commandfunc = svncommands.table[subcommand] | 95 commandfunc = svncommands.table[subcommand] |
| 96 if commandfunc not in svncommands.nourl: | 96 if subcommand not in svncommands.nourl: |
| 97 opts['svn_url'] = open(os.path.join(repo.path, 'svn', 'url')).read() | 97 opts['svn_url'] = open(os.path.join(repo.path, 'svn', 'url')).read() |
| 98 return commandfunc(ui, args=args, hg_repo_path=path, repo=repo, **opts) | 98 return commandfunc(ui, args=args, hg_repo_path=path, repo=repo, **opts) |
| 99 except core.SubversionException, e: | 99 except core.SubversionException, e: |
| 100 if e.apr_err == core.SVN_ERR_RA_SERF_SSL_CERT_UNTRUSTED: | 100 if e.apr_err == core.SVN_ERR_RA_SERF_SSL_CERT_UNTRUSTED: |
| 101 raise hgutil.Abort('It appears svn does not trust the ssl cert for this site.\n' | 101 raise hgutil.Abort('It appears svn does not trust the ssl cert for this site.\n' |
