/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to breezy/bundle/serializer/v08.py

  • Committer: Jelmer Vernooij
  • Date: 2018-03-24 17:48:04 UTC
  • mfrom: (6921 work)
  • mto: This revision was merged to the branch mainline in revision 6923.
  • Revision ID: jelmer@jelmer.uk-20180324174804-xf22o05byoj12x1q
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/bundle/serializer/v08.py
281
281
 
282
282
        def finish_action(action, file_id, kind, meta_modified, text_modified,
283
283
                          old_path, new_path):
284
 
            entry = new_tree.root_inventory.get_entry(file_id)
 
284
            entry = new_tree.root_inventory[file_id]
285
285
            if entry.revision != default_revision_id:
286
286
                action.add_utf8_property('last-changed', entry.revision)
287
287
            if meta_modified:
321
321
            new_rev = new_tree.get_file_revision(path, file_id)
322
322
            if new_rev is None:
323
323
                continue
324
 
            old_rev = old_tree.get_file_revision(old_tree.id2path(file_id), file_id)
 
324
            old_rev = old_tree.get_file_revision(path, file_id)
325
325
            if new_rev != old_rev:
326
326
                action = Action('modified', [new_tree.kind(path, file_id),
327
327
                                             path])