~bzr-pqm/bzr/bzr.dev

Viewing changes to bzrlib/workingtree_4.py

Committer: John Arbash Meinel
Date: 2007-02-25 21:08:22 UTC
mto: (2255.13.2 subtree) (2321.1.1 integration)
mto: This revision was merged to the branch mainline in revision 2322.
Revision ID: john@arbash-meinel.com-20070225210822-22ll2yy3qfeo5bko

Simplify the update_minimal api a little bit, and document the parameters.
Switch from kind => minikind, since we frequently already have that anyway,
and update_minimal is a thin wrapper on changing the dirblocks in memory, not
converting from an Inventory.

files modified:
bzrlib/dirstate.py

bzrlib/workingtree_4.py

Show diffs side-by-side

added added

removed removed

bzrlib/workingtree_4.py

524

# remove the old row

525

from_key = old_block[old_entry_index][0]

526

to_key = ((to_block[0],) + from_key[1:3])

527

# We must grab old_entry_details here, because _make_absent

528

# will mark this record as absent and destroy any info we used

529

# to have

527

530

minikind = old_entry_details[0][0]

528

kind = dirstate.DirState._minikind_to_kind[minikind]

529

531

state._make_absent(old_block[old_entry_index])

530

532

rollbacks.append(

531

533

lambda:state.update_minimal(from_key,

532

kind,

533

num_present_parents=len(old_entry_details) - 1,

534

minikind,

534

535

executable=old_entry_details[0][3],

535

536

fingerprint=old_entry_details[0][1],

536

537

packed_stat=old_entry_details[0][4],

539

540

path_utf8=from_rel.encode('utf8')))

540

541

# create new row in current block

541

542

state.update_minimal(to_key,

542