aboutsummaryrefslogtreecommitdiffstats
path: root/libbe
diff options
context:
space:
mode:
Diffstat (limited to 'libbe')
-rw-r--r--libbe/darcs.py16
1 files changed, 8 insertions, 8 deletions
diff --git a/libbe/darcs.py b/libbe/darcs.py
index a46403c..9115886 100644
--- a/libbe/darcs.py
+++ b/libbe/darcs.py
@@ -97,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:
if self.parsed_version[0] >= 2:
- return self._u_invoke_client("show", "contents", "--patch", revision, path)
+ 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