← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/changeset.py

  • Committer: Robert Collins
  • Date: 2005-10-03 01:42:16 UTC
  • Revision ID: robertc@robertcollins.net-20051003014215-ee2990904cc4c7ad
integrate in Gustavos x-bit patch

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/changeset.py
1384
1384
 
1385
1385
        if cs_entry is None:
1386
1386
            return None
 
1387
 
 
1388
        full_path_a = self.tree_a.readonly_path(id)
 
1389
        full_path_b = self.tree_b.readonly_path(id)
 
1390
        stat_a = self.lstat(full_path_a)
 
1391
        stat_b = self.lstat(full_path_b)
 
1392
 
 
1393
        cs_entry.metadata_change = self.make_mode_change(stat_a, stat_b)
 
1394
 
1387
1395
        if id in self.tree_a and id in self.tree_b:
1388
1396
            a_sha1 = self.tree_a.get_file_sha1(id)
1389
1397
            b_sha1 = self.tree_b.get_file_sha1(id)
1390
1398
            if None not in (a_sha1, b_sha1) and a_sha1 == b_sha1:
1391
1399
                return cs_entry
1392
1400
 
1393
 
        full_path_a = self.tree_a.readonly_path(id)
1394
 
        full_path_b = self.tree_b.readonly_path(id)
1395
 
        stat_a = self.lstat(full_path_a)
1396
 
        stat_b = self.lstat(full_path_b)
1397
 
        
1398
 
        cs_entry.metadata_change = self.make_mode_change(stat_a, stat_b)
1399
1401
        cs_entry.contents_change = self.make_contents_change(full_path_a,
1400
1402
                                                             stat_a, 
1401
1403
                                                             full_path_b,