Rev 430: Merge 0.15 fixes. in http://people.samba.org/bzr/jelmer/bzr-svn/bzr.dev

[Jelmer Vernooij]

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

------------------------------------------------------------
revno: 430
revision-id: jelmer at samba.org-20070304125003-20rzetkgu0l40mxc
parent: jelmer at samba.org-20070304011548-vmqlcoqes9gmd0pi
parent: jelmer at samba.org-20070304124653-qonoqatvu19wwn8p
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: main
timestamp: Sun 2007-03-04 13:50:03 +0100
message:
  Merge 0.15 fixes.
modified:
  NEWS                           news-20061231030336-h9fhq245ie0de8bs-1
  __init__.py                    __init__.py-20051008155114-eae558e6cf149e1d
  branch.py                      svnbranch.py-20051017135706-11c749eb0dab04a7
  checkout.py                    workingtree.py-20060306120941-b083cb0fdd4a69de
    ------------------------------------------------------------
    revno: 402.1.13
    merged: jelmer at samba.org-20070304124653-qonoqatvu19wwn8p
    parent: jelmer at samba.org-20070210134644-yh0z59tdetv4qfcj
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.3
    timestamp: Sun 2007-03-04 13:46:53 +0100
    message:
      Prepare for 0.3.2
=== modified file 'NEWS'
--- a/NEWS	2007-03-04 01:15:48 +0000
+++ b/NEWS	2007-03-04 12:50:03 +0000
@@ -30,7 +30,6 @@
      This should reduce the number of roundtrips significantly when 
 	 finding file id mappings.
 
-
 bzr-svn 0.3.1	2007-01-31
 
   BUG FIXES

=== modified file '__init__.py'
--- a/__init__.py	2007-03-04 01:15:48 +0000
+++ b/__init__.py	2007-03-04 12:50:03 +0000
@@ -28,7 +28,7 @@
     # get the message out any way we can
     from warnings import warn as warning
 
-__version__ = '0.3.1'
+__version__ = '0.4.0'
 required_bzr_version = (0,15)
 
 def check_bzrlib_version(desired):

=== modified file 'branch.py'
--- a/branch.py	2007-03-04 01:09:12 +0000
+++ b/branch.py	2007-03-04 12:50:03 +0000
@@ -61,7 +61,7 @@
         :param branch_path: Relative path inside the repository this
             branch is located at.
         """
-        super(Branch, self).__init__()
+        super(SvnBranch, self).__init__()
         self.repository = repository
         assert isinstance(self.repository, SvnRepository)
         self.branch_path = branch_path
@@ -143,6 +143,9 @@
     def set_revision_history(self, rev_history):
         raise NotImplementedError(self.set_revision_history)
 
+    def set_last_revision_info(self, revno, revid):
+        pass
+
     def set_push_location(self, location):
         raise NotImplementedError(self.set_push_location)
 

=== modified file 'checkout.py'
--- a/checkout.py	2007-01-18 13:19:14 +0000
+++ b/checkout.py	2007-03-04 12:50:03 +0000
@@ -220,7 +220,7 @@
         def add_file_to_inv(relpath, id, revid, parent_id):
             """Add a file to the inventory."""
             if os.path.islink(self.abspath(relpath)):
-                file = InventoryLink(id, os.path.basename(relpath), parent_id)
+                file = InventoryLink(str(id), os.path.basename(relpath), str(parent_id))
                 file.revision = revid
                 file.symlink_target = os.readlink(self.abspath(relpath))
                 file.text_sha1 = None
@@ -228,7 +228,7 @@
                 file.executable = False
                 inv.add(file)
             else:
-                file = InventoryFile(id, os.path.basename(relpath), parent_id)
+                file = InventoryFile(str(id), os.path.basename(relpath), str(parent_id))
                 file.revision = revid
                 try:
                     data = fingerprint_file(open(self.abspath(relpath)))
@@ -294,7 +294,7 @@
                 inv.add_path("", 'directory', ROOT_ID)
                 inv.revision_id = revid
             else:
-                inventry = InventoryDirectory(id, os.path.basename(relpath), parent_id)
+                inventry = InventoryDirectory(str(id), os.path.basename(relpath), str(parent_id))
                 inventry.revision = revid
                 inv.add(inventry)