D8163.id18469.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D8163.id18469.diff
View Options

	diff --git a/src/applications/diffusion/conduit/ConduitAPI_diffusion_browsequery_Method.php b/src/applications/diffusion/conduit/ConduitAPI_diffusion_browsequery_Method.php
	--- a/src/applications/diffusion/conduit/ConduitAPI_diffusion_browsequery_Method.php
	+++ b/src/applications/diffusion/conduit/ConduitAPI_diffusion_browsequery_Method.php
	@@ -197,25 +197,18 @@
	$commit = $request->getValue('commit');
	$result = $this->getEmptyResultSet();

	- // TODO: This is a really really awful mess but Mercurial doesn't offer
	- // an equivalent of "git ls-files -- directory". If it's any comfort, this
	- // is what "hgweb" does too, see:
	- //
	- // http://selenic.com/repo/hg/file/91dc8878f888/mercurial/hgweb/webcommands.py#l320
	- //
	- // derp derp derp derp
	- //
	- // Anyway, figure out what's in this path by applying massive amounts
	- // of brute force.
	+ $match_against = trim($path, '/');
	+
	+ $prefix = trim('./'.$match_against, '/');

	list($entire_manifest) = $repository->execxLocalCommand(
	- 'manifest --rev %s',
	- hgsprintf('%s', $commit));
	- $entire_manifest = explode("\n", $entire_manifest);
	+ 'locate --print0 --rev %s -I %s',
	+ hgsprintf('%s', $commit),
	+ $prefix);
	+ $entire_manifest = explode("\0", $entire_manifest);

	$results = array();

	- $match_against = trim($path, '/');
	$match_len = strlen($match_against);

	// For the root, don't trim. For other paths, trim the "/" after we match.