Rev 1750: Merge 0.4. in file:///data/jelmer/bzr-svn/trunk/

[Jelmer Vernooij]

At file:///data/jelmer/bzr-svn/trunk/

------------------------------------------------------------
revno: 1750
revision-id: jelmer at samba.org-20080901022315-j0h5p5aw8x0admwi
parent: jelmer at samba.org-20080901013013-0r9r7syh1693zb7k
parent: jelmer at samba.org-20080901022247-3gfm3hutu2tiu8kf
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: trunk
timestamp: Mon 2008-09-01 04:23:15 +0200
message:
  Merge 0.4.
modified:
  NEWS                           news-20061231030336-h9fhq245ie0de8bs-1
  TODO                           todo-20060729211917-2kpobww0zyvvo0j2-1
  repository.py                  repository.py-20060306123302-1f8c5069b3fe0265
    ------------------------------------------------------------
    revno: 1669.1.24
    revision-id: jelmer at samba.org-20080901022247-3gfm3hutu2tiu8kf
    parent: jelmer at samba.org-20080831231630-2ofs47zet20wdhkc
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Mon 2008-09-01 04:22:47 +0200
    message:
      Properly encode cache file path.
    modified:
      NEWS                           news-20061231030336-h9fhq245ie0de8bs-1
      repository.py                  repository.py-20060306123302-1f8c5069b3fe0265
=== modified file 'NEWS'
--- a/NEWS	2008-09-01 01:30:13 +0000
+++ b/NEWS	2008-09-01 02:23:15 +0000
@@ -61,6 +61,9 @@
 
    * Fix pull into Subversion working copies.
 
+   * Properly encode cache file path in case it contains non-ascii 
+     characters. (#262923)
+
   FEATURES
 
    * Use native Windows password prompter on Windows. (#263287)

=== modified file 'TODO'
--- a/TODO	2008-09-01 01:30:13 +0000
+++ b/TODO	2008-09-01 02:23:15 +0000
@@ -1,7 +1,5 @@
 mappingv4:
  - implement layout functions, including command
- - add options in commit for create_root, create_prefix
-  - if create_root=False: skip _check_dirs_exist
  - allow skipping a revision completely - to allow creating branches using "svn cp"
 
 - generate deltas rather than fulltexts when creating file id maps
@@ -16,8 +14,6 @@
 
 - Needs more tests
  - Run all tests against repository with revprop changing allowed and without
-- Needs upgrade command that can use legacy file properties and set revprops
-- Support disabling legacy file property support somehow
 
 for other things to do, see:
 

=== modified file 'repository.py'
--- a/repository.py	2008-08-31 23:01:33 +0000
+++ b/repository.py	2008-09-01 02:23:15 +0000
@@ -253,7 +253,7 @@
             cache_dir = self.create_cache_dir()
             cache_file = os.path.join(cache_dir, 'cache-v%d' % CACHE_DB_VERSION)
             if not cachedbs.has_key(cache_file):
-                cachedbs[cache_file] = sqlite3.connect(cache_file)
+                cachedbs[cache_file] = sqlite3.connect(cache_file.encode(osutils._fs_enc))
             self.cachedb = cachedbs[cache_file]
             self._log = logwalker.CachingLogWalker(self._log, cache_db=self.cachedb)
             cachedir_transport = get_transport(cache_dir)