← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/branch.py

  • Committer: John Arbash Meinel
  • Date: 2005-12-01 17:11:25 UTC
  • mto: (1185.50.19 bzr-jam-integration)
  • mto: This revision was merged to the branch mainline in revision 1532.
  • Revision ID: john@arbash-meinel.com-20051201171125-5e1f0970246c4925
Updated the bzr sourcecode to use bzrlib.osutils.pathjoin rather than os.path.join to enforce internal use of / instead of \

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/branch.py
27
27
import bzrlib.inventory as inventory
28
28
from bzrlib.trace import mutter, note
29
29
from bzrlib.osutils import (isdir, quotefn,
30
 
                            rename, splitpath, sha_file, appendpath, 
31
 
                            file_kind, abspath)
 
30
                            rename, splitpath, sha_file,
 
31
                            file_kind, abspath, pathjoin)
32
32
import bzrlib.errors as errors
33
33
from bzrlib.errors import (BzrError, InvalidRevisionNumber, InvalidRevisionId,
34
34
                           NoSuchRevision, HistoryMissing, NotBranchError,
573
573
                              prefixed=prefixed,
574
574
                              compressed=compressed)
575
575
            #if self._transport.should_cache():
576
 
            #    cache_path = os.path.join(self.cache_root, name)
 
576
            #    cache_path = pathjoin(self.cache_root, name)
577
577
            #    os.mkdir(cache_path)
578
578
            #    store = bzrlib.store.CachedStore(store, cache_path)
579
579
            return store
1125
1125
        ...   orig.base == clone.base
1126
1126
        ...
1127
1127
        False
1128
 
        >>> os.path.isfile(os.path.join(clone.base, "file1"))
 
1128
        >>> os.path.isfile(pathjoin(clone.base, "file1"))
1129
1129
        True
1130
1130
        """
1131
1131
        from shutil import copytree