Rev 1116: Trim diff with 0.4 branch. in http://people.samba.org/bzr/jelmer/bzr-svn/cext

[Jelmer Vernooij]

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

------------------------------------------------------------
revno: 1116
revision-id: jelmer at samba.org-20080622084953-m45bb8qhwut1sznb
parent: jelmer at samba.org-20080622081216-b8vfyk8pxcffvl7w
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: cext
timestamp: Sun 2008-06-22 10:49:53 +0200
message:
  Trim diff with 0.4 branch.
modified:
  fetch.py                       fetch.py-20060625004942-x2lfaib8ra707a8p-1
  logwalker.py                   logwalker.py-20060621215743-c13fhfnyzh1xzwh2-1
  mapping.py                     mapping.py-20080128201303-6cp01phc0dmc0kiv-1
  tests/__init__.py              __init__.py-20060508151940-e9f4d914801a2535
  tests/test_logwalker.py        test_logwalker.py-20060622141944-pkocc3rj8g62ukbi-1
=== modified file 'fetch.py'
--- a/fetch.py	2008-06-22 08:12:16 +0000
+++ b/fetch.py	2008-06-22 08:49:53 +0000
@@ -600,6 +600,14 @@
         """See InterRepository.copy_content."""
         self.fetch(revision_id, pb, find_ghosts=False)
 
+    def _fetch_replay(self, revids, pb=None):
+        """Copy a set of related revisions using svn.ra.replay.
+
+        :param revids: Revision ids to copy.
+        :param pb: Optional progress bar
+        """
+        raise NotImplementedError(self._copy_revisions_replay)
+
     def _fetch_switch(self, repos_root, revids, pb=None):
         """Copy a set of related revisions using svn.ra.switch.
 
@@ -693,8 +701,6 @@
         """Fetch revisions. """
         if revision_id == NULL_REVISION:
             return
-
-        self._supports_replay = True # assume replay supported by default
         # Dictionary with paths as keys, revnums as values
 
         if pb:

=== modified file 'logwalker.py'
--- a/logwalker.py	2008-06-22 08:12:16 +0000
+++ b/logwalker.py	2008-06-22 08:49:53 +0000
@@ -21,8 +21,8 @@
 import bzrlib.ui as ui
 
 from bzrlib.plugins.svn import changes, core
+from bzrlib.plugins.svn.cache import CacheTable
 from bzrlib.plugins.svn.core import SubversionException
-from bzrlib.plugins.svn.cache import CacheTable
 from bzrlib.plugins.svn.errors import ERR_FS_NO_SUCH_REVISION, ERR_FS_NOT_FOUND
 from bzrlib.plugins.svn.ra import DIRENT_KIND
 from bzrlib.plugins.svn.transport import SvnRaTransport

=== modified file 'mapping.py'
--- a/mapping.py	2008-06-22 08:12:16 +0000
+++ b/mapping.py	2008-06-22 08:49:53 +0000
@@ -21,7 +21,6 @@
 
 from bzrlib.plugins.svn import core, errors, properties, version_info
 import calendar
-import sha
 import time
 import urllib
 

=== modified file 'tests/__init__.py'
--- a/tests/__init__.py	2008-06-22 08:12:16 +0000
+++ b/tests/__init__.py	2008-06-22 08:49:53 +0000
@@ -26,6 +26,7 @@
 from bzrlib.bzrdir import BzrDir
 from bzrlib.tests import TestCaseInTempDir, TestSkipped
 from bzrlib.trace import mutter
+from bzrlib.urlutils import local_path_to_url
 from bzrlib.workingtree import WorkingTree
 
 from bzrlib.plugins.svn import properties, ra, repos
@@ -68,7 +69,7 @@
                 open(revprop_hook, 'w').write("#!/bin/sh\n")
                 os.chmod(revprop_hook, os.stat(revprop_hook).st_mode | 0111)
 
-        return urlutils.local_path_to_url(abspath)
+        return local_path_to_url(abspath)
 
     def make_remote_bzrdir(self, relpath):
         """Create a repository."""
@@ -371,10 +372,10 @@
             'test_changes',
             'test_checkout',
             'test_client',
-            'test_core',
             'test_commit',
             'test_config',
             'test_convert',
+            'test_core',
             'test_errors',
             'test_fetch',
             'test_fileids', 

=== modified file 'tests/test_logwalker.py'
--- a/tests/test_logwalker.py	2008-06-15 02:54:00 +0000
+++ b/tests/test_logwalker.py	2008-06-22 08:49:53 +0000
@@ -16,7 +16,6 @@
 
 """Log walker tests."""
 
-from bzrlib import debug
 from bzrlib.errors import NoSuchRevision
 
 import os