Merge lp:~jelmer/bzr-builddeb/fix-merge-upstream-in-empty into lp:~jelmer/bzr-builddeb/521341-builddeb-strict

[Jelmer Vernooij]

[lp:~jelmer/bzr-builddeb/fix-merge-upstream-in-empty]

554. By Jelmer Vernooij on 2011-04-29

Merge support for automatically determining version from tarball names.

555. By Jelmer Vernooij on 2011-04-29

Merge support for running 'bzr merge-upstream' in a branch without packaging metadata.

556. By Max Bowsher on 2011-05-05

Add python-bzrlib.tests to Build-Depends-Indep.

557. By Jelmer Vernooij on 2011-05-06

Merge fix for check_inventory_shape being removed in newer versions of bzr.

558. By Jelmer Vernooij on 2011-05-06

releasing version 2.7.4

559. By Jelmer Vernooij on 2011-05-16

Merge new 'bzr dep3-patch' command.

560. By Max Bowsher on 2011-05-16

Adjust the Build-Depends on python-bzrlib.tests to include
| bzr (<< 2.4.0~beta1-2), for documentation and consistency.

561. By Max Bowsher on 2011-05-16

trace.note the cause when an execution of dch fails.

562. By Max Bowsher on 2011-06-03

Fix overly permissive determination of whether another branch in a
DistributionBranchSet can be pulled into the current one. This could result in
revisions being removed from an Ubuntu branch to make it identical to a Debian
branch, when importing a synced package version.

563. By Jelmer Vernooij on 2011-06-04

Merge refactoring of pristine tar upstream source.

564. By Max Bowsher on 2011-06-05

Mend inconsistencies where different indent widths are used at different points
within a single Python source file. I've not attempted to produce consistency
across the project, just ensure each file is internally consistent.

565. By Jelmer Vernooij on 2011-06-09

Merge jr's hook for automatically setting the changelog and setting bug revision properties based on debian/changelog.

566. By Max Bowsher on 2011-06-10

When attempting to import a package with multiple upstream tarballs, raise
MultipleUpstreamTarballsNotSupported rather than AssertionError.

567. By Jelmer Vernooij on 2011-06-13

Merge update of dependency on devscripts.

568. By Jelmer Vernooij on 2011-06-13

Merge fix to cope with native packages with dashes in the version in AptSource.

569. By Jelmer Vernooij on 2011-06-14

Merge fix for deprecation warnings introduced in bzr 2.4.

570. By Jelmer Vernooij on 2011-06-14

Merge support for multiple upstream tarballs in UpstreamSource.

571. By Jelmer Vernooij on 2011-06-15

Merge cleanup of DistributionBranch upstream attributes.

572. By Jelmer Vernooij on 2011-06-15

Merge part two of support for multiple upstream tarballs.

573. By Jelmer Vernooij on 2011-06-15

Merge part 3 of support for multiple upstream tarballs.

574. By Jelmer Vernooij on 2011-06-16

Merge support for LaunchpadUpstreamSource.

575. By Jelmer Vernooij on 2011-06-23

Merge support for -c argument to 'bzr dep3-patch'.

576. By Jelmer Vernooij on 2011-06-24

Merge part 4 of support for multiple upstream tarballs.

577. By Jelmer Vernooij on 2011-06-24

Fix a missing import of the util module.

578. By Jelmer Vernooij on 2011-06-26

Merge removal of unnecessary directory.

579. By Jelmer Vernooij on 2011-06-28

Merge support for lzma.

580. By Jelmer Vernooij on 2011-06-28

Merge moving of upstream tag functionality to upstream/pristinetar.

581. By Jelmer Vernooij on 2011-06-28

Merge part 5 of support for multiple upstream tarballs.

582. By Jelmer Vernooij on 2011-07-15

Cope with unversioned files in get_source_format.

583. By Jelmer Vernooij on 2011-07-18

Merge simplification of repacker interface, removing the force_gz argument.

584. By Jelmer Vernooij on 2011-07-18

Merge fix for not automatically repacking bz2 tarballs to gz tarballs.

585. By Jelmer Vernooij on 2011-07-18

Merge more refactoring and simplification of handling of upstream branches in import_dsc.

586. By Jelmer Vernooij on 2011-07-18

Merge simplification of access to branch basis tree and further work towards multiple upstream tarball support.

587. By Jelmer Vernooij on 2011-07-19

Fix test that requires contents in tarfile.

588. By Jelmer Vernooij on 2011-07-19

releasing version 2.7.5

589. By Jelmer Vernooij on 2011-07-19

Merge fix for incremental imports using 'bzr import-dsc'.

590. By Jelmer Vernooij on 2011-07-19

Merge fix for use of --package-merge when no versions of the package have yet been uploaded.

591. By Jelmer Vernooij on 2011-07-19

releasing version 2.7.6

592. By Jelmer Vernooij on 2011-07-21

Build type now defaults to normal mode when used in an empty tree.
LP: #776528

593. By Jelmer Vernooij on 2011-07-21

Fix importing of upstream tarballs in import-dsc from v3 packages.

594. By Jelmer Vernooij on 2011-07-22

Fix a typo in the help description for 'bzr merge-package'.

595. By Jelmer Vernooij on 2011-07-22

Fix support for newer versions of apt_pkg.

596. By Jelmer Vernooij on 2011-07-25

Merge spiv's support for using dpkg-mergechangelogs for merging changelogs.

597. By Jelmer Vernooij on 2011-07-25

Merge extra tests for tree_contains_upstream_source and fix to not look at unversioned files.

598. By Jelmer Vernooij on 2011-07-25

Fix formatting of changelog.

599. By Jelmer Vernooij on 2011-07-25

Cope with features moving to bzrlib.tests.features.

600. By Jelmer Vernooij on 2011-07-26

releasing version 2.7.7

601. By Jelmer Vernooij on 2011-07-26

Add python-lzma to dependencies.

602. By Jelmer Vernooij on 2011-07-26

Fix compatibility with bzr < 2.5.

603. By Jelmer Vernooij on 2011-07-26

Recommend libalgorithm-merge-perl, required for conflict resolution
in dpkg-mergechangelogs.

604. By Jelmer Vernooij on 2011-07-26

Fix compatibility with python < 2.7, where re.sub() does not take a flags argument.

605. By Jelmer Vernooij on 2011-07-26

releasing version 2.7.7

606. By Jelmer Vernooij on 2011-08-11

merge improved error message when preivous upstream tag is missing

607. By Max Bowsher on 2011-08-21

Work around test failure in test_import_upstream_with_lzma_tarball caused by
tar bug in lucid and maverick.

608. By Jelmer Vernooij on 2011-08-31

Cope with move of features in bzr 2.5.

609. By Jelmer Vernooij on 2011-08-31

Cope with newer versions of bzr raising IOError rather than
NoSuchFile error. LP: #831351, Closes: #638219

610. By Jelmer Vernooij on 2011-08-31

releasing version 2.7.8

611. By Jelmer Vernooij on 2011-09-07

Fix compatibility with newer versions of bzr-svn.

612. By Jelmer Vernooij on 2011-09-07

merge fix for gather_orig_files sometimes returning None.

613. By Jelmer Vernooij on 2011-09-09

merge change from .tar.lzma to .tar.xz.

614. By Jonathan Riddell on 2011-09-30

Rename "larstiq" property to "top_level". "larstiq" is meaningless to readers of the code, it is just named after one developer, use a variable name with meaning to make code more readable.

615. By Jonathan Riddell on 2011-09-30

fix syntax

616. By Jonathan Riddell on 2011-09-30

replace more uses of larstiq

617. By Jelmer Vernooij on 2011-10-01

Merge Martin [gz]'s tweaks to setup.py.

618. By Jelmer Vernooij on 2011-10-01

Merge fix from Martin [gz] to utf-8 decode debian/changelog message when generating commit message.

619. By Jelmer Vernooij on 2011-10-01

Add news entry for changelog fix.

620. By Jelmer Vernooij on 2011-10-01

releasing version 2.7.9

Unmerged revisions

620. By Jelmer Vernooij on 2011-10-01

releasing version 2.7.9

619. By Jelmer Vernooij on 2011-10-01

Add news entry for changelog fix.

618. By Jelmer Vernooij on 2011-10-01

Merge fix from Martin [gz] to utf-8 decode debian/changelog message when generating commit message.

617. By Jelmer Vernooij on 2011-10-01

Merge Martin [gz]'s tweaks to setup.py.

616. By Jonathan Riddell on 2011-09-30

replace more uses of larstiq

615. By Jonathan Riddell on 2011-09-30

fix syntax

614. By Jonathan Riddell on 2011-09-30

Rename "larstiq" property to "top_level". "larstiq" is meaningless to readers of the code, it is just named after one developer, use a variable name with meaning to make code more readable.

613. By Jelmer Vernooij on 2011-09-09

merge change from .tar.lzma to .tar.xz.

612. By Jelmer Vernooij on 2011-09-07

merge fix for gather_orig_files sometimes returning None.

611. By Jelmer Vernooij on 2011-09-07

Fix compatibility with newer versions of bzr-svn.

=== modified file '__init__.py'
--- __init__.py	2011-01-13 18:14:01 +0000
+++ __init__.py	2011-04-29 12:56:28 +0000
@@ -26,14 +26,7 @@
 import os
 
 import bzrlib
-from bzrlib import (
-    branch as _mod_branch,
-    errors,
-    merge,
-    msgeditor,
-    )
 from bzrlib.commands import plugin_cmds
-from bzrlib.config import config_dir
 from bzrlib.directory_service import directories
 
 from info import (
@@ -41,19 +34,6 @@
     )
 
 
