Rev 6429: (gz) Update dirstate now that osutils._fs_enc will be a python codec name 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: 6429 [merge]
revision-id: pqm at pqm.ubuntu.com-20120105143743-ysvb9ea44dklacs3
parent: pqm at pqm.ubuntu.com-20120105141032-2tyon90ttr1awh27
parent: martin.packman at canonical.com-20120105111645-dkj4c6geuh38ir0n
committer: Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2012-01-05 14:37:43 +0000
message:
  (gz) Update dirstate now that osutils._fs_enc will be a python codec name
   (Martin Packman)
modified:
  bzrlib/dirstate.py             dirstate.py-20060728012006-d6mvoihjb3je9peu-1
=== modified file 'bzrlib/dirstate.py'
--- a/bzrlib/dirstate.py	2011-12-21 00:07:49 +0000
+++ b/bzrlib/dirstate.py	2012-01-05 11:16:45 +0000
@@ -1924,7 +1924,7 @@
             # paths are produced by UnicodeDirReader on purpose.
             abspath = abspath.encode(fs_encoding)
         target = os.readlink(abspath)
-        if fs_encoding not in ('UTF-8', 'US-ASCII', 'ANSI_X3.4-1968'):
+        if fs_encoding not in ('utf-8', 'ascii'):
             # Change encoding if needed
             target = target.decode(fs_encoding).encode('UTF-8')
         return target