| durin42 |
| hg-reviewers |
"file" can mean a lot of things. Let's rename the interface
method to something more descriptive.
While I was here, I moved the docs about the payload format to
the implementation of the SSH protocol, because it was lying
about what the HTTP payload looked like.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | hgext/largefiles/proto.py (2 lines) | |||
| M | mercurial/wireproto.py (2 lines) | |||
| M | mercurial/wireprotoserver.py (19 lines) |
| '''Server command for putting a largefile into a repository's local store | '''Server command for putting a largefile into a repository's local store | ||||
| and into the user cache.''' | and into the user cache.''' | ||||
| with proto.mayberedirectstdio() as output: | with proto.mayberedirectstdio() as output: | ||||
| path = lfutil.storepath(repo, sha) | path = lfutil.storepath(repo, sha) | ||||
| util.makedirs(os.path.dirname(path)) | util.makedirs(os.path.dirname(path)) | ||||
| tmpfp = util.atomictempfile(path, createmode=repo.store.createmode) | tmpfp = util.atomictempfile(path, createmode=repo.store.createmode) | ||||
| try: | try: | ||||
| proto.getfile(tmpfp) | proto.forwardpayload(tmpfp) | ||||
| tmpfp._fp.seek(0) | tmpfp._fp.seek(0) | ||||
| if sha != lfutil.hexsha1(tmpfp._fp): | if sha != lfutil.hexsha1(tmpfp._fp): | ||||
| raise IOError(0, _('largefile contents do not match hash')) | raise IOError(0, _('largefile contents do not match hash')) | ||||
| tmpfp.close() | tmpfp.close() | ||||
| lfutil.linktousercache(repo, sha) | lfutil.linktousercache(repo, sha) | ||||
| except IOError as e: | except IOError as e: | ||||
| repo.ui.warn(_('largefiles: failed to put %s into store: %s\n') % | repo.ui.warn(_('largefiles: failed to put %s into store: %s\n') % | ||||
| (sha, e.strerror)) | (sha, e.strerror)) | ||||
| try: | try: | ||||
| exchange.check_heads(repo, their_heads, 'preparing changes') | exchange.check_heads(repo, their_heads, 'preparing changes') | ||||
| # write bundle data to temporary file because it can be big | # write bundle data to temporary file because it can be big | ||||
| fd, tempname = tempfile.mkstemp(prefix='hg-unbundle-') | fd, tempname = tempfile.mkstemp(prefix='hg-unbundle-') | ||||
| fp = os.fdopen(fd, pycompat.sysstr('wb+')) | fp = os.fdopen(fd, pycompat.sysstr('wb+')) | ||||
| r = 0 | r = 0 | ||||
| try: | try: | ||||
| proto.getfile(fp) | proto.forwardpayload(fp) | ||||
| fp.seek(0) | fp.seek(0) | ||||
| gen = exchange.readbundle(repo.ui, fp, None) | gen = exchange.readbundle(repo.ui, fp, None) | ||||
| if (isinstance(gen, changegroupmod.cg1unpacker) | if (isinstance(gen, changegroupmod.cg1unpacker) | ||||
| and not bundle1allowed(repo, 'push')): | and not bundle1allowed(repo, 'push')): | ||||
| if proto.name == 'http': | if proto.name == 'http': | ||||
| # need to special case http because stderr do not get to | # need to special case http because stderr do not get to | ||||
| # the http client on failed push so we need to abuse | # the http client on failed push so we need to abuse | ||||
| # some other error type to make sure the message get to | # some other error type to make sure the message get to | ||||
| @abc.abstractmethod | @abc.abstractmethod | ||||
| def getargs(self, args): | def getargs(self, args): | ||||
| """return the value for arguments in <args> | """return the value for arguments in <args> | ||||
| returns a list of values (same order as <args>)""" | returns a list of values (same order as <args>)""" | ||||
| @abc.abstractmethod | @abc.abstractmethod | ||||
| def getfile(self, fp): | def forwardpayload(self, fp): | ||||
| """write the whole content of a file into a file like object | """Read the raw payload and forward to a file. | ||||
| The file is in the form:: | The payload is read in full before the function returns. | ||||
| (<chunk-size>\n<chunk>)+0\n | |||||
| chunk size is the ascii version of the int. | |||||
| """ | """ | ||||
| @abc.abstractmethod | @abc.abstractmethod | ||||
| def mayberedirectstdio(self): | def mayberedirectstdio(self): | ||||
| """Context manager to possibly redirect stdio. | """Context manager to possibly redirect stdio. | ||||
| The context manager yields a file-object like object that receives | The context manager yields a file-object like object that receives | ||||
| stdout and stderr output when the context manager is active. Or it | stdout and stderr output when the context manager is active. Or it | ||||
| args.update(cgi.parse_qs( | args.update(cgi.parse_qs( | ||||
| self._req.read(postlen), keep_blank_values=True)) | self._req.read(postlen), keep_blank_values=True)) | ||||
| return args | return args | ||||
| argvalue = decodevaluefromheaders(self._req, r'X-HgArg') | argvalue = decodevaluefromheaders(self._req, r'X-HgArg') | ||||
| args.update(cgi.parse_qs(argvalue, keep_blank_values=True)) | args.update(cgi.parse_qs(argvalue, keep_blank_values=True)) | ||||
| return args | return args | ||||
| def getfile(self, fp): | def forwardpayload(self, fp): | ||||
| length = int(self._req.env[r'CONTENT_LENGTH']) | length = int(self._req.env[r'CONTENT_LENGTH']) | ||||
| # If httppostargs is used, we need to read Content-Length | # If httppostargs is used, we need to read Content-Length | ||||
| # minus the amount that was consumed by args. | # minus the amount that was consumed by args. | ||||
| length -= int(self._req.env.get(r'HTTP_X_HGARGS_POST', 0)) | length -= int(self._req.env.get(r'HTTP_X_HGARGS_POST', 0)) | ||||
| for s in util.filechunkiter(self._req, limit=length): | for s in util.filechunkiter(self._req, limit=length): | ||||
| fp.write(s) | fp.write(s) | ||||
| @contextlib.contextmanager | @contextlib.contextmanager | ||||
| val = self._fin.read(int(l)) | val = self._fin.read(int(l)) | ||||
| star[arg] = val | star[arg] = val | ||||
| data['*'] = star | data['*'] = star | ||||
| else: | else: | ||||
| val = self._fin.read(int(l)) | val = self._fin.read(int(l)) | ||||
| data[arg] = val | data[arg] = val | ||||
| return [data[k] for k in keys] | return [data[k] for k in keys] | ||||
| def getfile(self, fpout): | def forwardpayload(self, fpout): | ||||
| # The file is in the form: | |||||
| # | |||||
| # <chunk size>\n<chunk> | |||||
| # ... | |||||
| # 0\n | |||||
| _sshv1respondbytes(self._fout, b'') | _sshv1respondbytes(self._fout, b'') | ||||
| count = int(self._fin.readline()) | count = int(self._fin.readline()) | ||||
| while count: | while count: | ||||
| fpout.write(self._fin.read(count)) | fpout.write(self._fin.read(count)) | ||||
| count = int(self._fin.readline()) | count = int(self._fin.readline()) | ||||
| @contextlib.contextmanager | @contextlib.contextmanager | ||||
| def mayberedirectstdio(self): | def mayberedirectstdio(self): | ||||