/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to breezy/commit.py

  • Committer: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2017-06-19 01:29:45 UTC
  • mfrom: (6700.1.2 drop-fast-delta)
  • Revision ID: breezy.the.bot@gmail.com-20170619012945-b273h0mddn3yxpz6
Don't use record_entry_contents for commits with > 1 parent and in an older format.

Merged from https://code.launchpad.net/~jelmer/brz/drop-fast-delta/+merge/325895

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/commit.py
344
344
        self.work_tree.lock_write()
345
345
        operation.add_cleanup(self.work_tree.unlock)
346
346
        self.parents = self.work_tree.get_parent_ids()
347
 
        # We can use record_iter_changes IFF iter_changes is compatible with
348
 
        # the command line parameters, and the repository has fast delta
349
 
        # generation. See bug 347649.
 
347
        # We can use record_iter_changes IFF no tree references are involved.
350
348
        self.use_record_iter_changes = (
351
 
            not self.branch.repository._format.supports_tree_reference and
352
 
            (self.branch.repository._format.fast_deltas or
353
 
             len(self.parents) < 2))
 
349
            not self.branch.repository._format.supports_tree_reference)
354
350
        self.pb = ui.ui_factory.nested_progress_bar()
355
351
        operation.add_cleanup(self.pb.finished)
356
352
        self.basis_revid = self.work_tree.last_revision()