← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge.py

  • Committer: aaron.bentley at utoronto
  • Date: 2005-08-11 04:37:48 UTC
  • mto: (1092.1.41) (1185.3.4) (974.1.47)
  • mto: This revision was merged to the branch mainline in revision 1110.
  • Revision ID: aaron.bentley@utoronto.ca-20050811043748-9481c3082dae507d
Handled path generation properly

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge.py
272
272
    old_entries = this_branch.read_working_inventory()
273
273
    new_inventory = {}
274
274
    by_path = {}
 
275
    new_entries_map = {} 
 
276
    for path, file_id in new_entries:
 
277
        if path is None:
 
278
            continue
 
279
        new_entries_map[file_id] = path
 
280
 
 
281
    def id2path(file_id):
 
282
        path = new_entries_map.get(file_id)
 
283
        if path is not None:
 
284
            return path
 
285
        entry = old_entries[file_id]
 
286
        if entry.parent_id is None:
 
287
            return entry.name
 
288
        return os.path.join(id2path(entry.parent_id), entry.name)
 
289
        
275
290
    for file_id in old_entries:
276
291
        entry = old_entries[file_id]
277
 
        path = old_entries.id2path(file_id)
 
292
        path = id2path(file_id)
278
293
        new_inventory[file_id] = (path, file_id, entry.parent_id, entry.kind)
279
294
        by_path[path] = file_id
280
295