Rev 6289: (vila) Fix windows test failures around locations.conf handling. (Vincent in file:///srv/pqm.bazaar-vcs.org/archives/thelove/bzr/%2Btrunk/

[Patch Queue Manager]

At file:///srv/pqm.bazaar-vcs.org/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 6289 [merge]
revision-id: pqm at pqm.ubuntu.com-20111124150849-t85ra0d35uxe9xe2
parent: pqm at pqm.ubuntu.com-20111124134044-fxzjs2iro5obaax9
parent: v.ladeuil+lp at free.fr-20111124143059-txpz17n9sle39suh
committer: Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2011-11-24 15:08:49 +0000
message:
  (vila) Fix windows test failures around locations.conf handling. (Vincent
   Ladeuil)
modified:
  bzrlib/config.py               config.py-20051011043216-070c74f4e9e338e8
  doc/en/release-notes/bzr-2.5.txt bzr2.5.txt-20110708125756-587p0hpw7oke4h05-1
=== modified file 'bzrlib/config.py'
--- a/bzrlib/config.py	2011-11-22 13:27:04 +0000
+++ b/bzrlib/config.py	2011-11-24 14:30:59 +0000
@@ -3397,10 +3397,8 @@
         
         :param location: A URL prefix to """
         lstore = LocationStore()
-        if location is not None:
-            location = urlutils.normalize_url(location)
-            if location.startswith('file://'):
-                location = urlutils.local_path_from_url(location)
+        if location.startswith('file://'):
+            location = urlutils.local_path_from_url(location)
         matcher = LocationMatcher(lstore, location)
         gstore = GlobalStore()
         super(LocationStack, self).__init__(

=== modified file 'doc/en/release-notes/bzr-2.5.txt'
--- a/doc/en/release-notes/bzr-2.5.txt	2011-11-24 13:15:51 +0000
+++ b/doc/en/release-notes/bzr-2.5.txt	2011-11-24 14:30:59 +0000
@@ -47,6 +47,14 @@
   remote ones. See ``bzr help configuration`` for more details.
   (Vincent Ladeuil, #843211)
 
+* Fix test failures on windows related to locations.conf handling.
+  (Vincent Ladeuil, #892992)
+
+* Fixed parsing of the timestamp given to ``commit --commit-time``. Now
+  prohibits several invalid strings, reads the correct number of seconds,
+  and gives a better error message if the time zone offset is not given.
+  (Matt Giuca, #892657)
+
 * Resolve regression from colocated branch path handling, by ensuring that
   unreserved characters are unquoted in URLs. (Martin Packman, #842223)
 
@@ -59,11 +67,6 @@
 * Support verifying signatures on remote repositories.
   (Jelmer Vernooij, #889694)
 
-* Fixed parsing of the timestamp given to ``commit --commit-time``. Now
-  prohibits several invalid strings, reads the correct number of seconds,
-  and gives a better error message if the time zone offset is not given.
-  (Matt Giuca, #892657)
-
 Documentation
 *************