← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/store.py

  • Committer: aaron.bentley at utoronto
  • Date: 2005-09-04 03:32:17 UTC
  • mfrom: (974.1.52)
  • mto: (1185.3.4)
  • mto: This revision was merged to the branch mainline in revision 1178.
  • Revision ID: aaron.bentley@utoronto.ca-20050904033217-821a797652305c14
Disabled urlgrabber

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 trace import mutter
 
27
from bzrlib.errors import BzrError
 
28
from bzrlib.trace import mutter
 
29
import bzrlib.ui
28
30
 
29
31
######################################################################
30
32
# stores
90
92
            
91
93
        p = self._path(fileid)
92
94
        if os.access(p, os.F_OK) or os.access(p + '.gz', os.F_OK):
93
 
            from bzrlib.errors import bailout
94
95
            raise BzrError("store %r already contains id %r" % (self._basedir, fileid))
95
96
 
96
97
        fn = p
110
111
            af.close()
111
112
 
112
113
 
113
 
    def copy_multi(self, other, ids):
 
114
    def copy_multi(self, other, ids, permit_failure=False):
114
115
        """Copy texts for ids from other into self.
115
116
 
116
 
        If an id is present in self, it is skipped.  A count of copied
117
 
        ids is returned, which may be less than len(ids).
 
117
        If an id is present in self, it is skipped.
 
118
 
 
119
        Returns (count_copied, failed), where failed is a collection of ids
 
120
        that could not be copied.
118
121
        """
119
 
        from bzrlib.progress import ProgressBar
120
 
        pb = ProgressBar()
 
122
        pb = bzrlib.ui.ui_factory.progress_bar()
 
123
        
121
124
        pb.update('preparing to copy')
122
125
        to_copy = [id for id in ids if id not in self]
123
126
        if isinstance(other, ImmutableStore):
124
127
            return self.copy_multi_immutable(other, to_copy, pb)
125
128
        count = 0
 
129
        failed = set()
126
130
        for id in to_copy:
127
131
            count += 1
128
132
            pb.update('copy', count, len(to_copy))
129
 
            self.add(other[id], id)
130
 
        assert count == len(to_copy)
 
133
            if not permit_failure:
 
134
                self.add(other[id], id)
 
135
            else:
 
136
                try:
 
137
                    entry = other[id]
 
138
                except IndexError:
 
139
                    failed.add(id)
 
140
                    continue
 
141
                self.add(entry, id)
 
142
                
 
143
        if not permit_failure:
 
144
            assert count == len(to_copy)
131
145
        pb.clear()
132
 
        return count
133
 
 
134
 
 
135
 
    def copy_multi_immutable(self, other, to_copy, pb):
 
146
        return count, failed
 
147
 
 
148
    def copy_multi_immutable(self, other, to_copy, pb, permit_failure=False):
136
149
        from shutil import copyfile
137
150
        count = 0
 
151
        failed = set()
138
152
        for id in to_copy:
139
153
            p = self._path(id)
140
154
            other_p = other._path(id)
142
156
                copyfile(other_p, p)
143
157
            except IOError, e:
144
158
                if e.errno == errno.ENOENT:
145
 
                    copyfile(other_p+".gz", p+".gz")
 
159
                    if not permit_failure:
 
160
                        copyfile(other_p+".gz", p+".gz")
 
161
                    else:
 
162
                        try:
 
163
                            copyfile(other_p+".gz", p+".gz")
 
164
                        except IOError, e:
 
165
                            if e.errno == errno.ENOENT:
 
166
                                failed.add(id)
 
167
                            else:
 
168
                                raise
146
169
                else:
147
170
                    raise
148
171
            
150
173
            pb.update('copy', count, len(to_copy))
151
174
        assert count == len(to_copy)
152
175
        pb.clear()
153
 
        return count
 
176
        return count, failed
154
177
    
155
178
 
156
179
    def __contains__(self, fileid):