← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge.py

  • Committer: Patch Queue Manager
  • Date: 2012-02-20 12:40:02 UTC
  • mfrom: (6468.2.8 bzr)
  • Revision ID: pqm@pqm.ubuntu.com-20120220124002-0wte938ee8s7k0pm
(jelmer) Avoid direct access of tree inventories in a couple more places.
 (Jelmer Vernooij)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge.py
1260
1260
 
1261
1261
    def merge_names(self, file_id):
1262
1262
        def get_entry(tree):
1263
 
            if tree.has_id(file_id):
 
1263
            try:
1264
1264
                return tree.root_inventory[file_id]
1265
 
            else:
 
1265
            except errors.NoSuchId:
1266
1266
                return None
1267
1267
        this_entry = get_entry(self.this_tree)
1268
1268
        other_entry = get_entry(self.other_tree)