DeleteRemote: Add an option to delete a local tracking branch #11661

pmiossec · 2024-03-28T12:54:14Z

at the same time than a remote

Part of #11640 ( Following discussion)

Screenshots

Before

After

When remote deleted successfully, local branch delete form opened automatically with good branch(es) selected:

Test methodology

Manual

Test environment(s)

Git Extensions 33.33.33
Build fe059f5db67923fbb93efe2115223b97129e161d (Dirty)
Git 2.44.0.windows.1
Microsoft Windows NT 10.0.22631.0
.NET 8.0.1
DPI 96dpi (no scaling)
Portable: False
Microsoft.WindowsDesktop.App Versions

    Microsoft.WindowsDesktop.App 6.0.26 [C:\Program Files\dotnet\shared\Microsoft.WindowsDesktop.App]
    Microsoft.WindowsDesktop.App 7.0.15 [C:\Program Files\dotnet\shared\Microsoft.WindowsDesktop.App]
    Microsoft.WindowsDesktop.App 8.0.1 [C:\Program Files\dotnet\shared\Microsoft.WindowsDesktop.App]

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.

RussKie

How would it work if a user were to select multiple remote branches?

RussKie · 2024-04-01T02:45:53Z

GitUI/CommandsDialogs/FormDeleteRemoteBranch.Designer.cs

+            DeleteLocalTrackingBranch.Name = "DeleteLocalTrackingBranch";
+            DeleteLocalTrackingBranch.Size = new Size(197, 19);
+            DeleteLocalTrackingBranch.TabIndex = 3;
+            DeleteLocalTrackingBranch.Text = "Delete also local tracking branch";


Suggested change

DeleteLocalTrackingBranch.Text = "Delete also local tracking branch";

DeleteLocalTrackingBranch.Text = "Delete local tracking branch (if available)";

GitUI/CommandsDialogs/FormDeleteRemoteBranch.cs

GitUI/UserControls/BranchComboBox.cs

gerhardol

+1
I would like to see the local tracked branch name when ticking the checkbox.
Partly to see if there is a local (you can see this in the sidepanel but not in the grid if the commit differs), partly to see if the name differs (often for me).
This would probably mean that the delete is only available for single selection.

I would probably want to delete the remote from the local instead.

Not run, but no comments on the code.

pmiossec · 2024-04-03T11:12:25Z

+1 I would like to see the local tracked branch name when ticking the checkbox. Partly to see if there is a local (you can see this in the sidepanel but not in the grid if the commit differs), partly to see if the name differs (often for me). This would probably mean that the delete is only available for single selection.

Done. Screenshot updated.

pmiossec · 2024-04-03T11:14:13Z

I would probably want to delete the remote from the local instead.

Make sense but maybe later 😉

