From f2f5fb2508efe52f7a57cd0b9de53c26f838dad6 Mon Sep 17 00:00:00 2001
From: Joshua Spence <josh@joshuaspence.com>
Date: Wed, 18 Jun 2014 01:39:28 +1000
Subject: [PATCH] Drop support for parsing non-URL differential IDs from commit
 message.

Summary: This has been a `TODO` for a few years now... no-one should be using the old-school (non-URL) syntax anymore.

Test Plan: I'm actually not sure if it's okay to drop support for this... please verify.

Reviewers: epriestley, #blessed_reviewers

Reviewed By: epriestley, #blessed_reviewers

Subscribers: epriestley, Korvin

Differential Revision: https://secure.phabricator.com/D9595
---
 .../ArcanistDifferentialCommitMessage.php     | 25 +++++++------------
 1 file changed, 9 insertions(+), 16 deletions(-)

diff --git a/src/differential/ArcanistDifferentialCommitMessage.php b/src/differential/ArcanistDifferentialCommitMessage.php
index 9a0d3779..4381556b 100644
--- a/src/differential/ArcanistDifferentialCommitMessage.php
+++ b/src/differential/ArcanistDifferentialCommitMessage.php
@@ -19,27 +19,20 @@ final class ArcanistDifferentialCommitMessage {
     $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]}'.");
         }
       }
     }