Patchwork [STABLE] statichttprepo: do not use platform path separator to build a URL

login
register
mail settings
Submitter Matt Harbison
Date Oct. 29, 2017, 2:25 a.m.
Message ID <op.y8umb6m19lwrgf@envy>
Download mbox | patch
Permalink /patch/25301/
State Not Applicable
Headers show

Comments

Matt Harbison - Oct. 29, 2017, 2:25 a.m.
On Sat, 28 Oct 2017 04:38:49 -0400, Yuya Nishihara <yuya@tcha.org> wrote:

> # HG changeset patch
> # User Yuya Nishihara <yuya@tcha.org>
> # Date 1509179032 -32400
> #      Sat Oct 28 17:23:52 2017 +0900
> # Branch stable
> # Node ID ee3492423f7c8b1a350b2596c247e1b97759d2d7
> # Parent  6e66033f91ccfb7666ec0a25d19954673269c61a
> statichttprepo: do not use platform path separator to build a URL
>
> It wouldn't work between Windows client and Unix server.

LGTM, but I get this test diff (I didn't run the whole suite yet):

    /.hg/cache/hgtagsfnodes1
@@ -232,15 +232,10 @@
    /notarepo/.hg/requires
    /remote-with-names/.hg/bookmarks
    /remote-with-names/.hg/bookmarks.current
-  /remote-with-names/.hg/cache/branch2-served
    /remote-with-names/.hg/cache/hgtagsfnodes1
-  /remote-with-names/.hg/cache/tags2-served
-  /remote-with-names/.hg/localtags
    /remote-with-names/.hg/requires
    /remote-with-names/.hg/store/00changelog.i
    /remote-with-names/.hg/store/00manifest.i
-  /remote-with-names/.hg/store/data/%7E2ehgtags.i
-  /remote-with-names/.hg/store/data/foo.i
    /remote/.hg/bookmarks
    /remote/.hg/bookmarks.current
    /remote/.hg/cache/branch2-base

This does get rid of the extra lines that I mentioned here:

https://www.mercurial-scm.org/pipermail/mercurial-devel/2017-October/107187.html
Augie Fackler - Oct. 30, 2017, 9:19 p.m.
On Sat, Oct 28, 2017 at 10:25:08PM -0400, Matt Harbison wrote:
> On Sat, 28 Oct 2017 04:38:49 -0400, Yuya Nishihara <yuya@tcha.org> wrote:
>
> > # HG changeset patch
> > # User Yuya Nishihara <yuya@tcha.org>
> > # Date 1509179032 -32400
> > #      Sat Oct 28 17:23:52 2017 +0900
> > # Branch stable
> > # Node ID ee3492423f7c8b1a350b2596c247e1b97759d2d7
> > # Parent  6e66033f91ccfb7666ec0a25d19954673269c61a
> > statichttprepo: do not use platform path separator to build a URL

queued, thanks

Patch

diff --git a/tests/test-static-http.t b/tests/test-static-http.t
--- a/tests/test-static-http.t
+++ b/tests/test-static-http.t
@@ -218,7 +218,7 @@ 

  List of files accessed over HTTP:

-  $ cat server.log | sed -n -e 's|.*GET \(/[^ ]*\).*|\1|p' | sort -u
+  $ cat server.log | sed -n -e 's|\\|/|g' -e 's|.*GET \(/[^ ]*\).*|\1|p'  
| sort -u
    /.hg/bookmarks
    /.hg/bookmarks.current