← Back to branch summary

~bzr-pqm/bzr/bzr.dev

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/repository.py

Committer: Robert Collins
Date: 2008-11-14 00:16:23 UTC
mfrom: (3735.6.2 brisbane-core)
mto: (3735.30.1 trivial-fixes) (4194.1.1 bbc) (4216.5.1 bbc) (4265.1.1 bbc-merge)
mto: This revision was merged to the branch mainline in revision 4280.
Revision ID: robertc@robertcollins.net-20081114001623-vfblxa8k3vhg127a

Merge bb-core.

files modified:
bzrlib/repofmt/pack_repo.py

bzrlib/repository.py

bzrlib/tests/test_pack_repository.py

Show diffs side-by-side

added added

removed removed

bzrlib/repository.py

2142

2142

2143

2143

def _make_inv_delta(old, new):

2144

2144

"""Make an inventory delta from two inventories."""

2145

old_ids = set(old._byid.iterkeys())

2146

new_ids = set(new._byid.iterkeys())

2145

old_ids = set(old)

2146

new_ids = set(new)

2147

2147

adds = new_ids - old_ids

2148

2148

deletes = old_ids - new_ids

2149

2149

common = old_ids.intersection(new_ids)

Older »