This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8135

phabricator: refactor `phabread` to write all patches at once
ClosedPublic

Authored by mharbison72 on Feb 20 2020, 8:09 PM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHGd5d262c7e7a2: phabricator: refactor `phabread` to write all patches at once
rHGee5ea026ba8f: phabricator: refactor `phabread` to write all patches at once
Summary

This will be necessary to create a first class phabimport command. That
command requires a transaction, and will import all named patches within a
single transaction. But if Phabricator queries also happen within the
transaction, that leaves open the chance that an exception is raised, the
transaction is abandoned, and the next command that is run will complain about
needing to run hg recover.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Revision Contents
Changeset List

PathPackages
Mhgext/phabricator.py (18 lines)

Diff 20445

hgext/phabricator.py

if b'parent' not in meta and diff.get(b'sourceControlBaseRevision'): if b'parent' not in meta and diff.get(b'sourceControlBaseRevision'):
meta[b'parent'] = diff[b'sourceControlBaseRevision'] meta[b'parent'] = diff[b'sourceControlBaseRevision']
return meta return meta
def readpatch(ui, drevs, write): def readpatch(ui, drevs, write):
"""generate plain-text patch readable by 'hg import' """generate plain-text patch readable by 'hg import'
write is usually ui.write. drevs is what "querydrev" returns, results of write takes a list of (DREV, bytes), where DREV is the differential number
(as bytes, without the "D" prefix) and the bytes are the text of a patch
to be imported. drevs is what "querydrev" returns, results of
"differential.query". "differential.query".
""" """
# Prefetch hg:meta property for all diffs # Prefetch hg:meta property for all diffs
diffids = sorted(set(max(int(v) for v in drev[b'diffs']) for drev in drevs)) diffids = sorted(set(max(int(v) for v in drev[b'diffs']) for drev in drevs))
diffs = callconduit(ui, b'differential.querydiffs', {b'ids': diffids}) diffs = callconduit(ui, b'differential.querydiffs', {b'ids': diffids})
patches = []
# Generate patch for each drev # Generate patch for each drev
for drev in drevs: for drev in drevs:
ui.note(_(b'reading D%s\n') % drev[b'id']) ui.note(_(b'reading D%s\n') % drev[b'id'])
diffid = max(int(v) for v in drev[b'diffs']) diffid = max(int(v) for v in drev[b'diffs'])
body = callconduit(ui, b'differential.getrawdiff', {b'diffID': diffid}) body = callconduit(ui, b'differential.getrawdiff', {b'diffID': diffid})
desc = getdescfromdrev(drev) desc = getdescfromdrev(drev)
header = b'# HG changeset patch\n' header = b'# HG changeset patch\n'
# Try to preserve metadata from hg:meta property. Write hg patch # Try to preserve metadata from hg:meta property. Write hg patch
# headers that can be read by the "import" command. See patchheadermap # headers that can be read by the "import" command. See patchheadermap
# and extract in mercurial/patch.py for supported headers. # and extract in mercurial/patch.py for supported headers.
meta = getdiffmeta(diffs[b'%d' % diffid]) meta = getdiffmeta(diffs[b'%d' % diffid])
for k in _metanamemap.keys(): for k in _metanamemap.keys():
if k in meta: if k in meta:
header += b'# %s %s\n' % (_metanamemap[k], meta[k]) header += b'# %s %s\n' % (_metanamemap[k], meta[k])
content = b'%s%s\n%s' % (header, desc, body) content = b'%s%s\n%s' % (header, desc, body)
write(content) patches.append((drev[b'id'], content))
# Write patches to the supplied callback
write(patches)
@vcrcommand( @vcrcommand(
b'phabread', b'phabread',
[(b'', b'stack', False, _(b'read dependencies'))], [(b'', b'stack', False, _(b'read dependencies'))],
_(b'DREVSPEC [OPTIONS]'), _(b'DREVSPEC [OPTIONS]'),
helpcategory=command.CATEGORY_IMPORT_EXPORT, helpcategory=command.CATEGORY_IMPORT_EXPORT,
) )
If --stack is given, follow dependencies information and read all patches. If --stack is given, follow dependencies information and read all patches.
It is equivalent to the ``:`` operator. It is equivalent to the ``:`` operator.
""" """
opts = pycompat.byteskwargs(opts) opts = pycompat.byteskwargs(opts)
if opts.get(b'stack'): if opts.get(b'stack'):
spec = b':(%s)' % spec spec = b':(%s)' % spec
drevs = querydrev(repo.ui, spec) drevs = querydrev(repo.ui, spec)
readpatch(repo.ui, drevs, ui.write)
def _write(patches):
for drev, content in patches:
ui.write(content)
readpatch(repo.ui, drevs, _write)
@vcrcommand( @vcrcommand(
b'phabupdate', b'phabupdate',
[ [
(b'', b'accept', False, _(b'accept revisions')), (b'', b'accept', False, _(b'accept revisions')),
(b'', b'reject', False, _(b'reject revisions')), (b'', b'reject', False, _(b'reject revisions')),
(b'', b'abandon', False, _(b'abandon revisions')), (b'', b'abandon', False, _(b'abandon revisions')),