D20056.id.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D20056.id.diff
View Options

	diff --git a/src/applications/differential/engine/DifferentialDiffExtractionEngine.php b/src/applications/differential/engine/DifferentialDiffExtractionEngine.php
	--- a/src/applications/differential/engine/DifferentialDiffExtractionEngine.php
	+++ b/src/applications/differential/engine/DifferentialDiffExtractionEngine.php
	@@ -177,14 +177,21 @@
	'repository' => $repository,
	));

	- $response = DiffusionQuery::callConduitWithDiffusionRequest(
	- $viewer,
	- $drequest,
	- 'diffusion.filecontentquery',
	- array(
	- 'commit' => $identifier,
	- 'path' => $path,
	- ));
	+ try {
	+ $response = DiffusionQuery::callConduitWithDiffusionRequest(
	+ $viewer,
	+ $drequest,
	+ 'diffusion.filecontentquery',
	+ array(
	+ 'commit' => $identifier,
	+ 'path' => $path,
	+ ));
	+ } catch (Exception $ex) {
	+ // TODO: See PHI1044. This call may fail if the diff deleted the
	+ // file. If the call fails, just detect a change for now. This should
	+ // generally be made cleaner in the future.
	+ return true;
	+ }

	$new_file_phid = $response['filePHID'];
	if (!$new_file_phid) {