← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/store/compressed_text.py

  • Committer: Jelmer Vernooij
  • Date: 2005-11-04 17:26:05 UTC
  • mfrom: (1185.16.146)
  • mto: (1185.33.1)
  • mto: This revision was merged to the branch mainline in revision 1509.
  • Revision ID: jelmer@samba.org-20051104172605-9288f261492667fd
Merge from Martin

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/store/compressed_text.py
81
81
    def _copy_one(self, fileid, suffix, other, pb):
82
82
        if not (isinstance(other, CompressedTextStore)
83
83
            and other._prefixed == self._prefixed):
84
 
            return super(CompressedTextStore, self)._copy_one(fileid, suffix,
85
 
                                                              other, pb)
 
84
            return super(CompressedTextStore, self)._copy_one(fileid, suffix, other, pb)
86
85
        if suffix is None or suffix == 'gz':
87
86
            path = self._relpath(fileid)
88
87
        else:
89
88
            path = self._relpath(fileid, [suffix])
90
 
        assert other._transport.copy_to([path], self._transport, pb=pb) == 1
 
89
        result = other._transport.copy_to([path], self._transport, pb=pb)
 
90
        assert result == 1      # or what???
91
91
 
92
92
    def __init__(self, transport, prefixed=False):
93
93
        super(CompressedTextStore, self).__init__(transport, prefixed)