~bzr-pqm/bzr/bzr.dev

Committer: John Arbash Meinel
Date: 2008-12-05 16:29:05 UTC
mto: (3735.13.1 merge_dev) (3879.2.10 differ_serializer)
mto: This revision was merged to the branch mainline in revision 3889.
Revision ID: john@arbash-meinel.com-20081205162905-12c9k3esfetyes4a

Hide the .basis_delta variable, and require callers to use .get_basis_delta()
This allows us to check that the callers were sure they would be
generating a proper delta, by using CommitBuilder.record_delete() correctly.

files modified:
bzrlib/commit.py

bzrlib/repository.py

Show diffs side-by-side

added added

removed removed

bzrlib/commit.py

352

entries_title="Directory")

353

self.builder = self.branch.get_commit_builder(self.parents,

354

self.config, timestamp, timezone, committer, revprops, rev_id)

355

356

try:

357

self.builder.recording_deletes()

357

self.builder.will_record_deletes()

358

# find the location being committed to

359

if self.bound_branch:

360

master_location = self.master_branch.base

412

# Make the working tree up to date with the branch

413

self._set_progress_stage("Updating the working tree")

414

self.work_tree.update_basis_by_delta(self.rev_id,

415

self.builder.basis_delta)

415

self.builder.get_basis_delta())

416

self.reporter.completed(new_revno, self.rev_id)

417

self._process_post_hooks(old_revno, new_revno)

418

finally:

Older »