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

  $ hg init t

     2

  $ cd t

     3

  $ echo 1 > foo

     4

  $ hg ci -Am m

     5

  adding foo

     6

     7

  $ cd ..

     8

  $ hg clone t tt

     9

  updating to branch default

    10

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

    11

  $ cd tt

    12

  $ echo 1.1 > foo

    13

  $ hg ci -Am m

    14

    15

  $ cd ../t

    16

  $ echo 1.2 > foo

    17

  $ hg ci -Am m

    18

    19

Should not update:

    20

    21

  $ hg pull -u ../tt

    22

  pulling from ../tt

    23

  searching for changes

    24

  adding changesets

    25

  adding manifests

    26

  adding file changes

    27

  added 1 changesets with 1 changes to 1 files (+1 heads)

    28

  not updating, since new heads added

    29

  (run 'hg heads' to see heads, 'hg merge' to merge)

    30

    31

  $ cd ../tt

    32

    33

Should not update:

    34

    35

  $ hg pull -u ../t

    36

  pulling from ../t

    37

  searching for changes

    38

  adding changesets

    39

  adding manifests

    40

  adding file changes

    41

  added 1 changesets with 1 changes to 1 files (+1 heads)

    42

  not updating, since new heads added

    43

  (run 'hg heads' to see heads, 'hg merge' to merge)

    44

    45

  $ HGMERGE=true hg merge

    46

  merging foo

    47

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

    48

  (branch merge, don't forget to commit)

    49

  $ hg ci -mm

    50

    51

  $ cd ../t

    52

    53

Should work:

    54

    55

  $ hg pull -u ../tt

    56

  pulling from ../tt

    57

  searching for changes

    58

  adding changesets

    59

  adding manifests

    60

  adding file changes

    61

  added 1 changesets with 1 changes to 1 files (-1 heads)

    62

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

    63