[PATCH STABLE] ignore: fix path concatenation of .hgignore on Windows

[Sean Farley]

Yuya Nishihara <yuya at tcha.org> writes:

> # HG changeset patch
> # User Yuya Nishihara <yuya at tcha.org>
> # Date 1438002880 -32400
> #      Mon Jul 27 22:14:40 2015 +0900
> # Branch stable
> # Node ID fb55ea49d79ecdc193392b791dee02b2912cf727
> # Parent  3e84f40232c7931dbeca16e563ae8f63ca12cf4d
> ignore: fix path concatenation of .hgignore on Windows
>
> Since 3de48ff62733, .hgignore is ignored on Windows because a pat may have
> a drive letter, but pathutil.join is posixpath.join.
>
>   "z:\foo\bar/z:\foo\bar\.hgignore"
>
> Instead, this patch uses os.path.join() and util.localpath() to process both
> parts as file-system paths.

This patch looks good to me for stable.

> Maybe we can remove os.path.join() at dirstate._ignore because 'include:' is
> resolved relative to repo root? It was introduced by a04c7b74b3d5.

That is a good question that maybe Martin or Fujiwara could answer?