Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
E
erp5
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Kirill Smelkov
erp5
Commits
6e3101c9
Commit
6e3101c9
authored
9 years ago
by
Sebastien Robin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ERP5VCS: completely disable Subversion if pysvn is not present
parent
069cfdf1
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
3 deletions
+5
-3
product/ERP5VCS/Subversion.py
product/ERP5VCS/Subversion.py
+1
-2
product/ERP5VCS/__init__.py
product/ERP5VCS/__init__.py
+4
-1
No files found.
product/ERP5VCS/Subversion.py
View file @
6e3101c9
...
...
@@ -30,6 +30,7 @@
##############################################################################
import
errno
,
glob
,
os
,
re
,
shutil
from
pysvn
import
ClientError
,
Revision
,
opt_revision_kind
,
svn_err
import
threading
from
ZTUtils
import
make_query
from
Products.ERP5Type.Message
import
translateString
...
...
@@ -71,7 +72,6 @@ class Subversion(WorkingCopy):
path
=
self
.
working_copy
except
AttributeError
:
return
from
pysvn
import
ClientError
try
:
self
.
getRevision
()
except
(
ClientError
,
KeyError
):
...
...
@@ -145,7 +145,6 @@ class Subversion(WorkingCopy):
return
self
.
aq_parent
.
download
(
'.'
)
def
showOld
(
self
,
path
):
from
pysvn
import
ClientError
,
Revision
,
opt_revision_kind
,
svn_err
try
:
return
self
.
_getClient
().
cat
(
os
.
path
.
join
(
self
.
working_copy
,
path
),
Revision
(
opt_revision_kind
.
base
))
...
...
This diff is collapsed.
Click to expand it.
product/ERP5VCS/__init__.py
View file @
6e3101c9
...
...
@@ -53,5 +53,8 @@ def initialize( context ):
content_classes
=
content_classes
)
# Register Subversion before Git
from
Products.ERP5VCS.Subversion
import
Subversion
try
:
from
Products.ERP5VCS.Subversion
import
Subversion
except
ImportError
:
pass
from
Products.ERP5VCS.Git
import
Git
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment