Rev 354: Update NEWS, TODO, add some FIXME's. in http://people.samba.org/bzr/jelmer/bzr-svn/bzr.dev

Jelmer Vernooij jelmer at samba.org
Mon Jan 1 17:37:21 GMT 2007


------------------------------------------------------------
revno: 354
revision-id: jelmer at samba.org-20070101173622-q1h4vkjd9cuevxzd
parent: jelmer at samba.org-20070101170010-0v0mdegv2ilp0fxj
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: main
timestamp: Mon 2007-01-01 18:36:22 +0100
message:
  Update NEWS, TODO, add some FIXME's.
modified:
  NEWS                           news-20061231030336-h9fhq245ie0de8bs-1
  TODO                           todo-20060729211917-2kpobww0zyvvo0j2-1
  checkout.py                    workingtree.py-20060306120941-b083cb0fdd4a69de
=== modified file 'NEWS'
--- a/NEWS	2007-01-01 16:07:12 +0000
+++ b/NEWS	2007-01-01 17:36:22 +0000
@@ -46,10 +46,12 @@
 
    * The LogWalker class is now a lot dumber.
 
-   * Added --scheme and --all option to svn-import.
+   * Added --scheme and --all options to svn-import.
 
    * Implemented SvnRaTransport.list_dir().
 
+   * Conversion output can now be on a remote transport.
+
   PERFORMANCE IMPROVEMENTS
 
    * More efficient implementation of follow_history().

=== modified file 'TODO'
--- a/TODO	2007-01-01 17:00:10 +0000
+++ b/TODO	2007-01-01 17:36:22 +0000
@@ -1,3 +1,4 @@
+- fix autorealm repository
 - handle parent directories of branches being moved correctly
 - fix "bzr status" in checkouts
 - faster "bzr status" in checkouts

=== modified file 'checkout.py'
--- a/checkout.py	2007-01-01 16:07:12 +0000
+++ b/checkout.py	2007-01-01 17:36:22 +0000
@@ -137,11 +137,13 @@
         try:
             for file in files:
                 svn.wc.delete2(self.abspath(file), wc, None, None, None)
+                # FIXME: Make sure bzr:file-ids entry also gets deleted
         finally:
             svn.wc.adm_close(wc)
 
     def _get_wc(self, relpath="", write_lock=False):
-        return svn.wc.adm_open3(None, self.abspath(relpath).rstrip("/"), write_lock, 0, None)
+        return svn.wc.adm_open3(None, self.abspath(relpath).rstrip("/"), 
+                                write_lock, 0, None)
 
     def _get_rel_wc(self, relpath, write_lock=False):
         dir = os.path.dirname(relpath)
@@ -154,7 +156,9 @@
         to_wc = self._get_wc(to_name, write_lock=True)
         try:
             for entry in from_paths:
-                svn.wc.copy(self.abspath(entry), to_wc, os.path.basename(entry), None, None)
+                svn.wc.copy(self.abspath(entry), to_wc, 
+                            os.path.basename(entry), None, None)
+                # FIXME: Make sure bzr:file-ids entry gets added
         finally:
             svn.wc.adm_close(to_wc)
 
@@ -168,6 +172,7 @@
         try:
             svn.wc.copy(self.abspath(from_rel), to_wc, to_file, None, None)
             svn.wc.delete2(self.abspath(from_rel), to_wc, None, None, None)
+            # FIXME: Make sure bzr:file-ids entry gets renamed
         finally:
             svn.wc.adm_close(to_wc)
 
@@ -205,6 +210,7 @@
             svn.wc.adm_close(wc)
 
         def find_ids(entry):
+            # FIXME: Check bzr:file-ids property as well
             relpath = entry.url[len(entry.repos):].strip("/")
             assert entry.schedule in (svn.wc.schedule_normal, 
                                       svn.wc.schedule_delete,
@@ -361,6 +367,7 @@
                     svn.wc.add2(os.path.join(self.basedir, f), wc, None, 0, 
                             None, None, None)
                     if ids:
+                        # FIXME: set bzr:file-ids instead
                         svn.wc.prop_set2('bzr:fileid', ids.pop(), relpath, wc, 
                                 False)
                 except SubversionException, (_, num):
@@ -395,14 +402,16 @@
         return fingerprint_file(open(self.abspath(path)))['sha1']
 
     def _get_bzr_merges(self):
-        return self.branch.repository.branchprop_list.get_property(self.branch.branch_path, 
-                                            self.base_revnum, 
-                                            SVN_PROP_BZR_MERGE, "")
+        return self.branch.repository.branchprop_list.get_property(
+                self.branch.branch_path, 
+                self.base_revnum, 
+                SVN_PROP_BZR_MERGE, "")
 
     def _get_svk_merges(self):
-        return self.branch.repository.branchprop_list.get_property(self.branch.branch_path, 
-                                            self.base_revnum, 
-                                            SVN_PROP_SVK_MERGE, "")
+        return self.branch.repository.branchprop_list.get_property(
+                self.branch.branch_path, 
+                self.base_revnum, 
+                SVN_PROP_SVK_MERGE, "")
 
     def set_pending_merges(self, merges):
         wc = self._get_wc(write_lock=True)




More information about the bazaar-commits mailing list