Show More
@@ -12,6 +12,7 b' import re' | |||||
12 | from mercurial.i18n import _ |
|
12 | from mercurial.i18n import _ | |
13 | from mercurial import ( |
|
13 | from mercurial import ( | |
14 | hook, |
|
14 | hook, | |
|
15 | pycompat, | |||
15 | util, |
|
16 | util, | |
16 | ) |
|
17 | ) | |
17 |
|
18 | |||
@@ -136,8 +137,8 b' def createlog(ui, directory=None, root="' | |||||
136 | except IOError: |
|
137 | except IOError: | |
137 | raise logerror(_('not a CVS sandbox')) |
|
138 | raise logerror(_('not a CVS sandbox')) | |
138 |
|
139 | |||
139 |
if prefix and not prefix.endswith( |
|
140 | if prefix and not prefix.endswith(pycompat.ossep): | |
140 |
prefix += |
|
141 | prefix += pycompat.ossep | |
141 |
|
142 | |||
142 | # Use the Root file in the sandbox, if it exists |
|
143 | # Use the Root file in the sandbox, if it exists | |
143 | try: |
|
144 | try: |
@@ -53,6 +53,7 b' from mercurial.i18n import _' | |||||
53 | from mercurial import ( |
|
53 | from mercurial import ( | |
54 | encoding, |
|
54 | encoding, | |
55 | error, |
|
55 | error, | |
|
56 | pycompat, | |||
56 | ) |
|
57 | ) | |
57 |
|
58 | |||
58 | # Note for extension authors: ONLY specify testedwith = 'ships-with-hg-core' for |
|
59 | # Note for extension authors: ONLY specify testedwith = 'ships-with-hg-core' for | |
@@ -97,7 +98,7 b' def appendsep(s):' | |||||
97 | except UnicodeError: |
|
98 | except UnicodeError: | |
98 | us = s |
|
99 | us = s | |
99 | if us and us[-1] not in ':/\\': |
|
100 | if us and us[-1] not in ':/\\': | |
100 |
s += |
|
101 | s += pycompat.ossep | |
101 | return s |
|
102 | return s | |
102 |
|
103 | |||
103 |
|
104 |
General Comments 0
You need to be logged in to leave comments.
Login now