~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/commit.py

  • Committer: Robert Collins
  • Date: 2005-10-15 11:38:29 UTC
  • mfrom: (1185.16.40)
  • Revision ID: robertc@lifelesslap.robertcollins.net-20051015113829-40226233fb246920
mergeĀ fromĀ martin

Show diffs side-by-side

added added

removed removed

Lines of Context:
160
160
               specific_files=None,
161
161
               rev_id=None,
162
162
               allow_pointless=True,
163
 
               verbose=False):
 
163
               verbose=False,
 
164
               revprops=None):
164
165
        """Commit working copy as a new revision.
165
166
 
166
167
        timestamp -- if not None, seconds-since-epoch for a
176
177
 
177
178
        allow_pointless -- If true (default), commit even if nothing
178
179
            has changed and no merges are recorded.
 
180
 
 
181
        revprops -- Properties for new revision
179
182
        """
180
183
        mutter('preparing to commit')
181
184
 
184
187
        self.rev_id = rev_id
185
188
        self.specific_files = specific_files
186
189
        self.allow_pointless = allow_pointless
 
190
        self.revprops = revprops
187
191
 
188
192
        if timestamp is None:
189
193
            self.timestamp = time.time()
304
308
                            committer=self.committer,
305
309
                            message=self.message,
306
310
                            inventory_sha1=self.inv_sha1,
307
 
                            revision_id=self.rev_id)
 
311
                            revision_id=self.rev_id,
 
312
                            properties=self.revprops)
308
313
        self.rev.parent_ids = self.parents
309
314
        rev_tmp = StringIO()
310
315
        serializer_v5.write_revision(self.rev, rev_tmp)