← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/store/weave.py

  • Committer: Martin Pool
  • Date: 2005-10-04 02:27:27 UTC
  • mfrom: (1399)
  • mto: (1185.13.3)
  • mto: This revision was merged to the branch mainline in revision 1400.
  • Revision ID: mbp@sourcefrog.net-20051004022727-aee7064c62e039a7
[merge] merge robertc's format5 integration

 - test status on specific files
 - track x bit
 - baz2bzr fixes
 - remotebranch fixes

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/store/weave.py
115
115
        w.add(rev_id, parent_idxs, new_lines)
116
116
        self.put_weave(file_id, w)
117
117
        
 
118
    def add_identical_text(self, file_id, old_rev_id, new_rev_id, parents):
 
119
        w = self.get_weave_or_empty(file_id)
 
120
        parent_idxs = map(w.lookup, parents)
 
121
        w.add_identical(old_rev_id, new_rev_id, parent_idxs)
 
122
        self.put_weave(file_id, w)
118
123
     
119
124
    def copy_multi(self, from_store, file_ids):
120
125
        assert isinstance(from_store, WeaveStore)