search

Sertion / vscode-gitblame

Visual Studio Code Extension - See Git Blame info in status bar.
https://marketplace.visualstudio.com/items/waderyan.gitblame
MIT License
72 stars 31 forks source link

Git blame status bar info disappears on 7.0.2 #102

Closed smcdef closed 3 years ago

smcdef commented 3 years ago

Description

After upgrading to 7.0.2, the git blame in VSCode status bar disappears on my repositories.

I tried quitting and restarting VSCode, disabling/enabling, and uninstalling/reinstalling the extension.

6.0.2 image

7.0.2 image

Info

VSCode version: 1.56.0 (Universal) MacOS version: 11.3.1 macOS Big Sur Git version: git version 2.11.0

It is because the following setting does not work.

"gitblame.statusBarMessageFormat": "${commit.summary} ( ${time.ago} )"

${commit.hash} works. But ${commit.summary} does not work.

geneaiello commented 3 years ago

ditto

Sertion commented 3 years ago

Hey smcdef and Gene! I am unable to recreate this issue.

Is anyone of you able to upload some of the output from the following command?

git blame --incremental -- ./filename

(replace ./filename with the path to a file in the repository)

If possible to run the command on this repository that would allow you to post it without any retractions.

It should look something like this: rollup.config.js.porcelain

geneaiello commented 3 years ago

Here is a sample…

If I click on the “blame” on the bottom, Nothing displays. I used to get a little popup on the right.

-- Gene

From: Albin Jacobsson @.> Reply-To: Sertion/vscode-gitblame @.> Date: Monday, May 10, 2021 at 10:48 AM To: Sertion/vscode-gitblame @.> Cc: Gene Aiello @.>, Comment @.***> Subject: Re: [Sertion/vscode-gitblame] Git blame status bar info disappears on 7.0.2 (#102)

Hey smcdef and Gene! I am unable to recreate this issue.

Is anyone of you able to upload some of the output from the following command?

git blame --incremental -- ./filename

If possible to run the command on this repository that would allow you to post it without any retractions.

It should look something like this: rollup.config.js.porcelainhttps://nam12.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgithub.com%2FSertion%2Fvscode-gitblame%2Ffiles%2F6453328%2Frollup.config.js.porcelain.txt&data=04%7C01%7Cgaiello%40discoveryed.com%7C35f2e75fed674d2a511408d913cb1803%7C66486439753949e59b1f3856579dae67%7C0%7C0%7C637562585280560112%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&sdata=kQ%2Ft93mEV2%2BCcP3uV7bgujq0o4NLMWLlecxkRxiIR8I%3D&reserved=0

— You are receiving this because you commented. Reply to this email directly, view it on GitHubhttps://nam12.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgithub.com%2FSertion%2Fvscode-gitblame%2Fissues%2F102%23issuecomment-836865692&data=04%7C01%7Cgaiello%40discoveryed.com%7C35f2e75fed674d2a511408d913cb1803%7C66486439753949e59b1f3856579dae67%7C0%7C0%7C637562585280570110%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&sdata=WEke5EYlKGDNxmqWWGk5O4fWcHleMh82aNu5ooAeZoA%3D&reserved=0, or unsubscribehttps://nam12.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgithub.com%2Fnotifications%2Funsubscribe-auth%2FAOH2NAFXN7N4MZHDMMMU6KDTM755ZANCNFSM44QEYOVQ&data=04%7C01%7Cgaiello%40discoveryed.com%7C35f2e75fed674d2a511408d913cb1803%7C66486439753949e59b1f3856579dae67%7C0%7C0%7C637562585280570110%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&sdata=Yl9H4%2BEldnaSuCawke5lkpcu6QF7PIfnxwDI7%2BGNbnc%3D&reserved=0.

(3.7.10) @. controllers]$ git blame --incremental -- ./promo.py cffeb3d7cb44111338776a1d62188ae463b926ba 11 11 1 author pdisessa author-mail @.> author-time 1594822180 author-tz -0500 committer pdisessa committer-mail @.> committer-time 1594822180 committer-tz -0500 summary DEX-1919 previous 45bcc2c3c48653e88074dde5ac67c92f19ba04c2 promo_api/controllers/promo.py filename promo_api/controllers/promo.py 755e17a9a91779f0f6b5f083f7da408e05ab80b9 122 14 15 author Gene Aiello author-mail @.> author-time 1589379061 author-tz -0500 committer Gene Aiello committer-mail @.> committer-time 1589379061 committer-tz -0500 summary DEX-1661-adding the ability to archive a PromoAsset previous ae70bacd6995bd7fd4c66d33f703e660cf8fcd29 promo_api/controllers/promo.py filename promo_api/controllers/promo.py 71b28cf6578dc2da8bcc840fbdd0e4a2fc6b687f 104 9 1 author Gene Aiello author-mail @.> author-time 1588974942 author-tz -0500 committer Gene Aiello committer-mail @.> committer-time 1588974942 committer-tz -0500 summary DEX-1626-adding Edit functionality for PromoAssets, also updated the routes and allow for a Type and Status to be set previous 7cbd618ef72bdc0ff5b6830fbcdf8aaf2d5cff35 promo_api/controllers/promo.py filename promo_api/controllers/promo.py d384d9a880552fdc4a1a0d25afe6350705cf9739 10 8 1 author Gene Aiello author-mail @.> author-time 1585927686 author-tz -0500 committer Gene Aiello committer-mail @.> committer-time 1585927686 committer-tz -0500 summary DEX-1466-adding tests previous cf80f16874de0071b0c1399ae0208a6237225bae promo_api/controllers/promo.py filename promo_api/controllers/promo.py cf80f16874de0071b0c1399ae0208a6237225bae 3 1 2 author Gene Aiello author-mail @.> author-time 1585839326 author-tz -0500 committer Gene Aiello committer-mail @.***> committer-time 1585839326 committer-tz -0500 summary DEX-1466-today's progress filename promo_api/controllers/promo.py cf80f16874de0071b0c1399ae0208a6237225bae 5 3 5 filename promo_api/controllers/promo.py cf80f16874de0071b0c1399ae0208a6237225bae 57 10 1 filename promo_api/controllers/promo.py cf80f16874de0071b0c1399ae0208a6237225bae 59 12 2 filename promo_api/controllers/promo.py

