Mercurial > hg
comparison hgext/largefiles/proto.py @ 15316:c65f5b6e26d4 stable
largefiles: rename functions and methods to match desired behavior
The original intent was that the largefiles would primarily be in the
repository, with the global cache being only that--a cache. The naming
conventions and actual intent have both strayed. In this first patch, the
naming conventions are switched to match the actual intent, as are the
configuration options.
author | Benjamin Pollack <benjamin@bitquabit.com> |
---|---|
date | Thu, 20 Oct 2011 13:24:09 -0400 |
parents | 7ab05d752405 |
children | 41f371150ccb |
comparison
equal
deleted
inserted
replaced
15315:ca51a5dd5d0b | 15316:c65f5b6e26d4 |
---|---|
26 f = tempfile.NamedTemporaryFile(mode='wb+', prefix='hg-putlfile-') | 26 f = tempfile.NamedTemporaryFile(mode='wb+', prefix='hg-putlfile-') |
27 proto.getfile(f) | 27 proto.getfile(f) |
28 f.seek(0) | 28 f.seek(0) |
29 if sha != lfutil.hexsha1(f): | 29 if sha != lfutil.hexsha1(f): |
30 return wireproto.pushres(1) | 30 return wireproto.pushres(1) |
31 lfutil.copytocacheabsolute(repo, f.name, sha) | 31 lfutil.copytostoreabsolute(repo, f.name, sha) |
32 except IOError: | 32 except IOError: |
33 repo.ui.warn( | 33 repo.ui.warn( |
34 _('error: could not put received data into largefile store')) | 34 _('error: could not put received data into largefile store')) |
35 return wireproto.pushres(1) | 35 return wireproto.pushres(1) |
36 finally: | 36 finally: |