Work around bzr filelocking issue on Windows.

1 files changed, 6 insertions, 1 deletions

diff --git a/libbe/storage/vcs/bzr.py b/libbe/storage/vcs/bzr.py
index a00e3ac..9464d1d 100644
--- a/libbe/storage/vcs/bzr.py
+++ b/libbe/storage/vcs/bzr.py
@@ -156,7 +156,12 @@ class Bzr(base.VCS):
         path = os.path.join(self.repo, path)
         cmd = bzrlib.builtins.cmd_add()
         cmd.outf = StringIO.StringIO()
-        cmd.run(file_list=[path], file_ids_from=self.repo)
+        kwargs = {'file_ids_from': self.repo}
+        if self.repo == os.path.realpath(os.getcwd()):
+            # Work around bzr file locking on Windows.
+            # See: https://lists.ubuntu.com/archives/bazaar/2011q1/071705.html
+            kwargs.pop('file_ids_from')
+        cmd.run(file_list=[path], **kwargs)
         if self.version_cmp(2,2,0) < 0:
             cmd.cleanup_now()