Rev 313: import upstream from branch file:///data/jelmer/bzr-svn/0.4/ in http://bzr.debian.org/pkg-bazaar/bzr-svn/unstable

[Jelmer Vernooij]

At http://bzr.debian.org/pkg-bazaar/bzr-svn/unstable

------------------------------------------------------------
revno: 313
revision-id: jelmer at samba.org-20080826204410-rv832p22y0j9ymt9
parent: jelmer at samba.org-20080826044914-7j356z0v4klsrerr
parent: jelmer at samba.org-20080826204339-otrwrazsho6rme9m
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: debian
timestamp: Tue 2008-08-26 22:44:10 +0200
message:
  import upstream from branch file:///data/jelmer/bzr-svn/0.4/
modified:
  NEWS                           news-20061231030336-h9fhq245ie0de8bs-1
  __init__.py                    __init__.py-20051008155114-eae558e6cf149e1d
  logwalker.py                   logwalker.py-20060621215743-c13fhfnyzh1xzwh2-1
  mapping3/scheme.py             scheme.py-20060516195850-95181aae6b272f9e
  setup.py                       setup.py-20060502115218-86950492da22353f
  transport.py                   transport.py-20060406231150-b3472d06b3a0818d
    ------------------------------------------------------------
    revno: 220.36.664
    revision-id: jelmer at samba.org-20080826204339-otrwrazsho6rme9m
    parent: jelmer at samba.org-20080826121528-qz89hua33603cz0f
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Tue 2008-08-26 22:43:39 +0200
    message:
      release 0.4.11.
    modified:
      NEWS                           news-20061231030336-h9fhq245ie0de8bs-1
      __init__.py                    __init__.py-20051008155114-eae558e6cf149e1d
      setup.py                       setup.py-20060502115218-86950492da22353f
    ------------------------------------------------------------
    revno: 220.36.663
    revision-id: jelmer at samba.org-20080826121528-qz89hua33603cz0f
    parent: jelmer at samba.org-20080826121330-df94xf13m3fjsg5z
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Tue 2008-08-26 14:15:28 +0200
    message:
      Cope with revpaths being empty.
    modified:
      mapping3/scheme.py             scheme.py-20060516195850-95181aae6b272f9e
    ------------------------------------------------------------
    revno: 220.36.662
    revision-id: jelmer at samba.org-20080826121330-df94xf13m3fjsg5z
    parent: jelmer at samba.org-20080826044650-p4wsdjnwz8d8nnbm
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Tue 2008-08-26 14:13:30 +0200
    message:
      Cope with revpaths being empty, add mutter.
    modified:
      logwalker.py                   logwalker.py-20060621215743-c13fhfnyzh1xzwh2-1
      transport.py                   transport.py-20060406231150-b3472d06b3a0818d
=== modified file 'NEWS'
--- a/NEWS	2008-08-26 04:49:14 +0000
+++ b/NEWS	2008-08-26 20:44:10 +0000
@@ -1,3 +1,5 @@
+bzr-svn-0.4.11	2008-08-26
+
 bzr-svn-0.4.11~rc2	2008-08-26
 
   CHANGES
@@ -28,6 +30,8 @@
 
    * Add --merged option to svn-push command.
 
+   * Improve tag/branch discovery.
+
 bzr-svn 0.4.11~rc1	2008-08-08
 
   CHANGES

=== modified file '__init__.py'
--- a/__init__.py	2008-08-26 04:49:14 +0000
+++ b/__init__.py	2008-08-26 20:44:10 +0000
@@ -45,7 +45,7 @@
 # versions ending in 'exp' mean experimental mappings
 # versions ending in 'dev' mean development version
 # versions ending in 'final' mean release (well tested, etc)
-version_info = (0, 4, 11, 'rc', 2)
+version_info = (0, 4, 11, 'final', 0)
 
 if version_info[3] == 'final':
     version_string = '%d.%d.%d' % version_info[:3]

=== modified file 'logwalker.py'
--- a/logwalker.py	2008-08-26 04:49:14 +0000
+++ b/logwalker.py	2008-08-26 20:44:10 +0000
@@ -548,9 +548,10 @@
                     pb.update("determining changes", from_revnum-revnum, from_revnum)
                 if revnum == 0 and changed_paths is None:
                     revpaths = {"": ('A', None, -1)}
-                else:
-                    assert isinstance(changed_paths, dict), "invalid paths %r in %r" % (changed_paths, revnum)
+                elif isinstance(changed_paths, dict):
                     revpaths = struct_revpaths_to_tuples(changed_paths)
+                else:
+                    revpaths = {}
                 if todo_revprops is None:
                     revprops = known_revprops
                 else:

=== modified file 'mapping3/scheme.py'
--- a/mapping3/scheme.py	2008-08-26 04:49:14 +0000
+++ b/mapping3/scheme.py	2008-08-26 20:44:10 +0000
@@ -489,6 +489,8 @@
             assert isinstance(revpaths, dict)
             pb.update("analyzing repository layout", last_revnum-revnum, 
                       last_revnum)
+            if revpaths == {}:
+                continue
             for path in find_commit_paths([revpaths]):
                 scheme = guess_scheme_from_path(path)
                 if not potentials.has_key(str(scheme)):

=== modified file 'setup.py'
--- a/setup.py	2008-08-26 04:49:14 +0000
+++ b/setup.py	2008-08-26 20:44:10 +0000
@@ -219,7 +219,7 @@
 setup(name='bzr-svn',
       description='Support for Subversion branches in Bazaar',
       keywords='plugin bzr svn',
-      version='0.4.11~rc2',
+      version='0.4.11',
       url='http://bazaar-vcs.org/BzrForeignBranches/Subversion',
       download_url='http://bazaar-vcs.org/BzrSvn',
       license='GPL',

=== modified file 'transport.py'
--- a/transport.py	2008-08-26 04:49:14 +0000
+++ b/transport.py	2008-08-26 20:44:10 +0000
@@ -265,6 +265,8 @@
         assert isinstance(limit, int)
         from threading import Thread, Semaphore
 
+        self.mutter('svn iter-log -r%d:%d %r ' % (from_revnum, to_revnum, paths))
+
         class logfetcher(Thread):
             def __init__(self, transport, *args, **kwargs):
                 Thread.__init__(self)