-if getattr(merge, 'ConfigurableFileMerger', None) is None:
-    raise ImportError(
-        'need at least bzr 2.1.0rc2 (you use %r)', bzrlib.version_info)
-else:
-    def changelog_merge_hook_factory(merger):
-        from bzrlib.plugins.builddeb import merge_changelog
-        return merge_changelog.ChangeLogFileMerge(merger)
-
-    merge.Merger.hooks.install_named_hook(
-        'merge_file_content', changelog_merge_hook_factory,
-        'Debian Changelog file merge')
-
-
 commands = {
         "bd_do": [],
         "builddeb": ["bd"],
@@ -72,6 +52,7 @@
 builddeb_dir = '.bzr-builddeb'
 default_conf = os.path.join(builddeb_dir, 'default.conf')
 def global_conf():
+    from bzrlib.config import config_dir
     return os.path.join(config_dir(), 'builddeb.conf')
 local_conf = os.path.join(builddeb_dir, 'local.conf')
 
@@ -80,7 +61,7 @@
 default_result_dir = '..'
 
 
-directories.register_lazy("deb:", 'bzrlib.plugins.builddeb.directory', 
+directories.register_lazy("apt:", 'bzrlib.plugins.builddeb.directory', 
         'VcsDirectory', 
         "Directory that uses Debian Vcs-* control fields to look up branches")
 
@@ -128,10 +109,9 @@
     return "".join(changes)
 
 
-msgeditor.hooks.install_named_hook("commit_message_template",
-        debian_changelog_commit_message,
-        "Use changes documented in debian/changelog to suggest "
-        "the commit message")
+def changelog_merge_hook_factory(merger):
+    from bzrlib.plugins.builddeb import merge_changelog
+    return merge_changelog.ChangeLogFileMerge(merger)
 
 
 def debian_tag_name(branch, revid):
@@ -158,12 +138,45 @@
 
 
 try:
-    _mod_branch.Branch.hooks.install_named_hook("automatic_tag_name",
-         debian_tag_name,
+    from bzrlib.hooks import install_lazy_named_hook
+except ImportError: # Compatibility with bzr < 2.4
+    from bzrlib import (
+        branch as _mod_branch,
+        errors,
+        merge,
+        msgeditor,
+        )
+    msgeditor.hooks.install_named_hook("commit_message_template",
+            debian_changelog_commit_message,
+            "Use changes documented in debian/changelog to suggest "
+            "the commit message")
+    if getattr(merge, 'ConfigurableFileMerger', None) is None:
+        raise ImportError(
+            'need at least bzr 2.1.0rc2 (you use %r)', bzrlib.version_info)
+    else:
+        merge.Merger.hooks.install_named_hook(
+            'merge_file_content', changelog_merge_hook_factory,
+            'Debian Changelog file merge')
+    try:
+        _mod_branch.Branch.hooks.install_named_hook("automatic_tag_name",
+             debian_tag_name,
+             "Automatically determine tag names from Debian version")
+    except errors.UnknownHook:
+        pass # bzr < 2.2 doesn't have this hook.
+else:
+    install_lazy_named_hook(
+        "bzrlib.msgeditor", "hooks", "commit_message_template",
+            debian_changelog_commit_message,
+            "Use changes documented in debian/changelog to suggest "
+            "the commit message")
+    install_lazy_named_hook(
+        "bzrlib.merge", "Merger.hooks",
+        'merge_file_content', changelog_merge_hook_factory,
+        'Debian Changelog file merge')
+    install_lazy_named_hook(
+        "bzrlib.branch", "Branch.hooks",
+        "automatic_tag_name", debian_tag_name,
          "Automatically determine tag names from Debian version")
-except errors.UnknownHook:
-    pass # bzr < 2.2 doesn't have this hook.
-
 
 try:
     from bzrlib.revisionspec import revspec_registry

=== removed file 'bzr-builddeb_0.1-1_i386.changes'
--- bzr-builddeb_0.1-1_i386.changes	2006-08-17 01:42:02 +0000
+++ bzr-builddeb_0.1-1_i386.changes	1970-01-01 00:00:00 +0000
@@ -1,21 +0,0 @@
-Format: 1.7
-Date: Thu,  3 Aug 2006 19:16:22 +0100
-Source: bzr-builddeb
-Binary: bzr-builddeb
-Architecture: source all
-Version: 0.1-1
-Distribution: unstable
-Urgency: low
-Maintainer: James Westby <[e-mail]>
-Changed-By: James Westby <[e-mail]>
-Description: 
- bzr-builddeb - bzr plugin for Debian package management
-Closes: 380198
-Changes: 
- bzr-builddeb (0.1-1) unstable; urgency=low
- .
-   * Initial Release. (Closes: #380198)
-Files: 
- b4c9b646c741f531dd8349db83c77cae 290 devel optional bzr-builddeb_0.1-1.dsc
- da14c0e9ac9f48181a57e618f67e15f8 7261 devel optional bzr-builddeb_0.1-1.tar.gz
- 705f7c7f2ded0cd871911736c5420861 7434 devel optional bzr-builddeb_0.1-1_all.deb

=== removed file 'changes.py'
--- changes.py	2010-07-31 11:58:00 +0000
+++ changes.py	1970-01-01 00:00:00 +0000
@@ -1,84 +0,0 @@
-#    changes.py -- Abstraction of .changes files
-#    Copyright (C) 2006, 2007 James Westby <[e-mail]>
-#    
-#    This file is part of bzr-builddeb.
-#
-#    bzr-builddeb is free software; you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation; either version 2 of the License, or
-#    (at your option) any later version.
-#
-#    bzr-builddeb is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
-#
-#    You should have received a copy of the GNU General Public License
-#    along with bzr-builddeb; if not, write to the Free Software
-#    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-#
-
-import commands
-import os
-
-try:
-  from debian import deb822
-except ImportError:
-  # Prior to 0.1.15 the debian module was called debian_bundle
-  from debian_bundle import deb822
-
-from bzrlib.trace import mutter
-
-from bzrlib.plugins.builddeb.errors import DebianError, MissingChanges
-
-class DebianChanges(deb822.Changes):
-  """Abstraction of the .changes file used to find out what files were built."""
-
-  def __init__(self, package, version, dir, arch=None):
-    """
-    >>> import os.path
-    >>> file_dir = os.path.dirname(__file__)
-    >>> c = DebianChanges('bzr-builddeb', '0.1-1', file_dir, 'i386')
-    >>> fs = c.files()
-    >>> f = fs[0]
-    >>> str(f['name'])
-    'bzr-builddeb_0.1-1.dsc'
-    >>> str(f['priority'])
-    'optional'
-    >>> str(f['section'])
-    'devel'
-    >>> str(f['size'])
-    '290'
-    >>> str(f['md5sum'])
-    'b4c9b646c741f531dd8349db83c77cae'
-    """
-    if arch is None:
-      status, arch = commands.getstatusoutput(
-          'dpkg-architecture -qDEB_BUILD_ARCH')
-      if status > 0:
-        raise DebianError("Could not find the build architecture")
-    changes = str(package)+"_"+str(version)+"_"+str(arch)+".changes"
-    if dir is not None:
-      changes = os.path.join(dir,changes)
-    mutter("Looking for %s", changes)
-    if not os.path.exists(changes):
-      raise MissingChanges(changes)
-    fp = open(changes)
-    deb822.Changes.__init__(self, fp)
-    self._filename = changes
-
-  def files(self):
-    return self['Files']
-
-  def filename(self):
-    return self._filename
-
-
-def _test():
-  import doctest
-  doctest.testmod()
-
-if __name__ == "__main__":
-  _test()
-
-# vim: ts=2 sts=2 sw=2

=== modified file 'cmds.py'
--- cmds.py	2011-02-03 11:39:53 +0000
+++ cmds.py	2011-04-29 12:56:28 +0000
@@ -2,7 +2,7 @@
 #    Copyright (C) 2005 Jamie Wilkinson <[e-mail]> 
 #                  2006, 2007 James Westby <[e-mail]>
 #                  2007 Reinhard Tartler <[e-mail]>
-#                  2008 Canonical Ltd.
+#                  2008-2011 Canonical Ltd.
 #
 #    This file is part of bzr-builddeb.
 #
@@ -47,7 +47,6 @@
     NoWorkingTree,
     )
 from bzrlib.option import Option
-from bzrlib.revisionspec import RevisionSpec
 from bzrlib.tag import _merge_tags_if_possible
 from bzrlib.trace import note, warning
 from bzrlib.workingtree import WorkingTree
@@ -64,12 +63,13 @@
 from bzrlib.plugins.builddeb.config import (
     BUILD_TYPE_MERGE,
     BUILD_TYPE_NATIVE,
-    BUILD_TYPE_NORMAL,
     BUILD_TYPE_SPLIT,
     )
 from bzrlib.plugins.builddeb.errors import (
     BuildFailedError,
+    MissingChangelogError,
     NoPreviousUpload,
+    PackageVersionNotPresent,
     StrictBuildFailed,
     )
 from bzrlib.plugins.builddeb.hooks import run_hook
@@ -97,6 +97,9 @@
         TarfileSource,
         UScanSource,
         UpstreamProvider,
+        )
+from bzrlib.plugins.builddeb.upstream.branch import (
+        LazyUpstreamBranchSource,
         UpstreamBranchSource,
         )
 from bzrlib.plugins.builddeb.util import (
@@ -107,7 +110,6 @@
         find_changelog,
         find_last_distribution,
         find_previous_upload,
-        get_export_upstream_revision,
         get_source_format,
         guess_build_type,
         lookup_distribution,
@@ -305,32 +307,13 @@
             source = True
         return branch, build_options, source
 
-    def _get_upstream_branch(self, build_type, export_upstream,
-            export_upstream_revision, config, version):
-        upstream_branch = None
-        upstream_revision = None
-        if build_type == BUILD_TYPE_MERGE:
-            if export_upstream is None:
-                export_upstream = config.export_upstream
-            if export_upstream:
-                upstream_branch = Branch.open(export_upstream)
-                upstream_branch.lock_read()
-                try:
-                    if export_upstream_revision is None:
-                        export_upstream_revision = \
-                            get_export_upstream_revision(config,
-                                version=str(version.upstream_version))
-                    if export_upstream_revision is None:
-                        upstream_revision = \
-                                upstream_branch.last_revision()
-                    else:
-                        upstream_revspec = RevisionSpec.from_string(
-                                export_upstream_revision)
-                        upstream_revision = \
-                            upstream_revspec.as_revision_id(upstream_branch)
-                finally:
-                    upstream_branch.unlock()
-        return (upstream_branch, upstream_revision)
+    def _get_upstream_branch(self, export_upstream, export_upstream_revision,
+            config, version):
+        upstream_source = LazyUpstreamBranchSource(export_upstream,
+            config=config)
+        if export_upstream_revision:
+            upstream_source.upstream_revision_map[version.encode("utf-8")] = export_upstream_revision
+        return upstream_source
 
     def run(self, branch_or_build_options_list=None, verbose=False,
             working_tree=False,
@@ -342,7 +325,7 @@
             source=False, revision=None, result=None, package_merge=None,
             strict=False):
         if result is not None:
-            warning("--result is deprected, use --result-dir instead")
+            warning("--result is deprecated, use --result-dir instead")
         location, build_options, source = self._branch_and_build_options(
                 branch_or_build_options_list, source)
         tree, branch, is_local, location = self._get_tree_and_branch(location)
@@ -368,10 +351,6 @@
                 build_type = config.build_type
             contains_upstream_source = tree_contains_upstream_source(tree)
             (changelog, larstiq) = find_changelog(tree, not contains_upstream_source)
-            try:
-                prev_version = find_previous_upload(tree, not contains_upstream_source)
-            except NoPreviousUpload:
-                prev_version = None
             if build_type is None:
                 build_type = guess_build_type(tree, changelog.version,
                     contains_upstream_source)
@@ -379,6 +358,10 @@
             note("Building package in %s mode" % build_type)
 
             if package_merge:
+                try:
+                    prev_version = find_previous_upload(tree, not contains_upstream_source)
+                except NoPreviousUpload:
+                    prev_version = None
                 build_options.append("-v%s" % str(prev_version))
                 if (prev_version.upstream_version
                         != changelog.version.upstream_version
@@ -394,24 +377,26 @@
                 AptSource(),
                 ]
             if build_type == BUILD_TYPE_MERGE:
-                upstream_branch, upstream_revision = self._get_upstream_branch(
-                    build_type, export_upstream, export_upstream_revision, config,
-                    changelog.version)
-                if upstream_branch is not None:
-                    upstream_sources.append(UpstreamBranchSource(
-                            upstream_branch,
-                            {changelog.version.upstream_version:
-                            upstream_revision}))
-            elif not native and config.upstream_branch:
-                upstream_branch = Branch.open(config.upstream_branch)
-                upstream_sources.append(UpstreamBranchSource(upstream_branch))
+                if export_upstream is None and config.export_upstream:
+                    export_upstream = config.export_upstream
+                    warning("The 'export-upstream' configuration option is deprecated. "
+                            "Use 'upstream-branch' instead.")
+                if export_upstream is None and config.upstream_branch:
+                    export_upstream = config.upstream_branch
+                if export_upstream:
+                    upstream_branch_source = self._get_upstream_branch(
+                        export_upstream, export_upstream_revision, config,
+                        changelog.version.upstream_version)
+                    upstream_sources.append(upstream_branch_source)
+            elif not native and config.upstream_branch is not None:
+                upstream_sources.append(LazyUpstreamBranchSource(config.upstream_branch))
             upstream_sources.extend([
                 GetOrigSourceSource(tree, larstiq),
                 UScanSource(tree, larstiq),
                 ])
             if build_type == BUILD_TYPE_SPLIT:
                 upstream_sources.append(SelfSplitSource(tree))
- 
+
             upstream_provider = UpstreamProvider(changelog.package,
                 changelog.version.upstream_version, orig_dir, upstream_sources)
 
@@ -544,10 +529,13 @@
     snapshot_opt = Option('snapshot', help="Merge a snapshot from the "
             "upstream branch rather than a new upstream release.")
 
+    launchpad_opt = Option('launchpad',
+        help='Use Launchpad to find upstream locations.')
+
     takes_options = [package_opt, version_opt,
             distribution_opt, directory_opt, last_version_opt,
             force_opt, 'revision', 'merge-type',
-            snapshot_opt]
+            snapshot_opt, launchpad_opt]
 
     def _add_changelog_entry(self, tree, package, version, distribution_name,
             changelog):
@@ -559,12 +547,13 @@
                     'merge had completed failed. Add the new changelog '
                     'entry yourself, review the merge, and then commit.')
 
-    def _do_merge(self, tree, tarball_filename, version, current_version,
-            upstream_branch, upstream_revision, merge_type, force):
+    def _do_merge(self, tree, tarball_filename, package, version,
+            current_version, upstream_branch, upstream_revision, merge_type,
+            force):
         db = DistributionBranch(tree.branch, None, tree=tree)
         dbs = DistributionBranchSet()
         dbs.add_branch(db)
-        conflicts = db.merge_upstream(tarball_filename, version,
+        conflicts = db.merge_upstream(tarball_filename, package, version,
                 current_version, upstream_branch=upstream_branch,
                 upstream_revision=upstream_revision,
                 merge_type=merge_type, force=force)
@@ -599,8 +588,6 @@
             location, v3)
 
     def _get_changelog_info(self, tree, last_version, package, distribution):
-        from bzrlib.plugins.builddeb.errors import MissingChangelogError
-        changelog = None
         current_version = last_version
         try:
             (changelog, larstiq) = find_changelog(tree, False, max_blocks=2)
@@ -613,7 +600,8 @@
                 if distribution is not None:
                     note("Using distribution %s" % distribution)
         except MissingChangelogError:
-            pass
+            larstiq = False
+            changelog = None
         if distribution is None:
             note("No distribution specified, and no changelog, "
                     "assuming 'debian'")
@@ -634,7 +622,7 @@
     def run(self, location=None, upstream_branch=None, version=None,
             distribution=None, package=None,
             directory=".", revision=None, merge_type=None,
-            last_version=None, force=None, snapshot=False):
+            last_version=None, force=None, snapshot=False, launchpad=False):
         tree, _ = WorkingTree.open_containing(directory)
         tree.lock_write()
         try:
@@ -644,6 +632,29 @@
                         "working tree. You must commit before using this "
                         "command.")
             config = debuild_config(tree, tree)
+            (current_version, package, distribution, distribution_name,
+             changelog, larstiq) = self._get_changelog_info(tree, last_version,
+                 package, distribution)
+            contains_upstream_source = tree_contains_upstream_source(tree)
+            build_type = config.build_type
+            if build_type is None:
+                changelog_version = None
+            else:
+                changelog_version = changelog.version
+            build_type = guess_build_type(tree, changelog_version,
+                contains_upstream_source)
+            need_upstream_tarball = (build_type != BUILD_TYPE_MERGE)
+            if build_type == BUILD_TYPE_NATIVE:
+                raise BzrCommandError("Merge upstream in native mode is not "
+                        "supported.")
+
+            if launchpad:
+                from bzrlib.plugins.builddeb.launchpad import (
+                    get_upstream_branch_url as lp_get_upstream_branch_url,
+                    )
+                upstream_branch = lp_get_upstream_branch_url(package,
+                    distribution_name, distribution)
+                note("Using upstream branch %s" % upstream_branch)
 
             if upstream_branch is not None:
                 upstream_branch = Branch.open(upstream_branch)
@@ -652,29 +663,17 @@
                     upstream_branch = Branch.open(location)
                 except NotBranchError:
                     upstream_branch = None
-            elif upstream_branch is None:
+            elif upstream_branch is None and config.upstream_branch is not None:
                 upstream_branch = Branch.open(config.upstream_branch)
             else:
                 upstream_branch = None
+
             if upstream_branch is not None:
                 upstream_branch_source = UpstreamBranchSource(
                     upstream_branch, config=config)
             else:
                 upstream_branch_source = None
 
-            (current_version, package, distribution, distribution_name,
-             changelog, larstiq) = self._get_changelog_info(tree, last_version,
-                 package, distribution)
-            contains_upstream_source = tree_contains_upstream_source(tree)
-            build_type = config.build_type
-            if build_type is None:
-                build_type = guess_build_type(tree, changelog.version,
-                    contains_upstream_source)
-            need_upstream_tarball = (build_type != BUILD_TYPE_MERGE)
-            if build_type == BUILD_TYPE_NATIVE:
-                raise BzrCommandError("Merge upstream in native mode is not "
-                        "supported.")
-
             if location is not None:
                 try:
                     primary_upstream_source = UpstreamBranchSource(
@@ -711,12 +710,25 @@
                 version = primary_upstream_source.get_latest_version(
                     package, current_version)
             if version is None:
-                raise BzrCommandError("You must specify the version number using --version.")
+                if upstream_branch_source is not None:
+                    raise BzrCommandError("You must specify the version "
+                        "number using --version or specify --snapshot to "
+                        "merge a snapshot from the upstream branch.")
+                else:
+                    raise BzrCommandError("You must specify the version number using --version.")
+            assert isinstance(version, str)
             note("Using version string %s." % (version))
             # Look up the revision id from the version string
             if upstream_revision is None and upstream_branch_source is not None:
-                upstream_revision = upstream_branch_source.version_as_revision(
-                    package, version)
+                try:
+                    upstream_revision = upstream_branch_source.version_as_revision(
+                        package, version)
+                except PackageVersionNotPresent:
+                    raise BzrCommandError(
+                        "Version %s can not be found in upstream branch %r. "
+                        "Specify the revision manually using --revision or adjust "
+                        "'export-upstream-revision' in the configuration." %
+                        (version, upstream_branch_source))
             if need_upstream_tarball:
                 target_dir = tempfile.mkdtemp() # FIXME: Cleanup?
                 location = primary_upstream_source.fetch_tarball(
@@ -727,14 +739,17 @@
                 tarball_filename = self._get_tarball(config, tree, package,
                     version, upstream_branch, upstream_revision, v3,
                     location)
-                conflicts = self._do_merge(tree, tarball_filename, version,
-                    current_version, upstream_branch, upstream_revision,
+                conflicts = self._do_merge(tree, tarball_filename, package,
+                    version, current_version, upstream_branch, upstream_revision,
                     merge_type, force)
-            if Version(current_version) >= Version(version):
+            if current_version is not None and Version(current_version) >= Version(version):
                 raise BzrCommandError(
                     "Upstream version %s has already been merged." % version)
+            if not tree.has_filename("debian"):
+                tree.mkdir("debian")
             self._add_changelog_entry(tree, package, version,
                 distribution_name, changelog)
+            run_hook(tree, 'merge-upstream', config)
         finally:
             tree.unlock()
         if not need_upstream_tarball:
@@ -802,7 +817,6 @@
             db.import_package(os.path.join(orig_target, filename))
 
     def run(self, files_list, file=None):
-        from bzrlib.plugins.builddeb.errors import MissingChangelogError
         try:
             tree = WorkingTree.open_containing('.')[0]
         except NotBranchError:
@@ -845,15 +859,16 @@
                         '..'))
             try:
                 if last_version is not None:
-                    if not db.has_upstream_version_in_packaging_branch(
+                    if not db.pristine_tar_source.has_version(None,
                             last_version.upstream_version):
                         raise BzrCommandError("Unable to find the tag for the "
                             "previous upstream version, %s, in the branch: %s."
                             " Consider importing it via import-dsc or "
                             "import-upstream." % (last_version,
-                                    db.upstream_tag_name(last_version.upstream_version)))
-                    upstream_tip = db.revid_of_upstream_version_from_branch(
-                            last_version.upstream_version)
+                                    db.pristine_tar_source.tag_name(
+                                        last_version.upstream_version)))
+                    upstream_tip = db.pristine_tar_source.version_as_revision(
+                        None, last_version.upstream_version)
                     db.extract_upstream_tree(upstream_tip, tempdir)
                 else:
                     db._create_empty_upstream_tree(tempdir)
@@ -918,7 +933,7 @@
             dir=branch.bzrdir.root_transport.clone('..').local_abspath('.'))
         self.add_cleanup(shutil.rmtree, tempdir)
         db = DistributionBranch(branch, upstream_branch=upstream)
-        if db.has_upstream_version_in_packaging_branch(version):
+        if db.pristine_tar_source.has_version(None, version):
             raise BzrCommandError("Version %s is already present." % version)
         tagged_versions = {}
         for tag_name, tag_revid in branch.tags.get_tag_dict().iteritems():

=== modified file 'config.py'
--- config.py	2011-01-24 06:23:40 +0000
+++ config.py	2011-04-29 12:56:28 +0000
@@ -18,12 +18,12 @@
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #
 
-from bzrlib.config import ConfigObj, TreeConfig
+from bzrlib.config import (
+  configobj,
+  ConfigObj,
+  TreeConfig,
+  )
 from bzrlib.trace import mutter, warning
-try:
-  from bzrlib.util.configobj.configobj import ParseError
-except ImportError:
-  from configobj import ParseError
 
 
 BUILD_TYPE_NORMAL = "normal"
@@ -100,7 +100,7 @@
     for input in files:
       try:
         config = ConfigObj(input[0])
-      except ParseError, e:
+      except configobj.ParseError, e:
         if len(input) > 2:
           content = input[2]
         else:

=== modified file 'debian/NEWS'
--- debian/NEWS	2009-03-05 12:59:30 +0000
+++ debian/NEWS	2011-04-29 12:56:28 +0000
@@ -1,3 +1,9 @@
+bzr-builddeb (2.5.1) unstable; urgency=low
+
+  The 'deb:' directory service has been renamed to 'apt:' to avoid confusion.
+
+ -- Jelmer Vernooij <[e-mail]>  Sun, 06 Feb 2011 14:24:37 +0100
+
 bzr-builddeb (2.1) experimental; urgency=low
 
   * The build command now defaults to "debuild" instead of

=== modified file 'debian/changelog'
--- debian/changelog	2011-02-03 11:39:53 +0000
+++ debian/changelog	2011-04-29 12:56:28 +0000
@@ -1,4 +1,124 @@
-bzr-builddeb (2.5.1) UNRELEASED; urgency=low
+bzr-builddeb (2.7.4) UNRELEASED; urgency=low
+
+  * In 'bzr merge-usptream', don't ignore upstream branch when upstream
+    version can not be found.  LP: #772424
+  * Use --create when merging a new upstream into a branch that doesn't have a
+    changelog file. LP: #385667
+  * Fix merging of upstream in new packages. LP: #772225
+
+ -- Jelmer Vernooij <[e-mail]>  Fri, 29 Apr 2011 14:47:48 +0200
+
+bzr-builddeb (2.7.3) unstable; urgency=low
+
+  [ Jelmer Vernooij ]
+  * Avoid opening upstream branch when it is not necessary. LP: #730589
+  * Retrieve the upstream branch URL from Launchpad in 'bzr merge-upstream'
+    if --launchpad is specified. LP: #726460
+  * Fix merge of bz2 upstream tarballs. LP: #737012
+
+  [ Max Bowsher ]
+  * Do not error if the top changelog entry is not a recognized Debian or
+  Ubuntu upload target.
+
+ -- Jelmer Vernooij <[e-mail]>  Mon, 18 Apr 2011 23:17:34 +0200
+
+bzr-builddeb (2.7.2) unstable; urgency=high
+
+  [ Andrew Mitchell ]
+  * Add upstream/ directory to setup.py. Closes: #618380. LP: #735147
+
+ -- Jelmer Vernooij <[e-mail]>  Mon, 14 Mar 2011 23:27:25 +0100
+
+bzr-builddeb (2.7.1) unstable; urgency=low
+
+  * Add Ubuntu oneiric and Debian wheezy to the list of supported
+    distributions.
+
+ -- Jelmer Vernooij <[e-mail]>  Fri, 11 Mar 2011 11:18:52 +0100
+
+bzr-builddeb (2.7) unstable; urgency=low
+
+  [ James Westby ]
+
+  * Accept None as a valid previous_version value in merge_upstream().
+    LP: #680945
+
+  [ Jelmer Vernooij ]
+
+  * Support 'bzr tags --sort=debversion'. Closes: #701244.
+  * When adding a changelog entry, support git and svn snapshots.
+  * Automatically use debian/source/format if package is native. Closes:
+    #586617
+  * Fix "bzr builddeb" if last upload was not to a Ubuntu release pocket.
+    LP: #709263
+  * If possible use uscan to find the latest upstream version string.
+    LP: #295274
+  * Add --snapshot option to merge-upstream.
+  * 'bzr merge-upstream' now also works in merge mode, and will simply
+    add a new entry for new upstream versions.
+  * merge-upstream will now keep epochs around. LP: #622678
+  * 'bzr builddeb' now searches for directories relative to the working
+    tree rather than relative to the branch. Closes: #676456
+  * Use enums for build types, and a priority scheme to figure out the
+    build type. LP: #655277
+  * Fix finding upstream tarball when get-orig-source is not available.
+    Closes: #552893
+  * merge-upstream now looks at the package source format to see what
+    kind of compression is supported on tarballs. LP: #627718
+  * Support upstream version strings containing dashes. Patch by Stefano
+    Rivera. LP: #711826
+  * Run test suite unless nocheck is set (consistent with policy).
+  * Fix build dependencies for test suite.
+  * Support unversioned debian/ symlink in working tree when finding
+    changelog and larstiq mode. LP: #619295
+  * The deb: directory service has been renamed to apt: to avoid
+    confusion.
+  * When building with distribution set to UNRELEASED, it is now assumed
+    the build is targetted at the same distribution as the build before.
+  * A hook for 'bzr merge-upstream' has been added. LP: #657501
+  * Support running the test suite in parallel during package build.
+  * Pristine tarballs are now automatically created when merging upstream
+    from a branch. Closes: #517867
+
+  [ Max Bowsher ]
+
+  * Add devscripts to Build-Depends-Indep, the test suite runs dch.
+
+  [ Jelmer Vernooij ]
+  * The 'export-upstream' configuration option is now deprecated in
+    favour of 'upstream-branch'. LP: #730293
+  * Switch to dh_python2. Closes: #616752
+
+ -- Jelmer Vernooij <[e-mail]>  Mon, 07 Mar 2011 12:28:08 +0100
+
+bzr-builddeb (2.6) unstable; urgency=low
+
+  [ James Westby ]
+
+  * Don't fail if asked to use a .bz2 tarball that is already in the desired
+    location. LP: #616786
+  * Don't crash if we are asked to merge-upstream with an unrelated branch.
+    LP: #619614.
+  * Don't strip -n from the version we get in merge-upstream, as some
+    upstreams have this in there, and trying to support both means supporting
+    both badly. If you are used to doing "bzr merge-upstream --version
+    <package version>" then it will no longer work for you, use the
+    upstream version instead.
+  * Don't crash when doing merge-upstream with a branch that does a rename
+    and then ships another file with the old path in the tarball that isn't
+    in the branch.
+
+  [ Jelmer Vernooij ]
+
+  * Fix the auto-detection of merge mode.
+  * Don't crash on merge mode packages where there is no export-upstream
+    if we can't find the tarball.
+  * Determine Bazaar home directory using bzrlib to prevent test
+    isolation issues. LP: #614125
+
+ -- James Westby <[e-mail]>  Wed, 18 Aug 2010 20:12:20 -0400
+
+bzr-builddeb (2.5.1) unstable; urgency=low
 
   [ James Westby ]
 
@@ -45,9 +165,15 @@
     kind of compression is supported on tarballs. LP: #627718
   * Support upstream version strings containing dashes. Patch by Stefano
     Rivera. LP: #711826
+  * Run test suite unless nocheck is set (consistent with policy).
+  * Fix build dependencies for test suite.
+  * Support unversioned debian/ symlink in working tree when finding
+    changelog and larstiq mode. LP: #619295
+  * The deb: directory service has been renamed to apt: to avoid
+    confusion.
   * Add --strict argument to 'bzr builddeb'. LP: #521341
 
- -- Jelmer Vernooij <[e-mail]>  Thu, 03 Feb 2011 12:39:51 +0100
+ -- Jelmer Vernooij <[e-mail]>  Sun, 06 Feb 2011 14:25:32 +0100
 
 bzr-builddeb (2.5) unstable; urgency=low
 

=== modified file 'debian/control'
--- debian/control	2010-08-11 16:24:03 +0000
+++ debian/control	2011-04-29 12:56:28 +0000
@@ -3,11 +3,11 @@
 Priority: optional
 Maintainer: Debian Bazaar Maintainers <[e-mail]>
 Uploaders: Reinhard Tartler <[e-mail]>, James Westby <[e-mail]>, Jelmer Vernooij <[e-mail]>
-Build-Depends: debhelper (>= 5.0.37.2), python-all (>= 2.3.5-11)
-Build-Depends-Indep: bzr (>= 2.1~), python-central (>= 0.5.8), python-docutils, python-debian (>= 0.1.11), python-apt, patchutils
+Build-Depends: debhelper (>= 5.0.37.2), python-all (>= 2.6.6-3)
+Build-Depends-Indep: bzr (>= 2.1~), python-docutils, python-debian (>= 0.1.11), python-apt, patchutils, python-testtools (>= 0.9.2), pristine-tar, devscripts, python-subunit
 Vcs-Bzr: http://bzr.debian.org/pkg-bazaar/bzr-builddeb/unstable
 Vcs-Browser: http://bzr.debian.org/loggerhead/pkg-bazaar/bzr-builddeb/unstable
-XS-Python-Version: >= 2.4
+X-Python-Version: >= 2.4
 Standards-Version: 3.9.1
 
 Package: bzr-builddeb
@@ -16,7 +16,6 @@
 Recommends: python-launchpadlib
 Suggests: bzr-svn (>= 0.4.10)
 Provides: bzr-buildpackage
-XB-Python-Version: ${python:Versions}
 Description: bzr plugin for Debian package management
  bzr-builddeb is a plugin for the bzr version control system that helps to
  automate the task of maintaining Debian packages using bzr. It is similar

=== modified file 'debian/rules'
--- debian/rules	2010-01-18 06:32:06 +0000
+++ debian/rules	2011-04-29 12:56:28 +0000
@@ -19,10 +19,19 @@
 	rst2html README > README.html
 	touch $@
 
+ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+SELFTEST_CONCURRENCY = BZR_CONCURRENCY=$(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+SELFTEST_PARALLEL = --parallel=fork
+else
+SELFTEST_CONCURRENCY =
+SELFTEST_PARALLEL =
+endif
+
 build-python%:
 	python$* setup.py build
-ifneq (,$(filter test check,$(DEB_BUILD_OPTIONS)))
-	BZR_PLUGIN_PATH="$(CURDIR)/build/lib/bzrlib/plugins/" python$* /usr/bin/bzr test-builddeb
+ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
+	$(SELFTEST_CONCURRENCY) BZR_PLUGINS_AT=builddeb@$(CURDIR) python$* /usr/bin/bzr selftest \
+	    $(SELFTEST_PARALLEL) -v -s bp.builddeb
 endif
 	touch $@-stamp
 
@@ -57,7 +66,7 @@
 	dh_installexamples
 	dh_compress
 	dh_fixperms
-	dh_pycentral
+	dh_python2
 	dh_installdeb
 	dh_shlibdeps
 	dh_gencontrol

=== modified file 'doc/user_manual/configuration.rst'
--- doc/user_manual/configuration.rst	2009-03-02 22:06:20 +0000
+++ doc/user_manual/configuration.rst	2011-04-29 12:56:28 +0000
@@ -95,10 +95,10 @@
 
 When the upstream source is in ``bazaar`` it is possible to have the
 ``.orig.tar.gz`` created by exporting the upstream branch. To do this set
-the ``export-upstream`` option. This only works only for merge mode. For
+the ``upstream-branch`` option. This only works only for merge mode. For
 normal mode use the ``merge-upstream`` command.
 
-  * ``export-upstream = path``
+  * ``upstream-branch = path``
 
     This option takes a path (remote or local) to a bzr branch that contains
     the upstream code. If this is set then the plugin will export the code
@@ -110,7 +110,7 @@
     This sets the revision that the upstream code will be branched at. It takes
     the same revision spec as the normal --revision parameter. Use it to
     associate an upstream version number with a particular revision of the
-    upstream code. This has no effect if ``export-upstream`` is not set.
+    upstream code. This has no effect if ``upstream-branch`` is not set.
 
 
 Builders

=== modified file 'doc/user_manual/hooks.rst'
--- doc/user_manual/hooks.rst	2008-05-29 23:01:55 +0000
+++ doc/user_manual/hooks.rst	2011-04-29 12:56:28 +0000
@@ -17,6 +17,11 @@
 package. More hook points could be added if you have a specific need, contact
 me to discuss it if that is the case.
 
+  * ``merge-upstream`` - This is run after a new upstream version has
+     been merged into the current tree using ``bzr merge-upstream``.
+     This allows you to update the debian/ metadata based on the new upstream
+     release that has been merged in.
+
   * ``pre-export`` - This is run before the branch is exported to create
      the build directory. This allows you to modify the branch or the working
      tree. Note however that the tree to export is grabbed before the hook is

=== modified file 'errors.py'
--- errors.py	2011-02-07 15:23:22 +0000
+++ errors.py	2011-04-29 12:56:28 +0000
@@ -142,13 +142,6 @@
         BzrError.__init__(self, version=version)
 
 
-class UnknownDistribution(BzrError):
-    _fmt = "Unknown distribution: %(distribution)s."
-
-    def __init__(self, distribution):
-        BzrError.__init__(self, distribution=distribution)
-
-
 class VersionNotSpecified(BzrError):
     _fmt = "You did not specify a package version."
 
@@ -229,5 +222,5 @@
 
 class StrictBuildFailed(BzrError):
 
-    _fmt = ("Build refused because there are unknown files in the tree."
+    _fmt = ("Build refused because there are unknown files in the tree. "
             "To list all known files, run 'bzr unknowns'.")

=== modified file 'import_dsc.py'
--- import_dsc.py	2011-02-02 16:04:04 +0000
+++ import_dsc.py	2011-04-29 12:56:28 +0000
@@ -26,10 +26,9 @@
 #
 
 from base64 import (
-        standard_b64decode,
-        standard_b64encode,
-        )
-import errno
+    standard_b64encode,
+    )
+
 import os
 import re
 import shutil
@@ -58,7 +57,6 @@
         NoWorkingTree,
         UnrelatedBranches,
         )
-from bzrlib.revisionspec import RevisionSpec
 from bzrlib.revision import NULL_REVISION
 from bzrlib.trace import warning, mutter
 from bzrlib.transport import (
@@ -67,23 +65,28 @@
 
 from bzrlib.plugins.builddeb.bzrtools_import import import_dir
 from bzrlib.plugins.builddeb.errors import (
-                PristineTarError,
-                TarFailed,
-                UpstreamAlreadyImported,
-                UpstreamBranchAlreadyMerged,
-                )
+    TarFailed,
+    UpstreamAlreadyImported,
+    UpstreamBranchAlreadyMerged,
+    )
 from bzrlib.plugins.builddeb.util import (
     FORMAT_3_0_QUILT,
     FORMAT_3_0_NATIVE,
     export,
     get_commit_info_from_changelog,
-    get_snapshot_revision,
+    make_pristine_tar_delta,
     md5sum_filename,
     open_file_via_transport,
     open_transport,
     safe_decode,
     subprocess_setup,
     )
+from bzrlib.plugins.builddeb.upstream import (
+    PristineTarSource,
+    )
+from bzrlib.plugins.builddeb.upstream.branch import (
+    UpstreamBranchSource,
+    )
 
 
 class DscCache(object):
@@ -131,56 +134,6 @@
 
 
 
-def reconstruct_pristine_tar(dest, delta, dest_filename):
-    """Reconstruct a pristine tarball from a directory and a delta.
-
-    :param dest: Directory to pack
-    :param delta: pristine-tar delta
-    :param dest_filename: Destination filename
-    """
-    command = ["pristine-tar", "gentar", "-",
-               os.path.abspath(dest_filename)]
-    try:
-        proc = subprocess.Popen(command, stdin=subprocess.PIPE,
-                cwd=dest, preexec_fn=subprocess_setup,
-                stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
-    except OSError, e:
-        if e.errno == errno.ENOENT:
-            raise PristineTarError("pristine-tar is not installed")
-        else:
-            raise
-    (stdout, stderr) = proc.communicate(delta)
-    if proc.returncode != 0:
-        raise PristineTarError("Generating tar from delta failed: %s" % stdout)
-
-
-def make_pristine_tar_delta(dest, tarball_path):
-    """Create a pristine-tar delta for a tarball.
-
-    :param dest: Directory to generate pristine tar delta for
-    :param tarball_path: Path to the tarball
-    :return: pristine-tarball
-    """
-    # If tarball_path is relative, the cwd=dest parameter to Popen will make
-    # pristine-tar faaaail. pristine-tar doesn't use the VFS either, so we
-    # assume local paths.
-    tarball_path = osutils.abspath(tarball_path)
-    command = ["pristine-tar", "gendelta", tarball_path, "-"]
-    try:
-        proc = subprocess.Popen(command, stdout=subprocess.PIPE,
-                cwd=dest, preexec_fn=subprocess_setup,
-                stderr=subprocess.PIPE)
-    except OSError, e:
-        if e.errno == errno.ENOENT:
-            raise PristineTarError("pristine-tar is not installed")
-        else:
-            raise
-    (stdout, stderr) = proc.communicate()
-    if proc.returncode != 0:
-        raise PristineTarError("Generating delta from tar failed: %s" % stderr)
-    return stdout
-
-
 class DistributionBranchSet(object):
     """A collection of DistributionBranches with an ordering.
 
@@ -273,9 +226,14 @@
             upstream_branch.
         """
         self.branch = branch
+        self.tree = tree
+        self.pristine_tar_source = PristineTarSource(branch=branch, tree=tree)
         self.upstream_branch = upstream_branch
-        self.tree = tree
         self.upstream_tree = upstream_tree
+        if upstream_branch is not None:
+            self.upstream_source = UpstreamBranchSource(self.upstream_branch)
+        else:
+            self.upstream_source = None
         self.get_lesser_branches = None
         self.get_greater_branches = None
 
@@ -325,19 +283,6 @@
         """
         return str(version)
 
-    def upstream_tag_name(self, version, distro=None):
-        """Gets the tag name for the upstream part of version.
-
-        :param version: the Version object to extract the upstream
-            part of the version number from.
-        :return: a String with the name of the tag.
-        """
-        assert isinstance(version, str)
-        tag_name = self.tag_name(version)
-        if distro is None:
-            return "upstream-" + tag_name
-        return "upstream-%s-%s" % (distro, tag_name)
-
     def _has_version(self, branch, tag_name, md5=None):
         if branch.tags.has_tag(tag_name):
             revid = branch.tags.lookup_tag(tag_name)
@@ -399,18 +344,11 @@
         :return: True if the upstream branch contains the specified upstream
             version of the package. False otherwise.
         """
-        for tag_name in self.possible_upstream_tag_names(version):
+        for tag_name in self.pristine_tar_source.possible_tag_names(version):
             if self._has_version(self.upstream_branch, tag_name, md5=md5):
                 return True
         return False
 
-    def has_upstream_version_in_packaging_branch(self, version, md5=None):
-        assert isinstance(version, str), str(type(version))
-        for tag_name in self.possible_upstream_tag_names(version):
-            if self._has_version(self.branch, tag_name, md5=md5):
-                return True
-        return False
-
     def contained_versions(self, versions):
         """Splits a list of versions depending on presence in the branch.
 
@@ -507,19 +445,12 @@
         :return: the revision id corresponding to the upstream portion
             of the version
         """
-        for tag_name in self.possible_upstream_tag_names(version):
+        for tag_name in self.pristine_tar_source.possible_tag_names(version):
             if self._has_version(self.upstream_branch, tag_name):
                 return self.upstream_branch.tags.lookup_tag(tag_name)
-        tag_name = self.upstream_tag_name(version)
+        tag_name = self.pristine_tar_source.tag_name(version)
         return self.upstream_branch.tags.lookup_tag(tag_name)
 
-    def possible_upstream_tag_names(self, version):
-        tags = [self.upstream_tag_name(version),
-                self.upstream_tag_name(version, distro="debian"),
-                self.upstream_tag_name(version, distro="ubuntu"),
-                "upstream/%s" % self.tag_name(version)]
-        return tags
-
     def tag_version(self, version, revid=None):
         """Tags the branch's last revision with the given version.
 
@@ -551,7 +482,7 @@
         :return The tag name, revid of the added tag.
         """
         assert isinstance(version, str)
-        tag_name = self.upstream_tag_name(version)
+        tag_name = self.pristine_tar_source.tag_name(version)
         if revid is None:
             revid = self.upstream_branch.last_revision()
         self.upstream_branch.tags.set_tag(tag_name, revid)
@@ -981,8 +912,8 @@
         self.upstream_tree.set_parent_ids(upstream_parents)
         revprops = {"deb-md5": md5}
         if upstream_tarball is not None:
-            delta = self.make_pristine_tar_delta(self.upstream_tree,
-                    upstream_tarball)
+            delta = self.make_pristine_tar_delta(
+                self.upstream_tree, upstream_tarball)
             uuencoded = standard_b64encode(delta)
             if upstream_tarball.endswith(".tar.bz2"):
                 revprops["deb-pristine-delta-bz2"] = uuencoded
@@ -1298,7 +1229,6 @@
             parents.insert(0, self.branch.last_revision())
         return parents
 
-
     def _import_native_package(self, version, versions, debian_part, md5,
             timestamp=None, file_ids_from=None, pull_debian=True):
         pull_branch = None
@@ -1448,42 +1378,24 @@
             shutil.rmtree(tempdir)
             raise
 
-    def _revid_of_upstream_version_from_branch(self, version):
-        """The private method below will go away eventually."""
-        return self.revid_of_upstream_version_from_branch(version)
-
-    def revid_of_upstream_version_from_branch(self, version):
-        # TODO: remove the _revid_of_upstream_version_from_branch alias below.
-        assert isinstance(version, str)
-        for tag_name in self.possible_upstream_tag_names(version):
-            if self._has_version(self.branch, tag_name):
-                return self.branch.tags.lookup_tag(tag_name)
-        tag_name = self.upstream_tag_name(version)
-        return self.branch.tags.lookup_tag(tag_name)
-
-    _revid_of_upstream_version_from_branch = revid_of_upstream_version_from_branch
-
-    def _export_previous_upstream_tree(self, previous_version, tempdir, upstream_branch=None):
+    def _export_previous_upstream_tree(self, package, previous_version, tempdir, upstream_branch=None):
         assert isinstance(previous_version, str), \
             "Should pass upstream version as str, not Version."
-        previous_upstream_revision = get_snapshot_revision(previous_version)
-        if self.has_upstream_version_in_packaging_branch(previous_version):
-            upstream_tip = self.revid_of_upstream_version_from_branch(
-                    previous_version)
+        if self.pristine_tar_source.has_version(package, previous_version):
+            upstream_tip = self.pristine_tar_source.version_as_revision(
+                    package, previous_version)
             self.extract_upstream_tree(upstream_tip, tempdir)
-        elif (upstream_branch is not None and
-              previous_upstream_revision is not None):
-            upstream_tip = RevisionSpec.from_string(previous_upstream_revision).as_revision_id(upstream_branch)
-            assert isinstance(upstream_tip, str)
+        elif self.upstream_source is not None:
+            upstream_tip = self.upstream_source.version_as_revision(package, previous_version)
             self.extract_upstream_tree(upstream_tip, tempdir)
         else:
             raise BzrCommandError("Unable to find the tag for the "
                     "previous upstream version, %s, in the branch: "
                     "%s" % (
                 previous_version,
-                self.upstream_tag_name(previous_version)))
+                self.pristine_tar_source.tag_name(previous_version)))
 
-    def merge_upstream(self, tarball_filename, version, previous_version,
+    def merge_upstream(self, tarball_filename, package, version, previous_version,
             upstream_branch=None, upstream_revision=None, merge_type=None,
             force=False):
         assert self.upstream_branch is None, \
@@ -1496,11 +1408,11 @@
         tempdir = tempfile.mkdtemp(dir=os.path.join(self.tree.basedir, '..'))
         try:
             if previous_version is not None:
-                self._export_previous_upstream_tree(previous_version, tempdir,
+                self._export_previous_upstream_tree(package, previous_version, tempdir,
                     upstream_branch)
             else:
                 self._create_empty_upstream_tree(tempdir)
-            if self.has_upstream_version_in_packaging_branch(version):
+            if self.pristine_tar_source.has_version(package, version):
                 raise UpstreamAlreadyImported(version)
             if upstream_branch is not None:
                 upstream_branch.lock_read()
@@ -1537,13 +1449,14 @@
                         # Bug lp:515367 where the first upstream tarball is
                         # missing a proper history link and a criss-cross merge
                         # then recurses and finds no deeper ancestor.
-                        if len(parents) != 2:
-                            # Very first import... shouldn't be possible.
-                            raise
                         # Use the previous upstream import as the from revision
+                        if len(parents) == 0:
+                            from_revision = NULL_REVISION
+                        else:
+                            from_revision = parents[0]
                         conflicts = self.tree.merge_from_branch(
                                 self.upstream_branch, merge_type=merge_type,
-                                from_revision=parents[0])
+                                from_revision=from_revision)
                 else:
                     # Pull so that merge-upstream allows you to start a branch
                     # from upstream tarball.
@@ -1557,48 +1470,6 @@
         finally:
             shutil.rmtree(tempdir)
 
-    def has_pristine_tar_delta(self, rev):
-        return ('deb-pristine-delta' in rev.properties
-                or 'deb-pristine-delta-bz2' in rev.properties)
-
-    def pristine_tar_format(self, rev):
-        if 'deb-pristine-delta' in rev.properties:
-            return 'gz'
-        elif 'deb-pristine-delta-bz2' in rev.properties:
-            return 'bz2'
-        assert self.has_pristine_tar_delta(rev)
-        raise AssertionError("Not handled new delta type in "
-                "pristine_tar_format")
-
-    def pristine_tar_delta(self, rev):
-        if 'deb-pristine-delta' in rev.properties:
-            uuencoded = rev.properties['deb-pristine-delta']
-        elif 'deb-pristine-delta-bz2' in rev.properties:
-            uuencoded = rev.properties['deb-pristine-delta-bz2']
-        else:
-            assert self.has_pristine_tar_delta(rev)
-            raise AssertionError("Not handled new delta type in "
-                    "pristine_tar_delta")
-        delta = standard_b64decode(uuencoded)
-        return delta
-
-    def reconstruct_pristine_tar(self, revid, package, version,
-            dest_filename):
-        """Reconstruct a pristine-tar tarball from a bzr revision."""
-        tree = self.branch.repository.revision_tree(revid)
-        tmpdir = tempfile.mkdtemp(prefix="builddeb-pristine-")
-        try:
-            dest = os.path.join(tmpdir, "orig")
-            rev = self.branch.repository.get_revision(revid)
-            if self.has_pristine_tar_delta(rev):
-                export(tree, dest, format='dir')
-                delta = self.pristine_tar_delta(rev)
-                reconstruct_pristine_tar(dest, delta, dest_filename)
-            else:
-                export(tree, dest_filename, require_per_file_timestamps=True)
-        finally:
-            shutil.rmtree(tmpdir)
-
     def make_pristine_tar_delta(self, tree, tarball_path):
         tmpdir = tempfile.mkdtemp(prefix="builddeb-pristine-")
         try:

=== modified file 'info.py'
--- info.py	2010-01-18 06:20:19 +0000
+++ info.py	2011-04-29 12:56:28 +0000
@@ -18,7 +18,7 @@
 
 bzr_plugin_name = 'builddeb'
 
-bzr_plugin_version = (2, 2, 0, 'final', 0)
+bzr_plugin_version = (2, 7, 0, 'dev', 0)
 
 bzr_commands = [
     "test_builddeb",

=== modified file 'launchpad.py'
--- launchpad.py	2010-09-10 02:46:41 +0000
+++ launchpad.py	2011-04-29 12:56:28 +0000
@@ -21,7 +21,10 @@
 import os
 
 from bzrlib.config import config_dir
-from bzrlib.trace import mutter
+from bzrlib.trace import (
+    mutter,
+    note,
+    )
 
 try:
     from launchpadlib.launchpad import Launchpad
@@ -33,17 +36,20 @@
 
 
 def _get_launchpad():
-    creds_path = os.path.join(config_dir(), "builddeb.lp_creds.txt")
-    if not os.path.exists(creds_path):
-        return None
-    creds = Credentials("bzr-builddeb")
-    f = open(creds_path)
     try:
-        creds.load(f)
-    finally:
-        f.close()
-    lp = Launchpad(creds, service_root=LPNET_SERVICE_ROOT)
-    return lp
+        return Launchpad.login_anonymously("bzr-builddeb",
+            service_root=LPNET_SERVICE_ROOT)
+    except AttributeError: # older version of launchpadlib
+        creds_path = os.path.join(config_dir(), "builddeb.lp_creds.txt")
+        if not os.path.exists(creds_path):
+            return None
+        creds = Credentials("bzr-builddeb")
+        f = open(creds_path)
+        try:
+            creds.load(f)
+        finally:
+            f.close()
+        return Launchpad(creds, service_root=LPNET_SERVICE_ROOT)
 
 
 def ubuntu_bugs_for_debian_bug(bug_id):
@@ -83,3 +89,41 @@
         mutter(str(e))
         return []
     return []
+
+
+def get_upstream_branch_url(package, distribution_name, distroseries_name):
+    """Return the upstream branch URL based on a package in a distribution.
+
+    :param distribution_name: Distribution name
+    :param package: Source package name
+    :param distroseries_name: Distroseries name
+    """
+    if not HAVE_LPLIB:
+        return None
+    lp = _get_launchpad()
+    if lp is None:
+        return None
+    distribution = lp.distributions[distribution_name]
+    if distribution is None:
+        note("Launchpad: No such distribution %s" % distribution)
+        return None
+    distroseries = distribution.getSeries(name_or_version=distroseries_name)
+    if distroseries is None:
+        note("%s: No such distroseries %s" % (distribution_name, distroseries_name))
+        return None
+    sourcepackage = distroseries.getSourcePackage(name=package)
+    if sourcepackage is None:
+        note("%s: Source package %s not found in %s" % (distribution_name, package,
+            sourcepackage))
+        return None
+    productseries = sourcepackage.productseries
+    if productseries is None:
+        note("%s: Source package %s in %s not linked to a product series" % (
+            distribution_name, package, sourcepackage))
+        return None
+    branch = productseries.branch
+    if branch is None:
+        note(("%s: upstream product series %s for source package %s does not have "
+             "a branch") % (distribution_name, distroseries, package))
+        return None
+    return branch.bzr_identity

=== modified file 'merge_package.py'
--- merge_package.py	2010-05-23 15:29:38 +0000
+++ merge_package.py	2011-04-29 12:56:28 +0000
@@ -60,7 +60,7 @@
         db = DistributionBranch(branch, branch)
         uver = _latest_version(branch).upstream_version
         results.append((Version(uver),
-                    db.revid_of_upstream_version_from_branch(uver)))
+                    db.pristine_tar_source.version_as_revision(None, uver)))
 
     return results
 

=== modified file 'merge_upstream.py'
--- merge_upstream.py	2011-01-29 03:29:44 +0000
+++ merge_upstream.py	2011-04-29 12:56:28 +0000
@@ -34,152 +34,9 @@
     # Prior to 0.1.15 the debian module was called debian_bundle
     from debian_bundle.changelog import Version
 
-from bzrlib.errors import InvalidRevisionId
-from bzrlib.revisionspec import RevisionSpec
-
-from bzrlib.plugins.builddeb.util import get_snapshot_revision
-
-
 TAG_PREFIX = "upstream-"
 
 
-def extract_svn_revno(rev):
-    """Extract the Subversion number of a revision from a revision.
-
-    :param rev: Revision object
-    :return: Revision number, None if this was not a Subversion revision or
-         if the revision number could not be determined (bzr-svn not available).
-    """
-    try:
-        from bzrlib.plugins.svn import extract_svn_foreign_revid
-    except ImportError:
-        # No svn support
-        return None
-    else:
-        try:
-            (svn_uuid, branch_path, svn_revno) = extract_svn_foreign_revid(rev)
-        except InvalidRevisionId:
-            return None
-        else:
-            return svn_revno
-
-
-def upstream_version_add_revision(upstream_branch, version_string, revid):
-    """Update the revision in a upstream version string.
-
-    :param branch: Branch in which the revision can be found
-    :param version_string: Original version string
-    :param revid: Revision id of the revision
-    """
-    revno = upstream_branch.revision_id_to_revno(revid)
-
-    if "+bzr" in version_string:
-        return "%s+bzr%d" % (version_string[:version_string.rfind("+bzr")], revno)
-
-    if "~bzr" in version_string:
-        return "%s~bzr%d" % (version_string[:version_string.rfind("~bzr")], revno)
-
-    rev = upstream_branch.repository.get_revision(revid)
-    svn_revno = extract_svn_revno(rev)
-
-    # FIXME: Raise error if +svn/~svn is present and svn_revno is not set?
-    if "+svn" in version_string and svn_revno:
-        return "%s+svn%d" % (version_string[:version_string.rfind("+svn")], svn_revno)
-    if "~svn" in version_string and svn_revno:
-        return "%s~svn%d" % (version_string[:version_string.rfind("~svn")], svn_revno)
-
-    if svn_revno:
-        return "%s+svn%d" % (version_string, svn_revno)
-    else:
-        return "%s+bzr%d" % (version_string, revno)
-
-
-def _upstream_branch_version(revhistory, reverse_tag_dict, package, 
-                            previous_version, add_rev):
-    """Determine the version string of an upstream branch.
-
-    The upstream version is determined from the most recent tag
-    in the upstream branch. If that tag does not point at the last revision, 
-    the revision number is added to it (<version>+bzr<revno>).
-
-    If there are no tags set on the upstream branch, the previous Debian 
-    version is used and combined with the bzr revision number 
-    (usually <version>+bzr<revno>).
-
-    :param revhistory: Branch revision history.
-    :param reverse_tag_dict: Reverse tag dictionary (revid -> list of tags)
-    :param package: Name of package.
-    :param previous_version: Previous upstream version in debian changelog.
-    :param add_rev: Function that can add a revision suffix to a version string.
-    :return: Name of the upstream revision.
-    """
-    if revhistory == []:
-        # No new version to merge
-        return Version(previous_version)
-    for r in reversed(revhistory):
-        if r in reverse_tag_dict:
-            # If there is a newer version tagged in branch, 
-            # convert to upstream version 
-            # return <upstream_version>+bzr<revno>
-            for tag in reverse_tag_dict[r]:
-                upstream_version = upstream_tag_to_version(tag,
-                                                   package=package)
-                if upstream_version is not None:
-                    if r != revhistory[-1]:
-                        upstream_version.upstream_version = add_rev(
-                          upstream_version.upstream_version, revhistory[-1])
-                    return upstream_version
-    return Version(add_rev(previous_version, revhistory[-1]))
-
-
-def upstream_branch_version(upstream_branch, upstream_revision, package,
-        previous_version):
-    """Determine the version string for a revision in an upstream branch.
-
-    :param upstream_branch: The upstream branch object
-    :param upstream_revision: The revision id of the upstream revision
-    :param package: The name of the package
-    :param previous_version: The previous upstream version string
-    :return: Upstream version string for `upstream_revision`.
-    """
-    dotted_revno = upstream_branch.revision_id_to_dotted_revno(upstream_revision)
-    if len(dotted_revno) > 1:
-        revno = -2
-    else:
-        revno = dotted_revno[0]
-    revhistory = upstream_branch.revision_history()
-    previous_revision = get_snapshot_revision(previous_version)
-    if previous_revision is not None:
-        previous_revspec = RevisionSpec.from_string(previous_revision)
-        previous_revno, _ = previous_revspec.in_history(upstream_branch)
-        # Trim revision history - we don't care about any revisions
-        # before the revision of the previous version
-    else:
-        previous_revno = 0
-    revhistory = revhistory[previous_revno:revno+1]
-    return _upstream_branch_version(revhistory,
-            upstream_branch.tags.get_reverse_tag_dict(), package,
-            previous_version,
-            lambda version, revision: upstream_version_add_revision(upstream_branch, version, revision))
-
-
-def upstream_tag_to_version(tag_name, package=None):
-    """Take a tag name and return the upstream version, or None."""
-    if tag_name.startswith(TAG_PREFIX):
-        return Version(tag_name[len(TAG_PREFIX):])
-    if (package is not None and (
-          tag_name.startswith("%s-" % package) or
-          tag_name.startswith("%s_" % package))):
-        return Version(tag_name[len(package)+1:])
-    if tag_name.startswith("release-"):
-        return Version(tag_name[len("release-"):])
-    if tag_name[0] == "v" and tag_name[1].isdigit():
-        return Version(tag_name[1:])
-    if all([c.isdigit() or c in (".", "~") for c in tag_name]):
-        return Version(tag_name)
-    return None
-
-
 def package_version(upstream_version, distribution_name, epoch=None):
     """Determine the package version for a new upstream.
 
@@ -232,11 +89,17 @@
          "upstream_version should be a str, not %s" % str(
                  type(upstream_version))
     entry_description = upstream_merge_changelog_line(upstream_version)
-    proc = subprocess.Popen(["dch", "-v",
-            str(package_version(upstream_version, distribution_name,
-                                changelog.epoch)),
-            "-D", "UNRELEASED", "--release-heuristic", "changelog", entry_description],
-            cwd=tree.basedir)
+    if changelog is None:
+        epoch = None
+    else:
+        epoch = changelog.epoch
+    argv = ["dch", "-v",
+            str(package_version(upstream_version, distribution_name, epoch)),
+            "-D", "UNRELEASED", "--release-heuristic", "changelog",
+            "--package", package, entry_description]
+    if not tree.has_filename("debian/changelog"):
+        argv.append("--create")
+    proc = subprocess.Popen(argv, cwd=tree.basedir)
     proc.wait()
     # FIXME: Raise insightful exception here rather than just checking
     # return code.

=== modified file 'setup.py'
--- setup.py	2009-07-26 15:51:02 +0000
+++ setup.py	2011-04-29 12:56:28 +0000
@@ -37,7 +37,8 @@
           url="http://jameswestby.net/bzr/bzr-builddeb/",
           packages=['bzrlib.plugins.builddeb',
                     'bzrlib.plugins.builddeb.tests',
-                    'bzrlib.plugins.builddeb.tests.blackbox'],
+                    'bzrlib.plugins.builddeb.tests.blackbox',
+                    'bzrlib.plugins.builddeb.upstream'],
           package_dir={'bzrlib.plugins.builddeb': '.'},
           scripts=['bzr-buildpackage'],
           data_files=[('share/man/man1', ['bzr-buildpackage.1'])])

=== modified file 'tests/__init__.py'
--- tests/__init__.py	2010-09-10 02:37:09 +0000
+++ tests/__init__.py	2011-04-29 12:56:28 +0000
@@ -136,7 +136,6 @@
                                             for i in testmod_names]))
 
     doctest_mod_names = [
-             'changes',
              'config'
              ]
     for mod in doctest_mod_names:

=== modified file 'tests/blackbox/test_builddeb.py'
--- tests/blackbox/test_builddeb.py	2011-02-03 12:29:15 +0000
+++ tests/blackbox/test_builddeb.py	2011-04-29 12:56:28 +0000
@@ -113,7 +113,8 @@
   def test_builddeb_strict(self):
     tree = self.build_really_simple_tree()
     self.run_bzr_error(
-      ['bzr: ERROR: Build refused because there are unknown files in the tree'],
+      ['bzr: ERROR: Build refused because there are unknown files in the tree. '
+       "To list all known files, run 'bzr unknowns'."],
       "builddeb --strict")
 
   def test_builddeb_uses_revision_when_told(self):

=== modified file 'tests/blackbox/test_do.py'
--- tests/blackbox/test_do.py	2010-07-30 01:25:51 +0000
+++ tests/blackbox/test_do.py	2011-04-29 12:56:28 +0000
@@ -171,12 +171,15 @@
     tree = self.make_unpacked_source()
     self.make_merge_mode_config(tree)
     self.make_upstream_tarball()
-    old_shell = os.environ['SHELL']
+    old_shell = os.environ.get('SHELL')
     os.environ['SHELL'] = "touch debian/shell"
     try:
       self.run_bzr('bd-do')
     finally:
-      os.environ['SHELL'] = old_shell
+      if old_shell is not None:
+        os.environ['SHELL'] = old_shell
+      else:
+        del os.environ['SHELL']
     self.failUnlessExists('debian/shell')
 
 # vim: ts=2 sts=2 sw=2

=== modified file 'tests/blackbox/test_merge_upstream.py'
--- tests/blackbox/test_merge_upstream.py	2010-07-29 18:46:35 +0000
+++ tests/blackbox/test_merge_upstream.py	2011-04-29 12:56:28 +0000
@@ -139,7 +139,9 @@
         return result
 
     def release_upstream(self, upstream):
-        tar = ExportedTarball(upstream, version=self.getUniqueInteger())
+        version = str(self.getUniqueInteger())
+        upstream.tree.branch.tags.set_tag(version, upstream.tree.branch.last_revision())
+        tar = ExportedTarball(upstream, version=version)
         tar.setUp(self)
         return tar
 
@@ -161,7 +163,47 @@
         changed_upstream = self.file_moved_replaced_upstream(upstream)
         rel2 = self.release_upstream(changed_upstream)
         self.run_bzr(['merge-upstream', '--version', str(rel2.version),
+            os.path.abspath(rel2.tarball)],
+            working_dir=package.tree.basedir)
+
+    def test_upstream_branch_revision_not_found(self):
+        # When an upstream branch is specified but does not have the
+        # upstream version, 'bzr merge-upstream' should complain.
+        upstream = self.make_upstream()
+        rel1 = self.release_upstream(upstream)
+        package = self.import_upstream(rel1, upstream)
+        changed_upstream = self.file_moved_replaced_upstream(upstream)
+        rel2 = self.release_upstream(changed_upstream)
+        self.run_bzr_error([
+            'Using version string 8.',
+            'bzr: ERROR: Version 8 can not be found in upstream branch <UpstreamBranchSource for \'.*\'>. Specify the revision manually using --revision or adjust \'export-upstream-revision\' in the configuration.'],
+            ['merge-upstream', '--version', str(rel2.version),
             os.path.abspath(rel2.tarball), changed_upstream.tree.basedir],
             working_dir=package.tree.basedir)
 
+    def test_hooks(self):
+        upstream = self.make_upstream()
+        rel1 = self.release_upstream(upstream)
+        package = self.import_upstream(rel1, upstream)
+        package_path = package.tree.basedir
+        os.mkdir(os.path.join(package_path, '.bzr-builddeb/'))
+        f = open(os.path.join(package_path, '.bzr-builddeb/local.conf'), 'wb')
+        try:
+          f.write('[HOOKS]\nmerge-upstream = touch muhook\n')
+        finally:
+          f.close()
+        changed_upstream = self.file_moved_replaced_upstream(upstream)
+        rel2 = self.release_upstream(changed_upstream)
+        self.run_bzr(['merge-upstream', '--version', str(rel2.version),
+            os.path.abspath(rel2.tarball)], working_dir=package.tree.basedir)
+        self.failUnlessExists(os.path.join(package.tree.basedir, 'muhook'))
+
+    def test_new_package(self):
+        upstream = self.make_upstream()
+        tree = upstream.tree.bzrdir.sprout("package").open_workingtree()
+        rel1 = self.release_upstream(upstream)
+        self.run_bzr(['merge-upstream', '--version', str(rel1.version),
+            "--package", "bar", os.path.abspath(rel1.tarball)],
+            working_dir=tree.basedir)
+
 # vim: ts=4 sts=4 sw=4

=== modified file 'tests/test_import_dsc.py'
--- tests/test_import_dsc.py	2010-10-28 18:13:44 +0000
+++ tests/test_import_dsc.py	2011-04-29 12:56:28 +0000
@@ -135,12 +135,6 @@
         version = Version(version_no)
         self.assertEqual(db.tag_name(version), version_no)
 
-    def test_upstream_tag_name(self):
-        db = self.db1
-        upstream_v_no = "0.1"
-        self.assertEqual(db.upstream_tag_name(upstream_v_no),
-                "upstream-" + upstream_v_no)
-
     def test_tag_version(self):
         db = self.db1
         tree = self.tree1
@@ -156,7 +150,7 @@
         version = "0.1"
         revid = tree.commit("one")
         db.tag_upstream_version(version)
-        tag_name = db.upstream_tag_name(version)
+        tag_name = db.pristine_tar_source.tag_name(version)
         self.assertEqual(tree.branch.tags.lookup_tag(tag_name), revid)
 
     def test_has_version(self):
@@ -1499,7 +1493,7 @@
             tf.add("a")
         finally:
             tf.close()
-        conflicts = db.merge_upstream(tarball_filename, "0.2", "0.1")
+        conflicts = db.merge_upstream(tarball_filename, "foo", "0.2", "0.1")
         self.assertEqual(0,  conflicts)
 
     def test_merge_upstream_initial_with_branch(self):
@@ -1536,9 +1530,9 @@
             tf.add("a")
         finally:
             tf.close()
-        conflicts = db.merge_upstream(tarball_filename, "0.2", "0.1",
-                upstream_branch=upstream_tree.branch,
-                upstream_revision=upstream_rev)
+        conflicts = db.merge_upstream(tarball_filename, "foo", "0.2", "0.1",
+            upstream_branch=upstream_tree.branch,
+            upstream_revision=upstream_rev)
         self.assertEqual(0,  conflicts)
 
     def test_merge_upstream_initial_with_removed_debian(self):
@@ -1576,9 +1570,9 @@
             tf.add("a")
         finally:
             tf.close()
-        conflicts = db.merge_upstream(tarball_filename, "0.2", "0.1",
-                upstream_branch=upstream_tree.branch,
-                upstream_revision=upstream_rev)
+        conflicts = db.merge_upstream(tarball_filename, "foo", "0.2", "0.1",
+            upstream_branch=upstream_tree.branch,
+            upstream_revision=upstream_rev)
         # ./debian conflicts.
         self.assertEqual(3,  conflicts)
 
@@ -1617,7 +1611,7 @@
         dbs.add_branch(db)
         tree.lock_write()
         self.addCleanup(tree.unlock)
-        db.merge_upstream(builder.tar_name(), str(version2),
+        db.merge_upstream(builder.tar_name(), "package", str(version2),
             version1.upstream_version,
             upstream_branch=upstream_tree.branch,
             upstream_revision=upstream_rev)
@@ -1656,7 +1650,8 @@
             tf.add("a")
         finally:
             tf.close()
-        conflicts = db.merge_upstream(tarball_filename, "0.2-1", "0.1")
+        conflicts = db.merge_upstream(tarball_filename, "package", "0.2-1",
+            "0.1")
         # Check that we tagged wiht the dash version
         self.assertTrue(tree.branch.tags.has_tag('upstream-0.2-1'))
 
@@ -1694,7 +1689,8 @@
         # We don't add the new file upstream, as the new file id would
         # be picked up from there.
         upstream_rev2 = upstream_tree.commit("two")
-        db.merge_upstream(builder.tar_name(), version2.upstream_version,
+        db.merge_upstream(builder.tar_name(), "package",
+            version2.upstream_version,
             version1.upstream_version,
             upstream_branch=upstream_tree.branch,
             upstream_revision=upstream_rev2)
@@ -1730,7 +1726,8 @@
         # We don't add the new file upstream, as the new file id would
         # be picked up from there.
         upstream_rev2 = upstream_tree.commit("two")
-        db.merge_upstream(builder.tar_name(), version2.upstream_version,
+        db.merge_upstream(builder.tar_name(), "package",
+            version2.upstream_version,
             version1.upstream_version,
             upstream_branch=upstream_tree.branch,
             upstream_revision=upstream_rev2)
@@ -1762,8 +1759,8 @@
         builder.add_upstream_file("a", "New a")
         builder.add_upstream_file("b", "Renamed a")
         builder.build()
-        db.merge_upstream(builder.tar_name(), version2.upstream_version,
-            version1.upstream_version)
+        db.merge_upstream(builder.tar_name(), "packaging",
+            version2.upstream_version, version1.upstream_version)
         self.assertEqual("a-id", packaging_tree.path2id("b"))
         self.assertEqual("other-a-id", packaging_tree.path2id("a"))
 
@@ -1920,20 +1917,3 @@
         finally:
             extractor.cleanup()
 
-
-class PossibleUpstreamTagNamesTests(BuilddebTestCase):
-
-    def setUp(self):
-        super(PossibleUpstreamTagNamesTests, self).setUp()
-        self.tree = self.make_branch_and_tree('unstable')
-        root_id = self.tree.path2id("")
-        self.up_tree = self.make_branch_and_tree('unstable-upstream')
-        self.up_tree.set_root_id(root_id)
-        self.db = DistributionBranch(self.tree.branch,
-                self.up_tree.branch, tree=self.tree,
-                upstream_tree=self.up_tree)
-
-    def test_version(self):
-        self.assertEquals(['upstream-3.3', 'upstream-debian-3.3',
-            'upstream-ubuntu-3.3', 'upstream/3.3'],
-            self.db.possible_upstream_tag_names("3.3"))

=== modified file 'tests/test_merge_upstream.py'
--- tests/test_merge_upstream.py	2011-01-29 03:29:44 +0000
+++ tests/test_merge_upstream.py	2011-04-29 12:56:28 +0000
@@ -24,121 +24,12 @@
     # Prior to 0.1.15 the debian module was called debian_bundle
     from debian_bundle.changelog import Version
 
-from bzrlib.revision import Revision
-from bzrlib.tests import TestCase, TestCaseWithTransport
+from bzrlib.tests import TestCase
 
 from bzrlib.plugins.builddeb.merge_upstream import (
-        upstream_merge_changelog_line,
-        package_version,
-        _upstream_branch_version,
-        upstream_tag_to_version,
-        upstream_version_add_revision
-        )
-
-
-class TestUpstreamVersionAddRevision(TestCaseWithTransport):
-  """Test that updating the version string works."""
-
-  def setUp(self):
-    super(TestUpstreamVersionAddRevision, self).setUp()
-    self.revnos = {}
-    self.svn_revnos = {"somesvnrev": 45}
-    self.revnos = {"somerev": 42, "somesvnrev": 12}
-    self.repository = self
-
-  def revision_id_to_revno(self, revid):
-    return self.revnos[revid]
-
-  def get_revision(self, revid):
-    rev = Revision(revid)
-    if revid in self.svn_revnos:
-      rev.foreign_revid = ("uuid", "bp", self.svn_revnos[revid])
-    return rev
-
-  def test_update_plus_rev(self):
-    self.assertEquals("1.3+bzr42", 
-        upstream_version_add_revision(self, "1.3+bzr23", "somerev"))
-
-  def test_update_tilde_rev(self):
-    self.assertEquals("1.3~bzr42", 
-        upstream_version_add_revision(self, "1.3~bzr23", "somerev"))
-
-  def test_new_rev(self):
-    self.assertEquals("1.3+bzr42", 
-        upstream_version_add_revision(self, "1.3", "somerev"))
-
-  def test_svn_new_rev(self):
-    self.assertEquals("1.3+svn45", 
-        upstream_version_add_revision(self, "1.3", "somesvnrev"))
-
-  def test_svn_plus_rev(self):
-    self.assertEquals("1.3+svn45", 
-        upstream_version_add_revision(self, "1.3+svn3", "somesvnrev"))
-
-  def test_svn_tilde_rev(self):
-    self.assertEquals("1.3~svn45", 
-        upstream_version_add_revision(self, "1.3~svn800", "somesvnrev"))
-
-
-class TestUpstreamBranchVersion(TestCase):
-  """Test that the upstream version of a branch can be determined correctly.
-  """
-
-  def get_suffix(self, version_string, revid):
-    revno = self.revhistory.index(revid)+1
-    if "bzr" in version_string:
-      return "%sbzr%d" % (version_string.split("bzr")[0], revno)
-    return "%s+bzr%d" % (version_string, revno)
-
-  def test_snapshot_none_existing(self):
-    self.revhistory = ["somerevid"]
-    self.assertEquals(Version("1.2+bzr1"),
-        _upstream_branch_version(self.revhistory, {}, "bla", "1.2", self.get_suffix))
-
-  def test_snapshot_nothing_new(self):
-    self.revhistory = []
-    self.assertEquals(Version("1.2"),
-        _upstream_branch_version(self.revhistory, {}, "bla", "1.2", self.get_suffix))
-
-  def test_new_tagged_release(self):
-    """Last revision is tagged - use as upstream version."""
-    self.revhistory = ["somerevid"]
-    self.assertEquals(Version("1.3"), 
-        _upstream_branch_version(self.revhistory, {"somerevid": ["1.3"]}, "bla", "1.2", self.get_suffix))
-
-  def test_refresh_snapshot_pre(self):
-    self.revhistory = ["oldrevid", "somerevid"]
-    self.assertEquals(Version("1.3~bzr2"), 
-        _upstream_branch_version(self.revhistory, {}, "bla", "1.3~bzr1", self.get_suffix))
-
-  def test_refresh_snapshot_post(self):
-    self.revhistory = ["oldrevid", "somerevid"]
-    self.assertEquals(Version("1.3+bzr2"), 
-        _upstream_branch_version(self.revhistory, {}, "bla", "1.3+bzr1", self.get_suffix))
-
-  def test_new_tag_refresh_snapshot(self):
-    self.revhistory = ["oldrevid", "somerevid", "newrevid"]
-    self.assertEquals(Version("1.3+bzr3"), 
-        _upstream_branch_version(self.revhistory, 
-                                {"somerevid": ["1.3"]}, "bla", "1.2+bzr1", self.get_suffix))
-
-
-class TestUpstreamTagToVersion(TestCase):
-
-  def test_prefix(self):
-    self.assertEquals(Version("5.0"), upstream_tag_to_version("upstream-5.0"))
-
-  def test_gibberish(self):
-    self.assertIs(None, upstream_tag_to_version("blabla"))
-
-  def test_vprefix(self):
-    self.assertEquals(Version("2.0"), upstream_tag_to_version("v2.0"))
-
-  def test_plain(self):
-    self.assertEquals(Version("2.0"), upstream_tag_to_version("2.0"))
-
-  def test_package_prefix(self):
-    self.assertEquals(Version("42.0"), upstream_tag_to_version("bla-42.0", "bla"))
+    upstream_merge_changelog_line,
+    package_version,
+    )
 
 
 class TestPackageVersion(TestCase):

=== modified file 'tests/test_repack_tarball.py'
--- tests/test_repack_tarball.py	2009-05-06 16:57:26 +0000
+++ tests/test_repack_tarball.py	2011-04-29 12:56:28 +0000
@@ -94,7 +94,9 @@
         repack_tarball(self.old_tarball, self.new_tarball)
         tar = tarfile.open(self.new_tarball, 'r:gz')
         try:
-            members = tar.getnames()
+            # The tarfile module returns member names of directories with a
+            # trailing slash, in Python 2.5 *only*.
+            members = [x.rstrip("/") for x in tar.getnames()]
         finally:
             tar.close()
         self.assertEqual(members,

=== modified file 'tests/test_upstream.py'
--- tests/test_upstream.py	2011-02-02 20:30:13 +0000
+++ tests/test_upstream.py	2011-04-29 12:56:28 +0000
@@ -22,12 +22,19 @@
 
 """Tests for the upstream module."""
 
+from base64 import standard_b64encode
 
+import bz2
+import gzip
 import os
 import tarfile
 import zipfile
 
+from bzrlib.revision import (
+    Revision,
+    )
 from bzrlib.tests import (
+    Feature,
     TestCase,
     TestCaseWithTransport,
     )
@@ -41,13 +48,40 @@
     )
 from bzrlib.plugins.builddeb.upstream import (
     AptSource,
+    PristineTarSource,
     StackedUpstreamSource,
     TarfileSource,
-    UpstreamBranchSource,
     UpstreamProvider,
     UpstreamSource,
     UScanSource,
-    )
+    Version,
+    )
+from bzrlib.plugins.builddeb.upstream.branch import (
+    get_export_upstream_revision,
+    get_snapshot_revision,
+    LazyUpstreamBranchSource,
+    UpstreamBranchSource,
+    _upstream_branch_version,
+    upstream_tag_to_version,
+    upstream_version_add_revision
+    )
+
+
+# Unless bug #712474 is fixed and available in the minimum bzrlib required, we
+# can't use:
+# svn_plugin = tests.ModuleAvailableFeature('bzrlib.plugins.svn')
+class SvnPluginAvailable(Feature):
+
+    def feature_name(self):
+        return 'bzr-svn plugin'
+
+    def _probe(self):
+        try:
+            import bzrlib.plugins.svn
+            return True
+        except ImportError:
+            return False
+svn_plugin = SvnPluginAvailable()
 
 
 class MockSources(object):
@@ -149,7 +183,7 @@
         apt_pkg = MockAptPkg(sources)
         src = AptSource()
         src._run_apt_source = caller.call
-        src.fetch_tarball("apackage", "0.2", "target", 
+        src.fetch_tarball("apackage", "0.2", "target",
             _apt_pkg=apt_pkg)
         self.assertEqual(1, apt_pkg.init_called_times)
         self.assertEqual(1, apt_pkg.get_pkg_source_records_called_times)
@@ -169,7 +203,7 @@
         src = AptSource()
         src._run_apt_source = caller.call
         self.assertRaises(PackageVersionNotPresent, src.fetch_tarball,
-            "apackage", "0.2", "target", 
+            "apackage", "0.2", "target",
             _apt_pkg=apt_pkg)
         self.assertEqual(1, apt_pkg.init_called_times)
         self.assertEqual(1, apt_pkg.get_pkg_source_records_called_times)
@@ -222,16 +256,16 @@
         self.assertEquals("1.1", stack.get_latest_version("mypkg", "1.0"))
 
     def test_repr(self):
-        self.assertEquals("StackedUpstreamSource([])", 
+        self.assertEquals("StackedUpstreamSource([])",
                 repr(StackedUpstreamSource([])))
-        self.assertEquals("StackedUpstreamSource([RecordingSource()])", 
+        self.assertEquals("StackedUpstreamSource([RecordingSource()])",
                 repr(StackedUpstreamSource([RecordingSource(False)])))
 
     def test_none(self):
         a = RecordingSource(False)
         b = RecordingSource(False)
         stack = StackedUpstreamSource([a, b])
-        self.assertRaises(PackageVersionNotPresent, 
+        self.assertRaises(PackageVersionNotPresent,
                 stack.fetch_tarball, "pkg", "1.0", "bla")
         self.assertEquals([("pkg", "1.0", "bla")], b._specific_versions)
         self.assertEquals([("pkg", "1.0", "bla")], a._specific_versions)
@@ -331,6 +365,297 @@
             source.version_as_revision("foo", "2.1+bzr2"))
         self.assertEquals(revid1, source.version_as_revision("foo", "2.1"))
 
+    def test_version_as_revision_no_revspec(self):
+        # There is no relevant revspec known
+        config = DebBuildConfig(
+            [('user.conf', True), ('default.conf', False)],
+            branch=self.tree.branch)
+        source = UpstreamBranchSource(self.tree.branch, {}, config=config)
+        self.assertRaises(PackageVersionNotPresent,
+            source.version_as_revision, "foo", "2.1")
+
+    def test_version_as_revision_invalid_revspec(self):
+        # There is no relevant revspec known
+        config = DebBuildConfig(
+            [('user.conf', True), ('default.conf', False)],
+            branch=self.tree.branch)
+        source = UpstreamBranchSource(self.tree.branch, {}, config=config)
+        self.assertRaises(PackageVersionNotPresent,
+            source.version_as_revision, "foo", "2.1+bzr4242")
+
+
+class LazyUpstreamBranchSourceTests(TestCaseWithTransport):
+    """Tests for LazyUpstreamBranchSource."""
+
+    def setUp(self):
+        super(LazyUpstreamBranchSourceTests, self).setUp()
+        self.tree = self.make_branch_and_tree('.')
+
+    def test_fetch_tarball(self):
+        self.tree.commit("msg")
+        self.tree.branch.tags.set_tag("1.0", self.tree.branch.last_revision())
+        source = LazyUpstreamBranchSource(self.tree.branch.base,
+            {"1.0": self.tree.branch.last_revision()})
+        self.assertIs(None, source._upstream_branch)
+        os.mkdir("mydir")
+        self.assertEquals("mydir/foo_1.0.orig.tar.gz",
+            source.fetch_tarball("foo", "1.0", "mydir"))
+        self.failUnlessExists("mydir/foo_1.0.orig.tar.gz")
+        self.assertIsNot(None, source._upstream_branch)
+
+    def test_fetch_tarball_not_found(self):
+        source = LazyUpstreamBranchSource(self.tree.branch.base)
+        self.assertIs(None, source._upstream_branch)
+        self.tree.commit("msg")
+        self.assertRaises(PackageVersionNotPresent,
+            source.fetch_tarball, "foo", "1.0", "mydir")
+        self.assertIsNot(None, source._upstream_branch)
+
+    def test_get_latest_version(self):
+        self.tree.commit("msg")
+        self.tree.branch.tags.set_tag("2.1", self.tree.branch.last_revision())
+        source = LazyUpstreamBranchSource(self.tree.branch.base,
+            {"2.1": self.tree.branch.last_revision()})
+        self.assertIs(None, source._upstream_branch)
+        self.assertEquals("2.1", source.get_latest_version("foo", "1.0"))
+        self.tree.commit("msg")
+        self.assertEquals("2.1+bzr2", source.get_latest_version("foo", "1.0"))
+        self.assertIsNot(None, source._upstream_branch)
+
+    def test_version_as_revision(self):
+        revid1 = self.tree.commit("msg")
+        self.tree.branch.tags.set_tag("2.1", self.tree.branch.last_revision())
+        config = DebBuildConfig(
+            [('user.conf', True), ('default.conf', False)],
+            branch=self.tree.branch)
+        source = LazyUpstreamBranchSource(self.tree.branch.base,
+            {"2.1": self.tree.branch.last_revision()},
+            config=config)
+        self.assertIs(None, source._upstream_branch)
+        revid2 = self.tree.commit("msg")
+        self.assertEquals(revid2,
+            source.version_as_revision("foo", "2.1+bzr2"))
+        self.assertEquals(revid1, source.version_as_revision("foo", "2.1"))
+        self.assertIsNot(None, source._upstream_branch)
+
+
+class TestUpstreamBranchVersion(TestCase):
+    """Test that the upstream version of a branch can be determined correctly.
+    """
+
+    def get_suffix(self, version_string, revid):
+        revno = len(self.revhistory) - self.revhistory.index(revid)
+        if "bzr" in version_string:
+            return "%sbzr%d" % (version_string.split("bzr")[0], revno)
+        return "%s+bzr%d" % (version_string, revno)
+
+    def test_snapshot_none_existing(self):
+      self.revhistory = ["somerevid"]
+      self.assertEquals("1.2+bzr1",
+          _upstream_branch_version(self.revhistory, {}, "bla", "1.2", self.get_suffix))
+
+    def test_snapshot_nothing_new(self):
+      self.revhistory = []
+      self.assertEquals("1.2",
+          _upstream_branch_version(self.revhistory, {}, "bla", "1.2", self.get_suffix))
+
+    def test_new_tagged_release(self):
+      """Last revision is tagged - use as upstream version."""
+      self.revhistory = ["somerevid"]
+      self.assertEquals("1.3",
+          _upstream_branch_version(self.revhistory, {"somerevid": [u"1.3"]}, "bla", "1.2", self.get_suffix))
+
+    def test_refresh_snapshot_pre(self):
+      self.revhistory = ["somerevid", "oldrevid"]
+      self.assertEquals("1.3~bzr2",
+          _upstream_branch_version(self.revhistory, {}, "bla", "1.3~bzr1",
+              self.get_suffix))
+
+    def test_refresh_snapshot_post(self):
+      self.revhistory = ["somerevid", "oldrevid"]
+      self.assertEquals("1.3+bzr2",
+          _upstream_branch_version(self.revhistory, {}, "bla", "1.3+bzr1",
+              self.get_suffix))
+
+    def test_new_tag_refresh_snapshot(self):
+      self.revhistory = ["newrevid", "somerevid", "oldrevid"]
+      self.assertEquals("1.3+bzr3",
+            _upstream_branch_version(self.revhistory,
+                {"somerevid": [u"1.3"]}, "bla", "1.2+bzr1", self.get_suffix))
+
+
+class TestUpstreamTagToVersion(TestCase):
+
+    def test_prefix(self):
+        self.assertEquals("5.0", upstream_tag_to_version(u"release-5.0"))
+
+    def test_gibberish(self):
+        self.assertIs(None, upstream_tag_to_version(u"blabla"))
+
+    def test_vprefix(self):
+        self.assertEquals("2.0", upstream_tag_to_version(u"v2.0"))
+
+    def test_plain(self):
+        self.assertEquals("2.0", upstream_tag_to_version(u"2.0"))
+
+    def test_package_prefix(self):
+        self.assertEquals("42.0", upstream_tag_to_version(u"bla-42.0", "bla"))
+
+    def test_unicode(self):
+        self.assertEquals("42.0\xc2\xa9", upstream_tag_to_version("bla-42.0\xc2\xa9".decode("utf-8"), "bla"))
+
+
+class TestUpstreamVersionAddRevision(TestCaseWithTransport):
+    """Test that updating the version string works."""
+
+    def setUp(self):
+        super(TestUpstreamVersionAddRevision, self).setUp()
+        self.revnos = {}
+        self.svn_revnos = {"somesvnrev": 45}
+        self.revnos = {"somerev": 42, "somesvnrev": 12}
+        self.repository = self
+
+    def revision_id_to_revno(self, revid):
+        return self.revnos[revid]
+
+    def get_revision(self, revid):
+        rev = Revision(revid)
+        if revid in self.svn_revnos:
+            self.requireFeature(svn_plugin)
+            # Fake a bzr-svn revision
+            rev.foreign_revid = ("uuid", "bp", self.svn_revnos[revid])
+            from bzrlib.plugins.svn import mapping
+            rev.mapping = mapping.mapping_registry.get_default()()
+        return rev
+
+    def test_update_plus_rev(self):
+        self.assertEquals("1.3+bzr42",
+          upstream_version_add_revision(self, "1.3+bzr23", "somerev"))
+
+    def test_update_tilde_rev(self):
+        self.assertEquals("1.3~bzr42",
+          upstream_version_add_revision(self, "1.3~bzr23", "somerev"))
+
+    def test_new_rev(self):
+        self.assertEquals("1.3+bzr42",
+          upstream_version_add_revision(self, "1.3", "somerev"))
+
+    def test_svn_new_rev(self):
+        self.assertEquals("1.3+svn45",
+          upstream_version_add_revision(self, "1.3", "somesvnrev"))
+
+    def test_svn_plus_rev(self):
+        self.assertEquals("1.3+svn45",
+          upstream_version_add_revision(self, "1.3+svn3", "somesvnrev"))
+
+    def test_svn_tilde_rev(self):
+        self.assertEquals("1.3~svn45",
+            upstream_version_add_revision(self, "1.3~svn800", "somesvnrev"))
+
+
+class GetExportUpstreamRevisionTests(TestCase):
+
+    def test_snapshot_rev(self):
+        config = DebBuildConfig([])
+        self.assertEquals("34",
+            get_export_upstream_revision(config, "0.1+bzr34"))
+
+    def test_export_upstream_rev(self):
+        config = DebBuildConfig([
+            ({"BUILDDEB": {"export-upstream-revision": "tag:foobar"}}, True)])
+        self.assertEquals("tag:foobar",
+            get_export_upstream_revision(config, "0.1"))
+
+    def test_export_upstream_rev_var(self):
+        config = DebBuildConfig([({"BUILDDEB":
+            {"export-upstream-revision": "tag:foobar-$UPSTREAM_VERSION"}},
+            True)])
+        self.assertEquals("tag:foobar-0.1",
+            get_export_upstream_revision(config, "0.1"))
+
+    def test_export_upstream_rev_not_set(self):
+        config = DebBuildConfig([])
+        self.assertEquals(None,
+            get_export_upstream_revision(config, "0.1"))
+
+
+class GetRevisionSnapshotTests(TestCase):
+
+    def test_with_snapshot(self):
+        self.assertEquals("30", get_snapshot_revision("0.4.4~bzr30"))
+
+    def test_with_snapshot_plus(self):
+        self.assertEquals("30", get_snapshot_revision("0.4.4+bzr30"))
+
+    def test_without_snapshot(self):
+        self.assertEquals(None, get_snapshot_revision("0.4.4"))
+
+    def test_non_numeric_snapshot(self):
+        self.assertEquals(None, get_snapshot_revision("0.4.4~bzra"))
+
+    def test_with_svn_snapshot(self):
+        self.assertEquals("svn:4242", get_snapshot_revision("0.4.4~svn4242"))
+
+    def test_with_svn_snapshot_plus(self):
+        self.assertEquals("svn:2424", get_snapshot_revision("0.4.4+svn2424"))
+
+
+class PristineTarSourceTests(TestCaseWithTransport):
+
+    def setUp(self):
+        super(PristineTarSourceTests, self).setUp()
+        self.tree = self.make_branch_and_tree('unstable')
+        root_id = self.tree.path2id("")
+        self.source = PristineTarSource(self.tree, self.tree.branch)
+
+    def test_upstream_tag_name(self):
+        upstream_v_no = "0.1"
+        self.assertEqual(self.source.tag_name(upstream_v_no),
+                "upstream-" + upstream_v_no)
+
+    def test_tag_name_distro(self):
+        self.assertEquals(self.source.tag_name("0.3", "ubuntu"),
+                "upstream-ubuntu-0.3")
+
+    def test_version(self):
+        self.assertEquals(['upstream-3.3', 'upstream-debian-3.3',
+            'upstream-ubuntu-3.3', 'upstream/3.3'],
+            self.source.possible_tag_names("3.3"))
+
+    def test_pristine_tar_format_gz(self):
+        rev = Revision("myrevid")
+        rev.properties["deb-pristine-delta"] = "1"
+        self.assertEquals("gz", self.source.pristine_tar_format(rev))
+
+    def test_pristine_tar_format_bz2(self):
+        rev = Revision("myrevid")
+        rev.properties["deb-pristine-delta-bz2"] = "1"
+        self.assertEquals("bz2", self.source.pristine_tar_format(rev))
+
+    def test_pristine_tar_format_unknown(self):
+        rev = Revision("myrevid")
+        self.assertRaises(AssertionError,
+            self.source.pristine_tar_format, rev)
+
+    def test_pristine_tar_delta_unknown(self):
+        rev = Revision("myrevid")
+        self.assertRaises(AssertionError,
+            self.source.pristine_tar_delta, rev)
+
+    def test_pristine_tar_delta_gz(self):
+        rev = Revision("myrevid")
+        rev.properties["deb-pristine-delta"] = standard_b64encode("bla")
+        self.assertEquals("bla", self.source.pristine_tar_delta(rev))
+
+    def test_version_as_revision_missing(self):
+        self.assertRaises(PackageVersionNotPresent,
+            self.source.version_as_revision, None, "1.2")
+
+    def test_version_as_revision(self):
+        revid1 = self.tree.commit("msg")
+        self.tree.branch.tags.set_tag("upstream-2.1", revid1)
+        self.assertEquals(revid1, self.source.version_as_revision(None, "2.1"))
+
 
 class TarfileSourceTests(TestCaseWithTransport):
     """Tests for TarfileSource."""
@@ -353,6 +678,7 @@
 
     def test_fetch_tarball_repack(self):
         zf = zipfile.ZipFile("bla-2.0.zip", "w")
+        zf.writestr('avoid', 'empty zip to make the repacker happy\n')
         zf.close()
         source = TarfileSource("bla-2.0.zip", "2.0")
         os.mkdir("bar")
@@ -366,6 +692,18 @@
         self.assertRaises(PackageVersionNotPresent,
             source.fetch_tarball, "foo", "0.9", "bar")
 
+    def test_fetch_tarball_bz2(self):
+        tar = tarfile.open("foo-1.0.tar.bz2", "w:bz2")
+        tar.close()
+        # verify this is a bzip2 file
+        bz2.BZ2File("foo-1.0.tar.bz2").close()
+        source = TarfileSource("foo-1.0.tar.bz2", "1.0")
+        os.mkdir("bar")
+        self.assertEquals("bar/foo_1.0.orig.tar.gz",
+            source.fetch_tarball("foo", "1.0", "bar"))
+        self.failUnlessExists("bar/foo_1.0.orig.tar.gz")
+        gzip.open("bar/foo_1.0.orig.tar.gz").close()
+
 
 class _MissingUpstreamProvider(UpstreamProvider):
     """For tests"""

=== modified file 'tests/test_util.py'
--- tests/test_util.py	2011-01-28 17:14:25 +0000
+++ tests/test_util.py	2011-04-29 12:56:28 +0000
@@ -41,7 +41,6 @@
                 AddChangelogError,
                 InconsistentSourceFormatError,
                 NoPreviousUpload,
-                UnknownDistribution,
                 )
 from bzrlib.plugins.builddeb.tests import SourcePackageBuilder
 from bzrlib.plugins.builddeb.util import (
@@ -53,9 +52,7 @@
                   find_last_distribution,
                   _find_previous_upload,
                   find_thanks,
-                  get_export_upstream_revision,
                   get_commit_info_from_changelog,
-                  get_snapshot_revision,
                   get_source_format,
                   guess_build_type,
                   lookup_distribution,
@@ -70,10 +67,12 @@
                   )
 
 from bzrlib import errors as bzr_errors
-from bzrlib.tests import (TestCaseWithTransport,
-                          TestCaseInTempDir,
-                          TestCase,
-                          )
+from bzrlib.tests import (
+    SymlinkFeature,
+    TestCaseWithTransport,
+    TestCaseInTempDir,
+    TestCase,
+    )
 
 
 class RecursiveCopyTests(TestCaseInTempDir):
@@ -170,6 +169,16 @@
         self.assertEqual(str(cl), cl_block1)
         self.assertEqual(lq, True)
 
+    def test_find_changelog_lq_unversioned_debian_symlink(self):
+        # LarstiQ mode, but with an unversioned "debian" -> "." symlink.
+        # Bug 619295
+        self.requireFeature(SymlinkFeature)
+        tree = self.make_branch_and_tree('.')
+        self.write_changelog('changelog')
+        tree.add(['changelog'])
+        os.symlink('.', 'debian')
+        self.assertRaises(AddChangelogError, find_changelog, tree, True)
+
     def test_find_changelog_nomerge_lq(self):
         tree = self.make_branch_and_tree('.')
         self.write_changelog('changelog')
@@ -187,6 +196,7 @@
 
     def test_find_changelog_symlink(self):
         """When there was a symlink debian -> . then the code used to break"""
+        self.requireFeature(SymlinkFeature)
         tree = self.make_branch_and_tree('.')
         self.write_changelog('changelog')
         tree.add(['changelog'])
@@ -265,27 +275,6 @@
                     format='lzma'), "package_0.1.orig.tar.lzma")
 
 
-class GetRevisionSnapshotTests(TestCase):
-
-    def test_with_snapshot(self):
-        self.assertEquals("30", get_snapshot_revision("0.4.4~bzr30"))
-
-    def test_with_snapshot_plus(self):
-        self.assertEquals("30", get_snapshot_revision("0.4.4+bzr30"))
-
-    def test_without_snapshot(self):
-        self.assertEquals(None, get_snapshot_revision("0.4.4"))
-
-    def test_non_numeric_snapshot(self):
-        self.assertEquals(None, get_snapshot_revision("0.4.4~bzra"))
-
-    def test_with_svn_snapshot(self):
-        self.assertEquals("svn:4242", get_snapshot_revision("0.4.4~svn4242"))
-
-    def test_with_svn_snapshot_plus(self):
-        self.assertEquals("svn:2424", get_snapshot_revision("0.4.4+svn2424"))
-
-
 class SuiteToDistributionTests(TestCase):
 
     def _do_lookup(self, target):
@@ -716,32 +705,6 @@
         self.assertEquals(None, find_last_distribution(changelog))
 
 
-class GetExportUpstreamRevisionTests(TestCase):
-
-    def test_snapshot_rev(self):
-        config = DebBuildConfig([])
-        self.assertEquals("34", 
-            get_export_upstream_revision(config, "0.1+bzr34"))
-
-    def test_export_upstream_rev(self):
-        config = DebBuildConfig([
-            ({"BUILDDEB": {"export-upstream-revision": "tag:foobar"}}, True)])
-        self.assertEquals("tag:foobar", 
-            get_export_upstream_revision(config, "0.1"))
-
-    def test_export_upstream_rev_var(self):
-        config = DebBuildConfig([({"BUILDDEB": 
-            {"export-upstream-revision": "tag:foobar-$UPSTREAM_VERSION"}},
-            True)])
-        self.assertEquals("tag:foobar-0.1", 
-            get_export_upstream_revision(config, "0.1"))
-
-    def test_export_upstream_rev_not_set(self):
-        config = DebBuildConfig([])
-        self.assertEquals(None, 
-            get_export_upstream_revision(config, "0.1"))
-
-
 class FindPreviousUploadTests(TestCase):
 
     def make_changelog(self, versions_and_distributions):
@@ -776,8 +739,8 @@
 
     def test_find_previous_upload_unknown(self):
         cl = self.make_changelog([("0.1-1", "lucid"),
-                ("0.1-2", "UNRELEASED")])
-        self.assertRaises(UnknownDistribution, _find_previous_upload, cl)
+                ("0.1-2", "dunno")])
+        self.assertRaises(NoPreviousUpload, _find_previous_upload, cl)
 
     def test_find_previous_upload_missing(self):
         cl = self.make_changelog([("0.1-1", "unstable"),
@@ -786,6 +749,11 @@
         cl = self.make_changelog([("0.1-1", "unstable")])
         self.assertRaises(NoPreviousUpload, _find_previous_upload, cl)
 
+    def test_find_previous_upload_unreleased(self):
+        cl = self.make_changelog([("0.1-1", "unstable"),
+                ("0.1-2", "UNRELEASED")])
+        self.assertEqual(Version("0.1-1"), _find_previous_upload(cl))
+
 
 class SourceFormatTests(TestCaseWithTransport):
 

=== added directory 'upstream'
=== renamed file 'upstream.py' => 'upstream/__init__.py'
--- upstream.py	2011-02-02 18:33:23 +0000
+++ upstream/__init__.py	2011-04-29 12:56:28 +0000
@@ -24,13 +24,21 @@
 import tarfile
 import tempfile
 
+from base64 import (
+    standard_b64decode,
+    )
+
+
 try:
     from debian.changelog import Version
 except ImportError:
     # Prior to 0.1.15 the debian module was called debian_bundle
     from debian_bundle.changelog import Version
 
-from bzrlib.revisionspec import RevisionSpec
+from bzrlib.errors import (
+    NoSuchRevision,
+    NoSuchTag,
+    )
 from bzrlib.trace import (
     note,
     warning,
@@ -43,11 +51,10 @@
     PristineTarError,
     WatchFileMissing,
     )
-from bzrlib.plugins.builddeb.import_dsc import DistributionBranch
 from bzrlib.plugins.builddeb.repack_tarball import repack_tarball
 from bzrlib.plugins.builddeb.util import (
     export,
-    get_snapshot_revision,
+    reconstruct_pristine_tar,
     tarball_name,
     )
 
@@ -69,9 +76,20 @@
 
         :param package: Package name
         :package version: Version string
+        :raise PackageVersionNotPresent: When the specified version was not
+            found
         """
         raise NotImplementedError(self.version_as_revision)
 
