Merge lp:~statik/config-manager/specific-revisions into lp:config-manager

[Elliot Murphy]

[Elliot Murphy (statik)]

This implements basic support for building configs that pull specific revisions of bzr branches. I've tested with a config file like so:

#Sample config file
./cm1 bzr+ssh://bazaar.launchpad.net/~lifeless/config-manager/trunk
./cm2 bzr+ssh://bazaar.launchpad.net/~lifeless/config-manager/trunk;revno=40

In order to be able to test, I had to temporarily short-circuit pybaz imports, I could not figure out where to get pybaz from. I have not committed those changes, but am mentioning it as a note to anyone trying to review this branch.

No support was added for updating a set of source trees when the branches specify particular versions, but I did provide enough code that update won't be broken when parsing a config that specifies a revno, it will just ignore the revno.

I also changed what seemed to be a typo in the imports. With this set of changes, and the sample config file I mentioned earlier, I was able to successfully run ./cm.py build config.txt, and see that the branches were built as expected with the expected revisions.

[Tom Haddon (mthaddon)]

> This implements basic support for building configs that pull specific
> revisions of bzr branches. I've tested with a config file like so:
>
> #Sample config file
> ./cm1 bzr+ssh://bazaar.launchpad.net/~lifeless/config-manager/trunk
> ./cm2 bzr+ssh://bazaar.launchpad.net/~lifeless/config-
> manager/trunk;revno=40
>
> In order to be able to test, I had to temporarily short-circuit pybaz imports,
> I could not figure out where to get pybaz from. I have not committed those
> changes, but am mentioning it as a note to anyone trying to review this
> branch.
>
> No support was added for updating a set of source trees when the branches
> specify particular versions, but I did provide enough code that update won't
> be broken when parsing a config that specifies a revno, it will just ignore
> the revno.

I got the following errors when testing:

http://pastebin.ubuntu.com/199767/

Basically was able to confirm the "build" part works okay, but changing the revno in the sample config file and then running "update" caused problems.

>
> I also changed what seemed to be a typo in the imports. With this set of
> changes, and the sample config file I mentioned earlier, I was able to
> successfully run ./cm.py build config.txt, and see that the branches were
> built as expected with the expected revisions.

[Robert Collins (lifeless)]

On Sat, 2009-06-20 at 03:45 +0000, Elliot Murphy wrote:
>
> + else:
> + revision_id = br_from.last_revision()

here, revision_id=None would be correct and avoid lookups outside of
locks.

Otherwise good, I'll merge Monday.

-Rob

[Elliot Murphy (statik)]

Hi Tom, thanks for testing and reviewing. I'm pasting the patch that I apply locally to disable pybaz, and when I use this patch, update at least 'does no harm'. I believe the error you are seeing on update is an existing problem with the pybaz code.

I've also revised the patch so update now partially supports revno. If you specify a revno, then build a set of trees, then advance the revno on one of the trees, update will update that tree only to the given revno. However, if you move the revno backward on one of the trees, update will not currently revert the tree back to the older revision.

[Elliot Murphy (statik)]

=== modified file 'lib/config_manager/__init__.py'
--- lib/config_manager/__init__.py 2009-06-20 03:38:27 +0000
+++ lib/config_manager/__init__.py 2009-06-20 16:02:24 +0000
@@ -29,7 +29,7 @@
 import config_manager.implementations
 #TODO import implementations dynamically.
 import config_manager.implementations.fake_vcs
-import config_manager.implementations.arch_vcs
+#import config_manager.implementations.arch_vcs
 fake_updates = []

 class UnsupportedScheme(KeyError):
@@ -135,6 +135,7 @@
         os.system("svn checkout %s %s" % (url, os.path.normpath(os.path.join(path, self.path))))

     def _build_pybaz_name(self, path):
+ return False
         import pybaz
         try:
             # try as registered name
@@ -146,6 +147,7 @@
             return False

     def _build_pybaz_url(self, path):
+ return None
         import pybaz
         try:
             lastslash = self.url.rfind('/')
@@ -265,6 +267,7 @@
                 raise ValueError("unknown url type '%s'" % self.url)

     def _update_pybaz(self, path):
+ return False
         import pybaz
         try:
             tree = pybaz.WorkingTree(os.path.join(path, self.path))

[Elliot Murphy (statik)]

Thanks for the review! I've made the change you asked for, and added partial support for updating trees to a newer revision. It doesn't yet handle the case where a tree is at revision 50, and you update the config to drop it back to an older revision yet. I've pushed rev 161 which should be ready to merge.

[lp:~statik/config-manager/specific-revisions]

161. By Elliot Murphy on 2009-06-20

Changes from code review, and added partial support for revno in update.

=== modified file 'lib/config_manager/__init__.py'
--- lib/config_manager/__init__.py	2006-03-16 12:13:06 +0000
+++ lib/config_manager/__init__.py	2009-06-20 03:38:27 +0000
@@ -160,13 +160,18 @@
     def _build_bzr_url(self, path):
         try:
             import errno
-            from bzrlib.branch import (Branch,
-                                       DivergedBranches,
+            from bzrlib.branch import Branch
+            from bzrlib.revisionspec import RevisionSpec
+            from bzrlib.errors import (DivergedBranches,
                                        NotBranchError,
                                        NoSuchRevision)
-    
-            revision = [None]
-            from_location = self.url
+
+            components = self.url.split(';revno=')
+            from_location = components[0]
+            if len(components) == 2:
+                revision = RevisionSpec.from_string(components[1])
+            else:
+                revision = None
             to_location = os.path.join(path, self.path)
 
             #if from_location.startswith("file://"):
@@ -178,10 +183,14 @@
             except NotBranchError:
                 return False
 
+            if revision is not None:
+                revision_id = revision.as_revision_id(br_from)
+            else:
+                revision_id = br_from.last_revision()
             os.mkdir(to_location)
-            to_dir = br_from.bzrdir.sprout(to_location)
+            to_dir = br_from.bzrdir.sprout(to_location, revision_id)
             # remove any local modifications
-            to_dir.open_workingtree().revert([])
+            to_dir.open_workingtree().revert()
             return True
         except Exception, e:
             print "%r" % e, e
@@ -205,7 +214,13 @@
             dir_to = BzrDir.open(path)
         except NotBranchError:
             return False
-        br_from = Branch.open(self.url)
+        components = self.url.split(';revno=')
+        url = components[0]
+        if len(components) == 2:
+            revno = components[1]
+        else:
+            revno = None
+        br_from = Branch.open(url)
         try:
             dir_to.open_workingtree().pull(br_from)
             return True