Merge lp:~bialix/bzr-colo/rename into lp:bzr-colo

[Alexander Belchenko]

I've renamed "dir" variable to more appropriate name, because it prevents me to debug one thing with pdb.

=== modified file 'colocated.py'
--- colocated.py	2010-02-21 19:30:16 +0000
+++ colocated.py	2010-04-02 16:10:33 +0000
@@ -34,7 +34,7 @@
 
 class NoColocatedWorkspace(errors.BzrCommandError):
 
-    _fmt = "No colocated workspace in %(dir)s"
+    _fmt = "No colocated workspace in %(directory)s"
 
 
 class NoCurrentBranch(errors.BzrCommandError):
@@ -49,19 +49,19 @@
     def __init__(self, location=u'.'):
         """A colocated workspace that contains the given path or URL."""
         try:
-            dir, extra_path = bzrdir.BzrDir.open_containing(location)
+            a_bzrdir, extra_path = bzrdir.BzrDir.open_containing(location)
         except errors.NotBranchError:
-            raise NoColocatedWorkspace(dir=location)
-        self.has_tree = dir.has_workingtree()
+            raise NoColocatedWorkspace(directory=location)
+        self.has_tree = a_bzrdir.has_workingtree()
 
         if not self.has_tree:
             self.base = urlutils.local_path_to_url(location)
         else:
-            branch = dir.open_branch()
+            branch = a_bzrdir.open_branch()
             try:
                 self.base = branch.base[:branch.base.index(COLOCATED_LOCATION)]
             except ValueError:
-                raise NoColocatedWorkspace(dir=location)
+                raise NoColocatedWorkspace(directory=location)
 
         self.repo_location = urlutils.join(self.base, COLOCATED_LOCATION)