mirror of
https://github.com/johndoe6345789/WizardMerge.git
synced 2026-04-24 13:44:55 +00:00
Fix C++ formatting issues with clang-format
Co-authored-by: johndoe6345789 <224850594+johndoe6345789@users.noreply.github.com>
This commit is contained in:
copilot-swe-agent[bot]
@@ -1,62 +1,60 @@
|
||||
#ifndef HTTP_CLIENT_H
|
||||
#define HTTP_CLIENT_H
|
||||
|
||||
#include <map>
|
||||
#include <string>
|
||||
#include <vector>
|
||||
#include <map>
|
||||
|
||||
/**
|
||||
* @brief HTTP client for communicating with WizardMerge backend
|
||||
*/
|
||||
class HttpClient {
|
||||
public:
|
||||
/**
|
||||
* @brief Construct HTTP client with backend URL
|
||||
* @param backendUrl URL of the backend server (e.g., "http://localhost:8080")
|
||||
*/
|
||||
explicit HttpClient(const std::string& backendUrl);
|
||||
/**
|
||||
* @brief Construct HTTP client with backend URL
|
||||
* @param backendUrl URL of the backend server (e.g., "http://localhost:8080")
|
||||
*/
|
||||
explicit HttpClient(const std::string &backendUrl);
|
||||
|
||||
/**
|
||||
* @brief Perform a three-way merge via backend API
|
||||
* @param base Base version lines
|
||||
* @param ours Our version lines
|
||||
* @param theirs Their version lines
|
||||
* @param merged Output merged lines
|
||||
* @param hasConflicts Output whether conflicts were detected
|
||||
* @return true if successful, false on error
|
||||
*/
|
||||
bool performMerge(
|
||||
const std::vector<std::string>& base,
|
||||
const std::vector<std::string>& ours,
|
||||
const std::vector<std::string>& theirs,
|
||||
std::vector<std::string>& merged,
|
||||
bool& hasConflicts
|
||||
);
|
||||
/**
|
||||
* @brief Perform a three-way merge via backend API
|
||||
* @param base Base version lines
|
||||
* @param ours Our version lines
|
||||
* @param theirs Their version lines
|
||||
* @param merged Output merged lines
|
||||
* @param hasConflicts Output whether conflicts were detected
|
||||
* @return true if successful, false on error
|
||||
*/
|
||||
bool performMerge(const std::vector<std::string> &base,
|
||||
const std::vector<std::string> &ours,
|
||||
const std::vector<std::string> &theirs,
|
||||
std::vector<std::string> &merged, bool &hasConflicts);
|
||||
|
||||
/**
|
||||
* @brief Check if backend is reachable
|
||||
* @return true if backend responds, false otherwise
|
||||
*/
|
||||
bool checkBackend();
|
||||
/**
|
||||
* @brief Check if backend is reachable
|
||||
* @return true if backend responds, false otherwise
|
||||
*/
|
||||
bool checkBackend();
|
||||
|
||||
/**
|
||||
* @brief Get last error message
|
||||
* @return Error message string
|
||||
*/
|
||||
std::string getLastError() const { return lastError_; }
|
||||
/**
|
||||
* @brief Get last error message
|
||||
* @return Error message string
|
||||
*/
|
||||
std::string getLastError() const { return lastError_; }
|
||||
|
||||
private:
|
||||
std::string backendUrl_;
|
||||
std::string lastError_;
|
||||
std::string backendUrl_;
|
||||
std::string lastError_;
|
||||
|
||||
/**
|
||||
* @brief Perform HTTP POST request
|
||||
* @param endpoint API endpoint (e.g., "/api/merge")
|
||||
* @param jsonBody JSON request body
|
||||
* @param response Output response string
|
||||
* @return true if successful, false on error
|
||||
*/
|
||||
bool post(const std::string& endpoint, const std::string& jsonBody, std::string& response);
|
||||
/**
|
||||
* @brief Perform HTTP POST request
|
||||
* @param endpoint API endpoint (e.g., "/api/merge")
|
||||
* @param jsonBody JSON request body
|
||||
* @param response Output response string
|
||||
* @return true if successful, false on error
|
||||
*/
|
||||
bool post(const std::string &endpoint, const std::string &jsonBody,
|
||||
std::string &response);
|
||||
};
|
||||
|
||||
#endif // HTTP_CLIENT_H
|
||||
|
||||
@@ -1,142 +1,152 @@
|
||||
#include "http_client.h"
|
||||
#include <curl/curl.h>
|
||||
#include <sstream>
|
||||
#include <iostream>
|
||||
#include <sstream>
|
||||
|
||||
// Callback for libcurl to write response data
|
||||
static size_t WriteCallback(void* contents, size_t size, size_t nmemb, void* userp) {
|
||||
((std::string*)userp)->append((char*)contents, size * nmemb);
|
||||
return size * nmemb;
|
||||
static size_t WriteCallback(void *contents, size_t size, size_t nmemb,
|
||||
void *userp) {
|
||||
((std::string *)userp)->append((char *)contents, size * nmemb);
|
||||
return size * nmemb;
|
||||
}
|
||||
|
||||
HttpClient::HttpClient(const std::string& backendUrl)
|
||||
: backendUrl_(backendUrl), lastError_("") {
|
||||
HttpClient::HttpClient(const std::string &backendUrl)
|
||||
: backendUrl_(backendUrl), lastError_("") {}
|
||||
|
||||
bool HttpClient::post(const std::string &endpoint, const std::string &jsonBody,
|
||||
std::string &response) {
|
||||
CURL *curl = curl_easy_init();
|
||||
if (!curl) {
|
||||
lastError_ = "Failed to initialize CURL";
|
||||
return false;
|
||||
}
|
||||
|
||||
std::string url = backendUrl_ + endpoint;
|
||||
response.clear();
|
||||
|
||||
curl_easy_setopt(curl, CURLOPT_URL, url.c_str());
|
||||
curl_easy_setopt(curl, CURLOPT_POSTFIELDS, jsonBody.c_str());
|
||||
curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, WriteCallback);
|
||||
curl_easy_setopt(curl, CURLOPT_WRITEDATA, &response);
|
||||
|
||||
struct curl_slist *headers = nullptr;
|
||||
headers = curl_slist_append(headers, "Content-Type: application/json");
|
||||
curl_easy_setopt(curl, CURLOPT_HTTPHEADER, headers);
|
||||
|
||||
CURLcode res = curl_easy_perform(curl);
|
||||
|
||||
bool success = (res == CURLE_OK);
|
||||
if (!success) {
|
||||
lastError_ = std::string("CURL error: ") + curl_easy_strerror(res);
|
||||
}
|
||||
|
||||
curl_slist_free_all(headers);
|
||||
curl_easy_cleanup(curl);
|
||||
|
||||
return success;
|
||||
}
|
||||
|
||||
bool HttpClient::post(const std::string& endpoint, const std::string& jsonBody, std::string& response) {
|
||||
CURL* curl = curl_easy_init();
|
||||
if (!curl) {
|
||||
lastError_ = "Failed to initialize CURL";
|
||||
return false;
|
||||
bool HttpClient::performMerge(const std::vector<std::string> &base,
|
||||
const std::vector<std::string> &ours,
|
||||
const std::vector<std::string> &theirs,
|
||||
std::vector<std::string> &merged,
|
||||
bool &hasConflicts) {
|
||||
// Build JSON request
|
||||
// NOTE: This is a simplified JSON builder for prototype purposes.
|
||||
// LIMITATION: Does not escape special characters in strings (quotes,
|
||||
// backslashes, etc.)
|
||||
// TODO: For production, use a proper JSON library like nlohmann/json or
|
||||
// rapidjson This implementation works for simple test cases but will fail
|
||||
// with complex content.
|
||||
std::ostringstream json;
|
||||
json << "{";
|
||||
json << "\"base\":[";
|
||||
for (size_t i = 0; i < base.size(); ++i) {
|
||||
json << "\"" << base[i] << "\""; // WARNING: No escaping!
|
||||
if (i < base.size() - 1)
|
||||
json << ",";
|
||||
}
|
||||
json << "],";
|
||||
json << "\"ours\":[";
|
||||
for (size_t i = 0; i < ours.size(); ++i) {
|
||||
json << "\"" << ours[i] << "\""; // WARNING: No escaping!
|
||||
if (i < ours.size() - 1)
|
||||
json << ",";
|
||||
}
|
||||
json << "],";
|
||||
json << "\"theirs\":[";
|
||||
for (size_t i = 0; i < theirs.size(); ++i) {
|
||||
json << "\"" << theirs[i] << "\""; // WARNING: No escaping!
|
||||
if (i < theirs.size() - 1)
|
||||
json << ",";
|
||||
}
|
||||
json << "]";
|
||||
json << "}";
|
||||
|
||||
std::string response;
|
||||
if (!post("/api/merge", json.str(), response)) {
|
||||
return false;
|
||||
}
|
||||
|
||||
// Parse JSON response (simple parsing for now)
|
||||
// NOTE: This is a fragile string-based parser for prototype purposes.
|
||||
// LIMITATION: Will break on complex JSON or unexpected formatting.
|
||||
// TODO: For production, use a proper JSON library like nlohmann/json or
|
||||
// rapidjson
|
||||
merged.clear();
|
||||
hasConflicts = (response.find("\"has_conflicts\":true") != std::string::npos);
|
||||
|
||||
// Extract merged lines from response
|
||||
// This is a simplified parser - production code MUST use a JSON library
|
||||
size_t mergedPos = response.find("\"merged\":");
|
||||
if (mergedPos != std::string::npos) {
|
||||
size_t startBracket = response.find("[", mergedPos);
|
||||
size_t endBracket = response.find("]", startBracket);
|
||||
if (startBracket != std::string::npos && endBracket != std::string::npos) {
|
||||
std::string mergedArray =
|
||||
response.substr(startBracket + 1, endBracket - startBracket - 1);
|
||||
|
||||
// Parse lines (simplified)
|
||||
size_t pos = 0;
|
||||
while (pos < mergedArray.size()) {
|
||||
size_t quoteStart = mergedArray.find("\"", pos);
|
||||
if (quoteStart == std::string::npos)
|
||||
break;
|
||||
size_t quoteEnd = mergedArray.find("\"", quoteStart + 1);
|
||||
if (quoteEnd == std::string::npos)
|
||||
break;
|
||||
|
||||
std::string line =
|
||||
mergedArray.substr(quoteStart + 1, quoteEnd - quoteStart - 1);
|
||||
merged.push_back(line);
|
||||
pos = quoteEnd + 1;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
std::string url = backendUrl_ + endpoint;
|
||||
response.clear();
|
||||
|
||||
curl_easy_setopt(curl, CURLOPT_URL, url.c_str());
|
||||
curl_easy_setopt(curl, CURLOPT_POSTFIELDS, jsonBody.c_str());
|
||||
curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, WriteCallback);
|
||||
curl_easy_setopt(curl, CURLOPT_WRITEDATA, &response);
|
||||
|
||||
struct curl_slist* headers = nullptr;
|
||||
headers = curl_slist_append(headers, "Content-Type: application/json");
|
||||
curl_easy_setopt(curl, CURLOPT_HTTPHEADER, headers);
|
||||
|
||||
CURLcode res = curl_easy_perform(curl);
|
||||
|
||||
bool success = (res == CURLE_OK);
|
||||
if (!success) {
|
||||
lastError_ = std::string("CURL error: ") + curl_easy_strerror(res);
|
||||
}
|
||||
|
||||
curl_slist_free_all(headers);
|
||||
curl_easy_cleanup(curl);
|
||||
|
||||
return success;
|
||||
}
|
||||
|
||||
bool HttpClient::performMerge(
|
||||
const std::vector<std::string>& base,
|
||||
const std::vector<std::string>& ours,
|
||||
const std::vector<std::string>& theirs,
|
||||
std::vector<std::string>& merged,
|
||||
bool& hasConflicts
|
||||
) {
|
||||
// Build JSON request
|
||||
// NOTE: This is a simplified JSON builder for prototype purposes.
|
||||
// LIMITATION: Does not escape special characters in strings (quotes, backslashes, etc.)
|
||||
// TODO: For production, use a proper JSON library like nlohmann/json or rapidjson
|
||||
// This implementation works for simple test cases but will fail with complex content.
|
||||
std::ostringstream json;
|
||||
json << "{";
|
||||
json << "\"base\":[";
|
||||
for (size_t i = 0; i < base.size(); ++i) {
|
||||
json << "\"" << base[i] << "\""; // WARNING: No escaping!
|
||||
if (i < base.size() - 1) json << ",";
|
||||
}
|
||||
json << "],";
|
||||
json << "\"ours\":[";
|
||||
for (size_t i = 0; i < ours.size(); ++i) {
|
||||
json << "\"" << ours[i] << "\""; // WARNING: No escaping!
|
||||
if (i < ours.size() - 1) json << ",";
|
||||
}
|
||||
json << "],";
|
||||
json << "\"theirs\":[";
|
||||
for (size_t i = 0; i < theirs.size(); ++i) {
|
||||
json << "\"" << theirs[i] << "\""; // WARNING: No escaping!
|
||||
if (i < theirs.size() - 1) json << ",";
|
||||
}
|
||||
json << "]";
|
||||
json << "}";
|
||||
|
||||
std::string response;
|
||||
if (!post("/api/merge", json.str(), response)) {
|
||||
return false;
|
||||
}
|
||||
|
||||
// Parse JSON response (simple parsing for now)
|
||||
// NOTE: This is a fragile string-based parser for prototype purposes.
|
||||
// LIMITATION: Will break on complex JSON or unexpected formatting.
|
||||
// TODO: For production, use a proper JSON library like nlohmann/json or rapidjson
|
||||
merged.clear();
|
||||
hasConflicts = (response.find("\"has_conflicts\":true") != std::string::npos);
|
||||
|
||||
// Extract merged lines from response
|
||||
// This is a simplified parser - production code MUST use a JSON library
|
||||
size_t mergedPos = response.find("\"merged\":");
|
||||
if (mergedPos != std::string::npos) {
|
||||
size_t startBracket = response.find("[", mergedPos);
|
||||
size_t endBracket = response.find("]", startBracket);
|
||||
if (startBracket != std::string::npos && endBracket != std::string::npos) {
|
||||
std::string mergedArray = response.substr(startBracket + 1, endBracket - startBracket - 1);
|
||||
|
||||
// Parse lines (simplified)
|
||||
size_t pos = 0;
|
||||
while (pos < mergedArray.size()) {
|
||||
size_t quoteStart = mergedArray.find("\"", pos);
|
||||
if (quoteStart == std::string::npos) break;
|
||||
size_t quoteEnd = mergedArray.find("\"", quoteStart + 1);
|
||||
if (quoteEnd == std::string::npos) break;
|
||||
|
||||
std::string line = mergedArray.substr(quoteStart + 1, quoteEnd - quoteStart - 1);
|
||||
merged.push_back(line);
|
||||
pos = quoteEnd + 1;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return true;
|
||||
return true;
|
||||
}
|
||||
|
||||
bool HttpClient::checkBackend() {
|
||||
CURL* curl = curl_easy_init();
|
||||
if (!curl) {
|
||||
lastError_ = "Failed to initialize CURL";
|
||||
return false;
|
||||
}
|
||||
CURL *curl = curl_easy_init();
|
||||
if (!curl) {
|
||||
lastError_ = "Failed to initialize CURL";
|
||||
return false;
|
||||
}
|
||||
|
||||
std::string url = backendUrl_ + "/";
|
||||
curl_easy_setopt(curl, CURLOPT_URL, url.c_str());
|
||||
curl_easy_setopt(curl, CURLOPT_NOBODY, 1L);
|
||||
curl_easy_setopt(curl, CURLOPT_TIMEOUT, 5L);
|
||||
std::string url = backendUrl_ + "/";
|
||||
curl_easy_setopt(curl, CURLOPT_URL, url.c_str());
|
||||
curl_easy_setopt(curl, CURLOPT_NOBODY, 1L);
|
||||
curl_easy_setopt(curl, CURLOPT_TIMEOUT, 5L);
|
||||
|
||||
CURLcode res = curl_easy_perform(curl);
|
||||
bool success = (res == CURLE_OK);
|
||||
CURLcode res = curl_easy_perform(curl);
|
||||
bool success = (res == CURLE_OK);
|
||||
|
||||
if (!success) {
|
||||
lastError_ = std::string("Cannot reach backend: ") + curl_easy_strerror(res);
|
||||
}
|
||||
if (!success) {
|
||||
lastError_ =
|
||||
std::string("Cannot reach backend: ") + curl_easy_strerror(res);
|
||||
}
|
||||
|
||||
curl_easy_cleanup(curl);
|
||||
return success;
|
||||
curl_easy_cleanup(curl);
|
||||
return success;
|
||||
}
|
||||
|
||||
@@ -1,395 +1,423 @@
|
||||
#include "http_client.h"
|
||||
#include "file_utils.h"
|
||||
#include <iostream>
|
||||
#include "http_client.h"
|
||||
#include <cstdlib>
|
||||
#include <cstring>
|
||||
#include <curl/curl.h>
|
||||
#include <fstream>
|
||||
#include <iostream>
|
||||
#include <sstream>
|
||||
#include <string>
|
||||
#include <cstring>
|
||||
#include <cstdlib>
|
||||
#include <curl/curl.h>
|
||||
|
||||
/**
|
||||
* @brief Print usage information
|
||||
*/
|
||||
void printUsage(const char* programName) {
|
||||
std::cout << "WizardMerge CLI Frontend - Intelligent Merge Conflict Resolution\n\n";
|
||||
std::cout << "Usage:\n";
|
||||
std::cout << " " << programName << " [OPTIONS] merge --base <file> --ours <file> --theirs <file>\n";
|
||||
std::cout << " " << programName << " [OPTIONS] pr-resolve --url <pr_url> [--token <token>]\n";
|
||||
std::cout << " " << programName << " [OPTIONS] git-resolve [FILE]\n";
|
||||
std::cout << " " << programName << " --help\n";
|
||||
std::cout << " " << programName << " --version\n\n";
|
||||
std::cout << "Global Options:\n";
|
||||
std::cout << " --backend <url> Backend server URL (default: http://localhost:8080)\n";
|
||||
std::cout << " -v, --verbose Enable verbose output\n";
|
||||
std::cout << " -q, --quiet Suppress non-error output\n";
|
||||
std::cout << " -h, --help Show this help message\n";
|
||||
std::cout << " --version Show version information\n\n";
|
||||
std::cout << "Commands:\n";
|
||||
std::cout << " merge Perform three-way merge\n";
|
||||
std::cout << " --base <file> Base version file (required)\n";
|
||||
std::cout << " --ours <file> Our version file (required)\n";
|
||||
std::cout << " --theirs <file> Their version file (required)\n";
|
||||
std::cout << " -o, --output <file> Output file (default: stdout)\n";
|
||||
std::cout << " --format <format> Output format: text, json (default: text)\n\n";
|
||||
std::cout << " pr-resolve Resolve pull request conflicts\n";
|
||||
std::cout << " --url <url> Pull request URL (required)\n";
|
||||
std::cout << " --token <token> GitHub API token (optional, can use GITHUB_TOKEN env)\n";
|
||||
std::cout << " --branch <name> Create branch with resolved conflicts (optional)\n";
|
||||
std::cout << " -o, --output <dir> Output directory for resolved files (default: stdout)\n\n";
|
||||
std::cout << " git-resolve Resolve Git merge conflicts (not yet implemented)\n";
|
||||
std::cout << " [FILE] Specific file to resolve (optional)\n\n";
|
||||
std::cout << "Examples:\n";
|
||||
std::cout << " " << programName << " merge --base base.txt --ours ours.txt --theirs theirs.txt\n";
|
||||
std::cout << " " << programName << " merge --base base.txt --ours ours.txt --theirs theirs.txt -o result.txt\n";
|
||||
std::cout << " " << programName << " pr-resolve --url https://github.com/owner/repo/pull/123\n";
|
||||
std::cout << " " << programName << " pr-resolve --url https://github.com/owner/repo/pull/123 --token ghp_xxx\n";
|
||||
std::cout << " " << programName << " --backend http://remote:8080 merge --base b.txt --ours o.txt --theirs t.txt\n\n";
|
||||
void printUsage(const char *programName) {
|
||||
std::cout
|
||||
<< "WizardMerge CLI Frontend - Intelligent Merge Conflict Resolution\n\n";
|
||||
std::cout << "Usage:\n";
|
||||
std::cout << " " << programName
|
||||
<< " [OPTIONS] merge --base <file> --ours <file> --theirs <file>\n";
|
||||
std::cout << " " << programName
|
||||
<< " [OPTIONS] pr-resolve --url <pr_url> [--token <token>]\n";
|
||||
std::cout << " " << programName << " [OPTIONS] git-resolve [FILE]\n";
|
||||
std::cout << " " << programName << " --help\n";
|
||||
std::cout << " " << programName << " --version\n\n";
|
||||
std::cout << "Global Options:\n";
|
||||
std::cout << " --backend <url> Backend server URL (default: "
|
||||
"http://localhost:8080)\n";
|
||||
std::cout << " -v, --verbose Enable verbose output\n";
|
||||
std::cout << " -q, --quiet Suppress non-error output\n";
|
||||
std::cout << " -h, --help Show this help message\n";
|
||||
std::cout << " --version Show version information\n\n";
|
||||
std::cout << "Commands:\n";
|
||||
std::cout << " merge Perform three-way merge\n";
|
||||
std::cout << " --base <file> Base version file (required)\n";
|
||||
std::cout << " --ours <file> Our version file (required)\n";
|
||||
std::cout << " --theirs <file> Their version file (required)\n";
|
||||
std::cout << " -o, --output <file> Output file (default: stdout)\n";
|
||||
std::cout << " --format <format> Output format: text, json (default: "
|
||||
"text)\n\n";
|
||||
std::cout << " pr-resolve Resolve pull request conflicts\n";
|
||||
std::cout << " --url <url> Pull request URL (required)\n";
|
||||
std::cout << " --token <token> GitHub API token (optional, can use "
|
||||
"GITHUB_TOKEN env)\n";
|
||||
std::cout << " --branch <name> Create branch with resolved conflicts "
|
||||
"(optional)\n";
|
||||
std::cout << " -o, --output <dir> Output directory for resolved files "
|
||||
"(default: stdout)\n\n";
|
||||
std::cout << " git-resolve Resolve Git merge conflicts (not yet "
|
||||
"implemented)\n";
|
||||
std::cout << " [FILE] Specific file to resolve (optional)\n\n";
|
||||
std::cout << "Examples:\n";
|
||||
std::cout << " " << programName
|
||||
<< " merge --base base.txt --ours ours.txt --theirs theirs.txt\n";
|
||||
std::cout << " " << programName
|
||||
<< " merge --base base.txt --ours ours.txt --theirs theirs.txt -o "
|
||||
"result.txt\n";
|
||||
std::cout << " " << programName
|
||||
<< " pr-resolve --url https://github.com/owner/repo/pull/123\n";
|
||||
std::cout << " " << programName
|
||||
<< " pr-resolve --url https://github.com/owner/repo/pull/123 "
|
||||
"--token ghp_xxx\n";
|
||||
std::cout << " " << programName
|
||||
<< " --backend http://remote:8080 merge --base b.txt --ours o.txt "
|
||||
"--theirs t.txt\n\n";
|
||||
}
|
||||
|
||||
/**
|
||||
* @brief Print version information
|
||||
*/
|
||||
void printVersion() {
|
||||
std::cout << "WizardMerge CLI Frontend v1.0.0\n";
|
||||
std::cout << "Part of the WizardMerge Intelligent Merge Conflict Resolution system\n";
|
||||
std::cout << "WizardMerge CLI Frontend v1.0.0\n";
|
||||
std::cout << "Part of the WizardMerge Intelligent Merge Conflict Resolution "
|
||||
"system\n";
|
||||
}
|
||||
|
||||
/**
|
||||
* @brief Parse command-line arguments and execute merge
|
||||
*/
|
||||
int main(int argc, char* argv[]) {
|
||||
// Default configuration
|
||||
std::string backendUrl = "http://localhost:8080";
|
||||
bool verbose = false;
|
||||
bool quiet = false;
|
||||
std::string command;
|
||||
std::string baseFile, oursFile, theirsFile, outputFile;
|
||||
std::string format = "text";
|
||||
std::string prUrl, githubToken, branchName;
|
||||
int main(int argc, char *argv[]) {
|
||||
// Default configuration
|
||||
std::string backendUrl = "http://localhost:8080";
|
||||
bool verbose = false;
|
||||
bool quiet = false;
|
||||
std::string command;
|
||||
std::string baseFile, oursFile, theirsFile, outputFile;
|
||||
std::string format = "text";
|
||||
std::string prUrl, githubToken, branchName;
|
||||
|
||||
// Check environment variable
|
||||
const char* envBackend = std::getenv("WIZARDMERGE_BACKEND");
|
||||
if (envBackend) {
|
||||
backendUrl = envBackend;
|
||||
}
|
||||
|
||||
// Check for GitHub token in environment
|
||||
const char* envToken = std::getenv("GITHUB_TOKEN");
|
||||
if (envToken) {
|
||||
githubToken = envToken;
|
||||
}
|
||||
// Check environment variable
|
||||
const char *envBackend = std::getenv("WIZARDMERGE_BACKEND");
|
||||
if (envBackend) {
|
||||
backendUrl = envBackend;
|
||||
}
|
||||
|
||||
// Parse arguments
|
||||
for (int i = 1; i < argc; ++i) {
|
||||
std::string arg = argv[i];
|
||||
// Check for GitHub token in environment
|
||||
const char *envToken = std::getenv("GITHUB_TOKEN");
|
||||
if (envToken) {
|
||||
githubToken = envToken;
|
||||
}
|
||||
|
||||
if (arg == "--help" || arg == "-h") {
|
||||
printUsage(argv[0]);
|
||||
return 0;
|
||||
} else if (arg == "--version") {
|
||||
printVersion();
|
||||
return 0;
|
||||
} else if (arg == "--backend") {
|
||||
if (i + 1 < argc) {
|
||||
backendUrl = argv[++i];
|
||||
} else {
|
||||
std::cerr << "Error: --backend requires an argument\n";
|
||||
return 2;
|
||||
}
|
||||
} else if (arg == "--verbose" || arg == "-v") {
|
||||
verbose = true;
|
||||
} else if (arg == "--quiet" || arg == "-q") {
|
||||
quiet = true;
|
||||
} else if (arg == "merge") {
|
||||
command = "merge";
|
||||
} else if (arg == "pr-resolve") {
|
||||
command = "pr-resolve";
|
||||
} else if (arg == "git-resolve") {
|
||||
command = "git-resolve";
|
||||
} else if (arg == "--url") {
|
||||
if (i + 1 < argc) {
|
||||
prUrl = argv[++i];
|
||||
} else {
|
||||
std::cerr << "Error: --url requires an argument\n";
|
||||
return 2;
|
||||
}
|
||||
} else if (arg == "--token") {
|
||||
if (i + 1 < argc) {
|
||||
githubToken = argv[++i];
|
||||
} else {
|
||||
std::cerr << "Error: --token requires an argument\n";
|
||||
return 2;
|
||||
}
|
||||
} else if (arg == "--branch") {
|
||||
if (i + 1 < argc) {
|
||||
branchName = argv[++i];
|
||||
} else {
|
||||
std::cerr << "Error: --branch requires an argument\n";
|
||||
return 2;
|
||||
}
|
||||
} else if (arg == "--base") {
|
||||
if (i + 1 < argc) {
|
||||
baseFile = argv[++i];
|
||||
} else {
|
||||
std::cerr << "Error: --base requires an argument\n";
|
||||
return 2;
|
||||
}
|
||||
} else if (arg == "--ours") {
|
||||
if (i + 1 < argc) {
|
||||
oursFile = argv[++i];
|
||||
} else {
|
||||
std::cerr << "Error: --ours requires an argument\n";
|
||||
return 2;
|
||||
}
|
||||
} else if (arg == "--theirs") {
|
||||
if (i + 1 < argc) {
|
||||
theirsFile = argv[++i];
|
||||
} else {
|
||||
std::cerr << "Error: --theirs requires an argument\n";
|
||||
return 2;
|
||||
}
|
||||
} else if (arg == "--output" || arg == "-o") {
|
||||
if (i + 1 < argc) {
|
||||
outputFile = argv[++i];
|
||||
} else {
|
||||
std::cerr << "Error: --output requires an argument\n";
|
||||
return 2;
|
||||
}
|
||||
} else if (arg == "--format") {
|
||||
if (i + 1 < argc) {
|
||||
format = argv[++i];
|
||||
} else {
|
||||
std::cerr << "Error: --format requires an argument\n";
|
||||
return 2;
|
||||
}
|
||||
}
|
||||
}
|
||||
// Parse arguments
|
||||
for (int i = 1; i < argc; ++i) {
|
||||
std::string arg = argv[i];
|
||||
|
||||
// Check if command was provided
|
||||
if (command.empty()) {
|
||||
std::cerr << "Error: No command specified\n\n";
|
||||
printUsage(argv[0]);
|
||||
if (arg == "--help" || arg == "-h") {
|
||||
printUsage(argv[0]);
|
||||
return 0;
|
||||
} else if (arg == "--version") {
|
||||
printVersion();
|
||||
return 0;
|
||||
} else if (arg == "--backend") {
|
||||
if (i + 1 < argc) {
|
||||
backendUrl = argv[++i];
|
||||
} else {
|
||||
std::cerr << "Error: --backend requires an argument\n";
|
||||
return 2;
|
||||
}
|
||||
} else if (arg == "--verbose" || arg == "-v") {
|
||||
verbose = true;
|
||||
} else if (arg == "--quiet" || arg == "-q") {
|
||||
quiet = true;
|
||||
} else if (arg == "merge") {
|
||||
command = "merge";
|
||||
} else if (arg == "pr-resolve") {
|
||||
command = "pr-resolve";
|
||||
} else if (arg == "git-resolve") {
|
||||
command = "git-resolve";
|
||||
} else if (arg == "--url") {
|
||||
if (i + 1 < argc) {
|
||||
prUrl = argv[++i];
|
||||
} else {
|
||||
std::cerr << "Error: --url requires an argument\n";
|
||||
return 2;
|
||||
}
|
||||
} else if (arg == "--token") {
|
||||
if (i + 1 < argc) {
|
||||
githubToken = argv[++i];
|
||||
} else {
|
||||
std::cerr << "Error: --token requires an argument\n";
|
||||
return 2;
|
||||
}
|
||||
} else if (arg == "--branch") {
|
||||
if (i + 1 < argc) {
|
||||
branchName = argv[++i];
|
||||
} else {
|
||||
std::cerr << "Error: --branch requires an argument\n";
|
||||
return 2;
|
||||
}
|
||||
} else if (arg == "--base") {
|
||||
if (i + 1 < argc) {
|
||||
baseFile = argv[++i];
|
||||
} else {
|
||||
std::cerr << "Error: --base requires an argument\n";
|
||||
return 2;
|
||||
}
|
||||
} else if (arg == "--ours") {
|
||||
if (i + 1 < argc) {
|
||||
oursFile = argv[++i];
|
||||
} else {
|
||||
std::cerr << "Error: --ours requires an argument\n";
|
||||
return 2;
|
||||
}
|
||||
} else if (arg == "--theirs") {
|
||||
if (i + 1 < argc) {
|
||||
theirsFile = argv[++i];
|
||||
} else {
|
||||
std::cerr << "Error: --theirs requires an argument\n";
|
||||
return 2;
|
||||
}
|
||||
} else if (arg == "--output" || arg == "-o") {
|
||||
if (i + 1 < argc) {
|
||||
outputFile = argv[++i];
|
||||
} else {
|
||||
std::cerr << "Error: --output requires an argument\n";
|
||||
return 2;
|
||||
}
|
||||
} else if (arg == "--format") {
|
||||
if (i + 1 < argc) {
|
||||
format = argv[++i];
|
||||
} else {
|
||||
std::cerr << "Error: --format requires an argument\n";
|
||||
return 2;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Check if command was provided
|
||||
if (command.empty()) {
|
||||
std::cerr << "Error: No command specified\n\n";
|
||||
printUsage(argv[0]);
|
||||
return 2;
|
||||
}
|
||||
|
||||
// Execute command
|
||||
if (command == "merge") {
|
||||
// Validate required arguments
|
||||
if (baseFile.empty() || oursFile.empty() || theirsFile.empty()) {
|
||||
std::cerr << "Error: merge command requires --base, --ours, and --theirs "
|
||||
"arguments\n";
|
||||
return 2;
|
||||
}
|
||||
|
||||
// Execute command
|
||||
if (command == "merge") {
|
||||
// Validate required arguments
|
||||
if (baseFile.empty() || oursFile.empty() || theirsFile.empty()) {
|
||||
std::cerr << "Error: merge command requires --base, --ours, and --theirs arguments\n";
|
||||
return 2;
|
||||
}
|
||||
// Check files exist
|
||||
if (!FileUtils::fileExists(baseFile)) {
|
||||
std::cerr << "Error: Base file not found: " << baseFile << "\n";
|
||||
return 4;
|
||||
}
|
||||
if (!FileUtils::fileExists(oursFile)) {
|
||||
std::cerr << "Error: Ours file not found: " << oursFile << "\n";
|
||||
return 4;
|
||||
}
|
||||
if (!FileUtils::fileExists(theirsFile)) {
|
||||
std::cerr << "Error: Theirs file not found: " << theirsFile << "\n";
|
||||
return 4;
|
||||
}
|
||||
|
||||
// Check files exist
|
||||
if (!FileUtils::fileExists(baseFile)) {
|
||||
std::cerr << "Error: Base file not found: " << baseFile << "\n";
|
||||
return 4;
|
||||
}
|
||||
if (!FileUtils::fileExists(oursFile)) {
|
||||
std::cerr << "Error: Ours file not found: " << oursFile << "\n";
|
||||
return 4;
|
||||
}
|
||||
if (!FileUtils::fileExists(theirsFile)) {
|
||||
std::cerr << "Error: Theirs file not found: " << theirsFile << "\n";
|
||||
return 4;
|
||||
}
|
||||
if (verbose) {
|
||||
std::cout << "Backend URL: " << backendUrl << "\n";
|
||||
std::cout << "Base file: " << baseFile << "\n";
|
||||
std::cout << "Ours file: " << oursFile << "\n";
|
||||
std::cout << "Theirs file: " << theirsFile << "\n";
|
||||
}
|
||||
|
||||
if (verbose) {
|
||||
std::cout << "Backend URL: " << backendUrl << "\n";
|
||||
std::cout << "Base file: " << baseFile << "\n";
|
||||
std::cout << "Ours file: " << oursFile << "\n";
|
||||
std::cout << "Theirs file: " << theirsFile << "\n";
|
||||
}
|
||||
// Read input files
|
||||
std::vector<std::string> baseLines, oursLines, theirsLines;
|
||||
if (!FileUtils::readLines(baseFile, baseLines)) {
|
||||
std::cerr << "Error: Failed to read base file\n";
|
||||
return 4;
|
||||
}
|
||||
if (!FileUtils::readLines(oursFile, oursLines)) {
|
||||
std::cerr << "Error: Failed to read ours file\n";
|
||||
return 4;
|
||||
}
|
||||
if (!FileUtils::readLines(theirsFile, theirsLines)) {
|
||||
std::cerr << "Error: Failed to read theirs file\n";
|
||||
return 4;
|
||||
}
|
||||
|
||||
// Read input files
|
||||
std::vector<std::string> baseLines, oursLines, theirsLines;
|
||||
if (!FileUtils::readLines(baseFile, baseLines)) {
|
||||
std::cerr << "Error: Failed to read base file\n";
|
||||
return 4;
|
||||
}
|
||||
if (!FileUtils::readLines(oursFile, oursLines)) {
|
||||
std::cerr << "Error: Failed to read ours file\n";
|
||||
return 4;
|
||||
}
|
||||
if (!FileUtils::readLines(theirsFile, theirsLines)) {
|
||||
std::cerr << "Error: Failed to read theirs file\n";
|
||||
return 4;
|
||||
}
|
||||
if (verbose) {
|
||||
std::cout << "Read " << baseLines.size() << " lines from base\n";
|
||||
std::cout << "Read " << oursLines.size() << " lines from ours\n";
|
||||
std::cout << "Read " << theirsLines.size() << " lines from theirs\n";
|
||||
}
|
||||
|
||||
if (verbose) {
|
||||
std::cout << "Read " << baseLines.size() << " lines from base\n";
|
||||
std::cout << "Read " << oursLines.size() << " lines from ours\n";
|
||||
std::cout << "Read " << theirsLines.size() << " lines from theirs\n";
|
||||
}
|
||||
// Connect to backend and perform merge
|
||||
HttpClient client(backendUrl);
|
||||
|
||||
// Connect to backend and perform merge
|
||||
HttpClient client(backendUrl);
|
||||
|
||||
if (!quiet) {
|
||||
std::cout << "Connecting to backend: " << backendUrl << "\n";
|
||||
}
|
||||
if (!quiet) {
|
||||
std::cout << "Connecting to backend: " << backendUrl << "\n";
|
||||
}
|
||||
|
||||
if (!client.checkBackend()) {
|
||||
std::cerr << "Error: Cannot connect to backend: " << client.getLastError() << "\n";
|
||||
std::cerr << "Make sure the backend server is running on " << backendUrl << "\n";
|
||||
return 3;
|
||||
}
|
||||
if (!client.checkBackend()) {
|
||||
std::cerr << "Error: Cannot connect to backend: " << client.getLastError()
|
||||
<< "\n";
|
||||
std::cerr << "Make sure the backend server is running on " << backendUrl
|
||||
<< "\n";
|
||||
return 3;
|
||||
}
|
||||
|
||||
if (!quiet) {
|
||||
std::cout << "Performing three-way merge...\n";
|
||||
}
|
||||
if (!quiet) {
|
||||
std::cout << "Performing three-way merge...\n";
|
||||
}
|
||||
|
||||
std::vector<std::string> mergedLines;
|
||||
bool hasConflicts = false;
|
||||
std::vector<std::string> mergedLines;
|
||||
bool hasConflicts = false;
|
||||
|
||||
if (!client.performMerge(baseLines, oursLines, theirsLines, mergedLines, hasConflicts)) {
|
||||
std::cerr << "Error: Merge failed: " << client.getLastError() << "\n";
|
||||
return 1;
|
||||
}
|
||||
if (!client.performMerge(baseLines, oursLines, theirsLines, mergedLines,
|
||||
hasConflicts)) {
|
||||
std::cerr << "Error: Merge failed: " << client.getLastError() << "\n";
|
||||
return 1;
|
||||
}
|
||||
|
||||
// Output results
|
||||
if (!quiet) {
|
||||
std::cout << "Merge completed. Has conflicts: " << (hasConflicts ? "Yes" : "No") << "\n";
|
||||
std::cout << "Result has " << mergedLines.size() << " lines\n";
|
||||
}
|
||||
// Output results
|
||||
if (!quiet) {
|
||||
std::cout << "Merge completed. Has conflicts: "
|
||||
<< (hasConflicts ? "Yes" : "No") << "\n";
|
||||
std::cout << "Result has " << mergedLines.size() << " lines\n";
|
||||
}
|
||||
|
||||
// Write output
|
||||
if (outputFile.empty()) {
|
||||
// Write to stdout
|
||||
for (const auto& line : mergedLines) {
|
||||
std::cout << line << "\n";
|
||||
}
|
||||
} else {
|
||||
if (!FileUtils::writeLines(outputFile, mergedLines)) {
|
||||
std::cerr << "Error: Failed to write output file\n";
|
||||
return 4;
|
||||
}
|
||||
if (!quiet) {
|
||||
std::cout << "Output written to: " << outputFile << "\n";
|
||||
}
|
||||
}
|
||||
|
||||
return hasConflicts ? 5 : 0;
|
||||
|
||||
} else if (command == "pr-resolve") {
|
||||
// Validate required arguments
|
||||
if (prUrl.empty()) {
|
||||
std::cerr << "Error: pr-resolve command requires --url argument\n";
|
||||
return 2;
|
||||
}
|
||||
|
||||
if (verbose) {
|
||||
std::cout << "Backend URL: " << backendUrl << "\n";
|
||||
std::cout << "Pull Request URL: " << prUrl << "\n";
|
||||
if (!githubToken.empty()) {
|
||||
std::cout << "Using GitHub token: " << githubToken.substr(0, 4) << "...\n";
|
||||
}
|
||||
}
|
||||
|
||||
// Connect to backend
|
||||
HttpClient client(backendUrl);
|
||||
|
||||
if (!quiet) {
|
||||
std::cout << "Connecting to backend: " << backendUrl << "\n";
|
||||
}
|
||||
|
||||
if (!client.checkBackend()) {
|
||||
std::cerr << "Error: Cannot connect to backend: " << client.getLastError() << "\n";
|
||||
std::cerr << "Make sure the backend server is running on " << backendUrl << "\n";
|
||||
return 3;
|
||||
}
|
||||
|
||||
if (!quiet) {
|
||||
std::cout << "Resolving pull request conflicts...\n";
|
||||
}
|
||||
|
||||
// Build JSON request for PR resolution
|
||||
std::ostringstream json;
|
||||
json << "{";
|
||||
json << "\"pr_url\":\"" << prUrl << "\"";
|
||||
if (!githubToken.empty()) {
|
||||
json << ",\"github_token\":\"" << githubToken << "\"";
|
||||
}
|
||||
if (!branchName.empty()) {
|
||||
json << ",\"create_branch\":true";
|
||||
json << ",\"branch_name\":\"" << branchName << "\"";
|
||||
}
|
||||
json << "}";
|
||||
|
||||
// Perform HTTP POST to /api/pr/resolve
|
||||
std::string response;
|
||||
CURL* curl = curl_easy_init();
|
||||
if (!curl) {
|
||||
std::cerr << "Error: Failed to initialize CURL\n";
|
||||
return 3;
|
||||
}
|
||||
|
||||
std::string url = backendUrl + "/api/pr/resolve";
|
||||
curl_easy_setopt(curl, CURLOPT_URL, url.c_str());
|
||||
curl_easy_setopt(curl, CURLOPT_POSTFIELDS, json.str().c_str());
|
||||
|
||||
auto WriteCallback = [](void* contents, size_t size, size_t nmemb, void* userp) -> size_t {
|
||||
((std::string*)userp)->append((char*)contents, size * nmemb);
|
||||
return size * nmemb;
|
||||
};
|
||||
|
||||
curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, +WriteCallback);
|
||||
curl_easy_setopt(curl, CURLOPT_WRITEDATA, &response);
|
||||
|
||||
struct curl_slist* headers = nullptr;
|
||||
headers = curl_slist_append(headers, "Content-Type: application/json");
|
||||
curl_easy_setopt(curl, CURLOPT_HTTPHEADER, headers);
|
||||
|
||||
CURLcode res = curl_easy_perform(curl);
|
||||
|
||||
if (res != CURLE_OK) {
|
||||
std::cerr << "Error: Request failed: " << curl_easy_strerror(res) << "\n";
|
||||
curl_slist_free_all(headers);
|
||||
curl_easy_cleanup(curl);
|
||||
return 3;
|
||||
}
|
||||
|
||||
curl_slist_free_all(headers);
|
||||
curl_easy_cleanup(curl);
|
||||
|
||||
// Output response
|
||||
if (outputFile.empty()) {
|
||||
std::cout << "\n=== Pull Request Resolution Result ===\n";
|
||||
std::cout << response << "\n";
|
||||
} else {
|
||||
std::ofstream out(outputFile);
|
||||
if (!out) {
|
||||
std::cerr << "Error: Failed to write output file\n";
|
||||
return 4;
|
||||
}
|
||||
out << response;
|
||||
out.close();
|
||||
if (!quiet) {
|
||||
std::cout << "Result written to: " << outputFile << "\n";
|
||||
}
|
||||
}
|
||||
|
||||
// Check if resolution was successful (simple check)
|
||||
if (response.find("\"success\":true") != std::string::npos) {
|
||||
if (!quiet) {
|
||||
std::cout << "\nPull request conflicts resolved successfully!\n";
|
||||
}
|
||||
return 0;
|
||||
} else {
|
||||
if (!quiet) {
|
||||
std::cerr << "\nFailed to resolve some conflicts. See output for details.\n";
|
||||
}
|
||||
return 1;
|
||||
}
|
||||
|
||||
} else if (command == "git-resolve") {
|
||||
std::cerr << "Error: git-resolve command not yet implemented\n";
|
||||
return 1;
|
||||
// Write output
|
||||
if (outputFile.empty()) {
|
||||
// Write to stdout
|
||||
for (const auto &line : mergedLines) {
|
||||
std::cout << line << "\n";
|
||||
}
|
||||
} else {
|
||||
std::cerr << "Error: Unknown command: " << command << "\n";
|
||||
return 2;
|
||||
if (!FileUtils::writeLines(outputFile, mergedLines)) {
|
||||
std::cerr << "Error: Failed to write output file\n";
|
||||
return 4;
|
||||
}
|
||||
if (!quiet) {
|
||||
std::cout << "Output written to: " << outputFile << "\n";
|
||||
}
|
||||
}
|
||||
|
||||
return 0;
|
||||
return hasConflicts ? 5 : 0;
|
||||
|
||||
} else if (command == "pr-resolve") {
|
||||
// Validate required arguments
|
||||
if (prUrl.empty()) {
|
||||
std::cerr << "Error: pr-resolve command requires --url argument\n";
|
||||
return 2;
|
||||
}
|
||||
|
||||
if (verbose) {
|
||||
std::cout << "Backend URL: " << backendUrl << "\n";
|
||||
std::cout << "Pull Request URL: " << prUrl << "\n";
|
||||
if (!githubToken.empty()) {
|
||||
std::cout << "Using GitHub token: " << githubToken.substr(0, 4)
|
||||
<< "...\n";
|
||||
}
|
||||
}
|
||||
|
||||
// Connect to backend
|
||||
HttpClient client(backendUrl);
|
||||
|
||||
if (!quiet) {
|
||||
std::cout << "Connecting to backend: " << backendUrl << "\n";
|
||||
}
|
||||
|
||||
if (!client.checkBackend()) {
|
||||
std::cerr << "Error: Cannot connect to backend: " << client.getLastError()
|
||||
<< "\n";
|
||||
std::cerr << "Make sure the backend server is running on " << backendUrl
|
||||
<< "\n";
|
||||
return 3;
|
||||
}
|
||||
|
||||
if (!quiet) {
|
||||
std::cout << "Resolving pull request conflicts...\n";
|
||||
}
|
||||
|
||||
// Build JSON request for PR resolution
|
||||
std::ostringstream json;
|
||||
json << "{";
|
||||
json << "\"pr_url\":\"" << prUrl << "\"";
|
||||
if (!githubToken.empty()) {
|
||||
json << ",\"github_token\":\"" << githubToken << "\"";
|
||||
}
|
||||
if (!branchName.empty()) {
|
||||
json << ",\"create_branch\":true";
|
||||
json << ",\"branch_name\":\"" << branchName << "\"";
|
||||
}
|
||||
json << "}";
|
||||
|
||||
// Perform HTTP POST to /api/pr/resolve
|
||||
std::string response;
|
||||
CURL *curl = curl_easy_init();
|
||||
if (!curl) {
|
||||
std::cerr << "Error: Failed to initialize CURL\n";
|
||||
return 3;
|
||||
}
|
||||
|
||||
std::string url = backendUrl + "/api/pr/resolve";
|
||||
curl_easy_setopt(curl, CURLOPT_URL, url.c_str());
|
||||
curl_easy_setopt(curl, CURLOPT_POSTFIELDS, json.str().c_str());
|
||||
|
||||
auto WriteCallback = [](void *contents, size_t size, size_t nmemb,
|
||||
void *userp) -> size_t {
|
||||
((std::string *)userp)->append((char *)contents, size * nmemb);
|
||||
return size * nmemb;
|
||||
};
|
||||
|
||||
curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, +WriteCallback);
|
||||
curl_easy_setopt(curl, CURLOPT_WRITEDATA, &response);
|
||||
|
||||
struct curl_slist *headers = nullptr;
|
||||
headers = curl_slist_append(headers, "Content-Type: application/json");
|
||||
curl_easy_setopt(curl, CURLOPT_HTTPHEADER, headers);
|
||||
|
||||
CURLcode res = curl_easy_perform(curl);
|
||||
|
||||
if (res != CURLE_OK) {
|
||||
std::cerr << "Error: Request failed: " << curl_easy_strerror(res) << "\n";
|
||||
curl_slist_free_all(headers);
|
||||
curl_easy_cleanup(curl);
|
||||
return 3;
|
||||
}
|
||||
|
||||
curl_slist_free_all(headers);
|
||||
curl_easy_cleanup(curl);
|
||||
|
||||
// Output response
|
||||
if (outputFile.empty()) {
|
||||
std::cout << "\n=== Pull Request Resolution Result ===\n";
|
||||
std::cout << response << "\n";
|
||||
} else {
|
||||
std::ofstream out(outputFile);
|
||||
if (!out) {
|
||||
std::cerr << "Error: Failed to write output file\n";
|
||||
return 4;
|
||||
}
|
||||
out << response;
|
||||
out.close();
|
||||
if (!quiet) {
|
||||
std::cout << "Result written to: " << outputFile << "\n";
|
||||
}
|
||||
}
|
||||
|
||||
// Check if resolution was successful (simple check)
|
||||
if (response.find("\"success\":true") != std::string::npos) {
|
||||
if (!quiet) {
|
||||
std::cout << "\nPull request conflicts resolved successfully!\n";
|
||||
}
|
||||
return 0;
|
||||
} else {
|
||||
if (!quiet) {
|
||||
std::cerr
|
||||
<< "\nFailed to resolve some conflicts. See output for details.\n";
|
||||
}
|
||||
return 1;
|
||||
}
|
||||
|
||||
} else if (command == "git-resolve") {
|
||||
std::cerr << "Error: git-resolve command not yet implemented\n";
|
||||
return 1;
|
||||
} else {
|
||||
std::cerr << "Error: Unknown command: " << command << "\n";
|
||||
return 2;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -1,88 +1,87 @@
|
||||
#include <QCommandLineParser>
|
||||
#include <QGuiApplication>
|
||||
#include <QNetworkAccessManager>
|
||||
#include <QQmlApplicationEngine>
|
||||
#include <QQmlContext>
|
||||
#include <QCommandLineParser>
|
||||
#include <QNetworkAccessManager>
|
||||
#include <QUrl>
|
||||
#include <iostream>
|
||||
|
||||
/**
|
||||
* @brief Main entry point for WizardMerge Qt6 frontend
|
||||
*
|
||||
*
|
||||
* This application provides a native desktop interface for WizardMerge,
|
||||
* supporting both standalone mode (with embedded backend) and client mode
|
||||
* (connecting to a remote backend server).
|
||||
*/
|
||||
int main(int argc, char *argv[])
|
||||
{
|
||||
QGuiApplication app(argc, argv);
|
||||
app.setApplicationName("WizardMerge");
|
||||
app.setApplicationVersion("1.0.0");
|
||||
app.setOrganizationName("WizardMerge");
|
||||
app.setOrganizationDomain("wizardmerge.dev");
|
||||
int main(int argc, char *argv[]) {
|
||||
QGuiApplication app(argc, argv);
|
||||
app.setApplicationName("WizardMerge");
|
||||
app.setApplicationVersion("1.0.0");
|
||||
app.setOrganizationName("WizardMerge");
|
||||
app.setOrganizationDomain("wizardmerge.dev");
|
||||
|
||||
// Command line parser
|
||||
QCommandLineParser parser;
|
||||
parser.setApplicationDescription("WizardMerge - Intelligent Merge Conflict Resolution");
|
||||
parser.addHelpOption();
|
||||
parser.addVersionOption();
|
||||
// Command line parser
|
||||
QCommandLineParser parser;
|
||||
parser.setApplicationDescription(
|
||||
"WizardMerge - Intelligent Merge Conflict Resolution");
|
||||
parser.addHelpOption();
|
||||
parser.addVersionOption();
|
||||
|
||||
QCommandLineOption backendUrlOption(
|
||||
QStringList() << "b" << "backend-url",
|
||||
"Backend server URL (default: http://localhost:8080)",
|
||||
"url",
|
||||
"http://localhost:8080"
|
||||
);
|
||||
parser.addOption(backendUrlOption);
|
||||
QCommandLineOption backendUrlOption(
|
||||
QStringList() << "b" << "backend-url",
|
||||
"Backend server URL (default: http://localhost:8080)", "url",
|
||||
"http://localhost:8080");
|
||||
parser.addOption(backendUrlOption);
|
||||
|
||||
QCommandLineOption standaloneOption(
|
||||
QStringList() << "s" << "standalone",
|
||||
"Run in standalone mode with embedded backend"
|
||||
);
|
||||
parser.addOption(standaloneOption);
|
||||
QCommandLineOption standaloneOption(
|
||||
QStringList() << "s" << "standalone",
|
||||
"Run in standalone mode with embedded backend");
|
||||
parser.addOption(standaloneOption);
|
||||
|
||||
parser.addPositionalArgument("file", "File to open (optional)");
|
||||
parser.addPositionalArgument("file", "File to open (optional)");
|
||||
|
||||
parser.process(app);
|
||||
parser.process(app);
|
||||
|
||||
// Get command line arguments
|
||||
QString backendUrl = parser.value(backendUrlOption);
|
||||
bool standalone = parser.isSet(standaloneOption);
|
||||
QStringList positionalArgs = parser.positionalArguments();
|
||||
QString filePath = positionalArgs.isEmpty() ? QString() : positionalArgs.first();
|
||||
// Get command line arguments
|
||||
QString backendUrl = parser.value(backendUrlOption);
|
||||
bool standalone = parser.isSet(standaloneOption);
|
||||
QStringList positionalArgs = parser.positionalArguments();
|
||||
QString filePath =
|
||||
positionalArgs.isEmpty() ? QString() : positionalArgs.first();
|
||||
|
||||
// Create QML engine
|
||||
QQmlApplicationEngine engine;
|
||||
// Create QML engine
|
||||
QQmlApplicationEngine engine;
|
||||
|
||||
// Expose application settings to QML
|
||||
QQmlContext* rootContext = engine.rootContext();
|
||||
rootContext->setContextProperty("backendUrl", backendUrl);
|
||||
rootContext->setContextProperty("standalone", standalone);
|
||||
rootContext->setContextProperty("initialFile", filePath);
|
||||
// Expose application settings to QML
|
||||
QQmlContext *rootContext = engine.rootContext();
|
||||
rootContext->setContextProperty("backendUrl", backendUrl);
|
||||
rootContext->setContextProperty("standalone", standalone);
|
||||
rootContext->setContextProperty("initialFile", filePath);
|
||||
|
||||
// Load main QML file
|
||||
const QUrl url(u"qrc:/qt/qml/WizardMerge/main.qml"_qs);
|
||||
|
||||
QObject::connect(&engine, &QQmlApplicationEngine::objectCreationFailed,
|
||||
&app, []() {
|
||||
std::cerr << "Error: Failed to load QML" << std::endl;
|
||||
QCoreApplication::exit(-1);
|
||||
},
|
||||
Qt::QueuedConnection);
|
||||
// Load main QML file
|
||||
const QUrl url(u"qrc:/qt/qml/WizardMerge/main.qml"_qs);
|
||||
|
||||
engine.load(url);
|
||||
QObject::connect(
|
||||
&engine, &QQmlApplicationEngine::objectCreationFailed, &app,
|
||||
[]() {
|
||||
std::cerr << "Error: Failed to load QML" << std::endl;
|
||||
QCoreApplication::exit(-1);
|
||||
},
|
||||
Qt::QueuedConnection);
|
||||
|
||||
if (engine.rootObjects().isEmpty()) {
|
||||
std::cerr << "Error: No root objects loaded from QML" << std::endl;
|
||||
return -1;
|
||||
}
|
||||
engine.load(url);
|
||||
|
||||
std::cout << "WizardMerge Qt6 Frontend Started" << std::endl;
|
||||
std::cout << "Backend URL: " << backendUrl.toStdString() << std::endl;
|
||||
std::cout << "Standalone Mode: " << (standalone ? "Yes" : "No") << std::endl;
|
||||
if (!filePath.isEmpty()) {
|
||||
std::cout << "Opening file: " << filePath.toStdString() << std::endl;
|
||||
}
|
||||
if (engine.rootObjects().isEmpty()) {
|
||||
std::cerr << "Error: No root objects loaded from QML" << std::endl;
|
||||
return -1;
|
||||
}
|
||||
|
||||
return app.exec();
|
||||
std::cout << "WizardMerge Qt6 Frontend Started" << std::endl;
|
||||
std::cout << "Backend URL: " << backendUrl.toStdString() << std::endl;
|
||||
std::cout << "Standalone Mode: " << (standalone ? "Yes" : "No") << std::endl;
|
||||
if (!filePath.isEmpty()) {
|
||||
std::cout << "Opening file: " << filePath.toStdString() << std::endl;
|
||||
}
|
||||
|
||||
return app.exec();
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user