Merge lp:~jelmer/bzr-builddeb/location-alias-upstream into lp:bzr-builddeb

[Jelmer Vernooij]

Register a ":upstream" location alias if bzr supports it.

This is an alias for the upstream branch location set in debian/bzr-builddeb.conf.

[Jelmer Vernooij (jelmer)]

This depends on https://code.launchpad.net/~jelmer/bzr/extend-location-aliases/+merge/83736

[James Westby (james-w)]

9 +from bzrlib.directory_service import (
10 + AliasDirectory,

Was that introduced recently enough that this will be a problem
on e.g. jubany for deployment?

Thanks,

James

review: Approve

[Jelmer Vernooij (jelmer)]

On 12/02/2011 12:35 AM, James Westby wrote:
> Review: Approve
>
> 9 +from bzrlib.directory_service import (
> 10 + AliasDirectory,
>
> Was that introduced recently enough that this will be a problem
> on e.g. jubany for deployment?
No, AliasDirectory has been around for quite some time - bzr 1.6.

Cheers,

Jelmer

[Vincent Ladeuil (vila)]

> Was that introduced recently enough that this will be a problem on e.g. jubany for deployment?

For the record: jubany now runs bzr from source so no more worries about dependencies (well, far less at least).

=== modified file '__init__.py'
--- __init__.py	2011-11-22 14:05:25 +0000
+++ __init__.py	2011-11-29 08:11:25 +0000
@@ -27,7 +27,10 @@
 
 import bzrlib
 from bzrlib.commands import plugin_cmds
-from bzrlib.directory_service import directories
+from bzrlib.directory_service import (
+    AliasDirectory,
+    directories,
+    )
 
 from info import (
     bzr_plugin_version as version_info,
@@ -69,6 +72,20 @@
         'VcsDirectory',
         "Directory that uses Debian Vcs-* control fields to look up branches")
 
+branch_aliases = getattr(AliasDirectory, "branch_aliases", None)
+if branch_aliases is not None:
+    def upstream_branch_alias(b):
+        from bzrlib.plugins.builddeb.util import debuild_config
+        b.lock_read()
+        try:
+            tree = b.basis_tree()
+            config = debuild_config(tree, False)
+            return directories.dereference(config.upstream_branch)
+        finally:
+            b.unlock()
+    branch_aliases.register("upstream", upstream_branch_alias,
+        help="upstream branch (for packaging branches)")
+
 
 def debian_changelog_commit_message(commit, start_message):
     if start_message is not None: