[Pkg-bazaar-maint] Bug#588916: bzrtools: Allow https URLs when listing remote branches

[Lluís]

Package: bzrtools
Version: 2.1.0-2
Severity: normal
Tags: patch

The attached patch allows the listing of remote branches on repositories served
through https.

Note that only the second chunk is necessary for branch listing to work, but I
also included the first for the sake of completeness.

Thanks,
        Lluis

-- System Information:
Debian Release: squeeze/sid
  APT prefers stable
  APT policy: (1000, 'stable'), (990, 'testing'), (500, 'unstable'), (250, 'experimental')
Architecture: amd64 (x86_64)

Kernel: Linux 2.6.32-5-amd64 (SMP w/2 CPU cores)
Locale: LANG=ca_ES.UTF-8, LC_CTYPE=ca_ES.UTF-8 (charmap=UTF-8) (ignored: LC_ALL set to ca_ES.UTF-8)
Shell: /bin/sh linked to /bin/dash

Versions of packages bzrtools depends on:
ii  bzr                          2.1.2-1     easy to use distributed version co
ii  patch                        2.5.9-5     Apply a diff file to an original
ii  python                       2.6.5-5     An interactive high-level object-o
ii  python-central               0.6.14+nmu2 register and build utility for Pyt

Versions of packages bzrtools recommends:
ii  rsync                         3.0.7-2    fast remote file copy program (lik

Versions of packages bzrtools suggests:
ii  graphviz                  2.26.3-4       rich set of graph drawing tools
ii  librsvg2-bin              2.22.2-2lenny1 command-line and graphical viewers

-- no debconf information

-------------- next part --------------
--- /usr/share/pyshared/bzrlib/plugins/bzrtools/bzrtools.py 2010-07-13 14:02:25.000000000 +0200
+++ /tmp/bzrtools.py    2010-07-13 14:02:13.000000000 +0200
@@ -363,7 +363,7 @@
         if match is None:
             continue
         url = match.group(1)
-        if url.startswith('http://') or url.startswith('/') or '../' in url:
+        if url.startswith('http://') or url.startswith('https://') or url.startswith('/') or '../' in url:
             continue
         if '?' in url:
             continue
@@ -374,7 +374,7 @@
     def is_inside(branch):
         return bool(branch.base.startswith(t.base))
 
-    if t.base.startswith('http://'):
+    if t.base.startswith('http://') or t.base.startswith('https://'):
         def evaluate(bzrdir):
             try:
                 branch = bzrdir.open_branch()