comparison mercurial/util.py @ 15018:e89f62dcd723 stable

url: really handle urls of the form file:///c:/foo/bar/ correctly

28edd65000d9 made sure that paths that seemed to start with a windows drive
letter would not get an extra leading slash.

localpath should thus not try to handle this case by removing a leading slash,
and this special handling is thus removed.

(The localpath handling of this case was wrong anyway, because paths that look
like they start with a windows drive letter can't have a leading slash.)

A quick verification of this is to run 'hg id file:///c:/foo/bar/'.

15007:9991f8b19ff3

                else:
                    self.host = parts[0]
                    path = None
                if not self.host:
                    self.host = None
                    if path and not hasdriveletter(path):
                        path = '/' + path

            if self.host and '@' in self.host:
                self.user, self.host = self.host.rsplit('@', 1)

            # letters to paths with drive letters.
            if hasdriveletter(self._hostport):
                path = self._hostport + '/' + self.path
            elif self.host is not None and self.path:
                path = '/' + path
            # We also need to handle the case of file:///C:/, which
            # should return C:/, not /C:/.
            elif hasdriveletter(path):
                # Strip leading slash from paths with drive names
                return path[1:]
            return path
        return self._origpath

def hasscheme(path):
    return bool(url(path).scheme)

15018:e89f62dcd723

                else:
                    self.host = parts[0]
                    path = None
                if not self.host:
                    self.host = None
                    # path of file:///d is /d
                    # path of file:///d:/ is d:/, not /d:/
                    if path and not hasdriveletter(path):
                        path = '/' + path

            if self.host and '@' in self.host:
                self.user, self.host = self.host.rsplit('@', 1)

            # letters to paths with drive letters.
            if hasdriveletter(self._hostport):
                path = self._hostport + '/' + self.path
            elif self.host is not None and self.path:
                path = '/' + path
            return path
        return self._origpath

def hasscheme(path):
    return bool(url(path).scheme)