← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/transform.py

Swapped os.path.join for pathjoin everywhere

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transform.py
178
178
        # don't follow final symlinks
179
179
        dirname, basename = os.path.split(self._tree.abspath(path))
180
180
        dirname = os.path.realpath(dirname)
181
 
        return self._tree.relpath(os.path.join(dirname, basename))
 
181
        return self._tree.relpath(pathjoin(dirname, basename))
182
182
 
183
183
    def get_tree_path_id(self, path):
184
184
        """Determine (and maybe set) the transaction ID for a tree path."""
639
639
 
640
640
    def _limbo_name(self, trans_id):
641
641
        """Generate the limbo name of a file"""
642
 
        return os.path.join(self._limbodir, trans_id)
 
642
        return pathjoin(self._limbodir, trans_id)
643
643
 
644
644
    def _apply_removals(self, inv, limbo_inv):
645
645
        """Perform tree operations that remove directory/inventory names.
784
784
    if parent is None or parent == "":
785
785
        return child
786
786
    else:
787
 
        return os.path.join(parent, child)
 
787
        return pathjoin(parent, child)
788
788
 
789
789
class FinalPaths(object):
790
790
    """Make path calculation cheap by memoizing paths.
805
805
        if parent_id == self.transform.root:
806
806
            return name
807
807
        else:
808
 
            return os.path.join(self.get_path(parent_id), name)
 
808
            return pathjoin(self.get_path(parent_id), name)
809
809
 
810
810
    def get_path(self, trans_id):
811
811
        """Find the final path associated with a trans_id"""