Page MenuHomePhorge

Accept patches from Intellij Idea
Open, NormalPublic

Description

It seems that IntelliJ IDEA has this kind of patches:

Subject: [PATCH] The Commit message

Bla bla
---
Index: .arcconfig
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/.arcconfig b/.arcconfig
--- a/.arcconfig	(revision 1420)
+++ b/.arcconfig	(date 1688638306629)
@@ -1,3 +1,3 @@
 {
-  "phabricator.uri.test" : "https://dev.example.com/"
+  "phabricator.uri" : "https://dev.example.it/"
 }
Index: README.md
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/README.md b/README.md
--- a/README.md	(revision 1420)
+++ b/README.md	(date 1688638306621)
@@ -16,6 +16,8 @@
 
 ## How to improve stuff
 
+asd
+
 Find the right stuff:
 
 bla bla

But pasting this patch into Differential causes this exception:

Diff Parse Exception: Expected hunk target '+++ path/to/file.ext (revision N)'.

Complete stack trace:

EXCEPTION: (Exception) Diff Parse Exception: Expected hunk target '+++ path/to/file.ext (revision N)'.
           ...
at [<arcanist>/src/parser/ArcanistDiffParser.php:1228]
arcanist(head=master, ref.master=8426ebc053b3), phorge(head=master, ref.master=1005e381604e)
  #0 <#2> ArcanistDiffParser::didFailParse(string) called at [<arcanist>/src/parser/ArcanistDiffParser.php:870]
  #1 <#2> ArcanistDiffParser::parseHunkTarget() called at [<arcanist>/src/parser/ArcanistDiffParser.php:806]
  #2 <#2> ArcanistDiffParser::parseIndexHunk(ArcanistDiffChange) called at [<arcanist>/src/parser/ArcanistDiffParser.php:325]
  #3 <#2> ArcanistDiffParser::parseDiff(string) called at [<phorge>/src/applications/differential/conduit/DifferentialCreateRawDiffConduitAPIMethod.php:43]
  #4 <#2> DifferentialCreateRawDiffConduitAPIMethod::execute(ConduitAPIRequest) called at [<phorge>/src/applications/conduit/method/ConduitAPIMethod.php:156]
  #5 <#2> ConduitAPIMethod::executeMethod(ConduitAPIRequest) called at [<phorge>/src/applications/conduit/call/ConduitCall.php:131]
  #6 <#2> ConduitCall::executeMethod() called at [<phorge>/src/applications/conduit/call/ConduitCall.php:81]
  #7 <#2> ConduitCall::execute() called at [<phorge>/src/applications/differential/controller/DifferentialDiffCreateController.php:73]
  #8 <#2> DifferentialDiffCreateController::handleRequest(AphrontRequest) called at [<phorge>/src/aphront/configuration/AphrontApplicationConfiguration.php:284]
  #9 phlog(Exception) called at [<phorge>/src/aphront/handler/PhabricatorDefaultRequestExceptionHandler.php:41]
  #10 PhabricatorDefaultRequestExceptionHandler::handleRequestThrowable(AphrontRequest, Exception) called at [<phorge>/src/aphront/configuration/AphrontApplicationConfiguration.php:751]
  #11 AphrontApplicationConfiguration::handleThrowable(Exception) called at [<phorge>/src/aphront/configuration/AphrontApplicationConfiguration.php:296]
  #12 AphrontApplicationConfiguration::processRequest(AphrontRequest, PhutilDeferredLog, AphrontPHPHTTPSink, MultimeterControl) called at [<phorge>/src/aphront/configuration/AphrontApplicationConfiguration.php:207]
  #13 AphrontApplicationConfiguration::runHTTPRequest(AphrontPHPHTTPSink) called at [<phorge>/webroot/index.php:35]

Event Timeline

valerio.bozzolan triaged this task as Normal priority.
valerio.bozzolan created this object in space S1 Public.

The workaround for me was to manually strip all of these lines:

IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================