D10977.id26357.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D10977.id26357.diff
View Options

	diff --git a/src/applications/diffusion/conduit/DiffusionDiffQueryConduitAPIMethod.php b/src/applications/diffusion/conduit/DiffusionDiffQueryConduitAPIMethod.php
	--- a/src/applications/diffusion/conduit/DiffusionDiffQueryConduitAPIMethod.php
	+++ b/src/applications/diffusion/conduit/DiffusionDiffQueryConduitAPIMethod.php
	@@ -159,6 +159,14 @@

	$change = $changes[$path->getPath()];

	+ foreach ($this->getSVNProperties($old) as $prop_name => $prop_value) {
	+ $change->setOldProperty($prop_name, $prop_value);
	+ }
	+
	+ foreach ($this->getSVNProperties($new) as $prop_name => $prop_value) {
	+ $change->setNewProperty($prop_name, $prop_value);
	+ }
	+
	return array($change);
	}

	@@ -195,6 +203,28 @@
	$repository->getSubversionPathURI($ref, $rev));
	}

	+ private function getSVNProperties($spec) {
	+ if (!$spec) {
	+ return null;
	+ }
	+
	+ $drequest = $this->getDiffusionRequest();
	+ $repository = $drequest->getRepository();
	+
	+ list($ref, $rev) = $spec;
	+ list($stdout) = $repository->execxRemoteCommand(
	+ 'proplist -v %s --xml',
	+ $repository->getSubversionPathURI($ref, $rev));
	+
	+ $properties = array();
	+ $proplist = new SimpleXMLElement($stdout);
	+ foreach ($proplist->target->property as $property) {
	+ $properties[(string)$property['name']] = (string)$property;
	+ }
	+
	+ return $properties;
	+ }
	+
	private function getGitOrMercurialResult(ConduitAPIRequest $request) {
	$drequest = $this->getDiffusionRequest();
	$repository = $drequest->getRepository();