~bzr-pqm/bzr/bzr.dev

Committer: John Arbash Meinel
Date: 2011-01-25 22:54:08 UTC
mto: This revision was merged to the branch mainline in revision 5636.
Revision ID: john@arbash-meinel.com-20110125225408-w5b5mmh117q4jjz1

Implement a reset-to-known-state ability for DirState.

Use this in reset_state(). Allow it to use header information if it can
be parsed, otherwise allow us to pass in the information.

files modified:
bzrlib/dirstate.py

bzrlib/tests/per_workingtree/test_check_state.py

bzrlib/tests/test_dirstate.py

bzrlib/workingtree_4.py

Show diffs side-by-side

added added

removed removed

bzrlib/dirstate.py

# This program is free software; you can redistribute it and/or modify

# it under the terms of the GNU General Public License as published by

2681

if tracing:

2682

trace.mutter("set_state_from_inventory complete.")

2683

2684

def set_state_from_scratch(self, working_inv, parent_trees, parent_ghosts):

2685

"""Wipe the currently stored state and set it to something new.

2686

2687

This is a hard-reset for the data we are working with.

2688

"""

2689

# Technically, we really want a write lock, but until we write, we

2690

# don't really need it.

2691

self._requires_lock()

2692

# root dir and root dir contents with no children. We have to have a

2693

# root for set_state_from_inventory to work correctly.

2694

empty_root = (('', '', inventory.ROOT_ID),

2695

[('d', '', 0, False, DirState.NULLSTAT)])

2696

empty_tree_dirblocks = [('', [empty_root]), ('', [])]

2697

self._set_data([], empty_tree_dirblocks)

2698

self.set_state_from_inventory(working_inv)

2699

self.set_parent_trees(parent_trees, parent_ghosts)

2700

2684

2701

def _make_absent(self, current_old):

2685

2702

"""Mark current_old - an entry - as absent for tree 0.

2686

2703

Older »