Skip to content

Conversation

mstv
Copy link
Member

@mstv mstv commented Oct 15, 2024

Fixes #10375

Proposed changes

  • FormRenameBranch: Run git interactively instead of manually dealing with git output and silent tracing of exceptions
  • dialog remains open on error in order to be able to fixup the entered name

Screenshots

Before

nothing but an entry in the Git Command Log:

image

After

image

Test methodology

  • manual
  • adapt testcase

Merge strategy

I agree that the maintainer squash merge this PR (if the commit message is clear).


✒️ I contribute this code under The Developer Certificate of Origin.

@mstv mstv self-assigned this Oct 15, 2024
Copy link
Member

@gerhardol gerhardol left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Commit message is fix!, this changes the plugin interface

Have not run

@@ -51,22 +51,10 @@ private void OkClick(object sender, EventArgs e)
return;
}

try
{
string renameBranchResult = Module.RenameBranch(_oldName, newName);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would have preferred to use the return status from the command instead, and present the error text.
You hate error hiding, I dislike popups that are not needed
Not requiring a change

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I dislike popups that are not needed

The popup is transient if "Keep dialog open" is unticked and no error occurred.
(AD: The success output can be read in the Output History if the popup closes too fast. I.e. there is no need to "Keep dialog open" any longer. [FormProcess could even be merged into the Output History, i.e. less popups.])

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

(AD: The success output can be read in the Output History if the popup closes too fast. I.e. there is no need to "Keep dialog open" any longer. [FormProcess could even be merged into the Output History, i.e. less popups.])

Sidenote:
that is #10307 that I have approved and support, have used it even if I not have used it much.
I mostly use the popup to open/view PRs from BitBucket/GitHub urls and that is more easily available and I have not changed how I work.
It has not been high on my agenda though to convince RussKie there.

So also this could be better if I change the way I work.
Right now I am mostly neutral, not enthusiastic at this moment... (Take this literally, no understatement.)

@mstv mstv merged commit 1c12e70 into gitextensions:master Oct 18, 2024
4 checks passed
@mstv mstv deleted the fix/10375_eoe branch October 18, 2024 17:50
@RussKie RussKie added this to the 5.1 milestone Oct 29, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

ExternalOperationException from denied branch rename is swallowed
3 participants