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

     2

  $ echo "[extensions]" >> $HGRCPATH

     3

  $ echo "mq=" >> $HGRCPATH

     4

     5

  $ hg init a

     6

  $ cd a

     7

     8

  $ echo 'base' > base

     9

  $ hg ci -Ambase

    10

  adding base

    11

    12

  $ hg qnew -mmqbase mqbase

    13

    14

  $ hg qrename mqbase renamed

    15

  $ mkdir .hg/patches/foo

    16

  $ hg qrename renamed foo

    17

    18

  $ hg qseries

    19

  foo/renamed

    20

    21

  $ ls .hg/patches/foo

    22

  renamed

    23

    24

  $ mkdir .hg/patches/bar

    25

  $ hg qrename foo/renamed bar

    26

    27

  $ hg qseries

    28

  bar/renamed

    29

    30

  $ ls .hg/patches/bar

    31

  renamed

    32

    33

  $ hg qrename bar/renamed baz

    34

    35

  $ hg qseries

    36

  baz

    37

    38

  $ ls .hg/patches/baz

    39

  .hg/patches/baz

    40

    41

  $ hg qrename baz new/dir

    42

    43

  $ hg qseries

    44

  new/dir

    45

    46

  $ ls .hg/patches/new/dir

    47

  .hg/patches/new/dir

    48

    49

  $ cd ..

    50

    51

Test patch being renamed before committed:

    52

    53

  $ hg init b

    54

  $ cd b

    55

  $ hg qinit -c

    56

  $ hg qnew x

    57

  $ hg qrename y

    58

  $ hg qcommit -m rename

    59

    60

  $ cd ..

    61

    62

Test overlapping renames (issue2388)

    63

    64

  $ hg init c

    65

  $ cd c

    66

  $ hg qinit -c

    67

  $ echo a > a

    68

  $ hg add

    69

  adding a

    70

  $ hg qnew patcha

    71

  $ echo b > b

    72

  $ hg add

    73

  adding b

    74

  $ hg qnew patchb

    75

  $ hg ci --mq -m c1

    76

  $ hg qrename patchb patchc

    77

  $ hg qrename patcha patchb

    78

  $ hg st --mq

    79

  M patchb

    80

  M series

    81

  A patchc

    82

  R patcha

    83

  $ cd ..

    84

    85

Test renames with mq repo (issue2097)

    86

    87

  $ hg init issue2097

    88

  $ cd issue2097

    89

  $ hg qnew p0

    90

  $ (cd .hg/patches && hg init)

    91

  $ hg qren p0 p1

    92

  $ hg debugstate --mq

    93

  $ hg ci --mq -mq0

    94

  nothing changed

    95

  [1]

    96

  $ cd ..