Changeset View
Changeset View
Standalone View
Standalone View
src/workflow/ArcanistCommitWorkflow.php
| Show First 20 Lines • Show All 219 Lines • ▼ Show 20 Lines | foreach ($status as $path => $mask) { | ||||
| } | } | ||||
| } | } | ||||
| $modified_but_not_included[] = $path; | $modified_but_not_included[] = $path; | ||||
| } | } | ||||
| if ($modified_but_not_included) { | if ($modified_but_not_included) { | ||||
| $prefix = pht( | $prefix = pht( | ||||
| '%s locally modified path(s) are not included in this revision:', | '%s locally modified path(s) are not included in this revision:', | ||||
| new PhutilNumber(count($modified_but_not_included))); | phutil_count($modified_but_not_included)); | ||||
| $prompt = pht( | $prompt = pht( | ||||
| 'These %s path(s) will NOT be committed. Commit this revision anyway?', | 'These %s path(s) will NOT be committed. Commit this revision anyway?', | ||||
| new PhutilNumber(count($modified_but_not_included))); | phutil_count($modified_but_not_included)); | ||||
| $this->promptFileWarning($prefix, $prompt, $modified_but_not_included); | $this->promptFileWarning($prefix, $prompt, $modified_but_not_included); | ||||
| } | } | ||||
| $do_not_exist = array(); | $do_not_exist = array(); | ||||
| foreach ($commit_paths as $path => $ignored) { | foreach ($commit_paths as $path => $ignored) { | ||||
| $disk_path = $repository_api->getPath($path); | $disk_path = $repository_api->getPath($path); | ||||
| if (file_exists($disk_path)) { | if (file_exists($disk_path)) { | ||||
| continue; | continue; | ||||
| } | } | ||||
| if (is_link($disk_path)) { | if (is_link($disk_path)) { | ||||
| continue; | continue; | ||||
| } | } | ||||
| if (idx($status, $path) & ArcanistRepositoryAPI::FLAG_DELETED) { | if (idx($status, $path) & ArcanistRepositoryAPI::FLAG_DELETED) { | ||||
| continue; | continue; | ||||
| } | } | ||||
| $do_not_exist[] = $path; | $do_not_exist[] = $path; | ||||
| unset($commit_paths[$path]); | unset($commit_paths[$path]); | ||||
| } | } | ||||
| if ($do_not_exist) { | if ($do_not_exist) { | ||||
| $prefix = pht( | $prefix = pht( | ||||
| 'Revision includes changes to %s path(s) that do not exist:', | 'Revision includes changes to %s path(s) that do not exist:', | ||||
| new PhutilNumber(count($do_not_exist))); | phutil_count($do_not_exist)); | ||||
| $prompt = pht('Commit this revision anyway?'); | $prompt = pht('Commit this revision anyway?'); | ||||
| $this->promptFileWarning($prefix, $prompt, $do_not_exist); | $this->promptFileWarning($prefix, $prompt, $do_not_exist); | ||||
| } | } | ||||
| $files = array_keys($commit_paths); | $files = array_keys($commit_paths); | ||||
| $files = ArcanistSubversionAPI::escapeFileNamesForSVN($files); | $files = ArcanistSubversionAPI::escapeFileNamesForSVN($files); | ||||
| if (empty($files)) { | if (empty($files)) { | ||||
| ▲ Show 20 Lines • Show All 90 Lines • Show Last 20 Lines | |||||