~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/transport/local.py

  • Committer: Shannon Weyrick
  • Date: 2011-11-04 13:40:04 UTC
  • mfrom: (6238 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6256.
  • Revision ID: weyrick@mozek.us-20111104134004-033t2wqhc3ydzm0a
Merge

Show diffs side-by-side

added added

removed removed

Lines of Context:
567
567
        self._local_base = urlutils._win32_local_path_from_url(base)
568
568
 
569
569
    def abspath(self, relpath):
570
 
        path = osutils.normpath(osutils.pathjoin(
 
570
        path = osutils._win32_normpath(osutils.pathjoin(
571
571
                    self._local_base, urlutils.unescape(relpath)))
572
572
        return urlutils._win32_local_path_to_url(path)
573
573