You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by br...@apache.org on 2013/03/17 20:10:45 UTC
[1/7] git commit: [#5973] remove pysvn dependency from Allura package
[#5973] remove pysvn dependency from Allura package
Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/e202a8eb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/e202a8eb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/e202a8eb
Branch: refs/heads/db/5973
Commit: e202a8ebae124a466adcb49b024ed7400582a082
Parents: d882b0b
Author: Dave Brondsema <db...@geek.net>
Authored: Thu Mar 14 13:04:42 2013 -0400
Committer: Dave Brondsema <db...@geek.net>
Committed: Sun Mar 17 12:09:45 2013 -0700
----------------------------------------------------------------------
Allura/allura/lib/utils.py | 10 ----------
ForgeSVN/forgesvn/model/svn.py | 10 +++++++++-
ForgeSVN/forgesvn/svn_main.py | 2 +-
ForgeSVN/forgesvn/tests/model/test_repository.py | 2 +-
4 files changed, 11 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/e202a8eb/Allura/allura/lib/utils.py
----------------------------------------------------------------------
diff --git a/Allura/allura/lib/utils.py b/Allura/allura/lib/utils.py
index fa63b38..6e2d3b8 100644
--- a/Allura/allura/lib/utils.py
+++ b/Allura/allura/lib/utils.py
@@ -27,7 +27,6 @@ from pygments.formatters import HtmlFormatter
from ew import jinja2_ew as ew
from ming.utils import LazyProperty
-import pysvn
def permanent_redirect(url):
try:
@@ -418,15 +417,6 @@ def generate_code_stats(blob):
return stats
-def svn_path_exists(path):
- svn = pysvn.Client()
- try:
- svn.info2(path)
- return True
- except pysvn.ClientError, e:
- return False
-
-
def is_text_file(file):
msg = magic.from_buffer(file[:1024])
if ("text" in msg) or ("empty" in msg):
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/e202a8eb/ForgeSVN/forgesvn/model/svn.py
----------------------------------------------------------------------
diff --git a/ForgeSVN/forgesvn/model/svn.py b/ForgeSVN/forgesvn/model/svn.py
index 7c7515a..7af4ed3 100644
--- a/ForgeSVN/forgesvn/model/svn.py
+++ b/ForgeSVN/forgesvn/model/svn.py
@@ -26,7 +26,6 @@ from ming.utils import LazyProperty
from allura import model as M
from allura.lib import helpers as h
from allura.model.auth import User
-from allura.lib.utils import svn_path_exists
log = logging.getLogger(__name__)
@@ -98,6 +97,15 @@ class SVNCalledProcessError(Exception):
(self.cmd, self.returncode, self.stdout, self.stderr)
+def svn_path_exists(path):
+ svn = SVNLibWrapper(pysvn.Client())
+ try:
+ svn.info2(path)
+ return True
+ except pysvn.ClientError:
+ return False
+
+
class SVNLibWrapper(object):
"""Wrapper around pysvn, used for instrumentation."""
def __init__(self, client):
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/e202a8eb/ForgeSVN/forgesvn/svn_main.py
----------------------------------------------------------------------
diff --git a/ForgeSVN/forgesvn/svn_main.py b/ForgeSVN/forgesvn/svn_main.py
index 29e531a..2df8ea4 100644
--- a/ForgeSVN/forgesvn/svn_main.py
+++ b/ForgeSVN/forgesvn/svn_main.py
@@ -18,13 +18,13 @@ from allura.lib.repository import RepositoryApp, RepoAdminController
from allura.app import SitemapEntry, ConfigOption
from allura.lib import helpers as h
from allura import model as M
-from allura.lib.utils import svn_path_exists
# Local imports
from . import model as SM
from . import version
from . import widgets
from .controllers import BranchBrowser
+from .model.svn import svn_path_exists
log = logging.getLogger(__name__)
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/e202a8eb/ForgeSVN/forgesvn/tests/model/test_repository.py
----------------------------------------------------------------------
diff --git a/ForgeSVN/forgesvn/tests/model/test_repository.py b/ForgeSVN/forgesvn/tests/model/test_repository.py
index 2b02ad0..5a735af 100644
--- a/ForgeSVN/forgesvn/tests/model/test_repository.py
+++ b/ForgeSVN/forgesvn/tests/model/test_repository.py
@@ -17,11 +17,11 @@ from ming.orm import session, ThreadLocalORMSession
from alluratest.controller import setup_basic_test, setup_global_objects
from allura import model as M
from allura.lib import helpers as h
-from allura.lib.utils import svn_path_exists
from allura.tests import decorators as td
from allura.tests.model.test_repo import RepoImplTestBase
from forgesvn import model as SM
+from forgesvn.model.svn import svn_path_exists
from forgesvn.tests import with_svn
class TestNewRepo(unittest.TestCase):