Rev 375: Couple of minor fixes in http://people.samba.org/bzr/jelmer/bzr-svn/bzr.dev

[Jelmer Vernooij]

------------------------------------------------------------
revno: 375
revision-id: jelmer at samba.org-20070106165818-4mt4qbtnyn6340h0
parent: jelmer at samba.org-20070103222400-7bjzm0ys0s39japf
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: main
timestamp: Sat 2007-01-06 17:58:18 +0100
message:
  Couple of minor fixes
modified:
  TODO                           todo-20060729211917-2kpobww0zyvvo0j2-1
  checkout.py                    workingtree.py-20060306120941-b083cb0fdd4a69de
  fetch.py                       fetch.py-20060625004942-x2lfaib8ra707a8p-1
=== modified file 'TODO'
--- a/TODO	2007-01-03 10:46:12 +0000
+++ b/TODO	2007-01-06 16:58:18 +0000
@@ -1,5 +1,3 @@
-- better tests for get_fileid_map()
- - better tests for get_local_changes()
 - make scheme name part of revision id
 - fix commits in checkouts somehow
 - fix autorealm repository
@@ -8,5 +6,7 @@
 - faster "bzr status" in lightweight checkouts
 - avoid extra connect in logwalker?
 - get rid of use of `svn ls' in logwalker
+- rewrite TrunkBranchingScheme() and ListBranchingScheme() as 
+  subclasses of ListBranchingScheme()
 - more efficient implementation for applying txdeltas to weaves. perhaps convert svn deltas to bzr deltas?
 - free memory!

=== modified file 'checkout.py'
--- a/checkout.py	2007-01-03 22:24:00 +0000
+++ b/checkout.py	2007-01-06 16:58:18 +0000
@@ -237,7 +237,6 @@
             if entry.schedule == svn.wc.schedule_normal:
                 assert entry.revision >= 0
                 # Keep old id
-                mutter('stay: %r' % relpath)
                 return self.path_to_file_id(entry.cmt_rev, entry.revision, 
                         relpath)
             elif entry.schedule == svn.wc.schedule_delete:
@@ -246,7 +245,6 @@
                   entry.schedule == svn.wc.schedule_replace):
                 # See if the file this file was copied from disappeared
                 # and has no other copies -> in that case, take id of other file
-                mutter('copies(%r): %r' % (relpath, list(find_copies(entry.copyfrom_url))))
                 if entry.copyfrom_url and list(find_copies(entry.copyfrom_url)) == [relpath]:
                     return self.path_to_file_id(entry.copyfrom_rev, entry.revision,
                             entry.copyfrom_url[len(entry.repos):])

=== modified file 'fetch.py'
--- a/fetch.py	2007-01-02 19:17:26 +0000
+++ b/fetch.py	2007-01-06 16:58:18 +0000
@@ -43,7 +43,8 @@
 
 
 class RevisionBuildEditor(svn.delta.Editor):
-    def __init__(self, source, target, branch_path, prev_inventory, revid, svn_revprops, id_map):
+    def __init__(self, source, target, branch_path, prev_inventory, revid, 
+                 svn_revprops, id_map):
         self.branch_path = branch_path
         self.old_inventory = prev_inventory
         self.inventory = copy(prev_inventory)