Show More
@@ -447,6 +447,7 b' test-subrepo-missing.t' | |||||
447 | test-subrepo-recursion.t |
|
447 | test-subrepo-recursion.t | |
448 | test-subrepo-relative-path.t |
|
448 | test-subrepo-relative-path.t | |
449 | test-subrepo.t |
|
449 | test-subrepo.t | |
|
450 | test-symlink-os-yes-fs-no.py | |||
450 | test-symlinks.t |
|
451 | test-symlinks.t | |
451 | test-tag.t |
|
452 | test-tag.t | |
452 | test-tags.t |
|
453 | test-tags.t |
@@ -6,6 +6,7 b' import time' | |||||
6 | from mercurial import ( |
|
6 | from mercurial import ( | |
7 | commands, |
|
7 | commands, | |
8 | hg, |
|
8 | hg, | |
|
9 | pycompat, | |||
9 | ui as uimod, |
|
10 | ui as uimod, | |
10 | util, |
|
11 | util, | |
11 | ) |
|
12 | ) | |
@@ -19,13 +20,13 b' if not getattr(os, "symlink", False):' | |||||
19 |
|
20 | |||
20 | u = uimod.ui.load() |
|
21 | u = uimod.ui.load() | |
21 | # hide outer repo |
|
22 | # hide outer repo | |
22 | hg.peer(u, {}, '.', create=True) |
|
23 | hg.peer(u, {}, b'.', create=True) | |
23 |
|
24 | |||
24 | # unbundle with symlink support |
|
25 | # unbundle with symlink support | |
25 | hg.peer(u, {}, 'test0', create=True) |
|
26 | hg.peer(u, {}, b'test0', create=True) | |
26 |
|
27 | |||
27 | repo = hg.repository(u, 'test0') |
|
28 | repo = hg.repository(u, b'test0') | |
28 | commands.unbundle(u, repo, BUNDLEPATH, update=True) |
|
29 | commands.unbundle(u, repo, pycompat.fsencode(BUNDLEPATH), update=True) | |
29 |
|
30 | |||
30 | # wait a bit, or the status call wont update the dirstate |
|
31 | # wait a bit, or the status call wont update the dirstate | |
31 | time.sleep(1) |
|
32 | time.sleep(1) | |
@@ -42,7 +43,7 b' os.path.islink = islink_failure' | |||||
42 |
|
43 | |||
43 | # dereference links as if a Samba server has exported this to a |
|
44 | # dereference links as if a Samba server has exported this to a | |
44 | # Windows client |
|
45 | # Windows client | |
45 | for f in 'test0/a.lnk', 'test0/d/b.lnk': |
|
46 | for f in b'test0/a.lnk', b'test0/d/b.lnk': | |
46 | os.unlink(f) |
|
47 | os.unlink(f) | |
47 | fp = open(f, 'wb') |
|
48 | fp = open(f, 'wb') | |
48 | fp.write(util.readfile(f[:-4])) |
|
49 | fp.write(util.readfile(f[:-4])) | |
@@ -50,11 +51,11 b" for f in 'test0/a.lnk', 'test0/d/b.lnk':" | |||||
50 |
|
51 | |||
51 | # reload repository |
|
52 | # reload repository | |
52 | u = uimod.ui.load() |
|
53 | u = uimod.ui.load() | |
53 | repo = hg.repository(u, 'test0') |
|
54 | repo = hg.repository(u, b'test0') | |
54 | commands.status(u, repo) |
|
55 | commands.status(u, repo) | |
55 |
|
56 | |||
56 | # try unbundling a repo which contains symlinks |
|
57 | # try unbundling a repo which contains symlinks | |
57 | u = uimod.ui.load() |
|
58 | u = uimod.ui.load() | |
58 |
|
59 | |||
59 | repo = hg.repository(u, 'test1', create=True) |
|
60 | repo = hg.repository(u, b'test1', create=True) | |
60 | commands.unbundle(u, repo, BUNDLEPATH, update=True) |
|
61 | commands.unbundle(u, repo, pycompat.fsencode(BUNDLEPATH), update=True) |
General Comments 0
You need to be logged in to leave comments.
Login now