This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7047

phabricator: add the uploadfile function
ClosedPublic

Authored by Kwan on Oct 10 2019, 5:52 PM.

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Commits
rHG24e8aac7c630: phabricator: add the uploadfile function
Summary

This is needed to be able to submit binary files such as images in commits (and
also non-UTF-8 text files). One of the primary disadvantages of the current
use of createrawdiff is that Phabricator simply drops any binary diffs included
in the patch, but not the files, so if such a diff is then committed it
corrupts any binary files in it.

Diff Detail

Repository
rHG Mercurial
Branch
default
Lint
No Linters Available
Unit
No Unit Test Coverage

Event Timeline

Kwan created this revision.Oct 10 2019, 5:52 PM
Kwan updated this revision to Diff 17078.Oct 11 2019, 1:54 PM

Fix some test-check-code issues, and one test-check-pyflakes unused local.

indygreg accepted this revision.Oct 11 2019, 9:49 PM
This revision is now accepted and ready to land.Oct 11 2019, 9:49 PM
Kwan added a commit: rHG24e8aac7c630: phabricator: add the uploadfile function.Oct 11 2019, 9:56 PM
Closed by commit rHG24e8aac7c630: phabricator: add the uploadfile function (authored by Kwan). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/phabricator.py (38 lines)

Diff 17078

hgext/phabricator.py

# API token. Get it from https://$HOST/conduit/login/ # API token. Get it from https://$HOST/conduit/login/
example.phabtoken = cli-xxxxxxxxxxxxxxxxxxxxxxxxxxxx example.phabtoken = cli-xxxxxxxxxxxxxxxxxxxxxxxxxxxx
""" """
from __future__ import absolute_import from __future__ import absolute_import
import base64 import base64
import contextlib import contextlib
import hashlib
import itertools import itertools
import json import json
import operator import operator
import re import re
from mercurial.node import bin, nullid from mercurial.node import bin, nullid
from mercurial.i18n import _ from mercurial.i18n import _
from mercurial.pycompat import getattr from mercurial.pycompat import getattr
b'byteStart': bstart, b'byteStart': bstart,
b'data': base64.b64encode(fctx.data()[bstart:bend]), b'data': base64.b64encode(fctx.data()[bstart:bend]),
b'dataEncoding': b'base64', b'dataEncoding': b'base64',
}, },
) )
progress.complete() progress.complete()
def uploadfile(fctx):
"""upload binary files to Phabricator"""
repo = fctx.repo()
ui = repo.ui
fname = fctx.path()
size = fctx.size()
fhash = pycompat.bytestr(hashlib.sha256(fctx.data()).hexdigest())
# an allocate call is required first to see if an upload is even required
# (Phab might already have it) and to determine if chunking is needed
allocateparams = {
b'name': fname,
b'contentLength': size,
b'contentHash': fhash,
}
filealloc = callconduit(ui, b'file.allocate', allocateparams)
fphid = filealloc[b'filePHID']
if filealloc[b'upload']:
ui.write(_(b'uploading %s\n') % bytes(fctx))
if not fphid:
uploadparams = {
b'name': fname,
b'data_base64': base64.b64encode(fctx.data()),
}
fphid = callconduit(ui, b'file.upload', uploadparams)
else:
uploadchunks(fctx, fphid)
else:
ui.debug(b'server already has %s\n' % bytes(fctx))
if not fphid:
raise error.Abort(b'Upload of %s failed.' % bytes(fctx))
return fphid
def creatediff(ctx): def creatediff(ctx):
"""create a Differential Diff""" """create a Differential Diff"""
repo = ctx.repo() repo = ctx.repo()
repophid = getrepophid(repo) repophid = getrepophid(repo)
# Create a "Differential Diff" via "differential.createrawdiff" API # Create a "Differential Diff" via "differential.createrawdiff" API
params = {b'diff': getdiff(ctx, mdiff.diffopts(git=True, context=32767))} params = {b'diff': getdiff(ctx, mdiff.diffopts(git=True, context=32767))}
if repophid: if repophid:
params[b'repositoryPHID'] = repophid params[b'repositoryPHID'] = repophid