aboutsummaryrefslogtreecommitdiffstats
path: root/interfaces
diff options
context:
space:
mode:
Diffstat (limited to 'interfaces')
-rw-r--r--interfaces/email/interactive/becommands/init.py2
-rw-r--r--interfaces/email/interactive/libbe/arch.py8
-rw-r--r--interfaces/email/interactive/libbe/bugdir.py8
-rw-r--r--interfaces/email/interactive/libbe/bzr.py4
-rw-r--r--interfaces/email/interactive/libbe/darcs.py26
-rw-r--r--interfaces/email/interactive/libbe/git.py4
-rw-r--r--interfaces/email/interactive/libbe/hg.py4
-rw-r--r--interfaces/email/interactive/libbe/utility.py5
-rw-r--r--interfaces/email/interactive/libbe/vcs.py32
-rw-r--r--interfaces/web/Bugs-Everywhere-Web/libbe/arch.py8
-rw-r--r--interfaces/web/Bugs-Everywhere-Web/libbe/bugdir.py8
-rw-r--r--interfaces/web/Bugs-Everywhere-Web/libbe/bzr.py4
-rw-r--r--interfaces/web/Bugs-Everywhere-Web/libbe/darcs.py26
-rw-r--r--interfaces/web/Bugs-Everywhere-Web/libbe/git.py4
-rw-r--r--interfaces/web/Bugs-Everywhere-Web/libbe/hg.py4
-rw-r--r--interfaces/web/Bugs-Everywhere-Web/libbe/utility.py5
-rw-r--r--interfaces/web/Bugs-Everywhere-Web/libbe/vcs.py32
17 files changed, 95 insertions, 89 deletions
diff --git a/interfaces/email/interactive/becommands/init.py b/interfaces/email/interactive/becommands/init.py
index 1125d93..a6098ba 100644
--- a/interfaces/email/interactive/becommands/init.py
+++ b/interfaces/email/interactive/becommands/init.py
@@ -32,7 +32,7 @@ def execute(args, manipulate_encodings=True):
>>> execute(['--root', dir.path], manipulate_encodings=False)
No revision control detected.
Directory initialized.
- >>> del(dir)
+ >>> dir.cleanup()
>>> dir = utility.Dir()
>>> os.chdir(dir.path)
diff --git a/interfaces/email/interactive/libbe/arch.py b/interfaces/email/interactive/libbe/arch.py
index ab55172..daa8ac6 100644
--- a/interfaces/email/interactive/libbe/arch.py
+++ b/interfaces/email/interactive/libbe/arch.py
@@ -53,8 +53,8 @@ class Arch(vcs.VCS):
_project_name = None
_tmp_project = False
_arch_paramdir = os.path.expanduser("~/.arch-params")
- def _vcs_help(self):
- status,output,error = self._u_invoke_client("--help")
+ def _vcs_version(self):
+ status,output,error = self._u_invoke_client("--version")
return output
def _vcs_detect(self, path):
"""Detect whether a directory is revision-controlled using Arch"""
@@ -70,7 +70,7 @@ class Arch(vcs.VCS):
"""
Create a temporary Arch archive in the directory PATH. This
archive will be removed by
- __del__->cleanup->_vcs_cleanup->_remove_archive
+ cleanup->_vcs_cleanup->_remove_archive
"""
# http://regexps.srparish.net/tutorial-tla/new-archive.html#Creating_a_New_Archive
assert self._archive_name == None
@@ -112,7 +112,7 @@ class Arch(vcs.VCS):
"""
Create a temporary Arch project in the directory PATH. This
project will be removed by
- __del__->cleanup->_vcs_cleanup->_remove_project
+ cleanup->_vcs_cleanup->_remove_project
"""
# http://mwolson.org/projects/GettingStartedWithArch.html
# http://regexps.srparish.net/tutorial-tla/new-project.html#Starting_a_New_Project
diff --git a/interfaces/email/interactive/libbe/bugdir.py b/interfaces/email/interactive/libbe/bugdir.py
index c4f0f91..5324163 100644
--- a/interfaces/email/interactive/libbe/bugdir.py
+++ b/interfaces/email/interactive/libbe/bugdir.py
@@ -305,6 +305,7 @@ settings easy. Don't set this attribute. Set .vcs instead, and
self.root = self._find_root(root)
else:
if not os.path.exists(root):
+ self.root = None
raise NoRootEntry(root)
self.root = root
# get a temporary vcs until we've loaded settings
@@ -324,9 +325,6 @@ settings easy. Don't set this attribute. Set .vcs instead, and
self.vcs = vcs
self._setup_user_id(self.user_id)
- def __del__(self):
- self.cleanup()
-
def cleanup(self):
self.vcs.cleanup()
@@ -339,6 +337,7 @@ settings easy. Don't set this attribute. Set .vcs instead, and
then only if sink_to_existing_root == True.
"""
if not os.path.exists(path):
+ self.root = None
raise NoRootEntry(path)
versionfile=utility.search_parent_directories(path,
os.path.join(".be", "version"))
@@ -349,6 +348,7 @@ settings easy. Don't set this attribute. Set .vcs instead, and
else:
beroot = utility.search_parent_directories(path, ".be")
if beroot == None:
+ self.root = None
raise NoBugDir(path)
return beroot
@@ -671,7 +671,7 @@ class SimpleBugDir (BugDir):
assert_new_BugDir=assert_new_BugDir,
allow_vcs_init=vcs_init,
manipulate_encodings=False)
- if sync_with_disk == True: # postpone cleanup since dir.__del__() removes dir.
+ if sync_with_disk == True: # postpone cleanup since dir.cleanup() removes dir.
self._dir_ref = dir
bug_a = self.new_bug("a", summary="Bug A")
bug_a.creator = "John Doe <jdoe@example.com>"
diff --git a/interfaces/email/interactive/libbe/bzr.py b/interfaces/email/interactive/libbe/bzr.py
index e9e0649..ed9e032 100644
--- a/interfaces/email/interactive/libbe/bzr.py
+++ b/interfaces/email/interactive/libbe/bzr.py
@@ -37,8 +37,8 @@ class Bzr(vcs.VCS):
name = "bzr"
client = "bzr"
versioned = True
- def _vcs_help(self):
- status,output,error = self._u_invoke_client("--help")
+ def _vcs_version(self):
+ status,output,error = self._u_invoke_client("--version")
return output
def _vcs_detect(self, path):
if self._u_search_parent_directories(path, ".bzr") != None :
diff --git a/interfaces/email/interactive/libbe/darcs.py b/interfaces/email/interactive/libbe/darcs.py
index 16005f2..9115886 100644
--- a/interfaces/email/interactive/libbe/darcs.py
+++ b/interfaces/email/interactive/libbe/darcs.py
@@ -40,8 +40,10 @@ class Darcs(vcs.VCS):
name="darcs"
client="darcs"
versioned=True
- def _vcs_help(self):
- status,output,error = self._u_invoke_client("--help")
+ def _vcs_version(self):
+ status,output,error = self._u_invoke_client("--version")
+ num_part = output.split(" ")[0]
+ self.parsed_version = [int(i) for i in num_part.split(".")]
return output
def _vcs_detect(self, path):
if self._u_search_parent_directories(path, "_darcs") != None :
@@ -95,20 +97,20 @@ class Darcs(vcs.VCS):
def _vcs_get_file_contents(self, path, revision=None, binary=False):
if revision == None:
return vcs.VCS._vcs_get_file_contents(self, path, revision,
- binary=binary)
+ binary=binary)
else:
- try:
- return self._u_invoke_client("show", "contents", "--patch", revision, path)
- except vcs.CommandError:
+ if self.parsed_version[0] >= 2:
+ status,output,error = self._u_invoke_client( \
+ "show", "contents", "--patch", revision, path)
+ return output
+ else:
# Darcs versions < 2.0.0pre2 lack the "show contents" command
- status,output,error = self._u_invoke_client("diff", "--unified",
- "--from-patch",
- revision, path)
+ status,output,error = self._u_invoke_client( \
+ "diff", "--unified", "--from-patch", revision, path)
major_patch = output
- status,output,error = self._u_invoke_client("diff", "--unified",
- "--patch",
- revision, path)
+ status,output,error = self._u_invoke_client( \
+ "diff", "--unified", "--patch", revision, path)
target_patch = output
# "--output -" to be supported in GNU patch > 2.5.9
diff --git a/interfaces/email/interactive/libbe/git.py b/interfaces/email/interactive/libbe/git.py
index 3abe3b8..628f9b9 100644
--- a/interfaces/email/interactive/libbe/git.py
+++ b/interfaces/email/interactive/libbe/git.py
@@ -36,8 +36,8 @@ class Git(vcs.VCS):
name="git"
client="git"
versioned=True
- def _vcs_help(self):
- status,output,error = self._u_invoke_client("--help")
+ def _vcs_version(self):
+ status,output,error = self._u_invoke_client("--version")
return output
def _vcs_detect(self, path):
if self._u_search_parent_directories(path, ".git") != None :
diff --git a/interfaces/email/interactive/libbe/hg.py b/interfaces/email/interactive/libbe/hg.py
index f8f8121..7cd4c2f 100644
--- a/interfaces/email/interactive/libbe/hg.py
+++ b/interfaces/email/interactive/libbe/hg.py
@@ -36,8 +36,8 @@ class Hg(vcs.VCS):
name="hg"
client="hg"
versioned=True
- def _vcs_help(self):
- status,output,error = self._u_invoke_client("--help")
+ def _vcs_version(self):
+ status,output,error = self._u_invoke_client("--version")
return output
def _vcs_detect(self, path):
"""Detect whether a directory is revision-controlled using Mercurial"""
diff --git a/interfaces/email/interactive/libbe/utility.py b/interfaces/email/interactive/libbe/utility.py
index aafbf8d..1e43516 100644
--- a/interfaces/email/interactive/libbe/utility.py
+++ b/interfaces/email/interactive/libbe/utility.py
@@ -58,13 +58,10 @@ class Dir (object):
"A temporary directory for testing use"
def __init__(self):
self.path = tempfile.mkdtemp(prefix="BEtest")
- self.rmtree = shutil.rmtree # save local reference for __del__
self.removed = False
- def __del__(self):
- self.cleanup()
def cleanup(self):
if self.removed == False:
- self.rmtree(self.path)
+ shutil.rmtree(self.path)
self.removed = True
def __call__(self):
return self.path
diff --git a/interfaces/email/interactive/libbe/vcs.py b/interfaces/email/interactive/libbe/vcs.py
index a1d3022..7b506e8 100644
--- a/interfaces/email/interactive/libbe/vcs.py
+++ b/interfaces/email/interactive/libbe/vcs.py
@@ -50,7 +50,7 @@ def _get_matching_vcs(matchfn):
vcs = module.new()
if matchfn(vcs) == True:
return vcs
- del(vcs)
+ vcs.cleanup()
return VCS()
def vcs_by_name(vcs_name):
@@ -124,15 +124,12 @@ class VCS(object):
self._duplicateBasedir = None
self._duplicateDirname = None
self.encoding = encoding
- def __del__(self):
- self.cleanup()
-
- def _vcs_help(self):
+ self.version = self._get_version()
+ def _vcs_version(self):
"""
- Return the command help string.
- (Allows a simple test to see if the client is installed.)
+ Return the VCS version string.
"""
- pass
+ return "0.0"
def _vcs_detect(self, path=None):
"""
Detect whether a directory is revision controlled with this VCS.
@@ -231,15 +228,21 @@ class VCS(object):
specified revision does not exist.
"""
return None
- def installed(self):
+ def _get_version(self):
try:
- self._vcs_help()
- return True
+ ret = self._vcs_version()
+ return ret
except OSError, e:
if e.errno == errno.ENOENT:
- return False
+ return None
+ else:
+ raise OSError, e
except CommandError:
- return False
+ return None
+ def installed(self):
+ if self.version != None:
+ return True
+ return False
def detect(self, path="."):
"""
Detect whether a directory is revision controlled with this VCS.
@@ -674,7 +677,7 @@ class VCSTestCase(unittest.TestCase):
setup_vcs_test_fixtures(self)
def tearDown(self):
- del(self.vcs)
+ self.vcs.cleanup()
super(VCSTestCase, self).tearDown()
def full_path(self, rel_path):
@@ -837,6 +840,7 @@ class VCS_commit_TestCase(VCSTestCase):
def test_revision_file_contents_as_committed(self):
"""Should get file contents as committed to specified revision."""
+ import sys
if not self.vcs.versioned:
return
for path in self.test_files:
diff --git a/interfaces/web/Bugs-Everywhere-Web/libbe/arch.py b/interfaces/web/Bugs-Everywhere-Web/libbe/arch.py
index ab55172..daa8ac6 100644
--- a/interfaces/web/Bugs-Everywhere-Web/libbe/arch.py
+++ b/interfaces/web/Bugs-Everywhere-Web/libbe/arch.py
@@ -53,8 +53,8 @@ class Arch(vcs.VCS):
_project_name = None
_tmp_project = False
_arch_paramdir = os.path.expanduser("~/.arch-params")
- def _vcs_help(self):
- status,output,error = self._u_invoke_client("--help")
+ def _vcs_version(self):
+ status,output,error = self._u_invoke_client("--version")
return output
def _vcs_detect(self, path):
"""Detect whether a directory is revision-controlled using Arch"""
@@ -70,7 +70,7 @@ class Arch(vcs.VCS):
"""
Create a temporary Arch archive in the directory PATH. This
archive will be removed by
- __del__->cleanup->_vcs_cleanup->_remove_archive
+ cleanup->_vcs_cleanup->_remove_archive
"""
# http://regexps.srparish.net/tutorial-tla/new-archive.html#Creating_a_New_Archive
assert self._archive_name == None
@@ -112,7 +112,7 @@ class Arch(vcs.VCS):
"""
Create a temporary Arch project in the directory PATH. This
project will be removed by
- __del__->cleanup->_vcs_cleanup->_remove_project
+ cleanup->_vcs_cleanup->_remove_project
"""
# http://mwolson.org/projects/GettingStartedWithArch.html
# http://regexps.srparish.net/tutorial-tla/new-project.html#Starting_a_New_Project
diff --git a/interfaces/web/Bugs-Everywhere-Web/libbe/bugdir.py b/interfaces/web/Bugs-Everywhere-Web/libbe/bugdir.py
index c4f0f91..5324163 100644
--- a/interfaces/web/Bugs-Everywhere-Web/libbe/bugdir.py
+++ b/interfaces/web/Bugs-Everywhere-Web/libbe/bugdir.py
@@ -305,6 +305,7 @@ settings easy. Don't set this attribute. Set .vcs instead, and
self.root = self._find_root(root)
else:
if not os.path.exists(root):
+ self.root = None
raise NoRootEntry(root)
self.root = root
# get a temporary vcs until we've loaded settings
@@ -324,9 +325,6 @@ settings easy. Don't set this attribute. Set .vcs instead, and
self.vcs = vcs
self._setup_user_id(self.user_id)
- def __del__(self):
- self.cleanup()
-
def cleanup(self):
self.vcs.cleanup()
@@ -339,6 +337,7 @@ settings easy. Don't set this attribute. Set .vcs instead, and
then only if sink_to_existing_root == True.
"""
if not os.path.exists(path):
+ self.root = None
raise NoRootEntry(path)
versionfile=utility.search_parent_directories(path,
os.path.join(".be", "version"))
@@ -349,6 +348,7 @@ settings easy. Don't set this attribute. Set .vcs instead, and
else:
beroot = utility.search_parent_directories(path, ".be")
if beroot == None:
+ self.root = None
raise NoBugDir(path)
return beroot
@@ -671,7 +671,7 @@ class SimpleBugDir (BugDir):
assert_new_BugDir=assert_new_BugDir,
allow_vcs_init=vcs_init,
manipulate_encodings=False)
- if sync_with_disk == True: # postpone cleanup since dir.__del__() removes dir.
+ if sync_with_disk == True: # postpone cleanup since dir.cleanup() removes dir.
self._dir_ref = dir
bug_a = self.new_bug("a", summary="Bug A")
bug_a.creator = "John Doe <jdoe@example.com>"
diff --git a/interfaces/web/Bugs-Everywhere-Web/libbe/bzr.py b/interfaces/web/Bugs-Everywhere-Web/libbe/bzr.py
index e9e0649..ed9e032 100644
--- a/interfaces/web/Bugs-Everywhere-Web/libbe/bzr.py
+++ b/interfaces/web/Bugs-Everywhere-Web/libbe/bzr.py
@@ -37,8 +37,8 @@ class Bzr(vcs.VCS):
name = "bzr"
client = "bzr"
versioned = True
- def _vcs_help(self):
- status,output,error = self._u_invoke_client("--help")
+ def _vcs_version(self):
+ status,output,error = self._u_invoke_client("--version")
return output
def _vcs_detect(self, path):
if self._u_search_parent_directories(path, ".bzr") != None :
diff --git a/interfaces/web/Bugs-Everywhere-Web/libbe/darcs.py b/interfaces/web/Bugs-Everywhere-Web/libbe/darcs.py
index 16005f2..9115886 100644
--- a/interfaces/web/Bugs-Everywhere-Web/libbe/darcs.py
+++ b/interfaces/web/Bugs-Everywhere-Web/libbe/darcs.py
@@ -40,8 +40,10 @@ class Darcs(vcs.VCS):
name="darcs"
client="darcs"
versioned=True
- def _vcs_help(self):
- status,output,error = self._u_invoke_client("--help")
+ def _vcs_version(self):
+ status,output,error = self._u_invoke_client("--version")
+ num_part = output.split(" ")[0]
+ self.parsed_version = [int(i) for i in num_part.split(".")]
return output
def _vcs_detect(self, path):
if self._u_search_parent_directories(path, "_darcs") != None :
@@ -95,20 +97,20 @@ class Darcs(vcs.VCS):
def _vcs_get_file_contents(self, path, revision=None, binary=False):
if revision == None:
return vcs.VCS._vcs_get_file_contents(self, path, revision,
- binary=binary)
+ binary=binary)
else:
- try:
- return self._u_invoke_client("show", "contents", "--patch", revision, path)
- except vcs.CommandError:
+ if self.parsed_version[0] >= 2:
+ status,output,error = self._u_invoke_client( \
+ "show", "contents", "--patch", revision, path)
+ return output
+ else:
# Darcs versions < 2.0.0pre2 lack the "show contents" command
- status,output,error = self._u_invoke_client("diff", "--unified",
- "--from-patch",
- revision, path)
+ status,output,error = self._u_invoke_client( \
+ "diff", "--unified", "--from-patch", revision, path)
major_patch = output
- status,output,error = self._u_invoke_client("diff", "--unified",
- "--patch",
- revision, path)
+ status,output,error = self._u_invoke_client( \
+ "diff", "--unified", "--patch", revision, path)
target_patch = output
# "--output -" to be supported in GNU patch > 2.5.9
diff --git a/interfaces/web/Bugs-Everywhere-Web/libbe/git.py b/interfaces/web/Bugs-Everywhere-Web/libbe/git.py
index 3abe3b8..628f9b9 100644
--- a/interfaces/web/Bugs-Everywhere-Web/libbe/git.py
+++ b/interfaces/web/Bugs-Everywhere-Web/libbe/git.py
@@ -36,8 +36,8 @@ class Git(vcs.VCS):
name="git"
client="git"
versioned=True
- def _vcs_help(self):
- status,output,error = self._u_invoke_client("--help")
+ def _vcs_version(self):
+ status,output,error = self._u_invoke_client("--version")
return output
def _vcs_detect(self, path):
if self._u_search_parent_directories(path, ".git") != None :
diff --git a/interfaces/web/Bugs-Everywhere-Web/libbe/hg.py b/interfaces/web/Bugs-Everywhere-Web/libbe/hg.py
index f8f8121..7cd4c2f 100644
--- a/interfaces/web/Bugs-Everywhere-Web/libbe/hg.py
+++ b/interfaces/web/Bugs-Everywhere-Web/libbe/hg.py
@@ -36,8 +36,8 @@ class Hg(vcs.VCS):
name="hg"
client="hg"
versioned=True
- def _vcs_help(self):
- status,output,error = self._u_invoke_client("--help")
+ def _vcs_version(self):
+ status,output,error = self._u_invoke_client("--version")
return output
def _vcs_detect(self, path):
"""Detect whether a directory is revision-controlled using Mercurial"""
diff --git a/interfaces/web/Bugs-Everywhere-Web/libbe/utility.py b/interfaces/web/Bugs-Everywhere-Web/libbe/utility.py
index aafbf8d..1e43516 100644
--- a/interfaces/web/Bugs-Everywhere-Web/libbe/utility.py
+++ b/interfaces/web/Bugs-Everywhere-Web/libbe/utility.py
@@ -58,13 +58,10 @@ class Dir (object):
"A temporary directory for testing use"
def __init__(self):
self.path = tempfile.mkdtemp(prefix="BEtest")
- self.rmtree = shutil.rmtree # save local reference for __del__
self.removed = False
- def __del__(self):
- self.cleanup()
def cleanup(self):
if self.removed == False:
- self.rmtree(self.path)
+ shutil.rmtree(self.path)
self.removed = True
def __call__(self):
return self.path
diff --git a/interfaces/web/Bugs-Everywhere-Web/libbe/vcs.py b/interfaces/web/Bugs-Everywhere-Web/libbe/vcs.py
index a1d3022..7b506e8 100644
--- a/interfaces/web/Bugs-Everywhere-Web/libbe/vcs.py
+++ b/interfaces/web/Bugs-Everywhere-Web/libbe/vcs.py
@@ -50,7 +50,7 @@ def _get_matching_vcs(matchfn):
vcs = module.new()
if matchfn(vcs) == True:
return vcs
- del(vcs)
+ vcs.cleanup()
return VCS()
def vcs_by_name(vcs_name):
@@ -124,15 +124,12 @@ class VCS(object):
self._duplicateBasedir = None
self._duplicateDirname = None
self.encoding = encoding
- def __del__(self):
- self.cleanup()
-
- def _vcs_help(self):
+ self.version = self._get_version()
+ def _vcs_version(self):
"""
- Return the command help string.
- (Allows a simple test to see if the client is installed.)
+ Return the VCS version string.
"""
- pass
+ return "0.0"
def _vcs_detect(self, path=None):
"""
Detect whether a directory is revision controlled with this VCS.
@@ -231,15 +228,21 @@ class VCS(object):
specified revision does not exist.
"""
return None
- def installed(self):
+ def _get_version(self):
try:
- self._vcs_help()
- return True
+ ret = self._vcs_version()
+ return ret
except OSError, e:
if e.errno == errno.ENOENT:
- return False
+ return None
+ else:
+ raise OSError, e
except CommandError:
- return False
+ return None
+ def installed(self):
+ if self.version != None:
+ return True
+ return False
def detect(self, path="."):
"""
Detect whether a directory is revision controlled with this VCS.
@@ -674,7 +677,7 @@ class VCSTestCase(unittest.TestCase):
setup_vcs_test_fixtures(self)
def tearDown(self):
- del(self.vcs)
+ self.vcs.cleanup()
super(VCSTestCase, self).tearDown()
def full_path(self, rel_path):
@@ -837,6 +840,7 @@ class VCS_commit_TestCase(VCSTestCase):
def test_revision_file_contents_as_committed(self):
"""Should get file contents as committed to specified revision."""
+ import sys
if not self.vcs.versioned:
return
for path in self.test_files:
generated by cgit (git 2.34.1) at 2024-11-18 22:34:23 +0000