#include <git_commit_handler.h>

Inheritance diagram for GIT_COMMIT_HANDLER:

Public Types
enum class	CommitResult { Success , Error , Cancelled }

enum class	GIT_STATUS { GIT_STATUS_UNTRACKED , GIT_STATUS_CURRENT , GIT_STATUS_MODIFIED , GIT_STATUS_ADDED , GIT_STATUS_DELETED , GIT_STATUS_BEHIND , GIT_STATUS_AHEAD , GIT_STATUS_CONFLICTED , GIT_STATUS_IGNORED , GIT_STATUS_LAST }

enum class	GIT_CONN_TYPE { GIT_CONN_HTTPS = 0 , GIT_CONN_SSH , GIT_CONN_LOCAL , GIT_CONN_LAST }

Public Member Functions
	GIT_COMMIT_HANDLER (git_repository *aRepo)

virtual	~GIT_COMMIT_HANDLER ()

CommitResult	PerformCommit (const std::vector< wxString > &aFiles, const wxString &aMessage, const wxString &aAuthorName, const wxString &aAuthorEmail)

wxString	GetErrorString () const

git_repository *	GetRepo () const

void	SetRepo (git_repository *aRepo)

wxString	GetCurrentBranchName () const

std::vector< wxString >	GetBranchNames () const

std::vector< wxString >	GetProjectDirs ()
	Return a vector of project files in the repository.

std::pair< std::set< wxString >, std::set< wxString > >	GetDifferentFiles () const
	Return a pair of sets of files that differ locally from the remote repository The first set is files that have been committed locally but not pushed The second set is files that have been committed remotely but not pulled.

wxString	GetUsername () const

wxString	GetPassword () const

GIT_CONN_TYPE	GetConnType () const

void	SetUsername (const wxString &aUsername)

void	SetPassword (const wxString &aPassword)

void	SetSSHKey (const wxString &aSSHKey)

unsigned &	TestedTypes ()

bool	HasLocalCommits () const

bool	HasPushAndPullRemote () const

void	UpdateCurrentBranchInfo ()

wxString	GetGitRootDirectory () const

wxString	GetRemotename () const

void	ResetNextKey ()

wxString	GetNextPublicKey ()

void	SetRemote (const wxString &aRemote)

int	HandleSSHKeyAuthentication (git_cred **aOut, const wxString &aUsername)

int	HandlePlaintextAuthentication (git_cred **aOut, const wxString &aUsername)

int	HandleSSHAgentAuthentication (git_cred **aOut, const wxString &aUsername)

bool	IsCancelled () const

void	SetCancelled (bool aCancel)

Static Public Member Functions
static wxString	GetLastGitError ()

Protected Attributes
git_repository *	m_repo

GIT_CONN_TYPE	m_connType

wxString	m_remote

wxString	m_hostname

wxString	m_username

wxString	m_password

unsigned	m_testedTypes

std::mutex	m_gitActionMutex

Private Member Functions
void	AddErrorString (const wxString &aErrorString)

void	updatePublicKeys ()

void	updateConnectionType ()

Private Attributes
wxString	m_errorString

std::vector< wxString >	m_publicKeys

int	m_nextPublicKey

std::atomic< bool >	m_cancel

Static Private Attributes
static const unsigned	KIGIT_CREDENTIAL_SSH_AGENT = 1 << sizeof( m_testedTypes - 1 )

Detailed Description

Definition at line 36 of file git_commit_handler.h.

Member Enumeration Documentation

◆ CommitResult

enum class GIT_COMMIT_HANDLER::CommitResult

strong

Enumerator
Success
Error
Cancelled

Definition at line 42 of file git_commit_handler.h.

◆ GIT_CONN_TYPE

enum class KIGIT_COMMON::GIT_CONN_TYPE

stronginherited

Enumerator
GIT_CONN_HTTPS
GIT_CONN_SSH
GIT_CONN_LOCAL
GIT_CONN_LAST

Definition at line 84 of file kicad_git_common.h.

◆ GIT_STATUS

enum class KIGIT_COMMON::GIT_STATUS

stronginherited

Enumerator
GIT_STATUS_UNTRACKED
GIT_STATUS_CURRENT
GIT_STATUS_MODIFIED
GIT_STATUS_ADDED
GIT_STATUS_DELETED
GIT_STATUS_BEHIND
GIT_STATUS_AHEAD
GIT_STATUS_CONFLICTED
GIT_STATUS_IGNORED
GIT_STATUS_LAST

Definition at line 70 of file kicad_git_common.h.

Constructor & Destructor Documentation

◆ GIT_COMMIT_HANDLER()

GIT_COMMIT_HANDLER::GIT_COMMIT_HANDLER ( git_repository * aRepo )

Definition at line 28 of file git_commit_handler.cpp.

◆ ~GIT_COMMIT_HANDLER()

GIT_COMMIT_HANDLER::~GIT_COMMIT_HANDLER ( )

virtual

Definition at line 33 of file git_commit_handler.cpp.

Member Function Documentation

◆ AddErrorString()

void GIT_COMMIT_HANDLER::AddErrorString ( const wxString & aErrorString )

private

Definition at line 161 of file git_commit_handler.cpp.

References m_errorString.

Referenced by PerformCommit().

◆ GetBranchNames()

std::vector< wxString > KIGIT_COMMON::GetBranchNames ( ) const

inherited

Definition at line 103 of file kicad_git_common.cpp.

References KIGIT_COMMON::m_repo, and traceGit.

Referenced by KIGIT_REPO_MIXIN::GetBranchNames(), PROJECT_TREE_PANE::onGitSwitchBranch(), and PROJECT_TREE_PANE::onRight().

◆ GetConnType()

KIGIT_COMMON::GIT_CONN_TYPE KIGIT_COMMON::GetConnType ( ) const

inherited

Definition at line 665 of file kicad_git_common.cpp.

References KIGIT_COMMON::GetRemotename(), KIGIT_COMMON::GIT_CONN_HTTPS, KIGIT_COMMON::GIT_CONN_LOCAL, KIGIT_COMMON::GIT_CONN_SSH, and KIGIT_COMMON::m_remote.

Referenced by KIGIT_REPO_MIXIN::GetConnType().

◆ GetCurrentBranchName()

wxString KIGIT_COMMON::GetCurrentBranchName ( ) const

inherited

Definition at line 71 of file kicad_git_common.cpp.

References KIGIT_COMMON::m_repo, and traceGit.

Referenced by KIGIT_REPO_MIXIN::GetCurrentBranchName().

◆ GetDifferentFiles()

std::pair< std::set< wxString >, std::set< wxString > > KIGIT_COMMON::GetDifferentFiles ( ) const

inherited

Return a pair of sets of files that differ locally from the remote repository The first set is files that have been committed locally but not pushed The second set is files that have been committed remotely but not pulled.

Definition at line 234 of file kicad_git_common.cpp.

References delta, KIGIT_COMMON::GetLastGitError(), KIGIT_COMMON::m_repo, and traceGit.

Referenced by KIGIT_REPO_MIXIN::GetDifferentFiles(), and PROJECT_TREE_PANE::updateGitStatusIconMap().

◆ GetErrorString()

wxString GIT_COMMIT_HANDLER::GetErrorString ( ) const

Definition at line 155 of file git_commit_handler.cpp.

References m_errorString.

Referenced by PROJECT_TREE_PANE::onGitCommit().

◆ GetGitRootDirectory()

wxString KIGIT_COMMON::GetGitRootDirectory ( ) const

inherited

Definition at line 558 of file kicad_git_common.cpp.

References KIGIT_COMMON::m_repo, and path.

Referenced by KIGIT_REPO_MIXIN::GetGitRootDirectory(), and PROJECT_TREE_PANE::onRight().

◆ GetLastGitError()

static wxString KIGIT_COMMON::GetLastGitError ( )

inlinestaticinherited

Definition at line 140 of file kicad_git_common.h.

Referenced by KIGIT::PROJECT_GIT_UTILS::CreateBranch(), credentials_cb(), GIT_CONFIG_HANDLER::GetConfigString(), GIT_STATUS_HANDLER::GetCurrentBranchName(), getDefaultAuthorAndEmail(), KIGIT_COMMON::GetDifferentFiles(), GIT_STATUS_HANDLER::GetFileStatus(), KIGIT_COMMON::GetProjectDirs(), KIGIT_COMMON::GetRemotename(), KIGIT::PROJECT_GIT_UTILS::GetRepositoryForFile(), GIT_PULL_HANDLER::handleRebase(), KIGIT_COMMON::HandleSSHAgentAuthentication(), KIGIT_COMMON::HandleSSHKeyAuthentication(), GIT_STATUS_HANDLER::HasChangedFiles(), KIGIT_COMMON::HasLocalCommits(), GIT_INIT_HANDLER::InitializeRepository(), KIGIT_PCB_MERGE::Merge(), DIALOG_GIT_REPOSITORY::OnTestClick(), PerformCommit(), GIT_PULL_HANDLER::PerformFetch(), GIT_PUSH_HANDLER::PerformPush(), GIT_INIT_HANDLER::SetupRemote(), and GIT_BRANCH_HANDLER::SwitchToBranch().

◆ GetNextPublicKey()

wxString KIGIT_COMMON::GetNextPublicKey ( )

inlineinherited

Definition at line 120 of file kicad_git_common.h.

References KIGIT_COMMON::m_nextPublicKey, and KIGIT_COMMON::m_publicKeys.

