# HG changeset patch # User Dan Villiom Podlaski Christiansen # Date 1242848941 -7200 # Node ID 4b992ebdecc63e844632d259d0cc754f2cb17803 # Parent 49a656155a925d23d8d68851d9dbd24bfcf45c1b improve reliability of Subversion checks. Use the presence of the UUID file for recognising a Subversion-enabled repository locally, and the 'subversion' capability in for recognising them wrappers.outgoing() remotely.0 diff --git a/hgsubversion/util.py b/hgsubversion/util.py --- a/hgsubversion/util.py +++ b/hgsubversion/util.py @@ -99,7 +99,7 @@ def build_extra(revnum, branch, uuid, su def is_svn_repo(repo): - return os.path.exists(os.path.join(repo.path, 'svn')) + return os.path.exists(os.path.join(repo.path, 'svn', 'uuid')) default_commit_msg = '*** empty log message ***' diff --git a/hgsubversion/wrappers.py b/hgsubversion/wrappers.py --- a/hgsubversion/wrappers.py +++ b/hgsubversion/wrappers.py @@ -39,7 +39,7 @@ def outgoing(orig, ui, repo, dest=None, """show changesets not found in the Subversion repository """ svnurl = repo.ui.expandpath(dest or 'default-push', dest or 'default') - if not (cmdutil.issvnurl(svnurl) or opts.get('svn', False)): + if not hg.repository(ui, svnurl).capable('subversion'): return orig(ui, repo, dest, *args, **opts) # split off #rev; TODO implement --revision/#rev support