Rev 1969: Merge 0.4. in file:///data/jelmer/bzr-svn/trunk/

[Jelmer Vernooij]

At file:///data/jelmer/bzr-svn/trunk/

------------------------------------------------------------
revno: 1969
revision-id: jelmer at samba.org-20081109215556-fn8r4zt9lhjm2ra5
parent: jelmer at samba.org-20081109202031-84mnkdx23cmi40va
parent: jelmer at samba.org-20081109213654-h0bkcj0a4e3qujxz
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: trunk
timestamp: Sun 2008-11-09 22:55:56 +0100
message:
  Merge 0.4.
modified:
  NEWS                           news-20061231030336-h9fhq245ie0de8bs-1
  fetch.py                       fetch.py-20060625004942-x2lfaib8ra707a8p-1
  format.py                      format.py-20070917005147-94kb7zysotf82kqw-1
  subvertpy/subvertpy/__init__.py core.pyx-20080313210413-17k59slolpfe5kdq-1
    ------------------------------------------------------------
    revno: 1669.9.18
    revision-id: jelmer at samba.org-20081109213654-h0bkcj0a4e3qujxz
    parent: jelmer at samba.org-20081109205321-t1cm6u5cjdf1lsq6
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Sun 2008-11-09 22:36:54 +0100
    message:
      Don't take over when pulling from WebDAV source (without Subversion)
    modified:
      NEWS                           news-20061231030336-h9fhq245ie0de8bs-1
      format.py                      format.py-20070917005147-94kb7zysotf82kqw-1
    ------------------------------------------------------------
    revno: 1669.9.17
    revision-id: jelmer at samba.org-20081109205321-t1cm6u5cjdf1lsq6
    parent: jelmer at samba.org-20081109200134-l6faemxkza9n5t35
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Sun 2008-11-09 21:53:21 +0100
    message:
      Make assert a bit more verbose.
    modified:
      fetch.py                       fetch.py-20060625004942-x2lfaib8ra707a8p-1
=== modified file 'NEWS'
--- a/NEWS	2008-11-09 20:20:31 +0000
+++ b/NEWS	2008-11-09 21:55:56 +0000
@@ -77,6 +77,9 @@
 
    * Fix erroneous call to object.__init__() causing issues with Python2.6.
 
+   * Don't take over when pulling from WebDAV source (without Subversion)
+     (#274840)
+
 bzr-svn 0.4.14	2008-11-03
 
   BUG FIXES

=== modified file 'fetch.py'
--- a/fetch.py	2008-11-09 20:20:31 +0000
+++ b/fetch.py	2008-11-09 21:55:56 +0000
@@ -372,7 +372,8 @@
         super(RevisionBuildEditor, self).__init__(revmeta, mapping)
 
     def _finish_commit(self):
-        assert len(self._premature_deletes) == 0
+        if len(self._premature_deletes) > 0:
+            raise AssertionError("Remaining deletes in %s: %r" % (self.revid, self._premature_deletes))
         rev = self.revmeta.get_revision(self.mapping)
         self.inventory.revision_id = self.revid
         # Escaping the commit message is really the task of the serialiser

=== modified file 'format.py'
--- a/format.py	2008-11-08 18:48:39 +0000
+++ b/format.py	2008-11-09 21:55:56 +0000
@@ -85,7 +85,7 @@
         try: 
             return remote.SvnRemoteAccess(transport, self)
         except subvertpy.SubversionException, (_, num):
-            if num == subvertpy.ERR_RA_DAV_REQUEST_FAILED:
+            if num in (errors.ERR_RA_DAV_REQUEST_FAILED, subvertpy.ERR_RA_DAV_NOT_VCC):
                 raise bzr_errors.NotBranchError(transport.base)
             raise
 

=== modified file 'subvertpy/subvertpy/__init__.py'
--- a/subvertpy/subvertpy/__init__.py	2008-10-15 16:56:59 +0000
+++ b/subvertpy/subvertpy/__init__.py	2008-11-09 21:55:56 +0000
@@ -56,7 +56,7 @@
 ERR_RA_DAV_RELOCATED = 175011
 ERR_FS_NOT_FILE = 160017
 ERR_WC_BAD_ADM_LOG = 155009
-
+ERR_RA_DAV_NOT_VCC = 20014
 
 class SubversionException(Exception):
     """A Subversion exception"""