Rev 1421: Merge python2.4 fixes. in http://people.samba.org/bzr/jelmer/bzr-svn/trunk

[Jelmer Vernooij]

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

------------------------------------------------------------
revno: 1421
revision-id: jelmer at samba.org-20080701221549-rwwvwbs7zka6gebr
parent: jelmer at samba.org-20080701213923-9jl2quanskc0oygn
parent: roberto.aguilar at nutricate.com-20080701215234-zoba4jwuvtugewql
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Wed 2008-07-02 00:15:49 +0200
message:
  Merge python2.4 fixes.
modified:
  commit.py                      commit.py-20060607190346-qvq128wgfubhhgm2-1
  transport.py                   transport.py-20060406231150-b3472d06b3a0818d
    ------------------------------------------------------------
    revno: 1418.1.2
    revision-id: roberto.aguilar at nutricate.com-20080701215234-zoba4jwuvtugewql
    parent: roberto.aguilar at nutricate.com-20080701213936-4453l0x3k9rjnkg3
    committer: Roberto Aguilar <roberto.aguilar at nutricate.com>
    branch nick: svn
    timestamp: Tue 2008-07-01 14:52:34 -0700
    message:
      replacing the use of all() in transport.py so that it works in Python 2.4
    modified:
      transport.py                   transport.py-20060406231150-b3472d06b3a0818d
    ------------------------------------------------------------
    revno: 1418.1.1
    revision-id: roberto.aguilar at nutricate.com-20080701213936-4453l0x3k9rjnkg3
    parent: jelmer at samba.org-20080701211901-opljk7ozw2jhju7z
    committer: Roberto Aguilar <roberto.aguilar at nutricate.com>
    branch nick: svn
    timestamp: Tue 2008-07-01 14:39:36 -0700
    message:
      updating the way ids are passed to the SvnCommitBuilder class so that it is 
      compatible with Python 2.4
    modified:
      commit.py                      commit.py-20060607190346-qvq128wgfubhhgm2-1
=== modified file 'commit.py'
--- a/commit.py	2008-07-01 21:37:19 +0000
+++ b/commit.py	2008-07-01 22:15:49 +0000
@@ -713,9 +713,10 @@
     base_tree = source_repo.revision_tree(base_revid)
 
     if push_metadata:
+        base_revids = rev.parent_ids
+    else:
         base_revids = [base_revid]
-    else:
-        base_revids = rev.parent_ids
+
     builder = SvnCommitBuilder(target.repository, target, 
                                base_revids,
                                config, rev.timestamp,

=== modified file 'transport.py'
--- a/transport.py	2008-07-01 17:37:54 +0000
+++ b/transport.py	2008-07-01 21:52:34 +0000
@@ -231,7 +231,14 @@
     def iter_log(self, paths, from_revnum, to_revnum, limit, discover_changed_paths, 
                  strict_node_history, include_merged_revisions, revprops):
         assert paths is None or isinstance(paths, list)
-        assert paths is None or all([isinstance(x, str) for x in paths])
+
+        all_true = True
+        for item in [isinstance(x, str) for x in paths]:
+            if not item:
+                all_true = False
+                break
+        
+        assert paths is None or all_true
         assert isinstance(from_revnum, int) and isinstance(to_revnum, int)
         assert isinstance(limit, int)
         from threading import Thread, Semaphore
@@ -286,7 +293,14 @@
     def get_log(self, rcvr, paths, from_revnum, to_revnum, limit, discover_changed_paths, 
                 strict_node_history, include_merged_revisions, revprops):
         assert paths is None or isinstance(paths, list), "Invalid paths"
-        assert paths is None or all([isinstance(x, str) for x in paths])
+
+        all_true = True
+        for item in [isinstance(x, str) for x in paths]:
+            if not item:
+                all_true = False
+                break
+        
+        assert paths is None or all_true
 
         self.mutter('svn log -r%d:%d %r' % (from_revnum, to_revnum, paths))