|
KiCad PCB EDA Suite
|
Docked panel for committing: the branch to commit to, a summary and description, the commit options, the changed files with a checkbox each, the commit and Get Changes buttons, and a gear holding the commit settings and the advanced Git window. More...
#include <git_commit_pane.h>
Classes | |
| struct | COMMIT_REQUEST |
| struct | MERGE_PREPARATION |
| struct | STATUS |
Public Member Functions | |
| GIT_COMMIT_PANE (EDA_BASE_FRAME *aParent) | |
| GIT_COMMIT_PANE (wxWindow *aParent, EDA_BASE_FRAME *aFrame) | |
| The same panel inside another window, such as the advanced window's Changes page. | |
| ~GIT_COMMIT_PANE () override | |
| void | OnGitTransfersChanged () override |
| Follow a transfer on this pane's repository beginning or ending in any window. | |
| bool | Layout () override |
| Lay out the pane, then re-wrap the status line when the width its column got has changed. | |
| void | SetFileSelectedHandler (std::function< void(const wxString &)> aHandler) |
| Called with the path of the file the user selects in the list, or empty when none is. | |
| wxString | GetCommitMessage () const |
| The message as typed. A second form on the same project shows the same text. | |
| void | SetCommitMessage (const wxString &aMessage) |
| void | SetMessageChangedHandler (std::function< void()> aHandler) |
| Called when the user edits the message, so another form can follow along. | |
| void | RefreshFileList () |
| Read the project's git status and repopulate the list. | |
| void | ShowTransferProgress (const wxString &aText) |
| Show a line of transfer progress. Called from the UI thread by a KIGIT_STATUS_REPORTER. | |
| void | ReloadAdvancedWindow () |
| Reload the advanced window when it is open, for a preferences change it also shows. | |
| void | ShowHistory () |
| Open the advanced window on its History page. | |
| void | Pull () |
| Get changes from the remote, as the Get Changes button does. | |
| void | Push () |
| Push the local commits, as the Push button does. | |
| void | BeginAmend (const wxString &aExpectedCommit=wxEmptyString) |
| Prepare the amend form. A history entry supplies its hash and starts with no files selected. | |
| void | SetBusyChangedHandler (std::function< void(bool)> aHandler) |
| Called when a transfer starts and when it ends, so an owning window can follow along. | |
| int | GetMinDockWidth () const |
| The width the panel needs so its widest row fits, for the dock that holds it. | |
Protected Attributes | |
| wxBoxSizer * | m_branchRow |
| wxStaticText * | m_branchName |
| wxChoice * | m_recentMessages |
| STD_BITMAP_BUTTON * | m_settingsButton |
| wxTextCtrl * | m_summary |
| wxStaticText * | m_summaryCount |
| wxTextCtrl * | m_description |
| wxStaticBoxSizer * | m_optionsSizer |
| wxCheckBox * | m_amendCheckbox |
| wxCheckBox * | m_signOffCheckbox |
| wxCheckBox * | m_newBranchCheckbox |
| wxTextCtrl * | m_newBranchName |
| wxBoxSizer * | m_changesRow |
| wxStaticText * | m_changesLabel |
| wxButton * | m_showDiffButton |
| wxStaticText * | m_emptyLabel |
| wxBoxSizer * | m_trustRow |
| wxTextCtrl * | m_trustCommand |
| wxButton * | m_copyTrustCommand |
| wxButton * | m_undoCommitButton |
| FILE_CHECKLIST_CTRL * | m_checklist |
| SPLIT_BUTTON * | m_commitButton |
| wxButton * | m_pullButton |
Private Member Functions | |
| void | onCommit (wxCommandEvent &aEvent) |
| The split button's main half. It commits, or pushes when that is all there is to do. | |
| void | onCommitAndPush (wxCommandEvent &aEvent) |
| void | onPull (wxCommandEvent &aEvent) |
| void | abandonOperation (std::shared_ptr< KIGIT_COMMON > aCommon) |
| Drop an in-progress merge or rebase and return the project to its last commit. | |
| void | finishAbandonOperation (std::shared_ptr< KIGIT_COMMON > aCommon, const std::vector< wxString > &aOutside) |
| void | onAmendToggled (wxCommandEvent &aEvent) |
| void | onUndoCommit (wxCommandEvent &aEvent) |
| Take back the last commit while no remote has it, keeping its changes staged and its message. | |
| void | onNewBranchToggled (wxCommandEvent &aEvent) |
| void | onRecentMessage (wxCommandEvent &aEvent) |
| void | onShowDiff (wxCommandEvent &aEvent) |
| void | onFileActivated (wxDataViewEvent &aEvent) |
| void | onChecklistContextMenu (wxDataViewEvent &aEvent) |
| void | discardFile (std::shared_ptr< KIGIT_COMMON > aCommon, const wxString &aPath) |
| void | confirmDiscardFile (std::shared_ptr< KIGIT_COMMON > aCommon, const wxString &aPath, bool aTracked, bool aConflicted, wxString aRoot) |
| void | doCommit (bool aAndPush) |
| Commit the checked files (or amend the last commit when the amend box is ticked), then push when aAndPush is set. | |
| void | saveForCommit (std::shared_ptr< KIGIT_COMMON > aCommon, std::shared_ptr< COMMIT_REQUEST > aRequest) |
| void | finishCommit (std::shared_ptr< KIGIT_COMMON > aCommon, const COMMIT_REQUEST &aRequest) |
| void | onChecklistChanged (wxDataViewEvent &aEvent) |
| void | onMessageChanged (wxCommandEvent &aEvent) |
| void | onIdle (wxIdleEvent &aEvent) |
| void | applyTheme () |
| Set the icons and colours that follow the light or dark theme. | |
| void | onThemeChanged (wxSysColourChangedEvent &aEvent) |
| void | onSettings (wxCommandEvent &aEvent) |
| The gear's menu: the advanced window and the author. | |
| void | setAuthor () |
| void | setStatusText (const wxString &aText) |
| Set the status line text and wrap it to the width of the label's column. | |
| bool | layoutAndWrapStatus () |
| Lay out the controls, then rewrap the status line to its column's new width. | |
| void | updateDockMinHeight () |
| Give the AUI pane the controls' minimum height, so a dock never squeezes them. | |
| void | showTrustCommand (const wxString &aCommand) |
| Show a command to copy under the status line, or hide the row when aCommand is empty. | |
| bool | transferCanStart () |
| False, with a message, while a transfer is running or a merge waits to be finished. | |
| void | layoutWide () |
| Put the file list beside the commit controls instead of above them, for a wide host, with a heading over the message and a summary of the working tree under it. | |
| void | updateSummary () |
| Refresh the staged count in the changes heading, and the summary box where the wide layout has one. | |
| void | applyStatus (const STATUS &aStatus) |
| Apply a completed repository snapshot on the UI thread. | |
| void | populateBranches (const STATUS &aStatus) |
| Fill the branch dropdown from the completed snapshot. | |
| void | populateRecentMessages (const std::vector< wxString > &aMessages) |
| Fill the Recent messages dropdown from the completed snapshot. | |
| void | updateDescriptionHint () |
| Where the platform has no hint for a multi line box, a label lies over the description box while it is empty. | |
| void | setDescription (const wxString &aText) |
| void | showDisabledState () |
| Clear the list and disable every control while version control is off. | |
| void | setBusy (bool aBusy, const wxString &aStatus) |
| Enable or disable the controls while a network operation runs, showing a status. | |
| GIT_TRANSFER_BUSY & | transfers () const |
| The transfers on the repository this pane shows. | |
| bool | othersBusy () const |
| The transfers on it that other windows started, leaving out this pane's own. | |
| wxString | othersStatus () const |
| bool | othersCanCancel () const |
| void | runActionQuery (std::shared_ptr< KIGIT_COMMON > aCommon, std::function< void(KIGIT_COMMON &)> aWork, std::function< void()> aDone, const wxString &aStatus) |
| Read an action's prerequisites off the UI thread, then resume only in the same project. | |
| bool | deferForSecret (const std::shared_ptr< KIGIT_COMMON > &aCommon, const wxString &aStatus, std::function< void()> aStart) |
| Read the keyring before a transfer, holding the pane busy as aStatus, then call aStart unless cancelled or the session changed. | |
| void | abandonKeyringWait () |
| bool | dropKeyringWait () |
| Forget a keyring wait without touching the busy state. True when one was pending. | |
| void | submitPush (std::shared_ptr< KIGIT_COMMON > aCommon, bool aRetriedAfterTrust=false) |
| void | startPush (std::shared_ptr< KIGIT_COMMON > aCommon, const wxString &aBranch, const wxString &aHead, bool aRetriedAfterTrust) |
| void | onPushDone (std::shared_ptr< KIGIT_COMMON > aCommon, int aResult, const wxString &aError, const wxString &aDetails, bool aAuthFailure, const std::optional< KIGIT::HOST_KEY_FAILURE > &aHostKey, bool aRetriedAfterTrust, bool aCancelled) |
| void | submitPull (std::shared_ptr< KIGIT_COMMON > aCommon, bool aThenPush, bool aRetriedAfterTrust=false) |
| aThenPush pushes after a successful pull, which belongs only to the rejected-push recovery flow. | |
| void | startPull (std::shared_ptr< KIGIT_COMMON > aCommon, bool aThenPush, bool aRetriedAfterTrust) |
| void | resolvePullConflicts (std::shared_ptr< KIGIT_COMMON > aCommon, bool aThenPush) |
| Resolve a conflicted pull file by file, using the visual merge tool for design files, then create the merge commit. | |
| void | finishPullConflictPreparation (std::shared_ptr< KIGIT_COMMON > aCommon, bool aThenPush, std::shared_ptr< MERGE_PREPARATION > aPreparation) |
| void | onPullDone (std::shared_ptr< KIGIT_COMMON > aCommon, int aResult, const wxString &aError, const wxString &aDetails, bool aAuthFailure, const std::optional< KIGIT::HOST_KEY_FAILURE > &aHostKey, bool aRetriedAfterTrust, bool aThenPush, bool aCancelled) |
| void | updateMessageVisibility (bool aHasChanges) |
| Show the message field whenever a commit is possible, including a message-only amend. | |
| void | updateCommitButton () |
| Set what the commit buttons say, and whether they are enabled, for the current state. | |
| void | updateSummaryCount () |
| Show how many of the summary's 72 columns are left, once that is 10 or fewer. | |
| wxString | operationNoun () const |
| The noun for the operation in progress, for messages. | |
| wxString | abandonLabel () const |
| The label the network button carries while an operation is in progress. | |
| void | syncListener () |
| Register a refresh listener with the project's current git session, re-registering if the session changed since last time (it is recreated when a project is loaded). | |
Private Attributes | |
| EDA_BASE_FRAME * | m_frame |
| int | m_minDockWidth = 0 |
| The widest row's minimum width, measured before anything is hidden. | |
| bool | m_inAdvancedWindow = false |
| True on the advanced window's Changes page, false in the docked panel. | |
| bool | m_hasUnpushedCommits |
| size_t | m_unpushedCount = 0 |
| Commits waiting to be pushed, or 0 when the branch has no upstream to count them against. | |
| bool | m_hasRemote |
| bool | m_hasRepo = false |
| Whether the last completed status snapshot had a repository. | |
| bool | m_headDetached |
| True when HEAD is a commit rather than a branch, so nothing can be committed or pushed. | |
| size_t | m_upstreamAhead |
| Commits the upstream has that this project does not, which Get Changes brings in. | |
| bool | m_operationInProgress |
| True while a merge or rebase is in progress. The network button then reads Abandon. | |
| GitOperation | m_operation |
| Which operation, so the button and the explanation can name it. | |
| bool | m_editorsDirty |
| True when an open editor held unsaved changes at the last refresh. | |
| bool | m_canAmend = false |
| Whether the current branch allows an amend. A refresh must not change an active amend into a commit. | |
| std::pair< wxString, wxString > | m_amendHead |
| The branch and commit chosen when amend started. Keep them fixed while editing. | |
| std::pair< wxString, wxString > | m_undoHead |
| The branch and commit the last refresh showed, so Undo takes back only the commit the user saw. | |
| wxStaticText * | m_descriptionHint = nullptr |
| The description box's hint, a label laid over it while it is empty. | |
| wxHyperlinkCtrl * | m_historyLink = nullptr |
| Opens the History page from the docked panel. Never shown inside the advanced window. | |
| std::vector< wxString > | m_recentMessageTexts |
| The full messages behind the Recent messages dropdown, in its order after the caption. | |
| wxMenuItem * | m_commitAndPushItem = nullptr |
| The arrow menu's entry, relabelled with the main button. | |
| bool | m_commitButtonPushes = false |
| True while the main button reads Push, with nothing left to commit. | |
| KIGIT_TRANSFER | m_transfer |
| The push or pull this panel submitted last. | |
| int | m_credentialPrompts = 0 |
| Keyring reads and credential prompts the current request has shown, reset when it ends. | |
| bool | m_keyringWait = false |
| A push or pull waits on the keyring. The count fences off an answer from a cancelled wait. | |
| unsigned | m_keyringRequest = 0 |
| wxString | m_transferStatus |
| The status m_transfer began with, shown again once other windows' transfers end before it. | |
| GIT_TRANSFER_BUSY::HOLD | m_ownHold |
| m_transfer's hold on the repository, so every other pane on it follows and can cancel it | |
| UTIL::LINK | m_transferLink |
| Follows the transfers other windows run on this pane's repository. | |
| bool | m_showingOthers = false |
| The busy state shows another window's transfer, which this pane releases when the last one ends. | |
| std::function< void(bool)> | m_busyChangedHandler |
| Told when a transfer starts and ends. Empty unless an owning window asked. | |
| wxString | m_statusText |
| Unwrapped status text, kept so it can be re-wrapped on resize. | |
| int | m_statusWrapWidth = -1 |
| The width the status text was last wrapped to, so a layout re-wraps it only when that changes. | |
| int | m_dockMinHeight = -1 |
| The controls' minimum height from the last layout, applied to the AUI pane at idle time. | |
| wxWindow * | m_dockParent = nullptr |
| bool | m_dockUpdatePending = false |
| bool | m_listenerAttached = false |
| True once this panel has attached its refresh listener to a session at least once. | |
| std::weak_ptr< KIGIT_COMMON > | m_listenerSession |
| The git session this panel registered a refresh listener with, weak so it does not keep the session alive. | |
| std::set< wxString > | m_shownPaths |
| Paths shown in the list at the last refresh, so a refresh can tell which files the user deliberately unticked from files that are simply new, and preserve those unticks. | |
| EDITOR_SNAPSHOT | m_docsBeforePull |
| On-disk identity of the open documents, taken before a pull so only the ones the merge rewrote are reloaded afterwards. | |
| std::function< void()> | m_messageChangedHandler |
| Told when the message is edited. Empty unless an owning window asked. | |
| wxString | m_currentBranch |
| The branch a commit will land on, empty when detached or before the first commit. | |
| std::function< void(const wxString &)> | m_fileSelectedHandler |
| wxStaticText * | m_summaryFiles = nullptr |
| wxStaticText * | m_summaryAdded = nullptr |
| wxStaticText * | m_summaryRemoved = nullptr |
| std::pair< int, int > | m_lineStats |
| Lines the working tree adds and removes against HEAD, read at the last refresh. | |
| KIGIT_QUERY | m_refresh |
| Coalesce refreshes while a repository read is running, and discard stale results. | |
| KIGIT_QUERY | m_actionQuery |
| bool | m_actionPending = false |
Docked panel for committing: the branch to commit to, a summary and description, the commit options, the changed files with a checkbox each, the commit and Get Changes buttons, and a gear holding the commit settings and the advanced Git window.
Definition at line 51 of file git_commit_pane.h.
| GIT_COMMIT_PANE::GIT_COMMIT_PANE | ( | EDA_BASE_FRAME * | aParent | ) |
Definition at line 198 of file git_commit_pane.cpp.
References GIT_COMMIT_PANE().
Referenced by GIT_COMMIT_PANE().
| GIT_COMMIT_PANE::GIT_COMMIT_PANE | ( | wxWindow * | aParent, |
| EDA_BASE_FRAME * | aFrame ) |
The same panel inside another window, such as the advanced window's Changes page.
The gear's entry for opening that window is left out there.
Definition at line 204 of file git_commit_pane.cpp.
References _, applyTheme(), doCommit(), KIPLATFORM::UI::EllipsizeChoiceBox(), KIUI::FollowSystemLinkColour(), GIT_COMMIT_PANE_BASE::GIT_COMMIT_PANE_BASE(), layoutWide(), GIT_COMMIT_PANE_BASE::m_amendCheckbox, GIT_COMMIT_PANE_BASE::m_checklist, m_commitAndPushItem, GIT_COMMIT_PANE_BASE::m_commitButton, m_commitButtonPushes, GIT_COMMIT_PANE_BASE::m_copyTrustCommand, GIT_COMMIT_PANE_BASE::m_description, m_descriptionHint, m_editorsDirty, m_fileSelectedHandler, m_frame, m_hasRemote, m_hasUnpushedCommits, m_headDetached, m_historyLink, m_inAdvancedWindow, m_messageChangedHandler, m_minDockWidth, GIT_COMMIT_PANE_BASE::m_newBranchCheckbox, GIT_COMMIT_PANE_BASE::m_newBranchName, m_operation, m_operationInProgress, GIT_COMMIT_PANE_BASE::m_pullButton, GIT_COMMIT_PANE_BASE::m_recentMessages, GIT_COMMIT_PANE_BASE::m_settingsButton, GIT_COMMIT_PANE_BASE::m_showDiffButton, GIT_COMMIT_PANE_BASE::m_summary, GIT_COMMIT_PANE_BASE::m_summaryCount, GIT_COMMIT_PANE_BASE::m_trustCommand, GIT_COMMIT_PANE_BASE::m_undoCommitButton, m_upstreamAhead, None, onAmendToggled(), onChecklistChanged(), onChecklistContextMenu(), onCommit(), onCommitAndPush(), onFileActivated(), OnGitTransfersChanged(), onIdle(), onMessageChanged(), onNewBranchToggled(), onPull(), onRecentMessage(), onSettings(), onShowDiff(), onThemeChanged(), onUndoCommit(), RefreshFileList(), SaveClipboard(), ShowHistory(), updateCommitButton(), updateDescriptionHint(), and updateSummaryCount().
|
override |
Definition at line 422 of file git_commit_pane.cpp.
References GIT_ADVANCED_DIALOG::CloseForPane(), m_actionQuery, m_listenerSession, m_ownHold, m_refresh, and m_transferLink.
|
private |
Definition at line 2483 of file git_commit_pane.cpp.
References _, dropKeyringWait(), m_actionPending, and setBusy().
Referenced by deferForSecret(), and onPull().
|
private |
The label the network button carries while an operation is in progress.
Definition at line 1002 of file git_commit_pane.cpp.
References _, CherryPick, m_operation, Merge, Rebase, and Revert.
Referenced by updateCommitButton().
|
private |
Drop an in-progress merge or rebase and return the project to its last commit.
Definition at line 1708 of file git_commit_pane.cpp.
References _, ChangedTrackedFilesOutsideProject(), finishAbandonOperation(), m_frame, and runActionQuery().
Referenced by onPull().
|
private |
Apply a completed repository snapshot on the UI thread.
Definition at line 578 of file git_commit_pane.cpp.
References _, GIT_COMMIT_PANE::STATUS::attachError, GIT_COMMIT_PANE::STATUS::attachTrustCommand, DocumentEditorsDirty(), GIT_COMMIT_PANE::STATUS::entries, GIT_COMMIT_PANE::STATUS::hasLocalCommits, GIT_COMMIT_PANE::STATUS::hasRemote, GIT_COMMIT_PANE::STATUS::hasRepo, GIT_COMMIT_PANE::STATUS::head, GIT_COMMIT_PANE::STATUS::headDetached, Layout(), GIT_COMMIT_PANE::STATUS::lineStats, m_actionPending, GIT_COMMIT_PANE_BASE::m_amendCheckbox, m_canAmend, GIT_COMMIT_PANE_BASE::m_changesRow, GIT_COMMIT_PANE_BASE::m_checklist, m_editorsDirty, GIT_COMMIT_PANE_BASE::m_emptyLabel, m_frame, m_hasRemote, m_hasRepo, m_hasUnpushedCommits, m_headDetached, m_historyLink, m_inAdvancedWindow, m_lineStats, m_operation, m_operationInProgress, m_shownPaths, m_transfer, GIT_COMMIT_PANE_BASE::m_undoCommitButton, m_undoHead, m_unpushedCount, m_upstreamAhead, GIT_COMMIT_PANE::STATUS::operation, GIT_COMMIT_PANE::STATUS::operationInProgress, operationNoun(), path, Pgm(), populateBranches(), populateRecentMessages(), GIT_COMMIT_PANE::STATUS::recentMessages, setStatusText(), showTrustCommand(), GIT_COMMIT_PANE::STATUS::unpushed, updateCommitButton(), updateDescriptionHint(), updateMessageVisibility(), updateSummary(), and GIT_COMMIT_PANE::STATUS::upstreamAhead.
Referenced by RefreshFileList().
|
private |
Set the icons and colours that follow the light or dark theme.
Definition at line 863 of file git_commit_pane.cpp.
References KICAD_DIFF::DIFF_COLOR_THEME::added, config, KICAD_DIFF::DIFF_COLOR_THEME::ForText(), KIPLATFORM::UI::IsDarkTheme(), KiBitmapBundle(), m_descriptionHint, GIT_COMMIT_PANE_BASE::m_settingsButton, m_summaryAdded, m_summaryRemoved, KICAD_DIFF::DIFF_COLOR_THEME::removed, and KIGFX::COLOR4D::ToColour().
Referenced by GIT_COMMIT_PANE(), and onThemeChanged().
| void GIT_COMMIT_PANE::BeginAmend | ( | const wxString & | aExpectedCommit = wxEmptyString | ) |
Prepare the amend form. A history entry supplies its hash and starts with no files selected.
Definition at line 1917 of file git_commit_pane.cpp.
References _, amendRefusal(), commitHead(), KIGIT::ComposeCommitMessage(), DisplayInfoMessage(), GetCommitMessage(), KIGIT_COMMON::GetLastCommitMessage(), KIGIT_COMMON::GetRepo(), info, IsOK(), Layout(), GIT_COMMIT_PANE_BASE::m_amendCheckbox, m_amendHead, m_canAmend, GIT_COMMIT_PANE_BASE::m_checklist, m_frame, m_messageChangedHandler, GIT_COMMIT_PANE_BASE::m_newBranchCheckbox, GIT_COMMIT_PANE_BASE::m_summary, message, Pgm(), RefreshFileList(), refusal(), runActionQuery(), SetCommitMessage(), KIGIT::SplitCommitMessage(), updateCommitButton(), and updateMessageVisibility().
Referenced by onAmendToggled().
|
private |
Definition at line 1450 of file git_commit_pane.cpp.
References _, CaptureOpenEditorDocs(), DisplayErrorMessage(), DisplayInfoMessage(), EditorsDirty(), m_frame, KIPLATFORM::ENV::MoveToTrash(), name, ReloadOpenEditors(), and KIGIT::TryLockAction().
Referenced by discardFile().
|
private |
Read the keyring before a transfer, holding the pane busy as aStatus, then call aStart unless cancelled or the session changed.
False when nothing needs reading
Definition at line 2426 of file git_commit_pane.cpp.
References abandonKeyringWait(), KIGIT_COMMON::DeferForSecret(), m_actionPending, m_keyringRequest, m_keyringWait, m_ownHold, m_transfer, and setBusy().
Referenced by startPull(), and startPush().
|
private |
Definition at line 1423 of file git_commit_pane.cpp.
References _, confirmDiscardFile(), KIGIT_COMMON::GetGitRootDirectory(), KIGIT_COMMON::IsPathConflicted(), KIGIT_COMMON::IsPathInHead(), and runActionQuery().
Referenced by onChecklistContextMenu().
|
private |
Commit the checked files (or amend the last commit when the amend box is ticked), then push when aAndPush is set.
Both halves of the commit button land here.
Definition at line 2025 of file git_commit_pane.cpp.
References _, amendRefusal(), KIGIT::BranchNameError(), commitHead(), DisplayErrorMessage(), DocumentEditorsDirty(), KIGIT_COMMON::GetRepo(), KIGIT::PROJECT_GIT_UTILS::LfsRefusal(), m_actionPending, GIT_COMMIT_PANE_BASE::m_amendCheckbox, m_amendHead, GIT_COMMIT_PANE_BASE::m_checklist, m_credentialPrompts, m_currentBranch, GIT_COMMIT_PANE_BASE::m_description, m_frame, m_hasRepo, m_hasUnpushedCommits, GIT_COMMIT_PANE_BASE::m_newBranchCheckbox, GIT_COMMIT_PANE_BASE::m_newBranchName, GIT_COMMIT_PANE_BASE::m_signOffCheckbox, GIT_COMMIT_PANE_BASE::m_summary, m_transfer, othersBusy(), KIGIT::ReadGitIdentity(), runActionQuery(), saveForCommit(), KIGIT::ShowBusyMessage(), submitPush(), and syncListener().
Referenced by GIT_COMMIT_PANE(), onCommit(), and onCommitAndPush().
|
private |
Forget a keyring wait without touching the busy state. True when one was pending.
Definition at line 2472 of file git_commit_pane.cpp.
References m_keyringRequest, and m_keyringWait.
Referenced by abandonKeyringWait(), showDisabledState(), and syncListener().
|
private |
Definition at line 1737 of file git_commit_pane.cpp.
References _, CaptureOpenEditorDocs(), DisplayErrorMessage(), DisplayInfoMessage(), EditorsDirty(), IsOK(), m_frame, operationNoun(), path, Pgm(), ReloadOpenEditors(), setBusy(), and KIGIT::TryLockAction().
Referenced by abandonOperation().
|
private |
Definition at line 2147 of file git_commit_pane.cpp.
References _, GIT_COMMIT_PANE::COMMIT_REQUEST::amend, amendRefusal(), GIT_COMMIT_PANE::COMMIT_REQUEST::andPush, GitUserConfig::authorEmail, GitUserConfig::authorName, GIT_COMMIT_PANE::COMMIT_REQUEST::branchName, commitHead(), KIGIT::ComposeCommitMessage(), GIT_COMMIT_PANE::COMMIT_REQUEST::description, KIGIT_ERROR_MESSAGE::details, DisplayErrorMessage(), DisplayInfoMessage(), dropNewBranch(), KIGIT::EnsureGitIdentity(), Error, GIT_COMMIT_PANE::COMMIT_REQUEST::files, GIT_CONFIG_HANDLER::GetUserConfig(), GIT_COMMIT_PANE::COMMIT_REQUEST::head, GIT_COMMIT_PANE::COMMIT_REQUEST::identity, GIT_COMMIT_PANE_BASE::m_amendCheckbox, m_amendHead, m_credentialPrompts, GIT_COMMIT_PANE_BASE::m_description, m_frame, GIT_COMMIT_PANE_BASE::m_newBranchCheckbox, GIT_COMMIT_PANE_BASE::m_newBranchName, GIT_COMMIT_PANE_BASE::m_summary, message, moveToNewBranch(), GIT_COMMIT_PANE::COMMIT_REQUEST::newBranch, GIT_COMMIT_HANDLER::PerformAmend(), GIT_COMMIT_HANDLER::PerformCommit(), KIGIT_ERRORS::PopError(), refusal(), result, setBusy(), setDescription(), GIT_COMMIT_PANE::COMMIT_REQUEST::signOff, submitPush(), Success, SuccessIndexStale, GIT_COMMIT_PANE::COMMIT_REQUEST::summary, KIGIT_ERROR_MESSAGE::summary, and KIGIT::WaitForActionLock().
Referenced by saveForCommit().
|
private |
Definition at line 2738 of file git_commit_pane.cpp.
References _, KIGIT_COMMON::ACTION_LOCK_WAIT, KIGIT_CONFLICT_SIDES::ancestorFile, copy, KIGIT_ERROR_MESSAGE::details, KICAD_DIFF::DispatchMerge(), DisplayErrorMessage(), DisplayInfoMessage(), KICAD_DIFF::DocKindFromExtension(), EditorsDirty(), KIGIT::EnsureGitIdentity(), CLI::EXIT_CODES::ERR_CANCELLED, FailedCleanly, KICAD_DIFF::FOOTPRINT, SETTINGS_MANAGER::GetBackupRootForProject(), PGM_BASE::GetSettingsManager(), KIGIT_CONFLICT_SIDES::hasAncestor, KIGIT_CONFLICT_SIDES::hasOurs, KIGIT_CONFLICT_SIDES::hasTheirs, IsOK(), m_docsBeforePull, m_frame, OKOrCancelDialog(), KIGIT_CONFLICT_SIDES::oursFile, KIGIT_CONFLICT_SIDES::path, Pgm(), ReloadOpenEditors(), reporter, result, GIT_DIFF_WORKSPACE::Root(), setBusy(), source, submitPush(), CLI::EXIT_CODES::SUCCESS, Success, KIGIT_ERROR_MESSAGE::summary, KICAD_DIFF::SYM_LIB, KIGIT_CONFLICT_SIDES::theirsFile, and KICAD_DIFF::UNKNOWN.
Referenced by resolvePullConflicts().
| wxString GIT_COMMIT_PANE::GetCommitMessage | ( | ) | const |
The message as typed. A second form on the same project shows the same text.
Definition at line 1195 of file git_commit_pane.cpp.
References KIGIT::ComposeCommitMessage(), GIT_COMMIT_PANE_BASE::m_description, and GIT_COMMIT_PANE_BASE::m_summary.
Referenced by BeginAmend(), and onUndoCommit().
|
inline |
The width the panel needs so its widest row fits, for the dock that holds it.
Definition at line 104 of file git_commit_pane.h.
References m_minDockWidth.
|
override |
Lay out the pane, then re-wrap the status line when the width its column got has changed.
Definition at line 767 of file git_commit_pane.cpp.
References layoutAndWrapStatus(), m_dockMinHeight, m_dockParent, and m_dockUpdatePending.
Referenced by applyStatus(), BeginAmend(), layoutWide(), onAmendToggled(), setStatusText(), showDisabledState(), updateCommitButton(), updateSummary(), and updateSummaryCount().
|
private |
Lay out the controls, then rewrap the status line to its column's new width.
Definition at line 790 of file git_commit_pane.cpp.
References GIT_COMMIT_PANE_BASE::m_emptyLabel, m_statusText, m_statusWrapWidth, and KIUI::WrapText().
Referenced by Layout().
|
private |
Put the file list beside the commit controls instead of above them, for a wide host, with a heading over the message and a summary of the working tree under it.
Definition at line 353 of file git_commit_pane.cpp.
References _, Layout(), GIT_COMMIT_PANE_BASE::m_changesRow, GIT_COMMIT_PANE_BASE::m_checklist, GIT_COMMIT_PANE_BASE::m_description, GIT_COMMIT_PANE_BASE::m_emptyLabel, GIT_COMMIT_PANE_BASE::m_optionsSizer, GIT_COMMIT_PANE_BASE::m_recentMessages, m_summaryAdded, m_summaryFiles, m_summaryRemoved, GIT_COMMIT_PANE_BASE::m_trustRow, and GIT_COMMIT_PANE_BASE::m_undoCommitButton.
Referenced by GIT_COMMIT_PANE().
|
private |
Definition at line 1807 of file git_commit_pane.cpp.
References BeginAmend(), Layout(), GIT_COMMIT_PANE_BASE::m_amendCheckbox, m_amendHead, GIT_COMMIT_PANE_BASE::m_checklist, updateCommitButton(), and updateMessageVisibility().
Referenced by GIT_COMMIT_PANE().
|
private |
Definition at line 1319 of file git_commit_pane.cpp.
References updateCommitButton(), and updateSummary().
Referenced by GIT_COMMIT_PANE().
|
private |
Definition at line 1351 of file git_commit_pane.cpp.
References _, GIT_ADVANCED_DIALOG::Active(), ChangeGitIgnore(), discardFile(), KIGIT::ExtensionIgnoreRule(), IGNORE_EXTENSION, IGNORE_PATH, KIGIT::IgnoreState(), m_actionPending, GIT_COMMIT_PANE_BASE::m_checklist, m_frame, m_inAdvancedWindow, m_transfer, GIT_IGNORE_TARGET::path, path, GIT_ADVANCED_DIALOG::ShowHistoryForFile(), and KIGIT::IGNORE_STATE::tracked.
Referenced by GIT_COMMIT_PANE().
|
private |
The split button's main half. It commits, or pushes when that is all there is to do.
Definition at line 1564 of file git_commit_pane.cpp.
References doCommit(), and m_commitButtonPushes.
Referenced by GIT_COMMIT_PANE().
|
private |
Definition at line 1570 of file git_commit_pane.cpp.
References doCommit().
Referenced by GIT_COMMIT_PANE().
|
private |
Definition at line 1555 of file git_commit_pane.cpp.
References GIT_COMMIT_PANE_BASE::m_checklist, m_frame, path, and ShowGitFileDiff().
Referenced by GIT_COMMIT_PANE().
|
overridevirtual |
Follow a transfer on this pane's repository beginning or ending in any window.
Implements GIT_TRANSFER_WATCHER.
Definition at line 2348 of file git_commit_pane.cpp.
References m_actionPending, m_frame, GIT_COMMIT_PANE_BASE::m_pullButton, m_showingOthers, m_transfer, m_transferStatus, othersBusy(), othersCanCancel(), othersStatus(), and setBusy().
Referenced by GIT_COMMIT_PANE(), and syncListener().
|
private |
Definition at line 892 of file git_commit_pane.cpp.
References DocumentEditorsDirty(), m_actionPending, m_dockUpdatePending, m_editorsDirty, m_frame, m_hasRepo, m_refresh, m_transfer, Pgm(), RefreshFileList(), updateDescriptionHint(), and updateDockMinHeight().
Referenced by GIT_COMMIT_PANE().
|
private |
Definition at line 1185 of file git_commit_pane.cpp.
References m_messageChangedHandler, updateCommitButton(), and updateSummaryCount().
Referenced by GIT_COMMIT_PANE().
|
private |
Definition at line 1216 of file git_commit_pane.cpp.
References GIT_COMMIT_PANE_BASE::m_newBranchCheckbox, GIT_COMMIT_PANE_BASE::m_newBranchName, and updateCommitButton().
Referenced by GIT_COMMIT_PANE().
|
private |
Definition at line 1576 of file git_commit_pane.cpp.
References _, abandonKeyringWait(), abandonOperation(), GIT_TRANSFER_BUSY::CancelAll(), m_actionPending, m_actionQuery, m_frame, m_operationInProgress, GIT_COMMIT_PANE_BASE::m_pullButton, m_transfer, othersBusy(), othersCanCancel(), Pull(), setBusy(), syncListener(), and transfers().
Referenced by GIT_COMMIT_PANE().
|
private |
Definition at line 3217 of file git_commit_pane.cpp.
References _, KIGIT::AnswerTransferFailure(), KIGIT::TRANSFER_FAILURE::authFailure, KIGIT::CANCELLED, KIGIT::TRANSFER_FAILURE::cancelled, KIGIT::ClearSyncWarnings(), Conflict, DirtyWorkdir, DisplayErrorMessage(), DisplayInfoMessage(), KIGIT::TRANSFER_FAILURE::error, FastForward, FETCH, KIGIT::GONE, KIGIT::HOST_DECLINED, KIGIT::TRANSFER_FAILURE::hostKey, m_credentialPrompts, m_frame, m_transfer, KIGIT::REPORT, resolvePullConflicts(), result, KIGIT::RETRY, KIGIT::RETRY_TRUSTED, setBusy(), submitPull(), submitPush(), Success, KIGIT::UnexplainedFailure(), and UpToDate.
|
private |
Definition at line 2609 of file git_commit_pane.cpp.
References _, KIGIT::AnswerTransferFailure(), KIGIT::TRANSFER_FAILURE::authFailure, Busy, KIGIT::CANCELLED, KIGIT::TRANSFER_FAILURE::cancelled, KIGIT::ClearSyncWarnings(), DisplayErrorMessage(), KIGIT::TRANSFER_FAILURE::error, KIGIT::GONE, KIGIT::HOST_DECLINED, KIGIT::TRANSFER_FAILURE::hostKey, IsOK(), m_credentialPrompts, m_frame, m_transfer, NonFastForward, Pgm(), ProjectSafeToRewrite(), PUSH, ReadGitWorktreeStatus(), KIGIT::REPORT, result, KIGIT::RETRY, KIGIT::RETRY_TRUSTED, runActionQuery(), setBusy(), KIGIT::ShowBusyMessage(), submitPull(), submitPush(), Success, and KIGIT::UnexplainedFailure().
|
private |
Definition at line 1283 of file git_commit_pane.cpp.
References GIT_COMMIT_PANE_BASE::m_recentMessages, m_recentMessageTexts, GIT_COMMIT_PANE_BASE::m_summary, setDescription(), and KIGIT::SplitCommitMessage().
Referenced by GIT_COMMIT_PANE().
|
private |
The gear's menu: the advanced window and the author.
Definition at line 919 of file git_commit_pane.cpp.
References _, m_frame, m_inAdvancedWindow, setAuthor(), and GIT_ADVANCED_DIALOG::ShowForFrame().
Referenced by GIT_COMMIT_PANE().
|
private |
Definition at line 1225 of file git_commit_pane.cpp.
References GIT_COMMIT_PANE_BASE::m_checklist, m_frame, path, and ShowGitFileDiff().
Referenced by GIT_COMMIT_PANE().
|
private |
Definition at line 880 of file git_commit_pane.cpp.
References applyTheme(), and RefreshFileList().
Referenced by GIT_COMMIT_PANE().
|
private |
Take back the last commit while no remote has it, keeping its changes staged and its message.
Definition at line 1822 of file git_commit_pane.cpp.
References _, KIGIT::ComposeCommitMessage(), KIGIT_ERROR_MESSAGE::details, DisplayErrorMessage(), DisplayInfoMessage(), Error, GetCommitMessage(), IsOK(), m_actionPending, GIT_COMMIT_PANE_BASE::m_amendCheckbox, m_amendHead, m_frame, m_messageChangedHandler, GIT_COMMIT_PANE_BASE::m_newBranchCheckbox, GIT_COMMIT_PANE_BASE::m_newBranchName, m_transfer, m_undoHead, message, NoCommit, othersBusy(), GIT_COMMIT_HANDLER::PerformUndoLastCommit(), KIGIT_ERRORS::PopError(), Published, result, setBusy(), SetCommitMessage(), KIGIT::ShowBusyMessage(), KIGIT::SplitCommitMessage(), Success, KIGIT_ERROR_MESSAGE::summary, syncListener(), TargetChanged, and KIGIT::TryLockAction().
Referenced by GIT_COMMIT_PANE().
|
private |
The noun for the operation in progress, for messages.
Definition at line 989 of file git_commit_pane.cpp.
References _, CherryPick, m_operation, Merge, Rebase, and Revert.
Referenced by applyStatus(), finishAbandonOperation(), and transferCanStart().
|
private |
The transfers on it that other windows started, leaving out this pane's own.
Definition at line 2330 of file git_commit_pane.cpp.
References GIT_TRANSFER_BUSY::IsBusy(), m_ownHold, and transfers().
Referenced by doCommit(), OnGitTransfersChanged(), onPull(), onUndoCommit(), runActionQuery(), setBusy(), transferCanStart(), and updateCommitButton().
|
private |
Definition at line 2342 of file git_commit_pane.cpp.
References GIT_TRANSFER_BUSY::CanCancel(), m_ownHold, and transfers().
Referenced by OnGitTransfersChanged(), onPull(), and setBusy().
|
private |
Definition at line 2336 of file git_commit_pane.cpp.
References m_ownHold, GIT_TRANSFER_BUSY::Status(), and transfers().
Referenced by OnGitTransfersChanged(), and setBusy().
|
private |
Fill the branch dropdown from the completed snapshot.
Definition at line 1234 of file git_commit_pane.cpp.
References _, GIT_COMMIT_PANE::STATUS::currentBranch, GIT_COMMIT_PANE::STATUS::hasRepo, GIT_COMMIT_PANE_BASE::m_branchName, GIT_COMMIT_PANE_BASE::m_branchRow, m_currentBranch, m_headDetached, and GIT_COMMIT_PANE_BASE::m_settingsButton.
Referenced by applyStatus().
|
private |
Fill the Recent messages dropdown from the completed snapshot.
Definition at line 1261 of file git_commit_pane.cpp.
References _, GIT_COMMIT_PANE_BASE::m_recentMessages, m_recentMessageTexts, and message.
Referenced by applyStatus().
| void GIT_COMMIT_PANE::Pull | ( | ) |
Get changes from the remote, as the Get Changes button does.
The advanced window's Pull button lands here, so one place owns the merge and its conflict handling.
Definition at line 1662 of file git_commit_pane.cpp.
References _, DisplayInfoMessage(), m_credentialPrompts, m_frame, m_hasRemote, submitPull(), syncListener(), and transferCanStart().
Referenced by onPull().
| void GIT_COMMIT_PANE::Push | ( | ) |
Push the local commits, as the Push button does.
The advanced window's Push button lands here too.
Definition at line 1682 of file git_commit_pane.cpp.
References _, DisplayInfoMessage(), m_credentialPrompts, m_frame, m_hasRemote, m_hasUnpushedCommits, submitPush(), syncListener(), and transferCanStart().
| void GIT_COMMIT_PANE::RefreshFileList | ( | ) |
Read the project's git status and repopulate the list.
Definition at line 513 of file git_commit_pane.cpp.
References applyStatus(), BuildGitChangeEntries(), commitHead(), KIGIT_COMMON::GetBranches(), KIGIT_COMMON::GetCurrentBranchName(), KIGIT_COMMON::GetRecentCommitMessages(), KIGIT_COMMON::GetRepo(), KIGIT_COMMON::GetWorkingTreeLineStats(), KIGIT_COMMON::HasPushAndPullRemote(), KIPLATFORM::UI::IsDarkTheme(), KIGIT_COMMON::IsHeadDetached(), KIGIT_COMMON::IsOperationInProgress(), m_frame, m_refresh, m_summaryFiles, KIGIT_COMMON::OperationInProgress(), FILE_CHECKLIST_ENTRY::path, Pgm(), showDisabledState(), KIGIT::SortBranchesForDisplay(), syncListener(), and KIGIT_COMMON::UpstreamStatus().
Referenced by BeginAmend(), GIT_COMMIT_PANE(), onIdle(), onThemeChanged(), and syncListener().
| void GIT_COMMIT_PANE::ReloadAdvancedWindow | ( | ) |
Reload the advanced window when it is open, for a preferences change it also shows.
Definition at line 694 of file git_commit_pane.cpp.
References GIT_ADVANCED_DIALOG::Active().
|
private |
Resolve a conflicted pull file by file, using the visual merge tool for design files, then create the merge commit.
Cancelling leaves the repository exactly as it was.
Definition at line 2711 of file git_commit_pane.cpp.
References _, finishPullConflictPreparation(), KIGIT_COMMON::GetMergeConflicts(), KIGIT_COMMON::IsPullRebaseConfigured(), KIGIT::ReadGitIdentity(), and runActionQuery().
Referenced by onPullDone().
|
private |
Read an action's prerequisites off the UI thread, then resume only in the same project.
Definition at line 2277 of file git_commit_pane.cpp.
References m_actionPending, m_actionQuery, m_frame, m_transfer, othersBusy(), Pgm(), setBusy(), and KIGIT::ShowBusyMessage().
Referenced by abandonOperation(), BeginAmend(), discardFile(), doCommit(), onPushDone(), resolvePullConflicts(), setAuthor(), submitPull(), and submitPush().
|
private |
Definition at line 2104 of file git_commit_pane.cpp.
References _, COMMIT, DisplayErrorMessage(), DisplayInfoMessage(), finishCommit(), m_frame, and PrepareEditorsForGitOperation().
Referenced by doCommit().
|
private |
Definition at line 949 of file git_commit_pane.cpp.
References _, KIGIT::EditGitIdentity(), m_frame, KIGIT::ReadGitIdentity(), and runActionQuery().
Referenced by onSettings().
|
private |
Enable or disable the controls while a network operation runs, showing a status.
Definition at line 2377 of file git_commit_pane.cpp.
References _, GIT_COMMIT_PANE_BASE::m_amendCheckbox, m_busyChangedHandler, m_canAmend, GIT_COMMIT_PANE_BASE::m_checklist, GIT_COMMIT_PANE_BASE::m_commitButton, GIT_COMMIT_PANE_BASE::m_description, GIT_COMMIT_PANE_BASE::m_emptyLabel, m_frame, m_headDetached, GIT_COMMIT_PANE_BASE::m_newBranchCheckbox, GIT_COMMIT_PANE_BASE::m_newBranchName, m_operationInProgress, m_ownHold, GIT_COMMIT_PANE_BASE::m_pullButton, GIT_COMMIT_PANE_BASE::m_recentMessages, m_showingOthers, GIT_COMMIT_PANE_BASE::m_signOffCheckbox, GIT_COMMIT_PANE_BASE::m_summary, GIT_COMMIT_PANE_BASE::m_undoCommitButton, othersBusy(), othersCanCancel(), othersStatus(), setBusy(), setStatusText(), and updateCommitButton().
Referenced by abandonKeyringWait(), deferForSecret(), finishAbandonOperation(), finishCommit(), finishPullConflictPreparation(), OnGitTransfersChanged(), onPull(), onPullDone(), onPushDone(), onUndoCommit(), runActionQuery(), setBusy(), showDisabledState(), startPull(), startPush(), submitPull(), submitPush(), and syncListener().
|
inline |
Called when a transfer starts and when it ends, so an owning window can follow along.
Definition at line 101 of file git_commit_pane.h.
References m_busyChangedHandler.
Referenced by GIT_ADVANCED_DIALOG::CloseForPane().
| void GIT_COMMIT_PANE::SetCommitMessage | ( | const wxString & | aMessage | ) |
Definition at line 1201 of file git_commit_pane.cpp.
References GIT_COMMIT_PANE_BASE::m_summary, setDescription(), KIGIT::SplitCommitMessage(), updateCommitButton(), and updateSummaryCount().
Referenced by BeginAmend(), and onUndoCommit().
|
private |
Definition at line 1312 of file git_commit_pane.cpp.
References GIT_COMMIT_PANE_BASE::m_description, and updateDescriptionHint().
Referenced by finishCommit(), onRecentMessage(), and SetCommitMessage().
| void GIT_COMMIT_PANE::SetFileSelectedHandler | ( | std::function< void(const wxString &)> | aHandler | ) |
Called with the path of the file the user selects in the list, or empty when none is.
Definition at line 416 of file git_commit_pane.cpp.
References m_fileSelectedHandler.
|
inline |
Called when the user edits the message, so another form can follow along.
Definition at line 75 of file git_commit_pane.h.
References m_messageChangedHandler.
Referenced by GIT_ADVANCED_DIALOG::CloseForPane().
|
private |
Set the status line text and wrap it to the width of the label's column.
Definition at line 759 of file git_commit_pane.cpp.
References Layout(), m_statusText, and m_statusWrapWidth.
Referenced by applyStatus(), setBusy(), showDisabledState(), and updateCommitButton().
|
private |
Clear the list and disable every control while version control is off.
Definition at line 707 of file git_commit_pane.cpp.
References _, dropKeyringWait(), Layout(), m_actionPending, m_actionQuery, GIT_COMMIT_PANE_BASE::m_amendCheckbox, m_amendHead, GIT_COMMIT_PANE_BASE::m_branchName, GIT_COMMIT_PANE_BASE::m_branchRow, m_canAmend, GIT_COMMIT_PANE_BASE::m_changesRow, GIT_COMMIT_PANE_BASE::m_checklist, m_editorsDirty, GIT_COMMIT_PANE_BASE::m_emptyLabel, m_hasRemote, m_hasRepo, m_hasUnpushedCommits, m_headDetached, m_historyLink, m_operation, m_operationInProgress, GIT_COMMIT_PANE_BASE::m_settingsButton, m_shownPaths, GIT_COMMIT_PANE_BASE::m_undoCommitButton, m_undoHead, m_unpushedCount, m_upstreamAhead, None, setBusy(), setStatusText(), showTrustCommand(), updateCommitButton(), and updateMessageVisibility().
Referenced by RefreshFileList().
| void GIT_COMMIT_PANE::ShowHistory | ( | ) |
Open the advanced window on its History page.
Definition at line 701 of file git_commit_pane.cpp.
References HISTORY, m_frame, and GIT_ADVANCED_DIALOG::ShowForFrame().
Referenced by GIT_COMMIT_PANE().
| void GIT_COMMIT_PANE::ShowTransferProgress | ( | const wxString & | aText | ) |
Show a line of transfer progress. Called from the UI thread by a KIGIT_STATUS_REPORTER.
Definition at line 2371 of file git_commit_pane.cpp.
References m_frame.
|
private |
Show a command to copy under the status line, or hide the row when aCommand is empty.
Definition at line 752 of file git_commit_pane.cpp.
References GIT_COMMIT_PANE_BASE::m_trustCommand, and GIT_COMMIT_PANE_BASE::m_trustRow.
Referenced by applyStatus(), and showDisabledState().
|
private |
Definition at line 3124 of file git_commit_pane.cpp.
References _, KIGIT::CallOnUi(), CaptureOpenEditorDocs(), deferForSecret(), KIGIT_ERROR_MESSAGE::details, Error, FastForward, m_docsBeforePull, m_frame, m_ownHold, m_transfer, m_transferStatus, ReloadOpenEditors(), result, setBusy(), startPull(), Success, and KIGIT_ERROR_MESSAGE::summary.
Referenced by startPull(), and submitPull().
|
private |
Definition at line 2527 of file git_commit_pane.cpp.
References _, KIGIT::CallOnUi(), deferForSecret(), KIGIT_ERROR_MESSAGE::details, Error, m_ownHold, m_transfer, m_transferStatus, result, setBusy(), startPush(), Success, and KIGIT_ERROR_MESSAGE::summary.
Referenced by startPush(), and submitPush().
|
private |
aThenPush pushes after a successful pull, which belongs only to the rejected-push recovery flow.
A plain Get Changes leaves local commits unpublished.
Definition at line 3075 of file git_commit_pane.cpp.
References _, CHECK, KIGIT::EnsureGitIdentity(), m_frame, ProjectSafeToRewrite(), KIGIT::ReadGitIdentity(), ReadGitWorktreeStatus(), result, runActionQuery(), setBusy(), and startPull().
Referenced by onPullDone(), onPushDone(), and Pull().
|
private |
Definition at line 2493 of file git_commit_pane.cpp.
References _, KIGIT_COMMON::GetCurrentBranchName(), KIGIT_COMMON::GetHeadCommitId(), KIGIT_COMMON::HasPushAndPullRemote(), runActionQuery(), setBusy(), startPush(), and TARGET.
Referenced by doCommit(), finishCommit(), finishPullConflictPreparation(), onPullDone(), onPushDone(), and Push().
|
private |
Register a refresh listener with the project's current git session, re-registering if the session changed since last time (it is recreated when a project is loaded).
Definition at line 441 of file git_commit_pane.cpp.
References GIT_ADVANCED_DIALOG::CloseActive(), dropKeyringWait(), m_actionPending, m_actionQuery, GIT_COMMIT_PANE_BASE::m_amendCheckbox, m_amendHead, m_frame, m_hasRepo, m_listenerAttached, m_listenerSession, m_refresh, m_shownPaths, m_transferLink, m_undoHead, OnGitTransfersChanged(), RefreshFileList(), setBusy(), and updateCommitButton().
Referenced by doCommit(), onPull(), onUndoCommit(), Pull(), Push(), and RefreshFileList().
|
private |
False, with a message, while a transfer is running or a merge waits to be finished.
Definition at line 1633 of file git_commit_pane.cpp.
References _, DisplayInfoMessage(), m_actionPending, m_headDetached, m_operationInProgress, m_transfer, operationNoun(), othersBusy(), and KIGIT::ShowBusyMessage().
|
private |
The transfers on the repository this pane shows.
Definition at line 2323 of file git_commit_pane.cpp.
References m_frame.
Referenced by onPull(), othersBusy(), othersCanCancel(), and othersStatus().
|
private |
Set what the commit buttons say, and whether they are enabled, for the current state.
Definition at line 1015 of file git_commit_pane.cpp.
References _, abandonLabel(), Layout(), m_actionPending, GIT_COMMIT_PANE_BASE::m_amendCheckbox, m_canAmend, GIT_COMMIT_PANE_BASE::m_checklist, m_commitAndPushItem, GIT_COMMIT_PANE_BASE::m_commitButton, m_commitButtonPushes, m_editorsDirty, GIT_COMMIT_PANE_BASE::m_emptyLabel, m_hasRemote, m_hasRepo, m_hasUnpushedCommits, m_headDetached, GIT_COMMIT_PANE_BASE::m_newBranchCheckbox, GIT_COMMIT_PANE_BASE::m_newBranchName, m_operationInProgress, GIT_COMMIT_PANE_BASE::m_pullButton, m_shownPaths, GIT_COMMIT_PANE_BASE::m_summary, m_transfer, m_unpushedCount, m_upstreamAhead, othersBusy(), and setStatusText().
Referenced by applyStatus(), BeginAmend(), GIT_COMMIT_PANE(), onAmendToggled(), onChecklistChanged(), onMessageChanged(), onNewBranchToggled(), setBusy(), SetCommitMessage(), showDisabledState(), and syncListener().
|
private |
Where the platform has no hint for a multi line box, a label lies over the description box while it is empty.
Definition at line 1298 of file git_commit_pane.cpp.
References GIT_COMMIT_PANE_BASE::m_description, and m_descriptionHint.
Referenced by applyStatus(), GIT_COMMIT_PANE(), onIdle(), and setDescription().
|
private |
Give the AUI pane the controls' minimum height, so a dock never squeezes them.
Definition at line 818 of file git_commit_pane.cpp.
References m_dockMinHeight.
Referenced by onIdle().
|
private |
Show the message field whenever a commit is possible, including a message-only amend.
Definition at line 967 of file git_commit_pane.cpp.
References GIT_COMMIT_PANE_BASE::m_amendCheckbox, m_canAmend, GIT_COMMIT_PANE_BASE::m_description, m_editorsDirty, GIT_COMMIT_PANE_BASE::m_newBranchCheckbox, GIT_COMMIT_PANE_BASE::m_newBranchName, GIT_COMMIT_PANE_BASE::m_optionsSizer, GIT_COMMIT_PANE_BASE::m_recentMessages, m_recentMessageTexts, GIT_COMMIT_PANE_BASE::m_signOffCheckbox, GIT_COMMIT_PANE_BASE::m_summary, and updateSummaryCount().
Referenced by applyStatus(), BeginAmend(), onAmendToggled(), and showDisabledState().
|
private |
Refresh the staged count in the changes heading, and the summary box where the wide layout has one.
Definition at line 1326 of file git_commit_pane.cpp.
References _, Layout(), GIT_COMMIT_PANE_BASE::m_changesLabel, GIT_COMMIT_PANE_BASE::m_checklist, m_lineStats, GIT_COMMIT_PANE_BASE::m_showDiffButton, m_shownPaths, m_summaryAdded, m_summaryFiles, and m_summaryRemoved.
Referenced by applyStatus(), and onChecklistChanged().
|
private |
Show how many of the summary's 72 columns are left, once that is 10 or fewer.
Definition at line 1168 of file git_commit_pane.cpp.
References Layout(), left, GIT_COMMIT_PANE_BASE::m_summary, and GIT_COMMIT_PANE_BASE::m_summaryCount.
Referenced by GIT_COMMIT_PANE(), onMessageChanged(), SetCommitMessage(), and updateMessageVisibility().
|
private |
Definition at line 386 of file git_commit_pane.h.
Referenced by abandonKeyringWait(), applyStatus(), deferForSecret(), doCommit(), onChecklistContextMenu(), OnGitTransfersChanged(), onIdle(), onPull(), onUndoCommit(), runActionQuery(), showDisabledState(), syncListener(), transferCanStart(), and updateCommitButton().
|
private |
Definition at line 385 of file git_commit_pane.h.
Referenced by onPull(), runActionQuery(), showDisabledState(), syncListener(), and ~GIT_COMMIT_PANE().
|
protectedinherited |
Definition at line 54 of file git_commit_pane_base.h.
Referenced by GIT_COMMIT_PANE::applyStatus(), GIT_COMMIT_PANE::BeginAmend(), GIT_COMMIT_PANE::doCommit(), GIT_COMMIT_PANE::finishCommit(), GIT_COMMIT_PANE::GIT_COMMIT_PANE(), GIT_COMMIT_PANE_BASE(), GIT_COMMIT_PANE::onAmendToggled(), GIT_COMMIT_PANE::onUndoCommit(), GIT_COMMIT_PANE::setBusy(), GIT_COMMIT_PANE::showDisabledState(), GIT_COMMIT_PANE::syncListener(), GIT_COMMIT_PANE::updateCommitButton(), and GIT_COMMIT_PANE::updateMessageVisibility().
|
private |
The branch and commit chosen when amend started. Keep them fixed while editing.
Definition at line 293 of file git_commit_pane.h.
Referenced by BeginAmend(), doCommit(), finishCommit(), onAmendToggled(), onUndoCommit(), showDisabledState(), and syncListener().
|
protectedinherited |
Definition at line 47 of file git_commit_pane_base.h.
Referenced by GIT_COMMIT_PANE_BASE(), GIT_COMMIT_PANE::populateBranches(), and GIT_COMMIT_PANE::showDisabledState().
|
protectedinherited |
Definition at line 46 of file git_commit_pane_base.h.
Referenced by GIT_COMMIT_PANE_BASE(), GIT_COMMIT_PANE::populateBranches(), and GIT_COMMIT_PANE::showDisabledState().
|
private |
Told when a transfer starts and ends. Empty unless an owning window asked.
Definition at line 338 of file git_commit_pane.h.
Referenced by setBusy(), and SetBusyChangedHandler().
|
private |
Whether the current branch allows an amend. A refresh must not change an active amend into a commit.
Definition at line 290 of file git_commit_pane.h.
Referenced by applyStatus(), BeginAmend(), setBusy(), showDisabledState(), updateCommitButton(), and updateMessageVisibility().
|
protectedinherited |
Definition at line 59 of file git_commit_pane_base.h.
Referenced by GIT_COMMIT_PANE_BASE(), and GIT_COMMIT_PANE::updateSummary().
|
protectedinherited |
Definition at line 58 of file git_commit_pane_base.h.
Referenced by GIT_COMMIT_PANE::applyStatus(), GIT_COMMIT_PANE_BASE(), GIT_COMMIT_PANE::layoutWide(), and GIT_COMMIT_PANE::showDisabledState().
|
protectedinherited |
Definition at line 66 of file git_commit_pane_base.h.
Referenced by GIT_COMMIT_PANE::applyStatus(), GIT_COMMIT_PANE::BeginAmend(), GIT_COMMIT_PANE::doCommit(), GIT_COMMIT_PANE::GIT_COMMIT_PANE(), GIT_COMMIT_PANE_BASE(), GIT_COMMIT_PANE::layoutWide(), GIT_COMMIT_PANE::onAmendToggled(), GIT_COMMIT_PANE::onChecklistContextMenu(), GIT_COMMIT_PANE::onFileActivated(), GIT_COMMIT_PANE::onShowDiff(), GIT_COMMIT_PANE::setBusy(), GIT_COMMIT_PANE::showDisabledState(), GIT_COMMIT_PANE::updateCommitButton(), and GIT_COMMIT_PANE::updateSummary().
|
private |
The arrow menu's entry, relabelled with the main button.
Definition at line 308 of file git_commit_pane.h.
Referenced by GIT_COMMIT_PANE(), and updateCommitButton().
|
protectedinherited |
Definition at line 67 of file git_commit_pane_base.h.
Referenced by GIT_COMMIT_PANE::GIT_COMMIT_PANE(), GIT_COMMIT_PANE_BASE(), GIT_COMMIT_PANE::setBusy(), and GIT_COMMIT_PANE::updateCommitButton().
|
private |
True while the main button reads Push, with nothing left to commit.
Definition at line 311 of file git_commit_pane.h.
Referenced by GIT_COMMIT_PANE(), onCommit(), and updateCommitButton().
|
protectedinherited |
Definition at line 64 of file git_commit_pane_base.h.
Referenced by GIT_COMMIT_PANE::GIT_COMMIT_PANE(), and GIT_COMMIT_PANE_BASE().
|
private |
Keyring reads and credential prompts the current request has shown, reset when it ends.
Definition at line 318 of file git_commit_pane.h.
Referenced by doCommit(), finishCommit(), onPullDone(), onPushDone(), Pull(), and Push().
|
private |
The branch a commit will land on, empty when detached or before the first commit.
Definition at line 371 of file git_commit_pane.h.
Referenced by doCommit(), and populateBranches().
|
protectedinherited |
Definition at line 52 of file git_commit_pane_base.h.
Referenced by GIT_COMMIT_PANE::doCommit(), GIT_COMMIT_PANE::finishCommit(), GIT_COMMIT_PANE::GetCommitMessage(), GIT_COMMIT_PANE::GIT_COMMIT_PANE(), GIT_COMMIT_PANE_BASE(), GIT_COMMIT_PANE::layoutWide(), GIT_COMMIT_PANE::setBusy(), GIT_COMMIT_PANE::setDescription(), GIT_COMMIT_PANE::updateDescriptionHint(), and GIT_COMMIT_PANE::updateMessageVisibility().
|
private |
The description box's hint, a label laid over it while it is empty.
Definition at line 299 of file git_commit_pane.h.
Referenced by applyTheme(), GIT_COMMIT_PANE(), and updateDescriptionHint().
|
private |
The controls' minimum height from the last layout, applied to the AUI pane at idle time.
Definition at line 347 of file git_commit_pane.h.
Referenced by Layout(), and updateDockMinHeight().
|
private |
Definition at line 348 of file git_commit_pane.h.
Referenced by Layout().
|
private |
Definition at line 349 of file git_commit_pane.h.
|
private |
On-disk identity of the open documents, taken before a pull so only the ones the merge rewrote are reloaded afterwards.
Definition at line 365 of file git_commit_pane.h.
Referenced by finishPullConflictPreparation(), and startPull().
|
private |
True when an open editor held unsaved changes at the last refresh.
Definition at line 287 of file git_commit_pane.h.
Referenced by applyStatus(), GIT_COMMIT_PANE(), onIdle(), showDisabledState(), updateCommitButton(), and updateMessageVisibility().
|
protectedinherited |
Definition at line 61 of file git_commit_pane_base.h.
Referenced by GIT_COMMIT_PANE::applyStatus(), GIT_COMMIT_PANE_BASE(), GIT_COMMIT_PANE::layoutAndWrapStatus(), GIT_COMMIT_PANE::layoutWide(), GIT_COMMIT_PANE::setBusy(), GIT_COMMIT_PANE::showDisabledState(), and GIT_COMMIT_PANE::updateCommitButton().
|
private |
Definition at line 373 of file git_commit_pane.h.
Referenced by GIT_COMMIT_PANE(), and SetFileSelectedHandler().
|
private |
Definition at line 256 of file git_commit_pane.h.
Referenced by abandonOperation(), applyStatus(), BeginAmend(), confirmDiscardFile(), doCommit(), finishAbandonOperation(), finishCommit(), finishPullConflictPreparation(), GIT_COMMIT_PANE(), onChecklistContextMenu(), onFileActivated(), OnGitTransfersChanged(), onIdle(), onPull(), onPullDone(), onPushDone(), onSettings(), onShowDiff(), onUndoCommit(), Pull(), Push(), RefreshFileList(), runActionQuery(), saveForCommit(), setAuthor(), setBusy(), ShowHistory(), ShowTransferProgress(), startPull(), submitPull(), syncListener(), and transfers().
|
private |
Definition at line 269 of file git_commit_pane.h.
Referenced by applyStatus(), GIT_COMMIT_PANE(), Pull(), Push(), showDisabledState(), and updateCommitButton().
|
private |
Whether the last completed status snapshot had a repository.
Definition at line 272 of file git_commit_pane.h.
Referenced by applyStatus(), doCommit(), onIdle(), showDisabledState(), syncListener(), and updateCommitButton().
|
private |
Definition at line 264 of file git_commit_pane.h.
Referenced by applyStatus(), doCommit(), GIT_COMMIT_PANE(), Push(), showDisabledState(), and updateCommitButton().
|
private |
True when HEAD is a commit rather than a branch, so nothing can be committed or pushed.
Definition at line 275 of file git_commit_pane.h.
Referenced by applyStatus(), GIT_COMMIT_PANE(), populateBranches(), setBusy(), showDisabledState(), transferCanStart(), and updateCommitButton().
|
private |
Opens the History page from the docked panel. Never shown inside the advanced window.
Definition at line 302 of file git_commit_pane.h.
Referenced by applyStatus(), GIT_COMMIT_PANE(), and showDisabledState().
|
private |
True on the advanced window's Changes page, false in the docked panel.
Definition at line 262 of file git_commit_pane.h.
Referenced by applyStatus(), GIT_COMMIT_PANE(), onChecklistContextMenu(), and onSettings().
|
private |
Definition at line 322 of file git_commit_pane.h.
Referenced by deferForSecret(), and dropKeyringWait().
|
private |
A push or pull waits on the keyring. The count fences off an answer from a cancelled wait.
Definition at line 321 of file git_commit_pane.h.
Referenced by deferForSecret(), and dropKeyringWait().
|
private |
Lines the working tree adds and removes against HEAD, read at the last refresh.
Definition at line 381 of file git_commit_pane.h.
Referenced by applyStatus(), and updateSummary().
|
private |
True once this panel has attached its refresh listener to a session at least once.
A first attachment is not a project change, so it must not close the Advanced window.
Definition at line 353 of file git_commit_pane.h.
Referenced by syncListener().
|
private |
The git session this panel registered a refresh listener with, weak so it does not keep the session alive.
Used to unregister on destruction.
Definition at line 357 of file git_commit_pane.h.
Referenced by syncListener(), and ~GIT_COMMIT_PANE().
|
private |
Told when the message is edited. Empty unless an owning window asked.
Definition at line 368 of file git_commit_pane.h.
Referenced by BeginAmend(), GIT_COMMIT_PANE(), onMessageChanged(), onUndoCommit(), and SetMessageChangedHandler().
|
private |
The widest row's minimum width, measured before anything is hidden.
Definition at line 259 of file git_commit_pane.h.
Referenced by GetMinDockWidth(), and GIT_COMMIT_PANE().
|
protectedinherited |
Definition at line 56 of file git_commit_pane_base.h.
Referenced by GIT_COMMIT_PANE::BeginAmend(), GIT_COMMIT_PANE::doCommit(), GIT_COMMIT_PANE::finishCommit(), GIT_COMMIT_PANE::GIT_COMMIT_PANE(), GIT_COMMIT_PANE_BASE(), GIT_COMMIT_PANE::onNewBranchToggled(), GIT_COMMIT_PANE::onUndoCommit(), GIT_COMMIT_PANE::setBusy(), GIT_COMMIT_PANE::updateCommitButton(), and GIT_COMMIT_PANE::updateMessageVisibility().
|
protectedinherited |
Definition at line 57 of file git_commit_pane_base.h.
Referenced by GIT_COMMIT_PANE::doCommit(), GIT_COMMIT_PANE::finishCommit(), GIT_COMMIT_PANE::GIT_COMMIT_PANE(), GIT_COMMIT_PANE_BASE(), GIT_COMMIT_PANE::onNewBranchToggled(), GIT_COMMIT_PANE::onUndoCommit(), GIT_COMMIT_PANE::setBusy(), GIT_COMMIT_PANE::updateCommitButton(), and GIT_COMMIT_PANE::updateMessageVisibility().
|
private |
Which operation, so the button and the explanation can name it.
Definition at line 284 of file git_commit_pane.h.
Referenced by abandonLabel(), applyStatus(), GIT_COMMIT_PANE(), operationNoun(), and showDisabledState().
|
private |
True while a merge or rebase is in progress. The network button then reads Abandon.
Definition at line 281 of file git_commit_pane.h.
Referenced by applyStatus(), GIT_COMMIT_PANE(), onPull(), setBusy(), showDisabledState(), transferCanStart(), and updateCommitButton().
|
protectedinherited |
Definition at line 53 of file git_commit_pane_base.h.
Referenced by GIT_COMMIT_PANE_BASE(), GIT_COMMIT_PANE::layoutWide(), and GIT_COMMIT_PANE::updateMessageVisibility().
|
private |
m_transfer's hold on the repository, so every other pane on it follows and can cancel it
Definition at line 328 of file git_commit_pane.h.
Referenced by deferForSecret(), othersBusy(), othersCanCancel(), othersStatus(), setBusy(), startPull(), startPush(), and ~GIT_COMMIT_PANE().
|
protectedinherited |
Definition at line 68 of file git_commit_pane_base.h.
Referenced by GIT_COMMIT_PANE::GIT_COMMIT_PANE(), GIT_COMMIT_PANE_BASE(), GIT_COMMIT_PANE::OnGitTransfersChanged(), GIT_COMMIT_PANE::onPull(), GIT_COMMIT_PANE::setBusy(), and GIT_COMMIT_PANE::updateCommitButton().
|
protectedinherited |
Definition at line 48 of file git_commit_pane_base.h.
Referenced by GIT_COMMIT_PANE::GIT_COMMIT_PANE(), GIT_COMMIT_PANE_BASE(), GIT_COMMIT_PANE::layoutWide(), GIT_COMMIT_PANE::onRecentMessage(), GIT_COMMIT_PANE::populateRecentMessages(), GIT_COMMIT_PANE::setBusy(), and GIT_COMMIT_PANE::updateMessageVisibility().
|
private |
The full messages behind the Recent messages dropdown, in its order after the caption.
Definition at line 305 of file git_commit_pane.h.
Referenced by onRecentMessage(), populateRecentMessages(), and updateMessageVisibility().
|
private |
Coalesce refreshes while a repository read is running, and discard stale results.
Definition at line 384 of file git_commit_pane.h.
Referenced by onIdle(), RefreshFileList(), syncListener(), and ~GIT_COMMIT_PANE().
|
protectedinherited |
Definition at line 49 of file git_commit_pane_base.h.
Referenced by GIT_COMMIT_PANE::applyTheme(), GIT_COMMIT_PANE::GIT_COMMIT_PANE(), GIT_COMMIT_PANE_BASE(), GIT_COMMIT_PANE::populateBranches(), and GIT_COMMIT_PANE::showDisabledState().
|
protectedinherited |
Definition at line 60 of file git_commit_pane_base.h.
Referenced by GIT_COMMIT_PANE::GIT_COMMIT_PANE(), GIT_COMMIT_PANE_BASE(), and GIT_COMMIT_PANE::updateSummary().
|
private |
The busy state shows another window's transfer, which this pane releases when the last one ends.
Definition at line 334 of file git_commit_pane.h.
Referenced by OnGitTransfersChanged(), and setBusy().
|
private |
Paths shown in the list at the last refresh, so a refresh can tell which files the user deliberately unticked from files that are simply new, and preserve those unticks.
Definition at line 361 of file git_commit_pane.h.
Referenced by applyStatus(), showDisabledState(), syncListener(), updateCommitButton(), and updateSummary().
|
protectedinherited |
Definition at line 55 of file git_commit_pane_base.h.
Referenced by GIT_COMMIT_PANE::doCommit(), GIT_COMMIT_PANE_BASE(), GIT_COMMIT_PANE::setBusy(), and GIT_COMMIT_PANE::updateMessageVisibility().
|
private |
Unwrapped status text, kept so it can be re-wrapped on resize.
Definition at line 341 of file git_commit_pane.h.
Referenced by layoutAndWrapStatus(), and setStatusText().
|
private |
The width the status text was last wrapped to, so a layout re-wraps it only when that changes.
Definition at line 344 of file git_commit_pane.h.
Referenced by layoutAndWrapStatus(), and setStatusText().
|
protectedinherited |
Definition at line 50 of file git_commit_pane_base.h.
Referenced by GIT_COMMIT_PANE::BeginAmend(), GIT_COMMIT_PANE::doCommit(), GIT_COMMIT_PANE::finishCommit(), GIT_COMMIT_PANE::GetCommitMessage(), GIT_COMMIT_PANE::GIT_COMMIT_PANE(), GIT_COMMIT_PANE_BASE(), GIT_COMMIT_PANE::onRecentMessage(), GIT_COMMIT_PANE::setBusy(), GIT_COMMIT_PANE::SetCommitMessage(), GIT_COMMIT_PANE::updateCommitButton(), GIT_COMMIT_PANE::updateMessageVisibility(), and GIT_COMMIT_PANE::updateSummaryCount().
|
private |
Definition at line 377 of file git_commit_pane.h.
Referenced by applyTheme(), layoutWide(), and updateSummary().
|
protectedinherited |
Definition at line 51 of file git_commit_pane_base.h.
Referenced by GIT_COMMIT_PANE::GIT_COMMIT_PANE(), GIT_COMMIT_PANE_BASE(), and GIT_COMMIT_PANE::updateSummaryCount().
|
private |
Definition at line 376 of file git_commit_pane.h.
Referenced by layoutWide(), RefreshFileList(), and updateSummary().
|
private |
Definition at line 378 of file git_commit_pane.h.
Referenced by applyTheme(), layoutWide(), and updateSummary().
|
private |
The push or pull this panel submitted last.
Definition at line 315 of file git_commit_pane.h.
Referenced by applyStatus(), deferForSecret(), doCommit(), onChecklistContextMenu(), OnGitTransfersChanged(), onIdle(), onPull(), onPullDone(), onPushDone(), onUndoCommit(), runActionQuery(), startPull(), startPush(), transferCanStart(), and updateCommitButton().
|
private |
Follows the transfers other windows run on this pane's repository.
Definition at line 331 of file git_commit_pane.h.
Referenced by syncListener(), and ~GIT_COMMIT_PANE().
|
private |
The status m_transfer began with, shown again once other windows' transfers end before it.
Definition at line 325 of file git_commit_pane.h.
Referenced by OnGitTransfersChanged(), startPull(), and startPush().
|
protectedinherited |
Definition at line 63 of file git_commit_pane_base.h.
Referenced by GIT_COMMIT_PANE::GIT_COMMIT_PANE(), GIT_COMMIT_PANE_BASE(), and GIT_COMMIT_PANE::showTrustCommand().
|
protectedinherited |
Definition at line 62 of file git_commit_pane_base.h.
Referenced by GIT_COMMIT_PANE_BASE(), GIT_COMMIT_PANE::layoutWide(), and GIT_COMMIT_PANE::showTrustCommand().
|
protectedinherited |
Definition at line 65 of file git_commit_pane_base.h.
Referenced by GIT_COMMIT_PANE::applyStatus(), GIT_COMMIT_PANE::GIT_COMMIT_PANE(), GIT_COMMIT_PANE_BASE(), GIT_COMMIT_PANE::layoutWide(), GIT_COMMIT_PANE::setBusy(), and GIT_COMMIT_PANE::showDisabledState().
|
private |
The branch and commit the last refresh showed, so Undo takes back only the commit the user saw.
Definition at line 296 of file git_commit_pane.h.
Referenced by applyStatus(), onUndoCommit(), showDisabledState(), and syncListener().
|
private |
Commits waiting to be pushed, or 0 when the branch has no upstream to count them against.
Definition at line 267 of file git_commit_pane.h.
Referenced by applyStatus(), showDisabledState(), and updateCommitButton().
|
private |
Commits the upstream has that this project does not, which Get Changes brings in.
Definition at line 278 of file git_commit_pane.h.
Referenced by applyStatus(), GIT_COMMIT_PANE(), showDisabledState(), and updateCommitButton().