D9595.id22987.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D9595.id22987.diff
View Options

	diff --git a/src/differential/ArcanistDifferentialCommitMessage.php b/src/differential/ArcanistDifferentialCommitMessage.php
	--- a/src/differential/ArcanistDifferentialCommitMessage.php
	+++ b/src/differential/ArcanistDifferentialCommitMessage.php
	@@ -19,27 +19,20 @@
	$obj = new ArcanistDifferentialCommitMessage();
	$obj->rawCorpus = $corpus;

	- // Parse older-style "123" fields, or newer-style full-URI fields.
	- // TODO: Remove support for older-style fields.
	-
	$match = null;
	if (preg_match('/^Differential Revision:\s(.)/im', $corpus, $match)) {
	$revision_id = trim($match[1]);
	if (strlen($revision_id)) {
	- if (preg_match('/^D?\d+$/', $revision_id)) {
	- $obj->revisionID = (int)trim($revision_id, 'D');
	+ $uri = new PhutilURI($revision_id);
	+ $path = $uri->getPath();
	+ $path = trim($path, '/');
	+ if (preg_match('/^D\d+$/', $path)) {
	+ $obj->revisionID = (int)trim($path, 'D');
	} else {
	- $uri = new PhutilURI($revision_id);
	- $path = $uri->getPath();
	- $path = trim($path, '/');
	- if (preg_match('/^D\d+$/', $path)) {
	- $obj->revisionID = (int)trim($path, 'D');
	- } else {
	- throw new ArcanistUsageException(
	- "Invalid 'Differential Revision' field. The field should have a ".
	- "Phabricator URI like 'http://phabricator.example.com/D123', ".
	- "but has '{$match[1]}'.");
	- }
	+ throw new ArcanistUsageException(
	+ "Invalid 'Differential Revision' field. The field should have a ".
	+ "Phabricator URI like 'http://phabricator.example.com/D123', ".
	+ "but has '{$match[1]}'.");
	}
	}
	}