Rev 3650: (vila) HFS on OSX is case-insensitive too, fix some failing tests in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 3650
revision-id: pqm at pqm.ubuntu.com-20080826151717-xb3qgwv6xta124k7
parent: pqm at pqm.ubuntu.com-20080825182248-dydy5bn4n5akbfjq
parent: v.ladeuil+lp at free.fr-20080826144327-uzsnxxnyzibacxqd
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2008-08-26 16:17:17 +0100
message:
  (vila) HFS on OSX is case-insensitive too, fix some failing tests
modified:
  bzrlib/workingtree.py          workingtree.py-20050511021032-29b6ec0a681e02e3
    ------------------------------------------------------------
    revno: 3649.2.1
    revision-id: v.ladeuil+lp at free.fr-20080826144327-uzsnxxnyzibacxqd
    parent: pqm at pqm.ubuntu.com-20080825182248-dydy5bn4n5akbfjq
    parent: v.ladeuil+lp at free.fr-20080826143353-y4s0frtmvgrsph6g
    committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
    branch nick: trunk
    timestamp: Tue 2008-08-26 16:43:27 +0200
    message:
      (vila) HFS on OSX is case-insensitive too, fix some failing tests
    modified:
      bzrlib/workingtree.py          workingtree.py-20050511021032-29b6ec0a681e02e3
    ------------------------------------------------------------
    revno: 3649.1.1
    revision-id: v.ladeuil+lp at free.fr-20080826143353-y4s0frtmvgrsph6g
    parent: pqm at pqm.ubuntu.com-20080825182248-dydy5bn4n5akbfjq
    committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
    branch nick: wt-ci
    timestamp: Tue 2008-08-26 16:33:53 +0200
    message:
      OSX too needs to accept 'bzr mv foo Foo' when foo and Foo are the same file.
      No new tests (existing ones were failing on OSX), this fixes the code.
      
      * bzrlib/workingtree.py:
      (WorkingTree._determine_mv_mode): Case sensitivity is what matter
      here, it exists outside of win32 (i.e. OSX).
    modified:
      bzrlib/workingtree.py          workingtree.py-20050511021032-29b6ec0a681e02e3
=== modified file 'bzrlib/workingtree.py'
--- a/bzrlib/workingtree.py	2008-07-30 09:50:22 +0000
+++ b/bzrlib/workingtree.py	2008-08-26 14:33:53 +0000
@@ -1316,9 +1316,9 @@
                 only_change_inv = True
             elif self.has_filename(from_rel) and not self.has_filename(to_rel):
                 only_change_inv = False
-            elif (sys.platform == 'win32'
-                and from_rel.lower() == to_rel.lower()
-                and self.has_filename(from_rel)):
+            elif (not self.case_sensitive
+                  and from_rel.lower() == to_rel.lower()
+                  and self.has_filename(from_rel)):
                 only_change_inv = False
             else:
                 # something is wrong, so lets determine what exactly