Page MenuHomePhabricator
Files F13270344

D18717.id44938.diff
No OneTemporary
Actions

D18717.id44938.diff
View Options

diff --git a/src/applications/diffusion/query/lowlevel/DiffusionLowLevelResolveRefsQuery.php b/src/applications/diffusion/query/lowlevel/DiffusionLowLevelResolveRefsQuery.php
--- a/src/applications/diffusion/query/lowlevel/DiffusionLowLevelResolveRefsQuery.php
+++ b/src/applications/diffusion/query/lowlevel/DiffusionLowLevelResolveRefsQuery.php
@@ -256,6 +256,66 @@
return $results;
}
+ // If some of the refs look like hashes, try to bulk resolve them. This
+ // workflow happens via RefEngine and bulk resolution is dramatically
+ // faster than individual resolution. See PHI158.
+
+ $hashlike = array();
+ foreach ($unresolved as $key => $ref) {
+ if (preg_match('/^[a-f0-9]{40}\z/', $ref)) {
+ $hashlike[$key] = $ref;
+ }
+ }
+
+ if (count($hashlike) > 1) {
+ $hashlike_map = array();
+
+ $hashlike_groups = array_chunk($hashlike, 64, true);
+ foreach ($hashlike_groups as $hashlike_group) {
+ $hashlike_arg = array();
+ foreach ($hashlike_group as $hashlike_ref) {
+ $hashlike_arg[] = hgsprintf('%s', $hashlike_ref);
+ }
+ $hashlike_arg = '('.implode(' or ', $hashlike_arg).')';
+
+ list($err, $refs) = $repository->execLocalCommand(
+ 'log --template=%s --rev %s',
+ '{node}\n',
+ $hashlike_arg);
+ if ($err) {
+ // NOTE: If any ref fails to resolve, Mercurial will exit with an
+ // error. We just give up on the whole group and resolve it
+ // individually below. In theory, we could split it into subgroups
+ // but the pathway where this bulk resolution matters rarely tries
+ // to resolve missing refs (see PHI158).
+ continue;
+ }
+
+ $refs = phutil_split_lines($refs, false);
+
+ foreach ($refs as $ref) {
+ $hashlike_map[$ref] = true;
+ }
+ }
+
+ foreach ($unresolved as $key => $ref) {
+ if (!isset($hashlike_map[$ref])) {
+ continue;
+ }
+
+ $results[$ref][] = array(
+ 'type' => 'commit',
+ 'identifier' => $ref,
+ );
+
+ unset($unresolved[$key]);
+ }
+ }
+
+ if (!$unresolved) {
+ return $results;
+ }
+
// If we still have unresolved refs (which might be things like "tip"),
// try to resolve them individually.

File Metadata

Mime Type
text/plain
Expires
Thu, May 30, 9:32 AM (4 w, 1 d ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
6284434
Default Alt Text
D18717.id44938.diff (2 KB)

Event Timeline

Phabricator · Built by Phacility