revi-archive/phorge-arcanist
1
0
Fork 0
mirror of https://we.phorge.it/source/arcanist.git synced 2025-02-16 16:58:38 +01:00
Code Issues Releases Wiki Activity

Inform user about current branch in diff

Browse source 
Summary: I am trying to stop using `--verbatim` and miss this information.

Test Plan: This diff.

Reviewers: epriestley

Reviewed By: epriestley

CC: aran, Koolvin

Differential Revision: https://secure.phabricator.com/D2575
This commit is contained in:
vrana 2012-05-24 17:48:56 -07:00
parent 812f7f782d
commit a089484042
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/workflow/diff/ArcanistDiffWorkflow.php
View file

@ -449,7 +449,7 @@ EOTEXT
$revision['id'] = $message->getRevisionID();
$this->revisionID = $revision['id'];
$update_message = $this->getUpdateMessage();
$update_message = $this->getUpdateMessage($revision['fields']);
$revision['message'] = $update_message;
$future = $conduit->callMethod(
@ -1389,10 +1389,14 @@ EOTEXT
foreach ($included as $k => $commit) {
$included[$k] = ' '.$commit;
}
$in_branch = '';
if (!$this->isRawDiffSource()) {
$in_branch = ' in branch '.$this->getRepositoryAPI()->getBranchName();
}
$included = array_merge(
array(
"",
"Included commits:",
"Included commits{$in_branch}:",
"",
),
$included,
@ -1583,7 +1587,7 @@ EOTEXT
/**
* @task message
*/
private function getUpdateMessage() {
private function getUpdateMessage(array $fields) {
$comments = $this->getArgument('message');
if (strlen($comments)) {
return $comments;
@ -1611,6 +1615,8 @@ EOTEXT
$template =
rtrim($comments).
"\n\n".
"# Updating D{$fields['revisionID']}: {$fields['title']}\n".
"#\n".
"# Enter a brief description of the changes included in this update.\n".
"# The first line is used as subject, next lines as comment.\n".
"#\n".