Display a notification when a commit is successful.

enlight · Apr 27, 2014 · 601fd4d · 601fd4d
1 parent e3d2627
commit 601fd4d
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 0 deletions.
diff --git a/Source/MercurialSourceControl/Private/MercurialSourceControlClient.cpp b/Source/MercurialSourceControl/Private/MercurialSourceControlClient.cpp
@@ -452,6 +452,18 @@ bool FClient::CommitFiles(
 	return RunCommand(Command, Output, OutErrors);
 }
 
+bool FClient::GetWorkingDirectoryParentRevisionID(
+	const FString& InWorkingDirectory, FString& OutRevisionID, TArray<FString>& OutErrors
+) const
+{
+	TArray<FString> Options;
+	// just grab the local revision number
+	Options.Add(FString(TEXT("--template \"{rev}\"")));
+	FString Command(TEXT("parents"));
+	AppendCommandOptions(Command, Options, InWorkingDirectory);
+	return RunCommand(Command, OutRevisionID, OutErrors);
+}
+
 void FClient::AppendCommandOptions(
 	FString& InOutCommand, const TArray<FString>& InOptions, const FString& InWorkingDirectory
 )

diff --git a/Source/MercurialSourceControl/Private/MercurialSourceControlClient.h b/Source/MercurialSourceControl/Private/MercurialSourceControlClient.h
@@ -123,6 +123,11 @@ class FClient : public TSharedFromThis<FClient, ESPMode::ThreadSafe>
 		const FString& InCommitMessage, TArray<FString>& OutErrors
 	) const;
 
+	/** Get the local ID of the working directory's parent revision. */
+	bool GetWorkingDirectoryParentRevisionID(
+		const FString& InWorkingDirectory, FString& OutRevisionID, TArray<FString>& OutErrors
+	) const;
+
 private:
 	static void AppendCommandOptions(
 		FString& InOutCommand, const TArray<FString>& InOptions,

diff --git a/Source/MercurialSourceControl/Private/MercurialSourceControlWorkers.cpp b/Source/MercurialSourceControl/Private/MercurialSourceControlWorkers.cpp
@@ -283,6 +283,26 @@ bool FCheckInWorker::Execute(FCommand& InCommand)
 		Operation->GetDescription().ToString(), InCommand.ErrorMessages
 	);
 
+	if (bResult)
+	{
+		FString RevisionID;
+		bool bRetrievedID = Client->GetWorkingDirectoryParentRevisionID(
+			InCommand.GetWorkingDirectory(), RevisionID, InCommand.ErrorMessages
+		);
+
+		if (!bRetrievedID)
+		{
+			RevisionID = "???";
+		}
+
+		Operation->SetSuccessMessage(
+			FText::Format(
+				LOCTEXT("CommitSuccessful", "Committed revision {0}."),
+				FText::FromString(RevisionID)
+			)
+		);
+	}
+
 	bResult &= Client->GetFileStates(
 		InCommand.GetWorkingDirectory(), InCommand.GetAbsoluteFiles(), FileStates,
 		InCommand.ErrorMessages