Page MenuHomePhabricator
Files F15423751

D12258.id29452.diff
No OneTemporary
Actions

D12258.id29452.diff
View Options

diff --git a/src/internationalization/ArcanistUSEnglishTranslation.php b/src/internationalization/ArcanistUSEnglishTranslation.php
--- a/src/internationalization/ArcanistUSEnglishTranslation.php
+++ b/src/internationalization/ArcanistUSEnglishTranslation.php
@@ -74,6 +74,11 @@
'%d assertion passed.',
'%d assertions passed.',
),
+
+ 'Ignore these %s untracked file(s) and continue?' => array(
+ 'Ignore this untracked file and continue?',
+ 'Ignore these untracked files and continue?',
+ ),
);
}
diff --git a/src/workflow/ArcanistDiffWorkflow.php b/src/workflow/ArcanistDiffWorkflow.php
--- a/src/workflow/ArcanistDiffWorkflow.php
+++ b/src/workflow/ArcanistDiffWorkflow.php
@@ -294,8 +294,7 @@
'add-all' => array(
'short' => 'a',
'help' =>
- 'Automatically add all untracked, unstaged and uncommitted files to '.
- 'the commit.',
+ 'Automatically add all unstaged and uncommitted files to the commit.',
),
'json' => array(
'help' =>
diff --git a/src/workflow/ArcanistWorkflow.php b/src/workflow/ArcanistWorkflow.php
--- a/src/workflow/ArcanistWorkflow.php
+++ b/src/workflow/ArcanistWorkflow.php
@@ -880,8 +880,43 @@
$untracked = array();
}
+ if ($untracked) {
+ echo pht(
+ "You have untracked files in this working copy.\n\n%s",
+ $working_copy_desc);
+
+ if ($api instanceof ArcanistGitAPI) {
+ $hint = pht(
+ '(To ignore these %s change(s), add them to ".git/info/exclude".)',
+ new PhutilNumber(count($untracked)));
+ } else if ($api instanceof ArcanistSubversionAPI) {
+ $hint = pht(
+ '(To ignore these %s change(s), add them to "svn:ignore".)',
+ new PhutilNumber(count($untracked)));
+ } else if ($api instanceof ArcanistMercurialAPI) {
+ $hint = pht(
+ '(To ignore these %s change(s), add them to ".hgignore".)',
+ new PhutilNumber(count($untracked)));
+ }
+
+ $untracked_list = " ".implode("\n ", $untracked);
+ echo pht(
+ " Untracked changes in working copy:\n %s\n%s",
+ $hint,
+ $untracked_list);
+
+ $prompt = pht(
+ 'Ignore these %s untracked file(s) and continue?',
+ new PhutilNumber(count($untracked)));
+
+ if (!phutil_console_confirm($prompt)) {
+ throw new ArcanistUserAbortException();
+ }
+ }
+
+
$should_commit = false;
- if ($untracked || $unstaged || $uncommitted) {
+ if ($unstaged || $uncommitted) {
// NOTE: We're running this because it builds a cache and can take a
// perceptible amount of time to arrive at an answer, but we don't want
@@ -894,28 +929,6 @@
$lists = array();
- if ($untracked) {
- if ($api instanceof ArcanistGitAPI) {
- $hint = pht(
- '(To ignore these %s change(s), add them to ".git/info/exclude".)',
- new PhutilNumber(count($untracked)));
- } else if ($api instanceof ArcanistSubversionAPI) {
- $hint = pht(
- '(To ignore these %s change(s), add them to "svn:ignore".)',
- new PhutilNumber(count($untracked)));
- } else if ($api instanceof ArcanistMercurialAPI) {
- $hint = pht(
- '(To ignore these %s change(s), add them to ".hgignore".)',
- new PhutilNumber(count($untracked)));
- }
-
- $untracked_list = " ".implode("\n ", $untracked);
- $lists[] = pht(
- " Untracked changes in working copy:\n %s\n%s",
- $hint,
- $untracked_list);
- }
-
if ($unstaged) {
$unstaged_list = " ".implode("\n ", $unstaged);
$lists[] = pht(
@@ -932,12 +945,8 @@
echo implode("\n\n", $lists)."\n";
- $all_uncommitted = array_merge($untracked, $unstaged, $uncommitted);
+ $all_uncommitted = array_merge($unstaged, $uncommitted);
if ($this->askForAdd($all_uncommitted)) {
- if ($untracked) {
- $api->addToCommit($untracked);
- }
-
if ($unstaged) {
$api->addToCommit($unstaged);
}
@@ -952,20 +961,10 @@
$api->stashChanges();
$this->stashed = true;
} else {
- if ($untracked && !$unstaged && !$uncommitted) {
- // Give a tailored message if there are only untracked files,
- // because the advice to commit files does not make sense in
- // Subversion.
- throw new ArcanistUsageException(
- pht(
- 'You can not continue with untracked changes. Add them, '.
- 'discard them, or mark them as ignored before proceeding.'));
- } else {
- throw new ArcanistUsageException(
- pht(
- 'You can not continue with uncommitted changes. Commit '.
- 'or discard them before proceeding.'));
- }
+ throw new ArcanistUsageException(
+ pht(
+ 'You can not continue with uncommitted changes. Commit '.
+ 'or discard them before proceeding.'));
}
}
}
@@ -980,10 +979,6 @@
"# ".pht('Enter a commit message.')."\n#\n".
"# ".pht('Changes:')."\n#\n";
- foreach ($untracked as $untracked_path) {
- $template .= "# ".$untracked_path." (".pht('Added').")\n";
- }
-
$paths = array_merge($uncommitted, $unstaged);
$paths = array_unique($paths);
sort($paths);

File Metadata

Mime Type
text/plain
Expires
Sun, Mar 23, 5:36 PM (2 d, 17 h ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7228710
Default Alt Text
D12258.id29452.diff (5 KB)

Event Timeline

Phabricator · Built by Phacility