Merge lp:~amanica/bzr-externals/push into lp:bzr-externals

[Marius Kruger]

this adds rudimentary support for pushing all the externals when the base is pushed.

[Eugene Tarasenko (etarasenko)]

Marius, why you used '--no-strict' options?

[Marius Kruger (amanica)]

On 9 March 2010 13:13, Eugene Tarasenko <email address hidden> wrote:
> Marius, why you used '--no-strict' options?

for the specific use case I had when I wrote it, I really needed it,
because I wanted to push my code to
another location before I start committing everything.

I don't think no-strict is a bad default, since bzr's default was like
that for a very long time, and people were talking about reverting it
(although I don't think they will).

as I noted in the comment I think a better solution would be to wrap
the main push command so that we can get at all the options for the
initial command. i.e. if the user typed `bzr push --no-strict` we
would also add --no-strict for each external.
But that could potentially interfere with other plugins as was noted
by the recent 'Overriding commands in plugins' thread on the bazaar
mailinglist.

[Eugene Tarasenko (etarasenko)]

Thanks!

review: Approve

=== modified file '__init__.py'
--- __init__.py	2010-03-06 14:37:09 +0000
+++ __init__.py	2010-03-08 11:56:24 +0000
@@ -79,6 +79,16 @@
         lazy_post_pull_hook,
         'pull/update external branches')
 
+    def lazy_post_push_hook(result):
+        from bzrlib.plugins.externals import externals
+        return externals.post_push_hook(result)
+
+    branch.Branch.hooks.install_named_hook(
+        'post_push',
+        lazy_post_push_hook,
+        'push external branches')
+
+
 if hasattr(branch.Branch.hooks, "install_named_hook"):
     install_hooks()
 

=== modified file 'externals.py'
--- externals.py	2010-02-27 16:25:38 +0000
+++ externals.py	2010-03-08 11:56:24 +0000
@@ -100,26 +100,27 @@
         if is_verbose():
             cmd += ['-v']
 
-    def branch_iterator(self):
+    def branch_iterator(self, target_root=None):
         if self.config is None:
             # branch not have externals configuration
             return
 
         bound = True
-        parent = self.branch.get_bound_location()
-        if not parent:
-            bound = False
-            parent = self.branch.get_parent()
-            if not parent:
-                # support new braches with no parent yet
-                parent = self.branch.base
+        if not target_root:
+            target_root = self.branch.get_bound_location()
+            if not target_root:
+                bound = False
+                target_root = self.branch.get_parent()
+                if not target_root:
+                    # support new braches with no parent yet
+                    target_root = self.branch.base
 
         for line in self.config:
             arg = shlex_split_unicode(line) # url directory [revision]
-            location = self._urljoin(parent, arg[0])
-            if parent.startswith('file:///'):
+            location = self._urljoin(target_root, arg[0])
+            if target_root.startswith('file:///'):
                 # try to pull externals from the parent for the feature branch
-                path = pathjoin(local_path_from_url(parent), arg[1])
+                path = pathjoin(local_path_from_url(target_root), arg[1])
                 if isdir(path):
                     location = self._relpath(path)
                 else:
@@ -166,6 +167,26 @@
             self._report(cmd)
             run_bzr(cmd)
 
+    def push(self, target):
+        for location, path, revision, bound in self.branch_iterator(target):
+            if location == path:
+                # don't push into itself
+                continue
+
+            # XXX: maybe he should rather decorate the push command
+            # so that we can get the commandline args
+            # alternatively the plugin infrastructure must provide it to us?!
+            cmd = ['push', location, '--directory', path, '--no-strict']
+
+            # not sure if we want/need this,
+            # but leaving it here for completeness
+            if revision is not None:
+                cmd += ['--revision', revision]
+
+            self._adjust_verbosity(cmd)
+            self._report(cmd)
+            run_bzr(cmd)
+
     def add_to_ignore(self):
         from bzrlib import IGNORE_FILENAME
         f = open(pathjoin(self.root, IGNORE_FILENAME), 'a+')
@@ -206,3 +227,8 @@
         if externals.read_config():
             externals.pull()
             externals.add_to_ignore()
+
+def post_push_hook(result):
+    externals = Externals(result.source_branch, result.new_revid)
+    if externals.read_config():
+        externals.push(result.target_branch.base)