[PATCH] terse: pconvert() entries added to the temporary terse dict for Windows

Yuya Nishihara yuya at tcha.org
Fri May 25 08:24:01 EDT 2018


On Tue, 22 May 2018 23:43:24 -0400, Matt Harbison wrote:
> # HG changeset patch
> # User Matt Harbison <matt_harbison at yahoo.com>
> # Date 1527045735 14400
> #      Tue May 22 23:22:15 2018 -0400
> # Node ID a6bed2a6eafea7d89af7e12696169c754c9bf64a
> # Parent  c65931d23baf101780d00f027bf57dbe0af5e8cc
> terse: pconvert() entries added to the temporary terse dict for Windows

Queued, thanks.

> I fixed a similar issue in 362096cfdb1f, and given the apparent need for these
> strings to be in '/' format, I wonder if cmdutil.dirnode() should be rewritten
> to avoid os.path.join().  But it looks like all entries added to the temporary
> terse dict should use '/' now, and cmdutil.tersedir() looks like the only user.
> 
> diff --git a/mercurial/cmdutil.py b/mercurial/cmdutil.py
> --- a/mercurial/cmdutil.py
> +++ b/mercurial/cmdutil.py
> @@ -552,7 +552,7 @@ def tersedir(statuslist, terseargs):
>      # process each sub-directory and build tersedict
>      for subdir in rootobj.subdirs.values():
>          for st, f in subdir.tersewalk(terseargs):
> -            tersedict[st].append(f)
> +            tersedict[st].append(util.pconvert(f))

I suspect the use of ossep in tersewalk() would be wrong if it's designed to
work with the internal paths.


More information about the Mercurial-devel mailing list