← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/store.py

  • Committer: Robert Collins
  • Date: 2005-08-25 10:04:51 UTC
  • mto: (974.1.50) (1185.1.10) (1092.3.1)
  • mto: This revision was merged to the branch mainline in revision 1139.
  • Revision ID: robertc@robertcollins.net-20050825100451-b01297285491ba46
make a default merge choose a sane base with branch.common_ancestor

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/store.py
24
24
import os, tempfile, types, osutils, gzip, errno
25
25
from stat import ST_SIZE
26
26
from StringIO import StringIO
27
 
from bzrlib.errors import BzrError
28
27
from bzrlib.trace import mutter
29
28
import bzrlib.ui
30
29
 
68
67
    def __init__(self, basedir):
69
68
        self._basedir = basedir
70
69
 
71
 
    def _path(self, entry_id):
72
 
        if not isinstance(entry_id, basestring):
73
 
            raise TypeError(type(entry_id))
74
 
        if '\\' in entry_id or '/' in entry_id:
75
 
            raise ValueError("invalid store id %r" % entry_id)
76
 
        return os.path.join(self._basedir, entry_id)
 
70
    def _path(self, id):
 
71
        if '\\' in id or '/' in id:
 
72
            raise ValueError("invalid store id %r" % id)
 
73
        return os.path.join(self._basedir, id)
77
74
 
78
75
    def __repr__(self):
79
76
        return "%s(%r)" % (self.__class__.__name__, self._basedir)
94
91
            
95
92
        p = self._path(fileid)
96
93
        if os.access(p, os.F_OK) or os.access(p + '.gz', os.F_OK):
 
94
            from bzrlib.errors import bailout
97
95
            raise BzrError("store %r already contains id %r" % (self._basedir, fileid))
98
96
 
99
97
        fn = p
116
114
    def copy_multi(self, other, ids, permit_failure=False):
117
115
        """Copy texts for ids from other into self.
118
116
 
119
 
        If an id is present in self, it is skipped.
120
 
 
121
 
        Returns (count_copied, failed), where failed is a collection of ids
122
 
        that could not be copied.
 
117
        If an id is present in self, it is skipped.  A count of copied
 
118
        ids is returned, which may be less than len(ids).
123
119
        """
124
120
        pb = bzrlib.ui.ui_factory.progress_bar()
125
121
        
126
122
        pb.update('preparing to copy')
127
123
        to_copy = [id for id in ids if id not in self]
128
124
        if isinstance(other, ImmutableStore):
129
 
            return self.copy_multi_immutable(other, to_copy, pb, 
130
 
                                             permit_failure=permit_failure)
 
125
            return self.copy_multi_immutable(other, to_copy, pb)
131
126
        count = 0
132
 
        failed = set()
133
127
        for id in to_copy:
134
128
            count += 1
135
129
            pb.update('copy', count, len(to_copy))
138
132
            else:
139
133
                try:
140
134
                    entry = other[id]
141
 
                except KeyError:
142
 
                    failed.add(id)
 
135
                except IndexError:
 
136
                    failures.add(id)
143
137
                    continue
144
138
                self.add(entry, id)
145
139
                
146
 
        if not permit_failure:
147
 
            assert count == len(to_copy)
 
140
        assert count == len(to_copy)
148
141
        pb.clear()
149
 
        return count, failed
 
142
        return count
 
143
 
150
144
 
151
145
    def copy_multi_immutable(self, other, to_copy, pb, permit_failure=False):
152
146
        from shutil import copyfile
214
208
            if e.errno != errno.ENOENT:
215
209
                raise
216
210
 
217
 
        raise KeyError(fileid)
 
211
        raise IndexError(fileid)
218
212
 
219
213
 
220
214
    def total_size(self):