[Pkg-bazaar-commits] ./bzr-builddeb/trunk r345: Merge from trunk.

[James Westby]

------------------------------------------------------------
revno: 345
committer: James Westby <james.westby at canonical.com>
branch nick: trunk
timestamp: Sat 2009-07-04 16:47:57 -0400
message:
  Merge from trunk.
modified:
  cmds.py
  debian/changelog
  directory.py
    ------------------------------------------------------------
    revno: 334.2.1
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: trunk
    timestamp: Tue 2009-03-24 00:50:11 +0100
    message:
      Support Vcs-Hg in the deb: directory service if bzr-hg is installed.
    modified:
      debian/changelog
      directory.py
    ------------------------------------------------------------
    revno: 334.2.2
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: trunk
    timestamp: Wed 2009-04-15 17:24:40 +0200
    message:
      Merge patch to use existing helper for opening tree and/or branch.
    modified:
      cmds.py
        ------------------------------------------------------------
        revno: 334.3.1
        committer: Jelmer Vernooij <jelmer at samba.org>
        branch nick: trunk
        timestamp: Wed 2009-04-15 13:50:06 +0200
        message:
          Use existing helper function for opening tree or branch.
        modified:
          cmds.py
-------------- next part --------------
=== modified file 'cmds.py'
--- a/cmds.py	2009-05-06 16:57:26 +0000
+++ b/cmds.py	2009-07-04 20:47:57 +0000
@@ -34,6 +34,7 @@
     urlutils,
     )
 from bzrlib.branch import Branch
+from bzrlib.bzrdir import BzrDir
 from bzrlib.commands import Command
 from bzrlib.errors import (BzrCommandError,
                            NoWorkingTree,
@@ -210,12 +211,7 @@
         is_local = urlparse.urlsplit(location)[0] in ('', 'file')
         if is_local:
             os.chdir(location)
-        try:
-            tree, _ = WorkingTree.open_containing(location)
-            branch = tree.branch
-        except NoWorkingTree:
-            tree = None
-            branch, _ = Branch.open_containing(location)
+        tree, branch, relpath = BzrDir.open_containing_tree_or_branch(location)
         return tree, branch, is_local
 
     def _get_build_tree(self, revision, tree, branch):

=== modified file 'debian/changelog'
--- a/debian/changelog	2009-05-06 16:56:52 +0000
+++ b/debian/changelog	2009-07-04 20:47:57 +0000
@@ -1,7 +1,11 @@
 bzr-builddeb (2.1.2~ubuntu2) jaunty; urgency=low
 
+  [ James Westby ]
   * Don't remove the debian part of the version number twice. (LP: #372792)
 
+  [ Jelmer Vernooij ]
+  * Support Vcs-Hg in the deb: directory service if bzr-hg is installed.
+
  -- James Westby <james.westby at ubuntu.com>  Wed, 06 May 2009 17:49:49 +0100
 
 bzr-builddeb (2.1.2~ubuntu1) jaunty; urgency=low

=== modified file 'directory.py'
--- a/directory.py	2009-01-30 04:38:21 +0000
+++ b/directory.py	2009-03-23 23:50:11 +0000
@@ -86,5 +86,15 @@
             else:
                 return urls[version]["Git"]
 
+        if "Hg" in urls[version]:
+            try:
+                import bzrlib.plugins.hg
+            except ImportError:
+                info("This package uses hg. If you would like to "
+                        "access it with bzr then please install bzr-hg"
+                        "and re-run the command.")
+            else:
+                return urls[version]["Hg"]
+
         raise errors.InvalidURL(path=url,
             extra='unsupported VCSes %r found' % urls[version].keys())