Sertion commented 3 years ago

Thank you Gene. That helped a lot. I have found the issues and patched them. A new version (7.0.4) should be available for download soon.

geneaiello commented 3 years ago

Thank you… works now!

-- Gene

From: Albin Jacobsson @.> Reply-To: Sertion/vscode-gitblame @.> Date: Monday, May 10, 2021 at 3:24 PM To: Sertion/vscode-gitblame @.> Cc: Gene Aiello @.>, Comment @.***> Subject: Re: [Sertion/vscode-gitblame] Git blame status bar info disappears on 7.0.2 (#102)

Thank you Gene. That helped a lot. I have found the issues and patched them. A new version (7.0.4) should be available for download soon.

— You are receiving this because you commented. Reply to this email directly, view it on GitHubhttps://nam12.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgithub.com%2FSertion%2Fvscode-gitblame%2Fissues%2F102%23issuecomment-837280651&data=04%7C01%7Cgaiello%40discoveryed.com%7C48ae5c11b98447235e1708d913f19c66%7C66486439753949e59b1f3856579dae67%7C0%7C0%7C637562750695613913%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&sdata=9ps9luHaDgfAdVD%2FpdbcO%2BTprBsA2GtM2jQryn9MxHM%3D&reserved=0, or unsubscribehttps://nam12.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgithub.com%2Fnotifications%2Funsubscribe-auth%2FAOH2NABKNEHVILNMU5YNWCLTNA6HXANCNFSM44QEYOVQ&data=04%7C01%7Cgaiello%40discoveryed.com%7C48ae5c11b98447235e1708d913f19c66%7C66486439753949e59b1f3856579dae67%7C0%7C0%7C637562750695623905%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&sdata=XHEL216yGSE4Z2MDhSK1IU9G09H%2Bo6Lm9UZ370mGQYs%3D&reserved=0.

smcdef commented 3 years ago

Thank you Gene. That helped a lot. I have found the issues and patched them. A new version (7.0.4) should be available for download soon.

Hi,

I still have the issue on 7.0.4. It can work on some lines. But some lines do not work.

Line 3751 works. image

Line 3752 does not work. image

Sertion commented 3 years ago

Hey again smcdef. That is very weird.

Could you run the following command on the file and check if you get one or two commits back?

git blame -L 3751,3752 --incremental -- .\filename

Please add the -w flag before -L if you have enabled gitblame.ignoreWhitespace.

Could you also check that the summary for the commit spanning 3752 isn't extremely long? Sometimes the message can hide when it no longer can fit.

smcdef commented 3 years ago

Hey again smcdef. That is very weird.

Could you run the following command on the file and check if you get one or two commits back?

git blame -L 3751,3752 --incremental -- .\filename
git blame -L 3751,3752 --incremental -- mm/memory.c

output:

fadae2953072e9005c5f1d64e1049edb043494dc 3403 3751 1
author Yang Shi
author-mail <yang.shi@linux.alibaba.com>
author-time 1534545895
author-tz -0700
committer Linus Torvalds
committer-mail <torvalds@linux-foundation.org>
committer-time 1534548028
committer-tz -0700
summary thp: use mm_file_counter to determine update which rss counter
previous 720e14ebec642bc56c44e5e60a2d595900e5bbf0 mm/memory.c
filename mm/memory.c
1010245964415bb7403463115bab2cd26244b445 2963 3752 1
author Kirill A. Shutemov
author-mail <kirill.shutemov@linux.intel.com>
author-time 1469571929
author-tz -0700
committer Linus Torvalds
committer-mail <torvalds@linux-foundation.org>
committer-time 1469575159
committer-tz -0700
summary mm: introduce do_set_pmd()
previous dd78fedde4b99b322f2dc849d467d365a82e23ca mm/memory.c
filename mm/memory.c

Please add the -w flag before -L if you have enabled gitblame.ignoreWhitespace.

Could you also check that the summary for the commit spanning 3752 isn't extremely long? Sometimes the message can hide when it no longer can fit.

The commit of line 3751 is here.

The commit of line 3752 is here.

Sertion commented 3 years ago

I believe I have found the issue and a fix. 7.0.5 is uploaded to the marketplace.

smcdef commented 3 years ago

I believe I have found the issue and a fix. 7.0.5 is uploaded to the marketplace.

Good job. Thanks.

smcdef commented 3 years ago

I believe I have found the issue and a fix. 7.0.5 is uploaded to the marketplace.

Hi Sertion,

I found another issue on v7.0.5.

image

The time is not correct and status bar didn't show commit title.

git blame -L 548,+1 --incremental -- mm/list_lru.c

output:

60d3fd32a7a9da4c8c93a9f89cfda22a0b4c65ce 454 548 1
author Vladimir Davydov
author-mail <vdavydov.dev@gmail.com>
author-time 1423781950
author-tz -0800
committer Linus Torvalds
committer-mail <torvalds@linux-foundation.org>
committer-time 1423796049
committer-tz -0800
summary list_lru: introduce per-memcg lists
previous c0a5b560938a0f2fd2fbf66ddc446c7c2b41383a mm/list_lru.c
filename mm/list_lru.c

The commit is here.

Sertion commented 3 years ago

This issue I am not able to recreate. I have added a few tests to possibly capture the issue, but they passed both locally and in the runner. Sadly I am unable to checkout the Linux kernel repository as I use Windows and there seems to be some issue with filenames(?).

I will look into adding a few more tests verifying that the chunkParser does what it should later.

smcdef commented 3 years ago

This issue I am not able to recreate. I have added a few tests to possibly capture the issue, but they passed both locally and in the runner. Sadly I am unable to checkout the Linux kernel repository as I use Windows and there seems to be some issue with filenames(?).

Yeah. Windows cannot create some special files. But we can use "git add ." and "git commit" to force a clean environment.

I will look into adding a few more tests verifying that the chunkParser does what it should later.

I've tested version v6.0.2. It works well. Maybe it can help you.

Sertion commented 3 years ago

It took a while but I have found the issue and been able to recreate it consistently.

Sertion commented 3 years ago

I have found a workaround, uploaded a new version, and added a test to not fall into that edge case again. Thank you very much for reporting the issues and for being patient.