Mercurial > hg
annotate hgext/largefiles/proto.py @ 17599:56136786000f stable
largefiles: restore caching of largefiles with 'clone -U --all-largefiles'
This was broken when restoring normal -u and -U functionality.
author | Matt Harbison <matt_harbison@yahoo.com> |
---|---|
date | Sun, 09 Sep 2012 03:37:38 -0400 |
parents | 1ac628cd7113 |
children | 3598c585e464 |
rev | line source |
---|---|
15168 | 1 # Copyright 2011 Fog Creek Software |
2 # | |
3 # This software may be used and distributed according to the terms of the | |
4 # GNU General Public License version 2 or any later version. | |
5 | |
6 import os | |
7 import urllib2 | |
8 | |
17192
1ac628cd7113
peer: introduce real peer classes
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
17127
diff
changeset
|
9 from mercurial import error, httppeer, util, wireproto |
17127
9e1616307c4c
largefiles: batch statlfile requests when pushing a largefiles repo (issue3386)
Na'Tosha Bard <natosha@unity3d.com>
parents:
16594
diff
changeset
|
10 from mercurial.wireproto import batchable, future |
15168 | 11 from mercurial.i18n import _ |
12 | |
13 import lfutil | |
14 | |
15255
7ab05d752405
largefiles: cosmetics, whitespace, code style
Greg Ward <greg@gerg.ca>
parents:
15252
diff
changeset
|
15 LARGEFILES_REQUIRED_MSG = ('\nThis repository uses the largefiles extension.' |
7ab05d752405
largefiles: cosmetics, whitespace, code style
Greg Ward <greg@gerg.ca>
parents:
15252
diff
changeset
|
16 '\n\nPlease enable it in your Mercurial config ' |
7ab05d752405
largefiles: cosmetics, whitespace, code style
Greg Ward <greg@gerg.ca>
parents:
15252
diff
changeset
|
17 'file.\n') |
15168 | 18 |
19 def putlfile(repo, proto, sha): | |
15317
41f371150ccb
largefiles: make the store primary, and the user cache secondary
Benjamin Pollack <benjamin@bitquabit.com>
parents:
15316
diff
changeset
|
20 '''Put a largefile into a repository's local store and into the |
41f371150ccb
largefiles: make the store primary, and the user cache secondary
Benjamin Pollack <benjamin@bitquabit.com>
parents:
15316
diff
changeset
|
21 user cache.''' |
15168 | 22 proto.redirect() |
15391
a5a6a9b7f3b9
largefiles: replace tempfile.NamedTemporaryFile with tempfile.mkstemp
Hao Lian <hao@fogcreek.com>
parents:
15317
diff
changeset
|
23 |
16594
5516fdf3fe24
largefiles: in putlfile, ensure tempfile's directory exists prior to creation
hlian
parents:
16247
diff
changeset
|
24 path = lfutil.storepath(repo, sha) |
5516fdf3fe24
largefiles: in putlfile, ensure tempfile's directory exists prior to creation
hlian
parents:
16247
diff
changeset
|
25 util.makedirs(os.path.dirname(path)) |
5516fdf3fe24
largefiles: in putlfile, ensure tempfile's directory exists prior to creation
hlian
parents:
16247
diff
changeset
|
26 tmpfp = util.atomictempfile(path, createmode=repo.store.createmode) |
5516fdf3fe24
largefiles: in putlfile, ensure tempfile's directory exists prior to creation
hlian
parents:
16247
diff
changeset
|
27 |
15168 | 28 try: |
29 try: | |
15391
a5a6a9b7f3b9
largefiles: replace tempfile.NamedTemporaryFile with tempfile.mkstemp
Hao Lian <hao@fogcreek.com>
parents:
15317
diff
changeset
|
30 proto.getfile(tmpfp) |
16155
1b2b42e866be
largefiles: respect store.createmode and avoid extra file copy
Martin Geisler <mg@aragost.com>
parents:
15778
diff
changeset
|
31 tmpfp._fp.seek(0) |
1b2b42e866be
largefiles: respect store.createmode and avoid extra file copy
Martin Geisler <mg@aragost.com>
parents:
15778
diff
changeset
|
32 if sha != lfutil.hexsha1(tmpfp._fp): |
15778
f15c646bffc7
largefiles: display remote errors from putlfile (issue3123) (issue3149)
Kevin Gessner <kevin@fogcreek.com>
parents:
15391
diff
changeset
|
33 raise IOError(0, _('largefile contents do not match hash')) |
15391
a5a6a9b7f3b9
largefiles: replace tempfile.NamedTemporaryFile with tempfile.mkstemp
Hao Lian <hao@fogcreek.com>
parents:
15317
diff
changeset
|
34 tmpfp.close() |
16155
1b2b42e866be
largefiles: respect store.createmode and avoid extra file copy
Martin Geisler <mg@aragost.com>
parents:
15778
diff
changeset
|
35 lfutil.linktousercache(repo, sha) |
15391
a5a6a9b7f3b9
largefiles: replace tempfile.NamedTemporaryFile with tempfile.mkstemp
Hao Lian <hao@fogcreek.com>
parents:
15317
diff
changeset
|
36 except IOError, e: |
15778
f15c646bffc7
largefiles: display remote errors from putlfile (issue3123) (issue3149)
Kevin Gessner <kevin@fogcreek.com>
parents:
15391
diff
changeset
|
37 repo.ui.warn(_('largefiles: failed to put %s into store: %s') % |
f15c646bffc7
largefiles: display remote errors from putlfile (issue3123) (issue3149)
Kevin Gessner <kevin@fogcreek.com>
parents:
15391
diff
changeset
|
38 (sha, e.strerror)) |
15168 | 39 return wireproto.pushres(1) |
40 finally: | |
16155
1b2b42e866be
largefiles: respect store.createmode and avoid extra file copy
Martin Geisler <mg@aragost.com>
parents:
15778
diff
changeset
|
41 tmpfp.discard() |
15168 | 42 |
43 return wireproto.pushres(0) | |
44 | |
45 def getlfile(repo, proto, sha): | |
15252
6e809bb4f969
largefiles: improve comments, internal docstrings
Greg Ward <greg@gerg.ca>
parents:
15224
diff
changeset
|
46 '''Retrieve a largefile from the repository-local cache or system |
6e809bb4f969
largefiles: improve comments, internal docstrings
Greg Ward <greg@gerg.ca>
parents:
15224
diff
changeset
|
47 cache.''' |
15168 | 48 filename = lfutil.findfile(repo, sha) |
49 if not filename: | |
50 raise util.Abort(_('requested largefile %s not present in cache') % sha) | |
51 f = open(filename, 'rb') | |
52 length = os.fstat(f.fileno())[6] | |
15252
6e809bb4f969
largefiles: improve comments, internal docstrings
Greg Ward <greg@gerg.ca>
parents:
15224
diff
changeset
|
53 |
6e809bb4f969
largefiles: improve comments, internal docstrings
Greg Ward <greg@gerg.ca>
parents:
15224
diff
changeset
|
54 # Since we can't set an HTTP content-length header here, and |
6e809bb4f969
largefiles: improve comments, internal docstrings
Greg Ward <greg@gerg.ca>
parents:
15224
diff
changeset
|
55 # Mercurial core provides no way to give the length of a streamres |
6e809bb4f969
largefiles: improve comments, internal docstrings
Greg Ward <greg@gerg.ca>
parents:
15224
diff
changeset
|
56 # (and reading the entire file into RAM would be ill-advised), we |
6e809bb4f969
largefiles: improve comments, internal docstrings
Greg Ward <greg@gerg.ca>
parents:
15224
diff
changeset
|
57 # just send the length on the first line of the response, like the |
6e809bb4f969
largefiles: improve comments, internal docstrings
Greg Ward <greg@gerg.ca>
parents:
15224
diff
changeset
|
58 # ssh proto does for string responses. |
15168 | 59 def generator(): |
60 yield '%d\n' % length | |
61 for chunk in f: | |
62 yield chunk | |
63 return wireproto.streamres(generator()) | |
64 | |
65 def statlfile(repo, proto, sha): | |
15252
6e809bb4f969
largefiles: improve comments, internal docstrings
Greg Ward <greg@gerg.ca>
parents:
15224
diff
changeset
|
66 '''Return '2\n' if the largefile is missing, '1\n' if it has a |
6e809bb4f969
largefiles: improve comments, internal docstrings
Greg Ward <greg@gerg.ca>
parents:
15224
diff
changeset
|
67 mismatched checksum, or '0\n' if it is in good condition''' |
15168 | 68 filename = lfutil.findfile(repo, sha) |
69 if not filename: | |
70 return '2\n' | |
71 fd = None | |
72 try: | |
73 fd = open(filename, 'rb') | |
74 return lfutil.hexsha1(fd) == sha and '0\n' or '1\n' | |
75 finally: | |
76 if fd: | |
77 fd.close() | |
78 | |
79 def wirereposetup(ui, repo): | |
80 class lfileswirerepository(repo.__class__): | |
81 def putlfile(self, sha, fd): | |
82 # unfortunately, httprepository._callpush tries to convert its | |
83 # input file-like into a bundle before sending it, so we can't use | |
84 # it ... | |
17192
1ac628cd7113
peer: introduce real peer classes
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
17127
diff
changeset
|
85 if issubclass(self.__class__, httppeer.httppeer): |
15778
f15c646bffc7
largefiles: display remote errors from putlfile (issue3123) (issue3149)
Kevin Gessner <kevin@fogcreek.com>
parents:
15391
diff
changeset
|
86 res = None |
15168 | 87 try: |
15778
f15c646bffc7
largefiles: display remote errors from putlfile (issue3123) (issue3149)
Kevin Gessner <kevin@fogcreek.com>
parents:
15391
diff
changeset
|
88 res = self._call('putlfile', data=fd, sha=sha, |
f15c646bffc7
largefiles: display remote errors from putlfile (issue3123) (issue3149)
Kevin Gessner <kevin@fogcreek.com>
parents:
15391
diff
changeset
|
89 headers={'content-type':'application/mercurial-0.1'}) |
f15c646bffc7
largefiles: display remote errors from putlfile (issue3123) (issue3149)
Kevin Gessner <kevin@fogcreek.com>
parents:
15391
diff
changeset
|
90 d, output = res.split('\n', 1) |
f15c646bffc7
largefiles: display remote errors from putlfile (issue3123) (issue3149)
Kevin Gessner <kevin@fogcreek.com>
parents:
15391
diff
changeset
|
91 for l in output.splitlines(True): |
f15c646bffc7
largefiles: display remote errors from putlfile (issue3123) (issue3149)
Kevin Gessner <kevin@fogcreek.com>
parents:
15391
diff
changeset
|
92 self.ui.warn(_('remote: '), l, '\n') |
f15c646bffc7
largefiles: display remote errors from putlfile (issue3123) (issue3149)
Kevin Gessner <kevin@fogcreek.com>
parents:
15391
diff
changeset
|
93 return int(d) |
15168 | 94 except (ValueError, urllib2.HTTPError): |
15778
f15c646bffc7
largefiles: display remote errors from putlfile (issue3123) (issue3149)
Kevin Gessner <kevin@fogcreek.com>
parents:
15391
diff
changeset
|
95 self.ui.warn(_('unexpected putlfile response: %s') % res) |
15168 | 96 return 1 |
97 # ... but we can't use sshrepository._call because the data= | |
98 # argument won't get sent, and _callpush does exactly what we want | |
99 # in this case: send the data straight through | |
100 else: | |
101 try: | |
102 ret, output = self._callpush("putlfile", fd, sha=sha) | |
103 if ret == "": | |
104 raise error.ResponseError(_('putlfile failed:'), | |
105 output) | |
106 return int(ret) | |
107 except IOError: | |
108 return 1 | |
109 except ValueError: | |
110 raise error.ResponseError( | |
111 _('putlfile failed (unexpected response):'), ret) | |
112 | |
113 def getlfile(self, sha): | |
114 stream = self._callstream("getlfile", sha=sha) | |
115 length = stream.readline() | |
116 try: | |
117 length = int(length) | |
118 except ValueError: | |
15170
c1a4a3220711
largefiles: fix over-long lines
Matt Mackall <mpm@selenic.com>
parents:
15168
diff
changeset
|
119 self._abort(error.ResponseError(_("unexpected response:"), |
c1a4a3220711
largefiles: fix over-long lines
Matt Mackall <mpm@selenic.com>
parents:
15168
diff
changeset
|
120 length)) |
15168 | 121 return (length, stream) |
122 | |
17127
9e1616307c4c
largefiles: batch statlfile requests when pushing a largefiles repo (issue3386)
Na'Tosha Bard <natosha@unity3d.com>
parents:
16594
diff
changeset
|
123 @batchable |
15168 | 124 def statlfile(self, sha): |
17127
9e1616307c4c
largefiles: batch statlfile requests when pushing a largefiles repo (issue3386)
Na'Tosha Bard <natosha@unity3d.com>
parents:
16594
diff
changeset
|
125 f = future() |
9e1616307c4c
largefiles: batch statlfile requests when pushing a largefiles repo (issue3386)
Na'Tosha Bard <natosha@unity3d.com>
parents:
16594
diff
changeset
|
126 result = {'sha': sha} |
9e1616307c4c
largefiles: batch statlfile requests when pushing a largefiles repo (issue3386)
Na'Tosha Bard <natosha@unity3d.com>
parents:
16594
diff
changeset
|
127 yield result, f |
15168 | 128 try: |
17127
9e1616307c4c
largefiles: batch statlfile requests when pushing a largefiles repo (issue3386)
Na'Tosha Bard <natosha@unity3d.com>
parents:
16594
diff
changeset
|
129 yield int(f.value) |
15168 | 130 except (ValueError, urllib2.HTTPError): |
15252
6e809bb4f969
largefiles: improve comments, internal docstrings
Greg Ward <greg@gerg.ca>
parents:
15224
diff
changeset
|
131 # If the server returns anything but an integer followed by a |
15168 | 132 # newline, newline, it's not speaking our language; if we get |
133 # an HTTP error, we can't be sure the largefile is present; | |
15252
6e809bb4f969
largefiles: improve comments, internal docstrings
Greg Ward <greg@gerg.ca>
parents:
15224
diff
changeset
|
134 # either way, consider it missing. |
17127
9e1616307c4c
largefiles: batch statlfile requests when pushing a largefiles repo (issue3386)
Na'Tosha Bard <natosha@unity3d.com>
parents:
16594
diff
changeset
|
135 yield 2 |
15168 | 136 |
137 repo.__class__ = lfileswirerepository | |
138 | |
139 # advertise the largefiles=serve capability | |
140 def capabilities(repo, proto): | |
16247
d87d9d8a8e03
largefiles: remove use of underscores that breaks coding convention
Na'Tosha Bard <natosha@unity3d.com>
parents:
16155
diff
changeset
|
141 return capabilitiesorig(repo, proto) + ' largefiles=serve' |
15168 | 142 |
143 # duplicate what Mercurial's new out-of-band errors mechanism does, because | |
144 # clients old and new alike both handle it well | |
16247
d87d9d8a8e03
largefiles: remove use of underscores that breaks coding convention
Na'Tosha Bard <natosha@unity3d.com>
parents:
16155
diff
changeset
|
145 def webprotorefuseclient(self, message): |
15168 | 146 self.req.header([('Content-Type', 'application/hg-error')]) |
147 return message | |
148 | |
16247
d87d9d8a8e03
largefiles: remove use of underscores that breaks coding convention
Na'Tosha Bard <natosha@unity3d.com>
parents:
16155
diff
changeset
|
149 def sshprotorefuseclient(self, message): |
15168 | 150 self.ui.write_err('%s\n-\n' % message) |
151 self.fout.write('\n') | |
152 self.fout.flush() | |
153 | |
154 return '' | |
155 | |
156 def heads(repo, proto): | |
157 if lfutil.islfilesrepo(repo): | |
15224
7c604d8c7e83
largefiles: remove pre-1.9 code from extension first bundled with 1.9
Na'Tosha Bard <natosha@unity3d.com>
parents:
15170
diff
changeset
|
158 return wireproto.ooberror(LARGEFILES_REQUIRED_MSG) |
15168 | 159 return wireproto.heads(repo, proto) |
160 | |
16247
d87d9d8a8e03
largefiles: remove use of underscores that breaks coding convention
Na'Tosha Bard <natosha@unity3d.com>
parents:
16155
diff
changeset
|
161 def sshrepocallstream(self, cmd, **args): |
15168 | 162 if cmd == 'heads' and self.capable('largefiles'): |
163 cmd = 'lheads' | |
164 if cmd == 'batch' and self.capable('largefiles'): | |
165 args['cmds'] = args['cmds'].replace('heads ', 'lheads ') | |
16247
d87d9d8a8e03
largefiles: remove use of underscores that breaks coding convention
Na'Tosha Bard <natosha@unity3d.com>
parents:
16155
diff
changeset
|
166 return ssholdcallstream(self, cmd, **args) |
15168 | 167 |
16247
d87d9d8a8e03
largefiles: remove use of underscores that breaks coding convention
Na'Tosha Bard <natosha@unity3d.com>
parents:
16155
diff
changeset
|
168 def httprepocallstream(self, cmd, **args): |
15168 | 169 if cmd == 'heads' and self.capable('largefiles'): |
170 cmd = 'lheads' | |
171 if cmd == 'batch' and self.capable('largefiles'): | |
172 args['cmds'] = args['cmds'].replace('heads ', 'lheads ') | |
16247
d87d9d8a8e03
largefiles: remove use of underscores that breaks coding convention
Na'Tosha Bard <natosha@unity3d.com>
parents:
16155
diff
changeset
|
173 return httpoldcallstream(self, cmd, **args) |