← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to shelf.py

  • Committer: Aaron Bentley
  • Date: 2008-10-09 12:47:07 UTC
  • mto: (0.15.11 unshelve)
  • mto: This revision was merged to the branch mainline in revision 3820.
  • Revision ID: aaron@aaronbentley.com-20081009124707-u3q69tkljecv9pyo
Provide path and kind when deletes/adds are detected.

Show diffs side-by-side

added added

removed removed

Lines of Context:
shelf.py
40
40
            if kind[0] is None or versioned[0] == False:
41
41
                self.creation[file_id] = (kind[1], names[1], parents[1],
42
42
                                          versioned)
43
 
                yield ('add file', file_id, kind[1])
 
43
                yield ('add file', file_id, kind[1], paths[1])
44
44
            elif kind[1] is None or versioned[0] == False:
45
45
                self.deletion[file_id] = (kind[0], names[0], parents[0],
46
46
                                          versioned)
47
 
                yield ('delete file', file_id)
 
47
                yield ('delete file', file_id, kind[0], paths[0])
48
48
            else:
49
49
                if names[0] != names[1] or parents[0] != parents[1]:
50
50
                    self.renames[file_id] = (names, parents)