← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge.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/merge.py
39
39
from bzrlib.trace import mutter, warning, note
40
40
from bzrlib.fetch import greedy_fetch, fetch
41
41
from bzrlib.revision import is_ancestor, NULL_REVISION
42
 
from bzrlib.osutils import rename
 
42
from bzrlib.osutils import rename, pathjoin
43
43
from bzrlib.revision import common_ancestor, MultipleRevisionSources
44
44
from bzrlib.errors import NoSuchRevision
45
45
 
202
202
            abspath = self.create_all_missing(entry.parent_id, tree)
203
203
        else:
204
204
            abspath = self.abs_this_path(entry.parent_id)
205
 
        entry_path = os.path.join(abspath, entry.name)
 
205
        entry_path = pathjoin(abspath, entry.name)
206
206
        if not os.path.isdir(entry_path):
207
207
            self.create(file_id, entry_path, tree)
208
208
        return entry_path
217
217
        self.conflict("Other branch modified locally deleted file %s" %
218
218
                      other_path)
219
219
        parent_dir = self.add_missing_parents(file_id, self.other_tree)
220
 
        stem = os.path.join(parent_dir, os.path.basename(other_path))
 
220
        stem = pathjoin(parent_dir, os.path.basename(other_path))
221
221
        self.create(file_id, stem+".OTHER", self.other_tree)
222
222
        self.create(file_id, stem+".BASE", self.base_tree)
223
223
 
583
583
            entry = old_entries[file_id]
584
584
            if entry.parent_id is None:
585
585
                return entry.name
586
 
            return os.path.join(id2path(entry.parent_id), entry.name)
 
586
            return pathjoin(id2path(entry.parent_id), entry.name)
587
587
            
588
588
        for file_id in old_entries:
589
589
            entry = old_entries[file_id]
610
610
                parent = None
611
611
            else:
612
612
                parent = by_path[os.path.dirname(path)]
613
 
            abspath = os.path.join(self.this_tree.basedir, path)
 
613
            abspath = pathjoin(self.this_tree.basedir, path)
614
614
            kind = bzrlib.osutils.file_kind(abspath)
615
615
            new_inventory[file_id] = (path, file_id, parent, kind)
616
616
            by_path[path] = file_id