← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/commit.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2006-04-06 10:41:03 UTC
  • mfrom: (1638.1.2 integration)
  • Revision ID: pqm@pqm.ubuntu.com-20060406104103-849a925941c89106
Change the basis-inventory file to not have the revision-id in the file name.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/commit.py
334
334
            self.branch.append_revision(self.rev_id)
335
335
 
336
336
            self.work_tree.set_pending_merges([])
337
 
            if len(self.parents):
338
 
                precursor = self.parents[0]
339
 
            else:
340
 
                precursor = None
341
 
            self.work_tree.set_last_revision(self.rev_id, precursor)
 
337
            self.work_tree.set_last_revision(self.rev_id)
342
338
            # now the work tree is up to date with the branch
343
339
            
344
340
            self.reporter.completed(self.branch.revno(), self.rev_id)
526
522
        revision set to their prior value.
527
523
        """
528
524
        mutter("Selecting files for commit with filter %s", self.specific_files)
529
 
        self.new_inv = Inventory()
 
525
        self.new_inv = Inventory(revision_id=self.rev_id)
530
526
        for path, new_ie in self.work_inv.iter_entries():
531
527
            file_id = new_ie.file_id
532
528
            mutter('check %s {%s}', path, new_ie.file_id)