D7730.id17454.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D7730.id17454.diff
View Options

	Index: src/applications/diffusion/query/rawdiff/DiffusionMercurialRawDiffQuery.php
	===================================================================
	--- src/applications/diffusion/query/rawdiff/DiffusionMercurialRawDiffQuery.php
	+++ src/applications/diffusion/query/rawdiff/DiffusionMercurialRawDiffQuery.php
	@@ -3,7 +3,13 @@
	final class DiffusionMercurialRawDiffQuery extends DiffusionRawDiffQuery {

	protected function executeQuery() {
	- $raw_diff = $this->executeRawDiffCommand();
	+ $no_diff = null;
	+
	+ try {
	+ $raw_diff = $this->executeRawDiffCommand();
	+ } catch (CommandException $no_diff) {
	+ $raw_diff = '';
	+ }

	// the only legitimate case here is if we are looking at the first commit
	// in the repository. no parents means first commit.
	@@ -16,6 +22,10 @@
	// mercurial likes the string null here
	$this->setAgainstCommit('null');
	$raw_diff = $this->executeRawDiffCommand();
	+ } else {
	+ // this commit actually had parents, which means the original command
	+ // did have something important to say
	+ throw $no_diff;
	}
	}