← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/store/text.py

first cut at merge from integration.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/store/text.py
14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
16
 
17
 
"""A store that keeps the full text of every version.
 
17
"""
 
18
A store that keeps the full text of every version.
18
19
 
19
20
This store keeps uncompressed versions of the full text. It does not
20
21
do any sort of delta compression.
22
23
 
23
24
import os
24
25
import bzrlib.store
 
26
from bzrlib.store import hash_prefix
25
27
from bzrlib.trace import mutter
26
28
from bzrlib.errors import BzrError, NoSuchFile, FileExists
27
29
 
93
95
            raise KeyError(fileid + '-' + str(suffix))
94
96
 
95
97
        try:
96
 
            result = other._transport.copy_to([path], self._transport,
 
98
            result = other._transport.copy_to([path], self._transport, pb=pb,
97
99
                                              mode=self._file_mode)
98
100
        except NoSuchFile:
99
101
            if not self._prefixed:
100
102
                raise
101
103
            try:
102
 
                self._transport.mkdir(self.hash_prefix(fileid)[:-1], mode=self._dir_mode)
 
104
                self._transport.mkdir(hash_prefix(fileid)[:-1], mode=self._dir_mode)
103
105
            except FileExists:
104
106
                pass
105
 
            result = other._transport.copy_to([path], self._transport,
 
107
            result = other._transport.copy_to([path], self._transport, pb=pb,
106
108
                                              mode=self._file_mode)
107
109
 
108
110
        if result != 1: