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.

1 files changed, 6 insertions, 6 deletions

diff --git a/libbe/arch.py b/libbe/arch.py
index daa8ac6..98c4edd 100644
--- a/libbe/arch.py
+++ b/libbe/arch.py
@@ -83,7 +83,7 @@ class Arch(vcs.VCS):
         self._archive_dir = "/tmp/%s" % trailer
         self._tmp_archive = True
         self._u_invoke_client("make-archive", self._archive_name,
-                              self._archive_dir, directory=path)
+                              self._archive_dir, cwd=path)
     def _invoke_client(self, *args, **kwargs):
         """
         Invoke the client on our archive.
@@ -121,7 +121,7 @@ class Arch(vcs.VCS):
         version = "0.1"
         self._project_name = "%s--%s--%s" % (category, branch, version)
         self._invoke_client("archive-setup", self._project_name,
-                            directory=path)
+                            cwd=path)
         self._tmp_project = True
     def _remove_project(self):
         assert self._tmp_project == True
@@ -164,10 +164,10 @@ class Arch(vcs.VCS):
         # http://regexps.srparish.net/tutorial-tla/new-source.html
         # http://regexps.srparish.net/tutorial-tla/importing-first.html
         self._invoke_client("init-tree", self._project_name,
-                              directory=path)
+                            cwd=path)
         self._adjust_naming_conventions(path)
         self._invoke_client("import", "--summary", "Began versioning",
-                            directory=path)
+                            cwd=path)
     def _vcs_cleanup(self):
         if self._tmp_project == True:
             self._remove_project()
@@ -198,7 +198,7 @@ class Arch(vcs.VCS):
         assert self._archive_name != None
     def _get_archive_project_name(self, root):
         # get project names
-        status,output,error = self._u_invoke_client("tree-version", directory=root)
+        status,output,error = self._u_invoke_client("tree-version", cwd=root)
         # e.g output
         # jdoe@example.com--bugs-everywhere-auto-2008.22.24.52/be--mainline--0.1
         archive_name,project_name = output.rstrip('\n').split('/')
@@ -266,7 +266,7 @@ class Arch(vcs.VCS):
             vcs.VCS._vcs_duplicate_repo(self, directory, revision)
         else:
             status,output,error = \
-                self._u_invoke_client("get", revision,directory)
+                self._u_invoke_client("get", revision, directory)
     def _vcs_commit(self, commitfile, allow_empty=False):
         if allow_empty == False:
             # arch applies empty commits without complaining, so check first