Mercurial > hg > mercurial-crew-with-dirclash
comparison mercurial/util.py @ 1566:8befbb4e30b2
Handle hg under /
| author | Arun Sharma <arun@sharma-home.net> |
|---|---|
| date | Thu, 01 Dec 2005 10:48:42 -0600 |
| parents | cc2a2e12f4ad |
| children | b3e94785ab69 |
comparison
equal
deleted
inserted
replaced
| 1565:4bcbc126b80b | 1566:8befbb4e30b2 |
|---|---|
| 173 b.reverse() | 173 b.reverse() |
| 174 return os.sep.join((['..'] * len(a)) + b) | 174 return os.sep.join((['..'] * len(a)) + b) |
| 175 | 175 |
| 176 def canonpath(root, cwd, myname): | 176 def canonpath(root, cwd, myname): |
| 177 """return the canonical path of myname, given cwd and root""" | 177 """return the canonical path of myname, given cwd and root""" |
| 178 rootsep = root + os.sep | 178 if root == os.sep: |
| 179 rootsep = os.sep | |
| 180 else: | |
| 181 rootsep = root + os.sep | |
| 179 name = myname | 182 name = myname |
| 180 if not name.startswith(os.sep): | 183 if not name.startswith(os.sep): |
| 181 name = os.path.join(root, cwd, name) | 184 name = os.path.join(root, cwd, name) |
| 182 name = os.path.normpath(name) | 185 name = os.path.normpath(name) |
| 183 if name.startswith(rootsep): | 186 if name.startswith(rootsep): |