+    def has_version(self, package, version, md5=None):
+        """Check whether this upstream source contains a particular package.
+
+        :param package: Package name
+        :param version: Version string
+        :param md5: Optional required MD5sum of the resulting tarball
+        """
+        raise NotImplementedError(self.has_version)
+
     def fetch_tarball(self, package, version, target_dir):
         """Fetch the source tarball for a particular version.
 
@@ -94,27 +112,127 @@
         self.branch = branch
         self.tree = tree
 
+    def tag_name(self, version, distro=None):
+        """Gets the tag name for the upstream part of version.
+
+        :param version: the Version object to extract the upstream
+            part of the version number from.
+        :return: a String with the name of the tag.
+        """
+        assert isinstance(version, str)
+        if distro is None:
+            return "upstream-" + version
+        return "upstream-%s-%s" % (distro, version)
+
     def fetch_tarball(self, package, version, target_dir):
-        db = DistributionBranch(self.branch, None, tree=self.tree)
-        if not db.has_upstream_version_in_packaging_branch(version):
+        revid = self.version_as_revision(package, version)
+        try:
+            rev = self.branch.repository.get_revision(revid)
+        except NoSuchRevision:
             raise PackageVersionNotPresent(package, version, self)
-        revid = db.revid_of_upstream_version_from_branch(version)
-        rev = self.branch.repository.get_revision(revid)
         note("Using pristine-tar to reconstruct the needed tarball.")
-        if db.has_pristine_tar_delta(rev):
-            format = db.pristine_tar_format(rev)
+        if self.has_pristine_tar_delta(rev):
+            format = self.pristine_tar_format(rev)
         else:
             format = 'gz'
         target_filename = self._tarball_path(package, version,
                                              target_dir, format=format)
         try:
-            db.reconstruct_pristine_tar(revid, package, version, target_filename)
+            self.reconstruct_pristine_tar(revid, package, version, target_filename)
         except PristineTarError:
             raise PackageVersionNotPresent(package, version, self)
         except PerFileTimestampsNotSupported:
             raise PackageVersionNotPresent(package, version, self)
         return target_filename
 
+    def _has_version(self, tag_name, md5=None):
+        if not self.branch.tags.has_tag(tag_name):
+            return False
+        revid = self.branch.tags.lookup_tag(tag_name)
+        self.branch.lock_read()
+        try:
+            graph = self.branch.repository.get_graph()
+            if not graph.is_ancestor(revid, self.branch.last_revision()):
+                return False
+        finally:
+            self.branch.unlock()
+        if md5 is None:
+            return True
+        rev = self.branch.repository.get_revision(revid)
+        try:
+            return rev.properties['deb-md5'] == md5
+        except KeyError:
+            warning("tag %s present in branch, but there is no "
+                "associated 'deb-md5' property" % tag_name)
+            return True
+
+    def version_as_revision(self, package, version):
+        assert isinstance(version, str)
+        for tag_name in self.possible_tag_names(version):
+            if self._has_version(tag_name):
+                return self.branch.tags.lookup_tag(tag_name)
+        tag_name = self.tag_name(version)
+        try:
+            return self.branch.tags.lookup_tag(tag_name)
+        except NoSuchTag:
+            raise PackageVersionNotPresent(package, version, self)
+
+    def has_version(self, package, version, md5=None):
+        assert isinstance(version, str), str(type(version))
+        for tag_name in self.possible_tag_names(version):
+            if self._has_version(tag_name, md5=md5):
+                return True
+        return False
+
+    def possible_tag_names(self, version):
+        assert isinstance(version, str)
+        tags = [self.tag_name(version),
+                self.tag_name(version, distro="debian"),
+                self.tag_name(version, distro="ubuntu"),
+                "upstream/%s" % version]
+        return tags
+
+    def has_pristine_tar_delta(self, rev):
+        return ('deb-pristine-delta' in rev.properties
+                or 'deb-pristine-delta-bz2' in rev.properties)
+
+    def pristine_tar_format(self, rev):
+        if 'deb-pristine-delta' in rev.properties:
+            return 'gz'
+        elif 'deb-pristine-delta-bz2' in rev.properties:
+            return 'bz2'
+        assert self.has_pristine_tar_delta(rev)
+        raise AssertionError("Not handled new delta type in "
+                "pristine_tar_format")
+
+    def pristine_tar_delta(self, rev):
+        if 'deb-pristine-delta' in rev.properties:
+            uuencoded = rev.properties['deb-pristine-delta']
+        elif 'deb-pristine-delta-bz2' in rev.properties:
+            uuencoded = rev.properties['deb-pristine-delta-bz2']
+        else:
+            assert self.has_pristine_tar_delta(rev)
+            raise AssertionError("Not handled new delta type in "
+                    "pristine_tar_delta")
+        return standard_b64decode(uuencoded)
+
+    def reconstruct_pristine_tar(self, revid, package, version,
+            dest_filename):
+        """Reconstruct a pristine-tar tarball from a bzr revision."""
+        tree = self.branch.repository.revision_tree(revid)
+        tmpdir = tempfile.mkdtemp(prefix="builddeb-pristine-")
+        try:
+            dest = os.path.join(tmpdir, "orig")
+            rev = self.branch.repository.get_revision(revid)
+            if self.has_pristine_tar_delta(rev):
+                export(tree, dest, format='dir')
+                delta = self.pristine_tar_delta(rev)
+                reconstruct_pristine_tar(dest, delta, dest_filename)
+            else:
+                export(tree, dest_filename, require_per_file_timestamps=True)
+        finally:
+            shutil.rmtree(tmpdir)
+
 
 class AptSource(UpstreamSource):
     """Upstream source that uses apt-source."""
@@ -168,63 +286,6 @@
         return True
 
 
-class UpstreamBranchSource(UpstreamSource):
-    """Upstream source that uses the upstream branch.
-
-    :ivar upstream_branch: Branch with upstream sources
-    :ivar upstream_version_map: Map from version strings to revids
-    """
-
-    def __init__(self, upstream_branch, upstream_revision_map=None,
-                 config=None):
-        self.upstream_branch = upstream_branch
-        self.config = config
-        if upstream_revision_map is None:
-            self.upstream_revision_map = {}
-        else:
-            self.upstream_revision_map = upstream_revision_map
-
-    def version_as_revision(self, package, version):
-        if version in self.upstream_revision_map:
-             return self.upstream_revision_map[version]
-        revspec = get_snapshot_revision(version)
-        if revspec is not None:
-            return RevisionSpec.from_string(
-                revspec).as_revision_id(self.upstream_branch)
-        return None
-
-    def get_latest_version(self, package, current_version):
-        return self.get_version(package, current_version,
-            self.upstream_branch.last_revision())
-
-    def get_version(self, package, current_version, revision):
-        from bzrlib.plugins.builddeb.merge_upstream import (
-            upstream_branch_version)
-        version = str(upstream_branch_version(self.upstream_branch,
-            revision, package, current_version))
-        return version
-
-    def fetch_tarball(self, package, version, target_dir):
-        self.upstream_branch.lock_read()
-        try:
-            revid = self.version_as_revision(package, version)
-            if revid is None:
-                raise PackageVersionNotPresent(package, version, self)
-            note("Exporting upstream branch revision %s to create the tarball",
-                 revid)
-            target_filename = self._tarball_path(package, version, target_dir)
-            tarball_base = "%s-%s" % (package, version)
-            rev_tree = self.upstream_branch.repository.revision_tree(revid)
-            export(rev_tree, target_filename, 'tgz', tarball_base)
-        finally:
-            self.upstream_branch.unlock()
-        return target_filename
-
-    def __repr__(self):
-        return "<%s for %r>" % (self.__class__.__name__,
-            self.upstream_branch.base)
-
-
 class GetOrigSourceSource(UpstreamSource):
     """Upstream source that uses the get-orig-source rule in debian/rules."""
 
@@ -523,10 +584,8 @@
         if version != self.version:
             raise PackageVersionNotPresent(package, version, self)
         dest_name = tarball_name(package, version)
-        repack_tarball(self.path, dest_name, target_dir=target_dir)
-        target_filename = self._tarball_path(package, version, target_dir)
-        shutil.copy(self.path, target_filename)
-        return target_filename
+        repack_tarball(self.path, dest_name, target_dir=target_dir, force_gz=True)
+        return os.path.join(target_dir, dest_name)
 
     def get_latest_version(self, package, version):
         return self.version

=== added file 'upstream/branch.py'
--- upstream/branch.py	1970-01-01 00:00:00 +0000
+++ upstream/branch.py	2011-04-29 12:56:28 +0000
@@ -0,0 +1,300 @@
+#    upstream/branch.py -- Upstream branch source provider
+#    Copyright (C) 2010-2011 Canonical Ltd.
+#    Copyright (C) 2009 Jelmer Vernooij
+#
+#    This file is part of bzr-builddeb.
+#
+#    bzr-builddeb is free software; you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation; either version 2 of the License, or
+#    (at your option) any later version.
+#
+#    bzr-builddeb is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with bzr-builddeb; if not, write to the Free Software
+#    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+import re
+
+from bzrlib.branch import Branch
+from bzrlib.errors import (
+    InvalidRevisionId,
+    InvalidRevisionSpec,
+    )
+from bzrlib.revisionspec import RevisionSpec
+from bzrlib.trace import note
+
+from bzrlib.plugins.builddeb.errors import PackageVersionNotPresent
+from bzrlib.plugins.builddeb.upstream import UpstreamSource
+from bzrlib.plugins.builddeb.util import (
+    export,
+    )
+
+
+def upstream_tag_to_version(tag_name, package=None):
+    """Take a tag name and return the upstream version, or None."""
+    assert isinstance(tag_name, unicode)
+    if (package is not None and (
+          tag_name.startswith("%s-" % package) or
+          tag_name.startswith("%s_" % package))):
+        return tag_name[len(package)+1:].encode("utf-8")
+    if tag_name.startswith("release-"):
+        return tag_name[len("release-"):].encode("utf-8")
+    if tag_name[0] == "v" and tag_name[1].isdigit():
+        return tag_name[1:].encode("utf-8")
+    if all([c.isdigit() or c in (".", "~") for c in tag_name]):
+        return tag_name.encode("utf-8")
+    return None
+
+
+def _upstream_branch_version(revhistory, reverse_tag_dict, package,
+                            previous_version, add_rev):
+    """Determine the version string of an upstream branch.
+
+    The upstream version is determined from the most recent tag
+    in the upstream branch. If that tag does not point at the last revision,
+    the revision number is added to it (<version>+bzr<revno>).
+
+    If there are no tags set on the upstream branch, the previous Debian
+    version is used and combined with the bzr revision number
+    (usually <version>+bzr<revno>).
+
+    :param revhistory: Reverse branch revision history.
+    :param reverse_tag_dict: Reverse tag dictionary (revid -> list of tags)
+    :param package: Name of package.
+    :param previous_version: Previous upstream version in debian changelog.
+    :param add_rev: Function that can add a revision suffix to a version string.
+    :return: Name of the upstream revision.
+    """
+    if revhistory == []:
+        # No new version to merge
+        return previous_version
+    for r in revhistory:
+        if r in reverse_tag_dict:
+            # If there is a newer version tagged in branch,
+            # convert to upstream version
+            # return <upstream_version>+bzr<revno>
+            for tag in reverse_tag_dict[r]:
+                upstream_version = upstream_tag_to_version(tag,
+                                                   package=package)
+                if upstream_version is not None:
+                    if r != revhistory[0]:
+                        upstream_version = add_rev(
+                          str(upstream_version), revhistory[0])
+                    return upstream_version
+    return add_rev(str(previous_version), revhistory[0])
+
+
+def extract_svn_revno(rev):
+    """Extract the Subversion number of a revision from a revision.
+
+    :param rev: Revision object
+    :return: Revision number, None if this was not a Subversion revision or
+         if the revision number could not be determined (bzr-svn not available).
+    """
+    try:
+        from bzrlib.plugins.svn import extract_svn_foreign_revid
+    except ImportError:
+        # No svn support
+        return None
+    else:
+        try:
+            (svn_uuid, branch_path, svn_revno) = extract_svn_foreign_revid(rev)
+        except InvalidRevisionId:
+            return None
+        else:
+            return svn_revno
+
+
+def upstream_version_add_revision(upstream_branch, version_string, revid):
+    """Update the revision in a upstream version string.
+
+    :param branch: Branch in which the revision can be found
+    :param version_string: Original version string
+    :param revid: Revision id of the revision
+    """
+    revno = upstream_branch.revision_id_to_revno(revid)
+
+    if "+bzr" in version_string:
+        return "%s+bzr%d" % (version_string[:version_string.rfind("+bzr")], revno)
+
+    if "~bzr" in version_string:
+        return "%s~bzr%d" % (version_string[:version_string.rfind("~bzr")], revno)
+
+    rev = upstream_branch.repository.get_revision(revid)
+    svn_revno = extract_svn_revno(rev)
+
+    # FIXME: Raise error if +svn/~svn is present and svn_revno is not set?
+    if "+svn" in version_string and svn_revno:
+        return "%s+svn%d" % (version_string[:version_string.rfind("+svn")], svn_revno)
+    if "~svn" in version_string and svn_revno:
+        return "%s~svn%d" % (version_string[:version_string.rfind("~svn")], svn_revno)
+
+    if svn_revno:
+        return "%s+svn%d" % (version_string, svn_revno)
+    else:
+        return "%s+bzr%d" % (version_string, revno)
+
+
+def get_snapshot_revision(upstream_version):
+    """Return the upstream revision specifier if specified in the upstream
+    version.
+
+    When packaging an upstream snapshot some people use +vcsnn or ~vcsnn to
+    indicate what revision number of the upstream VCS was taken for the
+    snapshot. This given an upstream version number this function will return
+    an identifier of the upstream revision if it appears to be a snapshot. The
+    identifier is a string containing a bzr revision spec, so it can be
+    transformed in to a revision.
+
+    :param upstream_version: a string containing the upstream version number.
+    :return: a string containing a revision specifier for the revision of the
+        upstream branch that the snapshot was taken from, or None if it
+        doesn't appear to be a snapshot.
+    """
+    match = re.search("(?:~|\\+)bzr([0-9]+)$", upstream_version)
+    if match is not None:
+        return match.groups()[0]
+    match = re.search("(?:~|\\+)svn([0-9]+)$", upstream_version)
+    if match is not None:
+        return "svn:%s" % match.groups()[0]
+    return None
+
+
+def upstream_branch_version(upstream_branch, upstream_revision, package,
+        previous_version):
+    """Determine the version string for a revision in an upstream branch.
+
+    :param upstream_branch: The upstream branch object
+    :param upstream_revision: The revision id of the upstream revision
+    :param package: The name of the package
+    :param previous_version: The previous upstream version string
+    :return: Upstream version string for `upstream_revision`.
+    """
+    graph = upstream_branch.repository.get_graph()
+    previous_revision = get_snapshot_revision(previous_version)
+    if previous_revision is not None:
+        previous_revspec = RevisionSpec.from_string(previous_revision)
+        previous_revno, previous_revid = previous_revspec.in_history(upstream_branch)
+        # Trim revision history - we don't care about any revisions
+        # before the revision of the previous version
+        stop_revids = [previous_revid]
+    else:
+        previous_revno = 0
+        stop_revids = None
+    revhistory = graph.iter_lefthand_ancestry(upstream_revision, stop_revids)
+    return _upstream_branch_version(list(revhistory),
+            upstream_branch.tags.get_reverse_tag_dict(), package,
+            previous_version,
+            lambda version, revision: upstream_version_add_revision(upstream_branch, version, revision))
+
+
+def get_export_upstream_revision(config=None, version=None):
+    """Find the revision to use when exporting the upstream source.
+
+    :param config: Config object
+    :param version: Optional upstream version to find revision for, if not the
+        latest.
+    :return: Revision id
+    """
+    rev = None
+    if version is not None:
+        assert type(version) is str
+        rev = get_snapshot_revision(version)
+    if rev is None and config is not None:
+        rev = config._get_best_opt('export-upstream-revision')
+        if rev is not None and version is not None:
+            rev = rev.replace('$UPSTREAM_VERSION', version)
+    return rev
+
+
+class UpstreamBranchSource(UpstreamSource):
+    """Upstream source that uses the upstream branch.
+
+    :ivar upstream_branch: Branch with upstream sources
+    :ivar upstream_version_map: Map from version strings to revspecs
+    """
+
+    def __init__(self, upstream_branch, upstream_revision_map=None,
+                 config=None):
+        self.upstream_branch = upstream_branch
+        self.config = config
+        if upstream_revision_map is None:
+            self.upstream_revision_map = {}
+        else:
+            self.upstream_revision_map = upstream_revision_map
+
+    def version_as_revision(self, package, version):
+        assert isinstance(version, str)
+        if version in self.upstream_revision_map:
+            revspec = self.upstream_revision_map[version]
+        else:
+            revspec = get_export_upstream_revision(self.config, version=version)
+        if revspec is not None:
+            try:
+                return RevisionSpec.from_string(
+                    revspec).as_revision_id(self.upstream_branch)
+            except InvalidRevisionSpec:
+                raise PackageVersionNotPresent(package, version, self)
+        raise PackageVersionNotPresent(package, version, self)
+
+    def get_latest_version(self, package, current_version):
+        return self.get_version(package, current_version,
+            self.upstream_branch.last_revision())
+
+    def get_version(self, package, current_version, revision):
+        self.upstream_branch.lock_read()
+        try:
+            return upstream_branch_version(self.upstream_branch,
+                revision, package, current_version)
+        finally:
+            self.upstream_branch.unlock()
+
+    def fetch_tarball(self, package, version, target_dir):
+        self.upstream_branch.lock_read()
+        try:
+            revid = self.version_as_revision(package, version)
+            if revid is None:
+                raise PackageVersionNotPresent(package, version, self)
+            note("Exporting upstream branch revision %s to create the tarball",
+                 revid)
+            target_filename = self._tarball_path(package, version, target_dir)
+            tarball_base = "%s-%s" % (package, version)
+            rev_tree = self.upstream_branch.repository.revision_tree(revid)
+            export(rev_tree, target_filename, 'tgz', tarball_base)
+        finally:
+            self.upstream_branch.unlock()
+        return target_filename
+
+    def __repr__(self):
+        return "<%s for %r>" % (self.__class__.__name__,
+            self.upstream_branch.base)
+
+
+class LazyUpstreamBranchSource(UpstreamBranchSource):
+    """Upstream branch source that defers loading the branch until it is used.
+    """
+
+    def __init__(self, upstream_branch_url, upstream_revision_map=None,
+                 config=None):
+        self.upstream_branch_url = upstream_branch_url
+        self._upstream_branch = None
+        self.config = config
+        if upstream_revision_map is None:
+            self.upstream_revision_map = {}
+        else:
+            self.upstream_revision_map = upstream_revision_map
+
+    @property
+    def upstream_branch(self):
+        if self._upstream_branch is None:
+            self._upstream_branch = Branch.open(self.upstream_branch_url)
+        return self._upstream_branch
+
+    def __repr__(self):
+        return "<%s for %r>" % (self.__class__.__name__,
+            self.upstream_branch_url)

=== modified file 'util.py'
--- util.py	2011-02-02 16:04:04 +0000
+++ util.py	2011-04-29 12:56:28 +0000
@@ -22,8 +22,10 @@
     import hashlib as md5
 except ImportError:
     import md5
+import errno
 import signal
 import shutil
+import subprocess
 import tempfile
 import os
 import re
@@ -39,11 +41,12 @@
     from debian_bundle.changelog import Changelog, ChangelogParseError
 
 from bzrlib import (
-        bugtracker,
-        errors,
-        urlutils,
-        version_info as bzr_version_info,
-        )
+    bugtracker,
+    errors,
+    osutils,
+    urlutils,
+    version_info as bzr_version_info,
+    )
 from bzrlib.export import export as bzr_export
 from bzrlib.trace import warning
 from bzrlib.transport import (
@@ -62,22 +65,22 @@
     BUILD_TYPE_NORMAL,
     )
 from bzrlib.plugins.builddeb.errors import (
-                MissingChangelogError,
-                AddChangelogError,
-                InconsistentSourceFormatError,
-                NoPreviousUpload,
-                UnableToFindPreviousUpload,
-                UnknownDistribution,
-                UnparseableChangelog,
-                )
-
-
-DEBIAN_RELEASES = ('woody', 'sarge', 'etch', 'lenny', 'squeeze', 'stable',
-        'testing', 'unstable', 'experimental', 'frozen', 'sid')
+    MissingChangelogError,
+    AddChangelogError,
+    InconsistentSourceFormatError,
+    NoPreviousUpload,
+    PristineTarError,
+    UnableToFindPreviousUpload,
+    UnparseableChangelog,
+    )
+
+
+DEBIAN_RELEASES = ('woody', 'sarge', 'etch', 'lenny', 'squeeze', 'wheezy',
+        'stable', 'testing', 'unstable', 'experimental', 'frozen', 'sid')
 DEBIAN_POCKETS = ('', '-security', '-proposed-updates', '-backports')
 UBUNTU_RELEASES = ('warty', 'hoary', 'breezy', 'dapper', 'edgy',
         'feisty', 'gutsy', 'hardy', 'intrepid', 'jaunty', 'karmic',
-        'lucid', 'maverick', 'natty')
+        'lucid', 'maverick', 'natty', "oneiric")
 UBUNTU_POCKETS = ('', '-proposed', '-updates', '-security', '-backports')
 
 
@@ -158,7 +161,9 @@
             # If it is a "larstiq" pacakge and debian is a symlink to
             # "." then it will have found debian/changelog. Try and detect
             # this.
-            if (t.kind(t.path2id('debian')) == 'symlink' and 
+            debian_file_id = t.path2id('debian')
+            if (debian_file_id is not None and 
+                t.kind(debian_file_id) == 'symlink' and 
                 t.get_symlink_target(t.path2id('debian')) == '.'):
                 changelog_file = 'changelog'
                 larstiq = True
@@ -220,49 +225,6 @@
     return "%s_%s.orig.tar.%s" % (package, str(version), format)
 
 
-def get_snapshot_revision(upstream_version):
-    """Return the upstream revision specifier if specified in the upstream
-    version.
-
-    When packaging an upstream snapshot some people use +vcsnn or ~vcsnn to
-    indicate what revision number of the upstream VCS was taken for the
-    snapshot. This given an upstream version number this function will return
-    an identifier of the upstream revision if it appears to be a snapshot. The
-    identifier is a string containing a bzr revision spec, so it can be
-    transformed in to a revision.
-
-    :param upstream_version: a string containing the upstream version number.
-    :return: a string containing a revision specifier for the revision of the
-        upstream branch that the snapshot was taken from, or None if it
-        doesn't appear to be a snapshot.
-    """
-    match = re.search("(?:~|\\+)bzr([0-9]+)$", upstream_version)
-    if match is not None:
-        return match.groups()[0]
-    match = re.search("(?:~|\\+)svn([0-9]+)$", upstream_version)
-    if match is not None:
-        return "svn:%s" % match.groups()[0]
-    return None
-
-
-def get_export_upstream_revision(config, version=None):
-    """Find the revision to use when exporting the upstream source.
-
-    :param config: Config object
-    :param version: Optional upstream version to find revision for, if not the
-        latest.
-    :return: Revision id
-    """
-    rev = None
-    if version is not None:
-        assert type(version) is str
-        rev = get_snapshot_revision(version)
-    if rev is None:
-        rev = config._get_best_opt('export-upstream-revision')
-        if rev is not None and version is not None:
-            rev = rev.replace('$UPSTREAM_VERSION', version)
-    return rev
-
 
 def suite_to_distribution(suite):
     """Infer the distribution from a suite.
