Respect locale environment variables on darwin. In python 2.4+ on darwin, locale.getpreferredencoding() returns mac-roman regardless of what LC_CTYPE, LANG etc are set to. This can produce hard-to-notice conversion errors if input text is not in mac-roman. So this patch overrides it with setlocale/getlocale if the environment has been customized, on the assumption that the user has done so deliberately.

     1

% file replaced with directory

     2

adding a

     3

% should fail - would corrupt dirstate

     4

abort: file named 'a' already in dirstate

     5

% directory replaced with file

     6

adding a/a

     7

% should fail - would corrupt dirstate

     8

abort: directory named 'a' already in dirstate

     9

% directory replaced with file

    10

adding b/c/d

    11

% should fail - would corrupt dirstate

    12

abort: directory named 'b' already in dirstate