url: refactor util.drop_scheme() and hg.localpath() into url.localpath() This replaces util.drop_scheme() with url.localpath(), using url.url for parsing instead of doing it on its own. The function is moved from util to url to avoid an import cycle. hg.localpath() is removed in favor of using url.localpath(). This provides more consistent behavior between "hg clone" and other commands. To preserve backwards compatibility, URLs like bundle://../foo still refer to ../foo, not /foo. If a URL contains a scheme, percent-encoded entities are decoded. When there's no scheme, all characters are left untouched. Comparison of old and new behaviors: URL drop_scheme() hg.localpath() url.localpath() === ============= ============== =============== file://foo/foo /foo foo/foo /foo file://localhost:80/foo /foo localhost:80/foo /foo file://localhost:/foo /foo localhost:/foo /foo file://localhost/foo /foo /foo /foo file:///foo /foo /foo /foo file://foo (empty string) foo / file:/foo /foo /foo /foo file:foo foo foo foo file:foo%23bar foo%23bar foo%23bar foo#bar foo%23bar foo%23bar foo%23bar foo%23bar /foo /foo /foo /foo Windows-related paths on Windows: URL drop_scheme() hg.localpath() url.localpath() === ============= ============== =============== file:///C:/foo C:/C:/foo /C:/foo C:/foo file:///D:/foo C:/D:/foo /D:/foo D:/foo file://C:/foo C:/foo C:/foo C:/foo file://D:/foo C:/foo D:/foo D:/foo file:////foo/bar //foo/bar //foo/bar //foo/bar //foo/bar //foo/bar //foo/bar //foo/bar \\foo\bar //foo/bar //foo/bar \\foo\bar Windows-related paths on other platforms: file:///C:/foo C:/C:/foo /C:/foo C:/foo file:///D:/foo C:/D:/foo /D:/foo D:/foo file://C:/foo C:/foo C:/foo C:/foo file://D:/foo C:/foo D:/foo D:/foo file:////foo/bar //foo/bar //foo/bar //foo/bar //foo/bar //foo/bar //foo/bar //foo/bar \\foo\bar //foo/bar //foo/bar \\foo\bar For more information about file:// URL handling, see: http://www-archive.mozilla.org/quality/networking/testing/filetests.html Related issues: - issue1153: File URIs aren't handled correctly in windows This patch should preserve the fix implemented in 2770d03ae49f. However, it goes a step further and "promotes" Windows-style drive letters from being interpreted as host names to being part of the path. - issue2154: Cannot escape '#' in Mercurial URLs (#1172 in THG) The fragment is still interpreted as a revision or a branch, even in paths to bundles. However, when file: is used, percent-encoded entities are decoded, so file:test%23bundle.hg can refer to test#bundle.hg ond isk.

     1

  $ mkdir test

     2

  $ cd test

     3

     4

  $ echo foo>foo

     5

  $ hg init

     6

  $ hg addremove

     7

  adding foo

     8

  $ hg commit -m 1

     9

    10

  $ hg verify

    11

  checking changesets

    12

  checking manifests

    13

  crosschecking files in changesets and manifests

    14

  checking files

    15

  1 files, 1 changesets, 1 total revisions

    16

    17

  $ hg serve -p $HGPORT -d --pid-file=hg.pid

    18

  $ cat hg.pid >> $DAEMON_PIDS

    19

  $ cd ..

    20

    21

  $ hg clone --pull http://foo:bar@localhost:$HGPORT/ copy

    22

  requesting all changes

    23

  adding changesets

    24

  adding manifests

    25

  adding file changes

    26

  added 1 changesets with 1 changes to 1 files

    27

  updating to branch default

    28

  1 files updated, 0 files merged, 0 files removed, 0 files unresolved

    29

    30

  $ cd copy

    31

  $ hg verify

    32

  checking changesets

    33

  checking manifests

    34

  crosschecking files in changesets and manifests

    35

  checking files

    36

  1 files, 1 changesets, 1 total revisions

    37

    38

  $ hg co

    39

  0 files updated, 0 files merged, 0 files removed, 0 files unresolved

    40

  $ cat foo

    41

  foo

    42

    43

  $ hg manifest --debug

    44

  2ed2a3912a0b24502043eae84ee4b279c18b90dd 644   foo

    45

    46

  $ hg pull

    47

  pulling from http://foo:***@localhost:$HGPORT/

    48

  searching for changes

    49

  no changes found

    50

    51

  $ hg rollback --dry-run --verbose

    52

  repository tip rolled back to revision -1 (undo pull: http://foo:***@localhost:$HGPORT/)

    53

    54

Issue622: hg init && hg pull -u URL doesn't checkout default branch

    55

    56

  $ cd ..

    57

  $ hg init empty

    58

  $ cd empty

    59

  $ hg pull -u ../test

    60

  pulling from ../test

    61

  requesting all changes

    62

  adding changesets

    63

  adding manifests

    64

  adding file changes

    65

  added 1 changesets with 1 changes to 1 files

    66

  1 files updated, 0 files merged, 0 files removed, 0 files unresolved

    67

    68

Test 'file:' uri handling:

    69

    70

  $ hg pull -q file://../test-doesnt-exist

    71

  abort: file:// URLs can only refer to localhost

    72

  [255]

    73

    74

  $ hg pull -q file://../test

    75

  abort: file:// URLs can only refer to localhost

    76

  [255]

    77

    78

  $ hg pull -q file:../test

    79

    80

It's tricky to make file:// URLs working on every platform with

    81

regular shell commands.

    82

    83

  $ URL=`python -c "import os; print 'file://foobar' + ('/' + os.getcwd().replace(os.sep, '/')).replace('//', '/') + '/../test'"`

    84

  $ hg pull -q "$URL"

    85

  abort: file:// URLs can only refer to localhost

    86

  [255]

    87

    88

  $ URL=`python -c "import os; print 'file://localhost' + ('/' + os.getcwd().replace(os.sep, '/')).replace('//', '/') + '/../test'"`

    89

  $ hg pull -q "$URL"