Differential D21686 Diff 51673 src/land/engine/ArcanistMercurialLandEngine.php

Changeset View

Standalone View

src/land/engine/ArcanistMercurialLandEngine.php

Show First 20 Lines • Show All 797 Lines • ▼ Show 20 Lines	protected function executeMerge(ArcanistLandCommitSet $set, $into_commit) {
$commits = $set->getCommits();		$commits = $set->getCommits();

// confirmCommits() reverses the order of the commits as they're ordered		// confirmCommits() reverses the order of the commits as they're ordered
// above in selectCommits(). Now the head of the list is the min commit and		// above in selectCommits(). Now the head of the list is the min commit and
// the last is the max commit, where within the range the max commit has no		// the last is the max commit, where within the range the max commit has no
// descendants and the min commit has no ancestors. The min/max terms are		// descendants and the min commit has no ancestors. The min/max terms are
// used in a topological sense as chronological terms for commits can be		// used in a topological sense as chronological terms for commits can be
// misleading or incorrect in certain situations.		// misleading or incorrect in certain situations.
$max_commit = last($commits)->getHash();
$min_commit = head($commits)->getHash();		$min_commit = head($commits)->getHash();
		$max_commit = last($commits)->getHash();
		cspeckmimAuthorUnsubmitted Done Inline Actions This bugged me after realizing I recorded the definitions different from the other places that do this cspeckmim: This bugged me after realizing I recorded the definitions different from the other places that…

$revision_ref = $set->getRevisionRef();		$revision_ref = $set->getRevisionRef();
$commit_message = $revision_ref->getCommitMessage();		$commit_message = $revision_ref->getCommitMessage();

// If we're landing "--onto" a branch, set that as the branch marker		// If we're landing "--onto" a branch, set that as the branch marker
// before creating the new commit.		// before creating the new commit.

// TODO: We could skip this if we know that the "$into_commit" already		// TODO: We could skip this if we know that the "$into_commit" already
▲ Show 20 Lines • Show All 460 Lines • Show Last 20 Lines