← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/store/text.py

  • Committer: James Westby
  • Date: 2008-02-25 23:41:06 UTC
  • mto: This revision was merged to the branch mainline in revision 3246.
  • Revision ID: jw+debian@jameswestby.net-20080225234106-9b4ql42w13ijewp3
Make version-info --custom imply --all.

When using a custom template you can use variables like {clean} which
are not enabled by default. This causes an ugly traceback.

This fixes the issue by implying --all when --custom (or more exactly
--template) is used, so that all variables are available in templates.

This was the easier fix than having the template code report that the
user should pass --check-clean to have {clean} available, but will
have a performance impact on all users of version-info --custom,
regardless of whether they use {clean}.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/store/text.py
12
12
#
13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
 
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
16
 
17
17
"""A store that keeps the full text of every version.
18
18
 
20
20
do any sort of delta compression.
21
21
"""
22
22
 
23
 
import gzip
24
23
import os
25
 
from cStringIO import StringIO
26
 
 
27
 
from bzrlib import osutils
28
 
from bzrlib.errors import BzrError, NoSuchFile, FileExists
29
24
import bzrlib.store
30
25
from bzrlib.trace import mutter
 
26
from bzrlib.errors import BzrError, NoSuchFile, FileExists
31
27
 
 
28
import gzip
 
29
from cStringIO import StringIO
32
30
 
33
31
 
34
32
class TextStore(bzrlib.store.TransportStore):
44
42
    def _add_compressed(self, fn, f):
45
43
        from cStringIO import StringIO
46
44
        from bzrlib.osutils import pumpfile
47
 
 
 
45
        
48
46
        if isinstance(f, basestring):
49
47
            f = StringIO(f)
50
 
 
 
48
            
51
49
        sio = StringIO()
52
50
        gf = gzip.GzipFile(mode='wb', fileobj=sio)
53
51
        # if pumpfile handles files that don't fit in ram,
101
99
            if not self._prefixed:
102
100
                raise
103
101
            try:
104
 
                self._transport.mkdir(osutils.dirname(path), mode=self._dir_mode)
 
102
                self._transport.mkdir(self.hash_prefix(fileid)[:-1], mode=self._dir_mode)
105
103
            except FileExists:
106
104
                pass
107
105
            result = other._transport.copy_to([path], self._transport,