← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to gen_changeset.py

  • Committer: John Arbash Meinel
  • Date: 2005-07-10 16:20:25 UTC
  • mto: (0.5.85) (1185.82.1 bzr-w-changeset)
  • mto: This revision was merged to the branch mainline in revision 1738.
  • Revision ID: john@arbash-meinel.com-20050710162025-010e82b26b3f6f84
Some fixups for gen_changeset.

Show diffs side-by-side

added added

removed removed

Lines of Context:
gen_changeset.py
221
221
                    self.target_rev_id,
222
222
                    self.base_branch, self.base_rev_id)
223
223
 
224
 
 
225
 
        # print 'target: %s' % self.target_rev_id
226
 
        # print 'base:   %s' % self.base_rev_id
227
 
        # print 'start:  %s' % self.starting_rev_id
228
 
 
229
224
        rev_id_list = _create_ancestry_to_rev(self.target_branch,
230
225
                self.starting_rev_id, self.target_rev_id)
 
226
 
 
227
        assert rev_id_list[-1] == self.starting_rev_id
 
228
        # The last entry should be starting_rev_id which should
 
229
        # exist in both base and target, so we don't need to
 
230
        # include it in the changeset
 
231
        rev_id_list.pop()
231
232
        rev_id_list.reverse()
232
233
 
233
234
        self.revision_list = [self.target_branch.get_revision(rid) 
333
334
        diff_file = internal_diff
334
335
        # Get the target tree so that we can check for
335
336
        # Appropriate text ids.
336
 
        rev_id = self.revision_list[-1].revision_id
337
 
        tree = self.target_branch.revision_tree(rev_id)
 
337
        rev_id = self.target_rev_id
 
338
        tree = self.target_tree
338
339
 
339
340
 
340
341
        def get_text_id_str(file_id, modified=True):