Rev 1103: Merge 0.4. in http://people.samba.org/bzr/jelmer/bzr-svn/cext

[Jelmer Vernooij]

At http://people.samba.org/bzr/jelmer/bzr-svn/cext

------------------------------------------------------------
revno: 1103
revision-id: jelmer at samba.org-20080617210009-b7q38wpl87b6y309
parent: jelmer at samba.org-20080617202733-h0mg8e7inpegxq1i
parent: jelmer at samba.org-20080617205523-hqus05shap15g9yc
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: cext
timestamp: Tue 2008-06-17 23:00:09 +0200
message:
  Merge 0.4.
modified:
  fetch.py                       fetch.py-20060625004942-x2lfaib8ra707a8p-1
    ------------------------------------------------------------
    revno: 950.3.175
    revision-id: jelmer at samba.org-20080617205523-hqus05shap15g9yc
    parent: jelmer at samba.org-20080617202354-kjwsfvx2j486yrep
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Tue 2008-06-17 22:55:23 +0200
    message:
      Remove memory Pool usage in bzr-svn.
    modified:
      commit.py                      commit.py-20060607190346-qvq128wgfubhhgm2-1
      fetch.py                       fetch.py-20060625004942-x2lfaib8ra707a8p-1
      logwalker.py                   logwalker.py-20060621215743-c13fhfnyzh1xzwh2-1
      ra.py                          ra.py-20080615005305-t5221niknu8rm6bt-1
      transport.py                   transport.py-20060406231150-b3472d06b3a0818d
      tree.py                        tree.py-20060624222557-dudlwqcmkf22lt2s-1
      workingtree.py                 workingtree.py-20060306120941-b083cb0fdd4a69de
=== modified file 'fetch.py'
--- a/fetch.py	2008-06-15 02:20:20 +0000
+++ b/fetch.py	2008-06-17 21:00:09 +0000
@@ -671,7 +671,8 @@
                         reporter.finish()
                     finally:
                         if conn is not None:
-                            self.source.transport.add_connection(conn)
+                            if not conn.is_busy():
+                                self.source.transport.add_connection(conn)
                 except:
                     editor.abort()
                     raise