Merge lp:~brad-fie/bzr-scmproj/bzr-scmproj-subprojectnames-01 into lp:bzr-scmproj

[Bradley Friedman]

made sub projects aware of their names when running project commands. Now, only root branches have a name of "root branch". sub projects will use their own name as specified in the project configuration in which they are referenced.

[lp:~brad-fie/bzr-scmproj/bzr-scmproj-subprojectnames-01]

382. By Bradley Friedman on 2011-11-04

merging in changes

[Alexander Belchenko (bialix)]

Why do you need this line:

+ isinstance(proj, Project)

It does nothing as I can see.

[lp:~brad-fie/bzr-scmproj/bzr-scmproj-subprojectnames-01]

383. By Bradley Friedman on 2012-03-06

merging in upstream changes

384. By Bradley Friedman on 2012-03-20

explicitly added dry-run as option to pcmd, as its not longer and automatic global

385. By Bradley Friedman on 2012-07-14

merged in upstream. removed local fix for dry-run in favor of upstream fix.

[Alexander Belchenko (bialix)]

Thank you for your patch. I've merged it.

review: Approve

=== modified file 'project.py'
--- project.py	2011-06-09 11:13:30 +0000
+++ project.py	2012-07-14 23:40:24 +0000
@@ -1139,10 +1139,14 @@
     is_root = True
 
     def __init__(self, proj, component_name, url=None, revision=None):
+        isinstance(proj, Project)
         self._project = proj
         self.component_name = component_name
         if self._project.format == 'v2':
-            self.name = 'root branch'
+            if not proj.i_am_subproject:
+                self.name = 'root branch'
+            else:
+                self.name = proj.name
         else:
             self.name = 'control branch'
         self.vcs = 'bzr'
@@ -1201,6 +1205,7 @@
         try:
             subp = Project(self.sub_root).open()
             subp.i_am_subproject = True
+            subp.name = self.name
             return subp
         except ProjectNotFound:
             # there is no subproject control branch,