Rev 1099: Merge 0.4. in http://people.samba.org/bzr/jelmer/bzr-svn/cext

[Jelmer Vernooij]

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

------------------------------------------------------------
revno: 1099
revision-id: jelmer at samba.org-20080615014942-c9pui6qg19wl85rb
parent: jelmer at samba.org-20080615014643-l4x2hkuy116die2r
parent: jelmer at samba.org-20080615014628-vr9qbhs2nmtfujff
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: cext
timestamp: Sun 2008-06-15 03:49:42 +0200
message:
  Merge 0.4.
modified:
  remote.py                      format.py-20060406233823-b6fa009fe35dfde7
  repository.py                  repository.py-20060306123302-1f8c5069b3fe0265
    ------------------------------------------------------------
    revno: 950.3.167
    revision-id: jelmer at samba.org-20080615014628-vr9qbhs2nmtfujff
    parent: jelmer at samba.org-20080615014047-1bd142e7ht01x1bj
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Sun 2008-06-15 03:46:28 +0200
    message:
      Abstract away more of the standard python-svn bindings.
    modified:
      auth.py                        auth.py-20071209174622-w8d42k6nm5yhxvi8-1
      commit.py                      commit.py-20060607190346-qvq128wgfubhhgm2-1
      core.py                        core.py-20080615010310-67lnibnp889hlarb-1
      ra.py                          ra.py-20080615005305-t5221niknu8rm6bt-1
      repository.py                  repository.py-20060306123302-1f8c5069b3fe0265
    ------------------------------------------------------------
    revno: 950.3.166
    revision-id: jelmer at samba.org-20080615014047-1bd142e7ht01x1bj
    parent: jelmer at samba.org-20080615012938-r19j03lxuer6yvzr
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Sun 2008-06-15 03:40:47 +0200
    message:
      Remove unused imports.
    modified:
      remote.py                      format.py-20060406233823-b6fa009fe35dfde7
=== modified file 'remote.py'
--- a/remote.py	2008-06-15 01:13:47 +0000
+++ b/remote.py	2008-06-15 01:49:42 +0000
@@ -22,9 +22,6 @@
                            NoWorkingTree, AlreadyBranchError)
 from bzrlib.transport.local import LocalTransport
 
-from core import SubversionException
-import core 
-
 from bzrlib.plugins.svn import core
 from bzrlib.plugins.svn.errors import NoSvnRepositoryPresent
 from bzrlib.plugins.svn.format import get_rich_root_format, SvnRemoteFormat

=== modified file 'repository.py'
--- a/repository.py	2008-06-15 01:13:47 +0000
+++ b/repository.py	2008-06-15 01:49:42 +0000
@@ -30,21 +30,20 @@
 from bzrlib.transport import Transport, get_transport
 from bzrlib.trace import info, mutter
 
-
 import os
 
 from bzrlib.plugins.svn import changes, core, errors, logwalker
 from bzrlib.plugins.svn.branchprops import PathPropertyProvider
 from bzrlib.plugins.svn.cache import create_cache_dir, sqlite3
-from bzrlib.plugins.svn.core import SubversionException
 from bzrlib.plugins.svn.changes import changes_path, find_prev_location
 from bzrlib.plugins.svn.config import SvnRepositoryConfig
-from bzrlib.plugins.svn.parents import SqliteCachingParentsProvider
+from bzrlib.plugins.svn.core import SubversionException
 from bzrlib.plugins.svn.mapping import (SVN_PROP_BZR_REVISION_ID, SVN_REVPROP_BZR_SIGNATURE,
                      parse_revision_metadata, parse_revid_property, 
                      parse_merge_property, BzrSvnMapping,
                      get_default_mapping, parse_revision_id)
 from bzrlib.plugins.svn.mapping3 import BzrSvnMappingv3FileProps
+from bzrlib.plugins.svn.parents import SqliteCachingParentsProvider
 from bzrlib.plugins.svn.revids import CachingRevidMap, RevidMap
 from bzrlib.plugins.svn.svk import (SVN_PROP_SVK_MERGE, svk_features_merged_since, 
                  parse_svk_feature)