diff --git a/src/applications/differential/field/specification/revisionstatus/DifferentialRevisionStatusFieldSpecification.php b/src/applications/differential/field/specification/revisionstatus/DifferentialRevisionStatusFieldSpecification.php index a4540a38ac..a64320d04d 100644 --- a/src/applications/differential/field/specification/revisionstatus/DifferentialRevisionStatusFieldSpecification.php +++ b/src/applications/differential/field/specification/revisionstatus/DifferentialRevisionStatusFieldSpecification.php @@ -35,17 +35,18 @@ final class DifferentialRevisionStatusFieldSpecification $next_step = null; if ($status == ArcanistDifferentialRevisionStatus::ACCEPTED) { switch ($diff->getSourceControlSystem()) { + case PhabricatorRepositoryType::REPOSITORY_TYPE_MERCURIAL: + $next_step = 'arc merge'; + break; case PhabricatorRepositoryType::REPOSITORY_TYPE_GIT: - $next_step = 'arc amend --revision '.$revision->getID(); + $next_step = 'arc amend or arc merge'; break; case PhabricatorRepositoryType::REPOSITORY_TYPE_SVN: - $next_step = 'arc commit --revision '.$revision->getID(); + $next_step = 'arc commit'; break; } if ($next_step) { - $next_step = - ' · '. - 'Next step: '.phutil_escape_html($next_step).''; + $next_step = ' · Next step: '.$next_step; } } $status = diff --git a/src/applications/differential/field/specification/revisionstatus/__init__.php b/src/applications/differential/field/specification/revisionstatus/__init__.php index a07a823770..6988d05d84 100644 --- a/src/applications/differential/field/specification/revisionstatus/__init__.php +++ b/src/applications/differential/field/specification/revisionstatus/__init__.php @@ -11,7 +11,5 @@ phutil_require_module('arcanist', 'differential/constants/revisionstatus'); phutil_require_module('phabricator', 'applications/differential/field/specification/base'); phutil_require_module('phabricator', 'applications/repository/constants/repositorytype'); -phutil_require_module('phutil', 'markup'); - phutil_require_source('DifferentialRevisionStatusFieldSpecification.php');