Rev 1609: Use absolute imports. in http://people.samba.org/bzr/jelmer/bzr-svn/trunk

Jelmer Vernooij jelmer at samba.org
Sat Aug 23 01:29:26 BST 2008


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

------------------------------------------------------------
revno: 1609
revision-id: jelmer at samba.org-20080823002922-3nwl8gz3nd0gt6dc
parent: jelmer at samba.org-20080822235751-me6sub0uw6951u1l
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Sat 2008-08-23 02:29:22 +0200
message:
  Use absolute imports.
modified:
  repository.py                  repository.py-20060306123302-1f8c5069b3fe0265
=== modified file 'repository.py'
--- a/repository.py	2008-08-22 23:57:51 +0000
+++ b/repository.py	2008-08-23 00:29:22 +0000
@@ -170,7 +170,8 @@
     def __init__(self, bzrdir, transport, branch_path=None):
         from bzrlib.plugins.svn import lazy_register_optimizers
         lazy_register_optimizers()
-        from fileids import CachingFileIdMap, simple_apply_changes, FileIdMap
+        from bzrlib.plugins.svn.fileids import (CachingFileIdMap, 
+                                                simple_apply_changes, FileIdMap)
         _revision_store = None
 
         assert isinstance(transport, Transport)
@@ -834,8 +835,8 @@
             pb.finished()
         return tags
 
-    def find_branchpaths(self, layout, from_revnum=0, to_revnum=None, 
-                         project=None):
+    def find_branchpaths(self, layout, check_path, check_parent_path,
+                         from_revnum=0, to_revnum=None, project=None):
         """Find all branch paths that were changed in the specified revision 
         range.
 
@@ -903,7 +904,7 @@
     def get_commit_builder(self, branch, parents, config, timestamp=None, 
                            timezone=None, committer=None, revprops=None, 
                            revision_id=None):
-        from commit import SvnCommitBuilder
+        from bzrlib.plugins.svn.commit import SvnCommitBuilder
         return SvnCommitBuilder(self, branch, parents, config, timestamp, 
                 timezone, committer, revprops, revision_id)
 




More information about the bazaar-commits mailing list