From: W. Trevor King <wking@drexel.edu>
Date: Sun, 27 Jun 2010 14:47:11 +0000 (-0400)
Subject: Ah, restored altered dirname code to Monotone's root method.
X-Git-Tag: 1.0.0~28
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=d661ec949cd97def3e33af1db98bd33ceb0e1acc;p=be.git

Ah, restored altered dirname code to Monotone's root method.

The previous implementation used
  cwd=path
which would fail for non-directory paths.

The implementation before that was missing the not from
  if not os.path.isdir(path):
      dirname = os.path.dirname(path)
which meant it found the dirname when it didn't need to, and not when
it did ;).
---

diff --git a/libbe/storage/vcs/monotone.py b/libbe/storage/vcs/monotone.py
index d95cb72..1e15aa4 100644
--- a/libbe/storage/vcs/monotone.py
+++ b/libbe/storage/vcs/monotone.py
@@ -132,8 +132,12 @@ class Monotone (base.VCS):
     def _vcs_root(self, path):
         """Find the root of the deepest repository containing path."""
         if self.version_cmp(8, 0) >= 0:
+            if not os.path.isdir(path):
+                dirname = os.path.dirname(path)
+            else:
+                dirname = path
             status,output,error = self._invoke_client(
-                'automate', 'get_workspace_root', cwd=path)
+                'automate', 'get_workspace_root', cwd=dirname)
         else:
             mtn_dir = self._u_search_parent_directories(path, '_MTN')
             if mtn_dir == None: