MergeCommand.hxx

См. документацию.

#pragma once
 
#include "ICommand.hxx"
#include "../../core/include/RepositoryManager.hxx"
#include "../../services/ISubject.hxx"
 
#include <string>
#include <vector>
#include <memory>

 * включая AddCommand, CommitCommand, StatusCommand и другие.
 */
namespace svcs::cli {
 
using namespace svcs::core;
using namespace svcs::services;

class MergeCommand : public ICommand {
public:
    MergeCommand(std::shared_ptr<ISubject> event_bus,
                 std::shared_ptr<RepositoryManager> repo_manager);

    ~MergeCommand() override = default;
 
    // ICommand interface implementation
    [[nodiscard]] std::string getName() const override;

    [[nodiscard]] std::string getDescription() const override;

    [[nodiscard]] std::string getUsage() const override;

    bool execute(const std::vector<std::string>& args) override;

    void showHelp() const override;
 
private:
    void debugBranchHistory(const std::string& branch_name, const std::string& head_commit) const;


    bool mergeBranch(const std::string& branch_name) const;

    bool abortMerge() const;

    [[nodiscard]] bool isMergeInProgress() const;

    std::string findCommonAncestor(const std::string& commit1, const std::string& commit2) const;

    bool performThreeWayMerge(const std::string& ancestor,
                             const std::string& current,
                             const std::string& other) const;

    static bool mergeFileContent(const std::string& ancestor_content,
                         const std::string& current_content,
                         const std::string& other_content,
                         std::string& merged_content);
 
private:
    std::shared_ptr<ISubject> event_bus_;

    std::shared_ptr<RepositoryManager> repo_manager_;
};
 
}