Make showing commit message body in the revision graph optional #9301

jwfx · 2021-06-18T21:42:43Z

Original code by @FodderMK

Fixes #9298

Proposed changes

Read revision graph configuration option that was previously removed
Enabled by default as it currently is without the option

Screenshots

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

jwfx · 2021-06-18T21:54:25Z

Hm, not sure what to make of that AppVeyor build break. Could use some guidance on what is missing here.

pmiossec · 2021-06-18T22:20:51Z

Hm, not sure what to make of that AppVeyor build break. Could use some guidance on what is missing here.

The translation file is not good.
In the build log,you have the link to follow to get the command to run to fix it: https://github.com/gitextensions/gitextensions/wiki/Translations

gerhardol · 2021-06-18T23:21:38Z

GitUI/UserControls/RevisionGrid/RevisionGridMenuCommands.cs

+                new MenuCommand
+                {
+                    Name = "showMultiLineCommitMessagesToolStripMenuItem",
+                    Text = "Show multi-line commit messages",


Suggested change

Text = "Show multi-line commit messages",

Text = "Show commit body",

@pmiossec If this would also be ok for you, I will also change all the related variables, etc.

I will also change all the related variables, etc.

Yes, please. For AppSettings, I prefer to be even more specific (and to use Delphi-case for the new setting):
"showmultilinecommitmessages" --> "ShowCommitBodyInRevisionGrid"

Should probably be clearer...

Suggested change

Text = "Show multi-line commit messages",

Text = "Show commit message body",

mstv

LGTM

mstv · 2021-06-20T10:22:21Z

GitUI/UserControls/RevisionGrid/RevisionGridMenuCommands.cs

+                new MenuCommand
+                {
+                    Name = "showMultiLineCommitMessagesToolStripMenuItem",
+                    Text = "Show multi-line commit messages",


I will also change all the related variables, etc.

Yes, please. For AppSettings, I prefer to be even more specific (and to use Delphi-case for the new setting):
"showmultilinecommitmessages" --> "ShowCommitBodyInRevisionGrid"

gerhardol

Probably OK, one question.
Need to be rebased.
Have not run.

gerhardol · 2021-06-20T13:42:09Z

GitUI/CommandsDialogs/FormBrowse.cs

@@ -849,7 +849,7 @@ private void RefreshSelection()
            FillCommitInfo(selectedRevision);

            // If the revision's body has been updated then the grid needs to be refreshed to display it
-            if (selectedRevision is not null && selectedRevision.HasMultiLineMessage && oldBody != selectedRevision.Body)
+            if (AppSettings.ShowCommitBodyInRevisionGrid && selectedRevision is not null && selectedRevision.HasMultiLineMessage && oldBody != selectedRevision.Body)


Is this correct when toggling the option?

I also applied this from the original commit, but I think it is wrong.
Even if the option is disabled, the grid should be refreshed to display the multi-line indicator in case someone changed a commit message from single to multi-line, e.g. during amend.
This should probably be removed unless I'm wrong about the mechanics.

I think it is correct. The comment above explains why.
[Toggle]ShowCommitBodyInRevisionGrid() calls RevisionGridControl.Refresh().

@FodderMK

…graph Original code by @FodderMK

…g to feedback

jwfx · 2021-06-20T14:19:07Z

Need to be rebased.

Done

GitCommands/Settings/AppSettings.cs

GitUI/UserControls/RevisionGrid/RevisionGridControl.cs

mstv · 2021-06-20T16:12:46Z

GitUI/CommandsDialogs/FormBrowse.cs

@@ -849,7 +849,7 @@ private void RefreshSelection()
            FillCommitInfo(selectedRevision);

            // If the revision's body has been updated then the grid needs to be refreshed to display it
-            if (selectedRevision is not null && selectedRevision.HasMultiLineMessage && oldBody != selectedRevision.Body)
+            if (AppSettings.ShowCommitBodyInRevisionGrid && selectedRevision is not null && selectedRevision.HasMultiLineMessage && oldBody != selectedRevision.Body)


I think it is correct. The comment above explains why.
[Toggle]ShowCommitBodyInRevisionGrid() calls RevisionGridControl.Refresh().

Co-authored-by: Michael Seibt <36601201+mstv@users.noreply.github.com>

…ToggleShowCommitBodyInRevisionGrid

mstv

LGTM, have not run

mstv · 2021-06-21T19:46:28Z

Thank you

nickb-carallon · 2021-07-13T08:54:11Z

Can this be cherry picked to the 3.5 branch? It seems like a minor change and I think there are quite a few people (inc. myself) who would really like to see it included in 3.5.2.

…xtensions#9301) (cherry picked from commit 2c32e7e)

mstv · 2021-07-13T20:37:41Z

#9374, @nickb-carallon

ghost assigned jwfx Jun 18, 2021

gerhardol reviewed Jun 18, 2021

View reviewed changes

mstv reviewed Jun 20, 2021

View reviewed changes

gerhardol reviewed Jun 20, 2021

View reviewed changes

jwfx added 2 commits June 20, 2021 15:46

Added support for showing multi-line commit messages in the revision …

dca11c3

…graph Original code by @FodderMK

Update naming of menu item and related variables and methods accordin…

8cb54db

…g to feedback

jwfx force-pushed the 9298-option-disable-multi-line branch from 56c86b8 to 8cb54db Compare June 20, 2021 14:08

mstv reviewed Jun 20, 2021

View reviewed changes

jwfx and others added 3 commits June 20, 2021 19:40

Update GitCommands/Settings/AppSettings.cs

f4208ba

Co-authored-by: Michael Seibt <36601201+mstv@users.noreply.github.com>

Update GitUI/UserControls/RevisionGrid/RevisionGridControl.cs

947e899

Co-authored-by: Michael Seibt <36601201+mstv@users.noreply.github.com>

Missing part of the requested change ShowCommitBodyInRevisionGrid => …

2417350

…ToggleShowCommitBodyInRevisionGrid

mstv approved these changes Jun 20, 2021

View reviewed changes

mstv added the 🖊️ status: cla signed label Jun 20, 2021

RussKie approved these changes Jun 20, 2021

View reviewed changes

mstv changed the title ~~Added support for showing multi-line commit messages in the revision graph~~ Make showing commit message body in the revision graph optional Jun 21, 2021

mstv merged commit 2c32e7e into gitextensions:master Jun 21, 2021

ghost added this to the 3.6 milestone Jun 21, 2021

pmiossec mentioned this pull request Jun 25, 2021

Added support for showing multi-line commit messages in the revision graph #8371

Merged

mstv added a commit to mstv/gitextensions that referenced this pull request Jul 13, 2021

Make showing commit message body in the revision graph optional (gite…

64d8ca3

…xtensions#9301) (cherry picked from commit 2c32e7e)

mstv mentioned this pull request Jul 13, 2021

Make showing commit message body in the revision graph optional #9374

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Make showing commit message body in the revision graph optional #9301

Make showing commit message body in the revision graph optional #9301

jwfx commented Jun 18, 2021 •

edited by mstv

jwfx commented Jun 18, 2021

pmiossec commented Jun 18, 2021

gerhardol Jun 18, 2021

jwfx Jun 19, 2021

mstv Jun 20, 2021

gerhardol Jun 20, 2021

mstv left a comment

mstv Jun 20, 2021

gerhardol left a comment

gerhardol Jun 20, 2021

jwfx Jun 20, 2021

mstv Jun 20, 2021

jwfx commented Jun 20, 2021

mstv Jun 20, 2021

mstv left a comment

mstv commented Jun 21, 2021

nickb-carallon commented Jul 13, 2021

mstv commented Jul 13, 2021

	Text = "Show multi-line commit messages",
	Text = "Show commit body",

	Text = "Show multi-line commit messages",
	Text = "Show commit message body",

Make showing commit message body in the revision graph optional #9301

Make showing commit message body in the revision graph optional #9301

Conversation

jwfx commented Jun 18, 2021 • edited by mstv

Proposed changes

Screenshots

jwfx commented Jun 18, 2021

pmiossec commented Jun 18, 2021

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

mstv left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

gerhardol left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

jwfx commented Jun 20, 2021

Choose a reason for hiding this comment

mstv left a comment

Choose a reason for hiding this comment

mstv commented Jun 21, 2021

nickb-carallon commented Jul 13, 2021

mstv commented Jul 13, 2021

jwfx commented Jun 18, 2021 •

edited by mstv