aboutsummaryrefslogtreecommitdiffstats
path: root/libbe/vcs.py
diff options
context:
space:
mode:
authorW. Trevor King <wking@drexel.edu>2009-11-17 09:47:44 -0500
committerW. Trevor King <wking@drexel.edu>2009-11-17 09:47:44 -0500
commitf108f5a0fb0984c0daccd8be72ea0ffa309b3fff (patch)
tree674a4de9a5f63c5e67ed07b15a76f4b1fcedf398 /libbe/vcs.py
parent2a1bca807d4b94610924343169c813a9f7868147 (diff)
downloadbugseverywhere-f108f5a0fb0984c0daccd8be72ea0ffa309b3fff.tar.gz
Use unicode_output=False in some Darcs._u_invoke_client() calls.
This avoids the following error: ====================================================================== ERROR: Should get file contents as committed to specified revision. ---------------------------------------------------------------------- Traceback (most recent call last): File ".../libbe/vcs.py", line 860, in test_revision_file_contents_as_committed full_path, revision) File ".../libbe/vcs.py", line 339, in get_file_contents contents = self._vcs_get_file_contents(relpath,revision,binary=binary) File ".../libbe/darcs.py", line 122, in _vcs_get_file_contents status,output,error = self._u_invoke(args, stdin=major_patch) File ".../libbe/vcs.py", line 488, in _u_invoke raise CommandError(args, status, stdout, stderr) CommandError: Command failed (2): patch: **** Only garbage was found in the patch input. while executing ['patch', '--reverse', 'a/text'] After adding the unicode_output=False lines, I adjusted the VCS._u_invoke_client() definition to pass all it's kwargs automatically through to VCS._u_invoke(). To make this simpler and more consistent, I renamed the "directory" option to "cwd", and adjusted *._u_invoke() calls appropriately in several VCS backends.
Diffstat (limited to 'libbe/vcs.py')
-rw-r--r--libbe/vcs.py5
1 files changed, 1 insertions, 4 deletions
diff --git a/libbe/vcs.py b/libbe/vcs.py
index 59dcaf8..ba23858 100644
--- a/libbe/vcs.py
+++ b/libbe/vcs.py
@@ -488,12 +488,9 @@ class VCS(object):
raise CommandError(args, status, stdout, stderr)
return status, stdout, stderr
def _u_invoke_client(self, *args, **kwargs):
- directory = kwargs.get('directory',None)
- expect = kwargs.get('expect', (0,))
- stdin = kwargs.get('stdin', None)
cl_args = [self.client]
cl_args.extend(args)
- return self._u_invoke(cl_args, stdin=stdin,expect=expect,cwd=directory)
+ return self._u_invoke(cl_args, **kwargs)
def _u_search_parent_directories(self, path, filename):
"""
Find the file (or directory) named filename in path or in any