KiCad PCB EDA Suite
Loading...
Searching...
No Matches
git_commit_pane.cpp File Reference
#include <widgets/git_commit_pane.h>
#include <cli/exit_codes.h>
#include <dialogs/git/git_advanced_dialog.h>
#include <dialogs/git/git_status_entries.h>
#include <frame_type.h>
#include <kiway.h>
#include <kiway_player.h>
#include <mail_type.h>
#include <algorithm>
#include <memory>
#include <wx/app.h>
#include <wx/button.h>
#include <wx/dataview.h>
#include <wx/file.h>
#include <wx/filefn.h>
#include <wx/filename.h>
#include <wx/menu.h>
#include <wx/msgdlg.h>
#include <wx/settings.h>
#include <wx/sizer.h>
#include <wx/statbox.h>
#include <wx/stattext.h>
#include <wx/textctrl.h>
#include <wx/weakref.h>
#include <wx/choicdlg.h>
#include <bitmaps.h>
#include <confirm.h>
#include <dialogs/git/git_credentials_prompt.h>
#include <dialogs/git/git_transfer.h>
#include <dialogs/git/git_ui_utils.h>
#include <diff_merge/merge_dispatch.h>
#include <kiplatform/ui.h>
#include <diff_merge/diff_scene.h>
#include <reporter.h>
#include <git/kicad_git_common.h>
#include <git/project_git_utils.h>
#include <git/git_branch_handler.h>
#include <git/git_commit_handler.h>
#include <git/git_config_handler.h>
#include <git/git_pull_handler.h>
#include <git/git_push_handler.h>
#include <eda_base_frame.h>
#include <kiplatform/environment.h>
#include <pgm_base.h>
#include <project.h>
#include <project/project_local_settings.h>
#include <settings/common_settings.h>
#include <thread>
#include <wildcards_and_files_ext.h>
#include <widgets/file_checklist_ctrl.h>
#include <widgets/std_bitmap_button.h>

Go to the source code of this file.

Classes

struct  GIT_COMMIT_PANE::STATUS
 
struct  GIT_COMMIT_PANE::COMMIT_REQUEST
 
struct  GIT_COMMIT_PANE::MERGE_PREPARATION
 

Functions

static std::pair< wxString, wxString > commitHead (git_repository *aRepo)
 
static wxString amendRefusal (KIGIT_COMMON &aCommon, const std::pair< wxString, wxString > &aExpectedHead)
 
static bool moveToNewBranch (KIGIT_COMMON &aCommon, const wxString &aName, wxString &aError, wxString &aDetail)
 
static void dropNewBranch (KIGIT_COMMON &aCommon, const wxString &aName, const wxString &aPrevious)
 
static bool reserveRecoveryFile (const wxString &aPreferredPath, wxString &aPathOut, wxString &aCreatedDir)
 

Function Documentation

◆ amendRefusal()

static wxString amendRefusal ( KIGIT_COMMON & aCommon,
const std::pair< wxString, wxString > & aExpectedHead )
static

◆ commitHead()

static std::pair< wxString, wxString > commitHead ( git_repository * aRepo)
static

◆ dropNewBranch()

static void dropNewBranch ( KIGIT_COMMON & aCommon,
const wxString & aName,
const wxString & aPrevious )
static

◆ moveToNewBranch()

static bool moveToNewBranch ( KIGIT_COMMON & aCommon,
const wxString & aName,
wxString & aError,
wxString & aDetail )
static

◆ reserveRecoveryFile()

static bool reserveRecoveryFile ( const wxString & aPreferredPath,
wxString & aPathOut,
wxString & aCreatedDir )
static

Definition at line 185 of file git_commit_pane.cpp.

Referenced by GIT_COMMIT_PANE::finishPullConflictPreparation().