mercurial-scm/hg-stable: contrib/phabricator.py comparison

comparison contrib/phabricator.py @ 33267:dba9f88659a3

phabricator: rework phabread to reduce memory usage and round-trips This patch reworked phabread a bit so it fetches the lightweight "Differential Revision" metadata for a stack first. Then read other data. This allows the code to: a) send 1 request to get all `hg:meta` data instead of N requests b) patches are read in desired order, no need to buffer the output "b)" reduces the memory usage from O(N^2) to O(N) since we no longer keep old patch contents in memory. The above `N` means the number of patches in the stack.

author	Jun Wu <quark@fb.com>
date	Tue, 04 Jul 2017 16:36:48 -0700
parents	5b2391b46906
children	85391b95961d

comparison

equal deleted inserted replaced

-:5b2391b46906
+:dba9f88659a3
 # Map from "hg:meta" keys to header understood by "hg import". The order is
 # consistent with "hg export" output.
 _metanamemap = util.sortdict([(r'user', 'User'), (r'date', 'Date'),
 (r'node', 'Node ID'), (r'parent', 'Parent ')])
-def readpatch(repo, params, recursive=False):
+def querydrev(repo, params, stack=False):
+"""return a list of "Differential Revision" dicts
+params is the input of "differential.query" API, and is expected to match
+just a single Differential Revision.
+A "Differential Revision dict" looks like:
+{
+"id": "2",
+"phid": "PHID-DREV-672qvysjcczopag46qty",
+"title": "example",
+"uri": "https://phab.example.com/D2",
+"dateCreated": "1499181406",
+"dateModified": "1499182103",
+"authorPHID": "PHID-USER-tv3ohwc4v4jeu34otlye",
+"status": "0",
+"statusName": "Needs Review",
+"properties": [],
+"branch": null,
+"summary": "",
+"testPlan": "",
+"lineCount": "2",
+"activeDiffPHID": "PHID-DIFF-xoqnjkobbm6k4dk6hi72",
+"diffs": [
+"3",
+"4",
+],
+"commits": [],
+"reviewers": [],
+"ccs": [],
+"hashes": [],
+"auxiliary": {
+"phabricator:projects": [],
+"phabricator:depends-on": [
+"PHID-DREV-gbapp366kutjebt7agcd"
+]
+},
+"repositoryPHID": "PHID-REPO-hub2hx62ieuqeheznasv",
+"sourcePath": null
+}
+If stack is True, return a list of "Differential Revision dict"s in an
+order that the latter ones depend on the former ones. Otherwise, return a
+list of a unique "Differential Revision dict".
+"""
+result = []
+queue = [params]
+while queue:
+params = queue.pop()
+drevs = callconduit(repo, 'differential.query', params)
+if len(drevs) != 1:
+raise error.Abort(_('cannot get Differential Revision %r') % params)
+drev = drevs[0]
+result.append(drev)
+if stack:
+auxiliary = drev.get(r'auxiliary', {})
+depends = auxiliary.get(r'phabricator:depends-on', [])
+for phid in depends:
+queue.append({'phids': [phid]})
+result.reverse()
+return result
+def readpatch(repo, params, write, stack=False):
 """generate plain-text patch readable by 'hg import'
-params is passed to "differential.query". If recursive is True, also return
+write is usually ui.write. params is passed to "differential.query". If
-dependent patches.
+stack is True, also write dependent patches.
 """
 # Differential Revisions
-drevs = callconduit(repo, 'differential.query', params)
+drevs = querydrev(repo, params, stack)
-if len(drevs) == 1:
-drev = drevs[0]
+# Prefetch hg:meta property for all diffs
-else:
+diffids = sorted(set(max(int(v) for v in drev[r'diffs']) for drev in drevs))
-raise error.Abort(_('cannot get Differential Revision %r') % params)
+diffs = callconduit(repo, 'differential.querydiffs', {'ids': diffids})
-repo.ui.note(_('reading D%s\n') % drev[r'id'])
+# Generate patch for each drev
+for drev in drevs:
-diffid = max(int(v) for v in drev[r'diffs'])
+repo.ui.note(_('reading D%s\n') % drev[r'id'])
-body = callconduit(repo, 'differential.getrawdiff', {'diffID': diffid})
-desc = callconduit(repo, 'differential.getcommitmessage',
+diffid = max(int(v) for v in drev[r'diffs'])
-{'revision_id': drev[r'id']})
+body = callconduit(repo, 'differential.getrawdiff', {'diffID': diffid})
-header = '# HG changeset patch\n'
+desc = callconduit(repo, 'differential.getcommitmessage',
+{'revision_id': drev[r'id']})
-# Remove potential empty "Summary:"
+header = '# HG changeset patch\n'
-desc = _summaryre.sub('', desc)
+# Remove potential empty "Summary:"
-# Try to preserve metadata from hg:meta property. Write hg patch headers
+desc = _summaryre.sub('', desc)
-# that can be read by the "import" command. See patchheadermap and extract
-# in mercurial/patch.py for supported headers.
+# Try to preserve metadata from hg:meta property. Write hg patch
-diffs = callconduit(repo, 'differential.querydiffs', {'ids': [diffid]})
+# headers that can be read by the "import" command. See patchheadermap
-props = diffs[str(diffid)][r'properties'] # could be empty list or dict
+# and extract in mercurial/patch.py for supported headers.
-if props and r'hg:meta' in props:
+props = diffs[str(diffid)][r'properties'] # could be empty list or dict
-meta = props[r'hg:meta']
+if props and r'hg:meta' in props:
-for k in _metanamemap.keys():
+meta = props[r'hg:meta']
-if k in meta:
+for k in _metanamemap.keys():
-header += '# %s %s\n' % (_metanamemap[k], meta[k])
+if k in meta:
+header += '# %s %s\n' % (_metanamemap[k], meta[k])
-patch = ('%s%s\n%s') % (header, desc, body)
+write(('%s%s\n%s') % (header, desc, body))
-# Check dependencies
-if recursive:
-auxiliary = drev.get(r'auxiliary', {})
-depends = auxiliary.get(r'phabricator:depends-on', [])
-for phid in depends:
-patch = readpatch(repo, {'phids': [phid]}, recursive=True) + patch
-return patch
 @command('phabread',
 [('', 'stack', False, _('read dependencies'))],
 _('REVID [OPTIONS]'))
 def phabread(ui, repo, revid, **opts):
 """
 try:
 revid = int(revid.split('/')[-1].replace('D', ''))
 except ValueError:
 raise error.Abort(_('invalid Revision ID: %s') % revid)
-patch = readpatch(repo, {'ids': [revid]}, recursive=opts.get('stack'))
+readpatch(repo, {'ids': [revid]}, ui.write, opts.get('stack'))
-ui.write(patch)

Mercurial > public > mercurial-scm > hg-stable

comparison contrib/phabricator.py @ 33267:dba9f88659a3