…anch (gitextensions#11661) at the same time than a remote and display local tracking branches candidates to deletion Note: With the consequence that the logic that fix popup size has to be removed because no more compatible with a popup that could grow in size (due to a list of branches to display)

…anch (gitextensions#11661) at the same time than a remote and display local tracking branches candidates to deletion Note: With the consequence that the logic that fix popup size has to be removed because no more compatible with a popup that could grow in size (due to a list of branches to display) # Conflicts: # GitUI/UserControls/BranchComboBox.Designer.cs # GitUI/UserControls/BranchComboBox.cs

GitUI/UserControls/BranchComboBox.cs

RussKie

👍

GitUI/CommandsDialogs/FormDeleteRemoteBranch.cs

…anch (gitextensions#11661) at the same time than a remote and display local tracking branches candidates to deletion Note: With the consequence that the logic that fix popup size has to be removed because no more compatible with a popup that could grow in size (due to a list of branches to display)

pmiossec · 2024-04-08T16:10:52Z

@RussKie done.

RussKie

Thank you

…anch (gitextensions#11661) at the same time than a remote and display local tracking branches candidates to deletion Note: With the consequence that the logic that fix popup size has to be removed because no more compatible with a popup that could grow in size (due to a list of branches to display)

RussKie · 2024-04-19T04:15:56Z

Thank you

mstv · 2024-04-19T18:18:43Z

GitUI/CommandsDialogs/FormDeleteRemoteBranch.Designer.cs

+            DeleteLocalTrackingBranch.Name = "DeleteLocalTrackingBranch";
+            DeleteLocalTrackingBranch.Size = new Size(284, 19);
+            DeleteLocalTrackingBranch.TabIndex = 3;
+            DeleteLocalTrackingBranch.Text = "Delete local tracking branch (if available)";


It comes (too) late, but add a mnemonic yet, please, e.g.:

DeleteLocalTrackingBranch.Text = "Delete &local tracking branch (if available)";

* VS 2022 Preview keeps making these changes and they really seem to be unnecessary * Designer changes after saving FormGitIgnore * Fix FormGitIgnore form buttons DPI scaling * Add .idea to the default ignore pattern list (JetBrains Rider) * Update translation files to match Examples with default ignore patterns * Increase default FormGitIgnore form height * Enable vertical scrollbar for the examples section * Remove unused using * Add mnemonic as per #11661 (review) * Revert non-English translation changes

pmiossec mentioned this pull request Mar 28, 2024

Checkbox to delete associated remote branch #11640

Closed

pmiossec force-pushed the delete_local_branch_when_delete_remote branch from dcfaf72 to 799690f Compare March 29, 2024 09:43

RussKie reviewed Apr 1, 2024

View reviewed changes

gerhardol reviewed Apr 1, 2024

View reviewed changes

pmiossec force-pushed the delete_local_branch_when_delete_remote branch from 3d45620 to 6752297 Compare April 4, 2024 21:44

pmiossec force-pushed the delete_local_branch_when_delete_remote branch from 6752297 to 98d4254 Compare April 6, 2024 13:49

RussKie reviewed Apr 7, 2024

View reviewed changes

GitUI/UserControls/BranchComboBox.cs Outdated Show resolved Hide resolved

RussKie reviewed Apr 7, 2024

View reviewed changes

GitUI/CommandsDialogs/FormDeleteRemoteBranch.cs Outdated Show resolved Hide resolved

pmiossec force-pushed the delete_local_branch_when_delete_remote branch from 98d4254 to 976214d Compare April 8, 2024 16:10

RussKie approved these changes Apr 9, 2024

View reviewed changes

pmiossec force-pushed the delete_local_branch_when_delete_remote branch from 976214d to 7a5cece Compare April 10, 2024 07:48

pmiossec force-pushed the delete_local_branch_when_delete_remote branch from 7a5cece to 351d714 Compare April 11, 2024 07:26

RussKie merged commit c06f177 into gitextensions:master Apr 19, 2024

RussKie added this to the vNext milestone Apr 19, 2024

mstv reviewed Apr 19, 2024

View reviewed changes

mdonatas added a commit to mdonatas/gitextensions that referenced this pull request Apr 20, 2024

Add mnemonic as per gitextensions#11661 (review)

16012d8

mdonatas mentioned this pull request Apr 20, 2024

Update ignore patterns of FormGitIgnore; Fix DPI issues #11690

Merged

pmiossec deleted the delete_local_branch_when_delete_remote branch April 22, 2024 07:47

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

DeleteRemote: Add an option to delete a local tracking branch #11661

DeleteRemote: Add an option to delete a local tracking branch #11661

Uh oh!

pmiossec commented Mar 28, 2024 •

edited

Loading

Uh oh!

RussKie left a comment •

edited

Loading

Uh oh!

RussKie Apr 1, 2024

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

gerhardol left a comment

Uh oh!

pmiossec commented Apr 3, 2024

Uh oh!

pmiossec commented Apr 3, 2024

Uh oh!

Uh oh!

RussKie left a comment

Uh oh!

Uh oh!

pmiossec commented Apr 8, 2024

Uh oh!

RussKie left a comment

Uh oh!

RussKie commented Apr 19, 2024

Uh oh!

mstv Apr 19, 2024

Uh oh!

Uh oh!

	DeleteLocalTrackingBranch.Text = "Delete also local tracking branch";
	DeleteLocalTrackingBranch.Text = "Delete local tracking branch (if available)";

Uh oh!

DeleteRemote: Add an option to delete a local tracking branch #11661

DeleteRemote: Add an option to delete a local tracking branch #11661

Uh oh!

Conversation

pmiossec commented Mar 28, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Screenshots

Before

After

Test methodology

Test environment(s)

Merge strategy

Uh oh!

RussKie left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

RussKie Apr 1, 2024

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

gerhardol left a comment

Choose a reason for hiding this comment

Uh oh!

pmiossec commented Apr 3, 2024

Uh oh!

pmiossec commented Apr 3, 2024

Uh oh!

Uh oh!

RussKie left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

pmiossec commented Apr 8, 2024

Uh oh!

RussKie left a comment

Choose a reason for hiding this comment

Uh oh!

RussKie commented Apr 19, 2024

Uh oh!

mstv Apr 19, 2024

Choose a reason for hiding this comment

Uh oh!

Uh oh!

pmiossec commented Mar 28, 2024 •

edited

Loading

RussKie left a comment •

edited

Loading