@@ -633,8 +595,7 @@
     :return: Version object for the previous upload
     :raise NoPreviousUpload: Raised when there is no previous upload
     """
-    blocks = cl._blocks
-    current_target = blocks[0].distributions.split(" ")[0]
+    current_target = find_last_distribution(cl)
     all_debian = [r + t for r in DEBIAN_RELEASES for t in DEBIAN_POCKETS]
     all_ubuntu = [r + t for r in UBUNTU_RELEASES for t in UBUNTU_POCKETS]
     if current_target in all_debian:
@@ -645,9 +606,12 @@
             match_targets += tuple([current_target.split("-", 1)[0]
                 + t for t in UBUNTU_POCKETS])
     else:
-        raise UnknownDistribution(current_target)
+        # If we do not recognize the current target in order to apply special
+        # rules to it, then just assume that only previous uploads to exactly
+        # the same target count.
+        match_targets = (current_target,)
     previous_version = None
-    for block in blocks[1:]:
+    for block in cl._blocks[1:]:
         if block.distributions.split(" ")[0] in match_targets:
             return block.version
     raise NoPreviousUpload(current_target)
@@ -664,7 +628,7 @@
     if root is None:
         return False # Empty tree
     present_files = set(root.children.keys())
-    packaging_files = frozenset(["debian", ".bzr-builddeb"])
+    packaging_files = frozenset(["debian", ".bzr-builddeb", ".bzrignore"])
     return (len(present_files - packaging_files) > 0)
 
 
@@ -705,7 +669,7 @@
 
     # If the package doesn't have a debian revision then it must be native.
     if version is not None:
-        version_native = (not version.debian_revision)
+        version_native = (not version.debian_version)
     else:
         version_native = None
 
@@ -720,3 +684,53 @@
         return BUILD_TYPE_MERGE
     else:
         return BUILD_TYPE_NORMAL
+
+
+def reconstruct_pristine_tar(dest, delta, dest_filename):
+    """Reconstruct a pristine tarball from a directory and a delta.
+
+    :param dest: Directory to pack
+    :param delta: pristine-tar delta
+    :param dest_filename: Destination filename
+    """
+    command = ["pristine-tar", "gentar", "-",
+               os.path.abspath(dest_filename)]
+    try:
+        proc = subprocess.Popen(command, stdin=subprocess.PIPE,
+                cwd=dest, preexec_fn=subprocess_setup,
+                stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
+    except OSError, e:
+        if e.errno == errno.ENOENT:
+            raise PristineTarError("pristine-tar is not installed")
+        else:
+            raise
+    (stdout, stderr) = proc.communicate(delta)
+    if proc.returncode != 0:
+        raise PristineTarError("Generating tar from delta failed: %s" % stdout)
+
+
+def make_pristine_tar_delta(dest, tarball_path):
+    """Create a pristine-tar delta for a tarball.
+
+    :param dest: Directory to generate pristine tar delta for
+    :param tarball_path: Path to the tarball
+    :return: pristine-tarball
+    """
+    # If tarball_path is relative, the cwd=dest parameter to Popen will make
+    # pristine-tar faaaail. pristine-tar doesn't use the VFS either, so we
+    # assume local paths.
+    tarball_path = osutils.abspath(tarball_path)
+    command = ["pristine-tar", "gendelta", tarball_path, "-"]
+    try:
+        proc = subprocess.Popen(command, stdout=subprocess.PIPE,
+                cwd=dest, preexec_fn=subprocess_setup,
+                stderr=subprocess.PIPE)
+    except OSError, e:
+        if e.errno == errno.ENOENT:
+            raise PristineTarError("pristine-tar is not installed")
+        else:
+            raise
+    (stdout, stderr) = proc.communicate()
+    if proc.returncode != 0:
+        raise PristineTarError("Generating delta from tar failed: %s" % stderr)
+    return stdout