D7886.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D7886.diff
View Options

	Index: src/repository/api/ArcanistRepositoryAPI.php
	===================================================================
	--- src/repository/api/ArcanistRepositoryAPI.php
	+++ src/repository/api/ArcanistRepositoryAPI.php
	@@ -187,6 +187,14 @@
	/**
	* @task status
	*/
	+ final public function getMissingChanges() {
	+ return $this->getUncommittedPathsWithMask(self::FLAG_MISSING);
	+ }
	+
	+
	+ /**
	+ * @task status
	+ */
	private function getUncommittedPathsWithMask($mask) {
	$match = array();
	foreach ($this->getUncommittedStatus() as $path => $flags) {
	Index: src/workflow/ArcanistBaseWorkflow.php
	===================================================================
	--- src/workflow/ArcanistBaseWorkflow.php
	+++ src/workflow/ArcanistBaseWorkflow.php
	@@ -847,6 +847,18 @@
	" ".implode("\n ", $conflicts)."\n");
	}

	+ $missing = $api->getMissingChanges();
	+ if ($missing) {
	+ throw new ArcanistUsageException(
	+ pht(
	+ "You have missing files in this working copy. Revert or formally ".
	+ "remove them (with `svn rm`) before proceeding.\n\n".
	+ "%s".
	+ " Missing files in working copy:\n%s\n",
	+ $working_copy_desc,
	+ " ".implode("\n ", $missing)));
	+ }
	+
	$unstaged = $api->getUnstagedChanges();
	if ($unstaged) {
	echo "You have unstaged changes in this working copy.\n\n".