From: W. Trevor King <wking@drexel.edu>
Date: Sat, 26 Jun 2010 20:26:50 +0000 (-0400)
Subject: Use _invoke_client (vs. old _u_invoke_client) for Monotone get_workspace_root.
X-Git-Tag: 1.0.0~30
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=dbc17b52969cd976dc20cd1a537810bd53db5745;p=be.git

Use _invoke_client (vs. old _u_invoke_client) for Monotone get_workspace_root.

This fixes Chris'

======================================================================
ERROR: Adding entries with the same ID should not increase the number
of children.
----------------------------------------------------------------------
Traceback (most recent call last):
  ...
CommandError: Command failed (1):
      mtn: misuse: workspace required but not found

while executing
      ['mtn', 'automate', 'get_workspace_root']
---

diff --git a/libbe/storage/vcs/monotone.py b/libbe/storage/vcs/monotone.py
index 2bb5fd4..350b4f1 100644
--- a/libbe/storage/vcs/monotone.py
+++ b/libbe/storage/vcs/monotone.py
@@ -136,7 +136,7 @@ class Monotone (base.VCS):
         else:
             dirname = path
         if self.version_cmp(8, 0) >= 0:
-            status,output,error = self._u_invoke_client(
+            status,output,error = self._invoke_client(
                 'automate', 'get_workspace_root', cwd=dirname)
         else:
             mtn_dir = self._u_search_parent_directories(path, '_MTN')