# [PATCH] gitk: Fix missing commits when using -S or -G 6 messages from 2016-05-06 to 2016-12-12. Participants: Stefan Dotterweich, Paul Mackerras. Thread: https://gitlist.dev/t/42237 ## Stefan Dotterweich, 2016-05-06 11:56 Subject: [PATCH] gitk: Fix missing commits when using -S or -G Message-ID: <572C8665.8090707@gmx.de> URL: https://gitlist.dev/e/572C8665.8090707%40gmx.de ``` When -S or -G is used as a filter option, the resulting commit list rarely contains all matching commits. Only a certain number of commits are displayed and the rest are missing. "git log --boundary -S" does not return as many boundary commits as you might expect. gitk makes up for this in closevargs() by adding missing parent (boundary) commits. However, it does not change $numcommits, which limits how many commits are shown. In the end, some commits at the end of the commit list are simply not shown. Change $numcommits whenever a missing parent is added. Signed-off-by: Stefan Dotterweich --- gitk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gitk b/gitk index 805a1c7..b0da174 100755 --- a/gitk +++ b/gitk @@ -1315,7 +1315,7 @@ proc commitonrow {row} { proc closevarcs {v} { global varctok varccommits varcid parents children - global cmitlisted commitidx vtokmod + global cmitlisted commitidx vtokmod numcommits set missing_parents 0 set scripts {} @@ -1339,7 +1339,7 @@ proc closevarcs {v} { modify_arc $v $b } lappend varccommits($v,$b) $p - incr commitidx($v) + set numcommits [incr commitidx($v)] set scripts [check_interest $p $scripts] } } -- 2.7.4 ``` ## Stefan Dotterweich, 2016-05-06 12:16 Subject: Re: [PATCH v2] gitk: Fix missing commits when using -S or -G Message-ID: <572C8B36.2000106@gmx.de> URL: https://gitlist.dev/e/572C8B36.2000106%40gmx.de In-Reply-To: <572C8665.8090707@gmx.de> ``` When -S or -G is used as a filter option, the resulting commit list rarely contains all matching commits. Only a certain number of commits are displayed and the rest are missing. "git log --boundary -S" does not return as many boundary commits as you might expect. gitk makes up for this in closevargs() by adding missing parent (boundary) commits. However, it does not change $numcommits, which limits how many commits are shown. In the end, some commits at the end of the commit list are simply not shown. Change $numcommits whenever a missing parent is added. Signed-off-by: Stefan Dotterweich --- gitk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gitk b/gitk index 805a1c7..b0da174 100755 --- a/gitk +++ b/gitk @@ -1315,7 +1315,7 @@ proc commitonrow {row} { proc closevarcs {v} { global varctok varccommits varcid parents children - global cmitlisted commitidx vtokmod + global cmitlisted commitidx vtokmod numcommits set missing_parents 0 set scripts {} @@ -1339,7 +1339,7 @@ proc closevarcs {v} { modify_arc $v $b } lappend varccommits($v,$b) $p - incr commitidx($v) + set numcommits [incr commitidx($v)] set scripts [check_interest $p $scripts] } } -- 2.7.4 ``` ## Paul Mackerras, 2016-05-09 03:45 Subject: Re: [PATCH v2] gitk: Fix missing commits when using -S or -G Message-ID: <20160509034519.GC12515@fergus.ozlabs.ibm.com> URL: https://gitlist.dev/e/20160509034519.GC12515%40fergus.ozlabs.ibm.com In-Reply-To: <572C8B36.2000106@gmx.de> ``` On Fri, May 06, 2016 at 02:16:54PM +0200, Stefan Dotterweich wrote: > When -S or -G is used as a filter option, the resulting commit list > rarely contains all matching commits. Only a certain number of commits > are displayed and the rest are missing. > > "git log --boundary -S" does not return as many boundary commits as you > might expect. gitk makes up for this in closevargs() by adding missing > parent (boundary) commits. However, it does not change $numcommits, > which limits how many commits are shown. In the end, some commits at the > end of the commit list are simply not shown. > > Change $numcommits whenever a missing parent is added. Nice catch; however, we should only update numcommits if the commits are for the current view, i.e. if $v == $curview. Do you want to update the patch? If you prefer, I can update the patch and put a note in the commit message about the issue. Paul. ``` ## Stefan Dotterweich, 2016-05-09 05:33 Subject: Re: [PATCH v2] gitk: Fix missing commits when using -S or -G Message-ID: URL: https://gitlist.dev/e/fea42c3e-a028-3204-690f-88843d31c264%40gmx.de In-Reply-To: <20160509034519.GC12515@fergus.ozlabs.ibm.com> ``` > Nice catch; however, we should only update numcommits if the commits > are for the current view, i.e. if $v == $curview. > > Do you want to update the patch? If you prefer, I can update the > patch and put a note in the commit message about the issue. Sure, feel free to update the patch as you see fit. ``` ## Stefan Dotterweich, 2016-06-04 08:47 Subject: [PATCH v3] gitk: Fix missing commits when using -S or -G Message-ID: <1f857709-3c47-d4a1-b858-3288347416f8@gmx.de> URL: https://gitlist.dev/e/1f857709-3c47-d4a1-b858-3288347416f8%40gmx.de In-Reply-To: ``` When -S or -G is used as a filter option, the resulting commit list rarely contains all matching commits. Only a certain number of commits are displayed and the rest are missing. "git log --boundary -S" does not return as many boundary commits as you might expect. gitk makes up for this in closevargs() by adding missing parent (boundary) commits. However, it does not change $numcommits, which limits how many commits are shown. In the end, some commits at the end of the commit list are simply not shown. Change $numcommits whenever a missing parent is added. Signed-off-by: Stefan Dotterweich --- Here is an updated version of the patch. Feel free to change it if anything is missing. gitk-git/gitk | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gitk-git/gitk b/gitk-git/gitk index 805a1c7..572da4a 100755 --- a/gitk-git/gitk +++ b/gitk-git/gitk @@ -1315,7 +1315,7 @@ proc commitonrow {row} { proc closevarcs {v} { global varctok varccommits varcid parents children - global cmitlisted commitidx vtokmod + global cmitlisted commitidx vtokmod curview numcommits set missing_parents 0 set scripts {} @@ -1340,6 +1340,9 @@ proc closevarcs {v} { } lappend varccommits($v,$b) $p incr commitidx($v) + if {$v == $curview} { + set numcommits $commitidx($v) + } set scripts [check_interest $p $scripts] } } -- 2.8.0 ``` ## Paul Mackerras, 2016-12-12 00:39 Subject: Re: [PATCH v3] gitk: Fix missing commits when using -S or -G Message-ID: <20161212003919.GE18316@fergus.ozlabs.ibm.com> URL: https://gitlist.dev/e/20161212003919.GE18316%40fergus.ozlabs.ibm.com In-Reply-To: <1f857709-3c47-d4a1-b858-3288347416f8@gmx.de> ``` On Sat, Jun 04, 2016 at 10:47:16AM +0200, Stefan Dotterweich wrote: > When -S or -G is used as a filter option, the resulting commit list > rarely contains all matching commits. Only a certain number of commits > are displayed and the rest are missing. > > "git log --boundary -S" does not return as many boundary commits as you > might expect. gitk makes up for this in closevargs() by adding missing > parent (boundary) commits. However, it does not change $numcommits, > which limits how many commits are shown. In the end, some commits at the > end of the commit list are simply not shown. > > Change $numcommits whenever a missing parent is added. > > Signed-off-by: Stefan Dotterweich Thanks, applied, with slight tweaks to the commit message. Paul. ```