Referenced by KIGIT_REPO_MIXIN::GetNextPublicKey(), and KIGIT_COMMON::HandleSSHKeyAuthentication().

◆ GetPassword()

wxString KIGIT_COMMON::GetPassword ( ) const

inlineinherited

Definition at line 93 of file kicad_git_common.h.

References KIGIT_COMMON::m_password.

Referenced by KIGIT_REPO_MIXIN::GetPassword(), KIGIT_COMMON::HandlePlaintextAuthentication(), and KIGIT_COMMON::HandleSSHKeyAuthentication().

◆ GetProjectDirs()

std::vector< wxString > KIGIT_COMMON::GetProjectDirs ( )

inherited

Return a vector of project files in the repository.

Sorted by the depth of the project file in the directory tree

Returns: std::vector<wxString> of project files

Definition at line 166 of file kicad_git_common.cpp.

References KIGIT_COMMON::GetLastGitError(), KIGIT_COMMON::m_repo, and traceGit.

Referenced by KIGIT_REPO_MIXIN::GetProjectDirs().

◆ GetRemotename()

wxString KIGIT_COMMON::GetRemotename ( ) const

inherited

Definition at line 477 of file kicad_git_common.cpp.

References KIGIT_COMMON::GetLastGitError(), KIGIT_COMMON::m_repo, and traceGit.

Referenced by KIGIT_COMMON::GetConnType(), KIGIT_REPO_MIXIN::GetRemotename(), and KIGIT_COMMON::UpdateCurrentBranchInfo().

◆ GetRepo()

git_repository * KIGIT_COMMON::GetRepo ( ) const

inherited

Definition at line 66 of file kicad_git_common.cpp.

References KIGIT_COMMON::m_repo.

Referenced by KIGIT_REPO_MIXIN::GetRepo(), and PerformCommit().

◆ GetUsername()

wxString KIGIT_COMMON::GetUsername ( ) const

inlineinherited

Definition at line 92 of file kicad_git_common.h.

References KIGIT_COMMON::m_username.

Referenced by KIGIT_REPO_MIXIN::GetUsername().

◆ HandlePlaintextAuthentication()

int KIGIT_COMMON::HandlePlaintextAuthentication	(	git_cred **	aOut,
		const wxString &	aUsername
	)

inherited

Definition at line 786 of file kicad_git_common.cpp.

References KIGIT_COMMON::GetPassword(), and KIGIT_COMMON::m_testedTypes.

Referenced by credentials_cb().

◆ HandleSSHAgentAuthentication()

int KIGIT_COMMON::HandleSSHAgentAuthentication	(	git_cred **	aOut,
		const wxString &	aUsername
	)

inherited

Definition at line 796 of file kicad_git_common.cpp.

References KIGIT_COMMON::GetLastGitError(), KIGIT_COMMON::KIGIT_CREDENTIAL_SSH_AGENT, KIGIT_COMMON::m_testedTypes, and traceGit.

Referenced by KIGIT_COMMON::HandleSSHKeyAuthentication().

◆ HandleSSHKeyAuthentication()

int KIGIT_COMMON::HandleSSHKeyAuthentication	(	git_cred **	aOut,
		const wxString &	aUsername
	)

inherited

Definition at line 754 of file kicad_git_common.cpp.

References KIGIT_COMMON::GetLastGitError(), KIGIT_COMMON::GetNextPublicKey(), KIGIT_COMMON::GetPassword(), KIGIT_COMMON::HandleSSHAgentAuthentication(), KIGIT_COMMON::KIGIT_CREDENTIAL_SSH_AGENT, KIGIT_COMMON::m_testedTypes, and traceGit.

Referenced by credentials_cb().

◆ HasLocalCommits()

bool KIGIT_COMMON::HasLocalCommits ( ) const

inherited

Definition at line 388 of file kicad_git_common.cpp.

References KIGIT_COMMON::GetLastGitError(), KIGIT_COMMON::m_repo, and traceGit.

Referenced by PROJECT_TREE_PANE::onRight().

◆ HasPushAndPullRemote()

bool KIGIT_COMMON::HasPushAndPullRemote ( ) const

inherited

Definition at line 449 of file kicad_git_common.cpp.

References KIGIT_COMMON::m_repo, and traceGit.

Referenced by PROJECT_TREE_PANE::onRight().

◆ IsCancelled()

bool KIGIT_COMMON::IsCancelled ( ) const

inlineinherited

Definition at line 150 of file kicad_git_common.h.

References KIGIT_COMMON::m_cancel.

Referenced by progress_cb(), and transfer_progress_cb().

◆ PerformCommit()

GIT_COMMIT_HANDLER::CommitResult GIT_COMMIT_HANDLER::PerformCommit	(	const std::vector< wxString > &	aFiles,
		const wxString &	aMessage,
		const wxString &	aAuthorName,
		const wxString &	aAuthorEmail
	)