Rev 1587: Throw appropriate error from put_file. in http://people.samba.org/bzr/jelmer/bzr-svn/trunk

[Jelmer Vernooij]

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

------------------------------------------------------------
revno: 1587
revision-id: jelmer at samba.org-20080821215529-7x70m5hq3a4791ct
parent: jelmer at samba.org-20080821203440-smqtkbf6f98u0zre
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Thu 2008-08-21 23:55:29 +0200
message:
  Throw appropriate error from put_file.
modified:
  fetch.py                       fetch.py-20060625004942-x2lfaib8ra707a8p-1
  transport.py                   transport.py-20060406231150-b3472d06b3a0818d
=== modified file 'fetch.py'
--- a/fetch.py	2008-08-21 20:34:40 +0000
+++ b/fetch.py	2008-08-21 21:55:29 +0000
@@ -661,11 +661,11 @@
         if revision_id in checked:
             return []
         extra = set()
-        needed = []
-        revs = []
-        meta_map = {}
-        lhs_parent = {}
         def check_revid(revision_id):
+            revs = []
+            meta_map = {}
+            needed = []
+            lhs_parent = {}
             try:
                 (branch_path, revnum, mapping) = \
                     self.source.lookup_revision_id(revision_id)
@@ -689,15 +689,14 @@
                 elif not find_ghosts:
                     break
                 checked.add(revid)
+            return [(revid, lhs_parent[revid], meta_map[revid]) 
+                      for revid in reversed(revs)]
 
-        check_revid(revision_id)
+        needed = check_revid(revision_id)
 
         for revid in extra:
-            if revid not in revs:
-                check_revid(revid)
-
-        needed = [(revid, lhs_parent[revid], meta_map[revid]) 
-                  for revid in reversed(revs)]
+            if revid not in checked:
+                needed += check_revid(revid)
 
         return needed
 
@@ -735,13 +734,12 @@
                 pb.update('copying revision', num, len(revids))
 
                 assert parent_revid is not None and parent_revid != revid
-                if "validate" in debug.debug_flags:
-                    assert self.target.has_revision(parent_revid)
-                    assert not self.target.has_revision(parent_revid)
 
                 if parent_revid == NULL_REVISION:
                     parent_inv = Inventory(root_id=None)
                 elif prev_revid != parent_revid:
+                    if "validate" in debug.debug_flags:
+                        assert self.target.has_revision(parent_revid)
                     parent_inv = self.target.get_inventory(parent_revid)
                 else:
                     parent_inv = prev_inv

=== modified file 'transport.py'
--- a/transport.py	2008-08-09 13:05:11 +0000
+++ b/transport.py	2008-08-21 21:55:29 +0000
@@ -219,6 +219,9 @@
         """See Transport.stat()."""
         raise TransportNotPossible('stat not supported on Subversion')
 
+    def put_file(self, name, file):
+        raise TransportNotPossible("put file not supported on Subversion")
+
     def get_uuid(self):
         if self._uuid is None:
             conn = self.get_connection()