D21716.id51740.diff
No OneTemporary
Actions

Size

962 B

Referenced Files

None

Subscribers

None

D21716.id51740.diff
View Options

	diff --git a/src/repository/api/ArcanistMercurialAPI.php b/src/repository/api/ArcanistMercurialAPI.php
	--- a/src/repository/api/ArcanistMercurialAPI.php
	+++ b/src/repository/api/ArcanistMercurialAPI.php
	@@ -50,6 +50,13 @@
	return $this->getPath('.hg');
	}

	+ protected function newCurrentCommitRef() {
	+ $current_commit_hash = $this->getCanonicalRevisionName('.');
	+
	+ return id(new ArcanistCommitRef())
	+ ->setCommitHash($current_commit_hash);
	+ }
	+
	public function getSourceControlBaseRevision() {
	return $this->getCanonicalRevisionName($this->getBaseCommit());
	}
	diff --git a/src/workflow/ArcanistAmendWorkflow.php b/src/workflow/ArcanistAmendWorkflow.php
	--- a/src/workflow/ArcanistAmendWorkflow.php
	+++ b/src/workflow/ArcanistAmendWorkflow.php
	@@ -164,8 +164,6 @@
	->execute();
	}

	- return;
	-
	if ($api->getUncommittedChanges()) {
	// TODO: Make this class of error show the uncommitted changes.