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

import os

     2

from mercurial import hg, ui, merge

     3

     4

u = ui.ui()

     5

     6

repo = hg.repository(u, 'test1', create=1)

     7

os.chdir('test1')

     8

     9

def commit(text, time):

    10

    repo.commit(text=text, date="%d 0" % time)

    11

    12

def addcommit(name, time):

    13

    f = open(name, 'w')

    14

    f.write('%s\n' % name)

    15

    f.close()

    16

    repo[None].add([name])

    17

    commit(name, time)

    18

    19

def update(rev):

    20

    merge.update(repo, rev, False, True, False)

    21

    22

def merge_(rev):

    23

    merge.update(repo, rev, True, False, False)

    24

    25

if __name__ == '__main__':

    26

    addcommit("A", 0)

    27

    addcommit("B", 1)

    28

    29

    update(0)

    30

    addcommit("C", 2)

    31

    32

    merge_(1)

    33

    commit("D", 3)

    34

    35

    update(2)

    36

    addcommit("E", 4)

    37

    addcommit("F", 5)

    38

    39

    update(3)

    40

    addcommit("G", 6)

    41

    42

    merge_(5)

    43

    commit("H", 7)

    44

    45

    update(5)

    46

    addcommit("I", 8)

    47

    48

    # Ancestors

    49

    print 'Ancestors of 5'

    50

    for r in repo.changelog.ancestors(5):

    51

        print r,

    52

    53

    print '\nAncestors of 6 and 5'

    54

    for r in repo.changelog.ancestors(6, 5):

    55

        print r,

    56

    57

    print '\nAncestors of 5 and 4'

    58

    for r in repo.changelog.ancestors(5, 4):

    59

        print r,

    60

    61

    # Descendants

    62

    print '\n\nDescendants of 5'

    63

    for r in repo.changelog.descendants(5):

    64

        print r,

    65

    66

    print '\nDescendants of 5 and 3'

    67

    for r in repo.changelog.descendants(5, 3):

    68

        print r,

    69

    70

    print '\nDescendants of 5 and 4'

    71

    for r in repo.changelog.descendants(5, 4):

    72

        print r,

    73