search

hbons / SparkleShare

Share and collaborate by syncing with any Git repository instantly. Linux, macOS, and Windows.
https://sparkleshare.org
Other
4.88k stars 579 forks source link

EventLog adds prefixes to file entries in history view #1816

Closed glunardi closed 6 years ago

glunardi commented 6 years ago

In case different issue, eventLog display extra prefixes per entries in the history view (when no hyperlinks are visible) (related to #1814 possibly)

hbons commented 6 years ago

Noticed this too. #1813 was mean to fix a similar issue with the newest Git, but looks like it causes other problems. I'm rewriting and simplifying the log parsing right now.

hbons commented 6 years ago

Could you check if the branch fix/parse-git-log fixes it for you?

glunardi commented 6 years ago

Sadly it seems to misbehave quite a bit on F27 (corresponding git, git-parse, etc)...

None of the entries seem to render properly with fix/parse-git-log.

Window output looks like these screenshots:

With the fix/parse-git-log branch changes: with-fix-parse-git-log-branch

For reference, same logs (no one is working on the files right now), from master: from-master

glunardi commented 6 years ago

Please let me know if I can help test anything else. Stuck dealing with ffmpeg troubles right now before a trip tomorrow.

Thank you so much for all your awesome work here on SparkleShare :-)

hbons commented 6 years ago

Oh no! :( Which Git version are you using on F27?

You're very welcome. Thanks for reporting the bugs and testing. :)

hbons commented 6 years ago

This is weird because the hashes should no longer be anywhere in the parsed output. I moved to using git log --name-status which doesn't include them...

glunardi commented 6 years ago

Which Git version are you using on F27?

$ git --version git version 2.14.3

glunardi commented 6 years ago

Sample output of git log --name-status from one of our repos:

Nothing sensitive in the file names. You are right, there is no hashes here:


commit 8889f6f66f46e962822bf869xxxxxxxxxxxxxxx (HEAD -> master, origin/master, origin/HEAD)
Author: Axxxxx Mxxxxxxxxx <axxxxxx.mxxxxxxxx@collabora.co.uk>
Date:   Fri Feb 23 18:49:32 2018 -0300

    - ‘Branding/LIBREOFFICE/Collabora/Content.xml’
    - ‘Branding/LIBREOFFICE/Collabora/META-INF/manifest.xml’
    - ‘Branding/LIBREOFFICE/Collabora/Pictures/100000000000000800000008DD0ADA29.png’
    - ‘Branding/LIBREOFFICE/Collabora/Pictures/100000000000005E0000005E1885C8B6.png’
    - ‘Branding/LIBREOFFICE/Collabora/Pictures/100000000000005E0000005E1A713443.png’
    - ‘Branding/LIBREOFFICE/Collabora/Pictures/100000000000005E0000005E1CAF87CD.png’
    - ‘Branding/LIBREOFFICE/Collabora/Pictures/100000000000005E0000005E1CC1C341.png’
    - ‘Branding/LIBREOFFICE/Collabora/Pictures/100000000000005E0000005E2CA7F86A.png’
    - ‘Branding/LIBREOFFICE/Collabora/Pictures/100000000000005E0000005E47394922.png’
    - ‘Branding/LIBREOFFICE/Collabora/Pictures/100000000000005E0000005E4FF81E94.png’
    ...

D       Branding/LIBREOFFICE/Collabora/Content.xml
D       Branding/LIBREOFFICE/Collabora/META-INF/manifest.xml
D       Branding/LIBREOFFICE/Collabora/Pictures/100000000000000800000008DD0ADA29.png
D       Branding/LIBREOFFICE/Collabora/Pictures/100000000000005E0000005E1885C8B6.png
D       Branding/LIBREOFFICE/Collabora/Pictures/100000000000005E0000005E1A713443.png
D       Branding/LIBREOFFICE/Collabora/Pictures/100000000000005E0000005E1CAF87CD.png
D       Branding/LIBREOFFICE/Collabora/Pictures/100000000000005E0000005E1CC1C341.png
D       Branding/LIBREOFFICE/Collabora/Pictures/100000000000005E0000005E2CA7F86A.png
D       Branding/LIBREOFFICE/Collabora/Pictures/100000000000005E0000005E47394922.png
D       Branding/LIBREOFFICE/Collabora/Pictures/100000000000005E0000005E4FF81E94.png
D       Branding/LIBREOFFICE/Collabora/Pictures/100000000000005E0000005E60E90F8C.png
D       Branding/LIBREOFFICE/Collabora/Pictures/100000000000005E0000005E7C5F6493.png
D       Branding/LIBREOFFICE/Collabora/Pictures/100000000000005E0000005E8DF4915E.png
D       Branding/LIBREOFFICE/Collabora/Pictures/100000000000005E0000005E8FB2B48D.png
D       Branding/LIBREOFFICE/Collabora/Pictures/100000000000005E0000005EA650620C.png
D       Branding/LIBREOFFICE/Collabora/Pictures/100000000000005E0000005EB1FC5BD3.png
D       Branding/LIBREOFFICE/Collabora/Pictures/100000000000005E0000005EB30A7831.png
D       Branding/LIBREOFFICE/Collabora/Pictures/100000000000005E0000005EB4395528.png
D       Branding/LIBREOFFICE/Collabora/Pictures/100000000000005E0000005EB866A8A7.png
D       Branding/LIBREOFFICE/Collabora/Pictures/100000000000005E0000005ECA922209.png
D       Branding/LIBREOFFICE/Collabora/Pictures/100000000000005E0000005ED93A7B9C.png
D       Branding/LIBREOFFICE/Collabora/Pictures/100000000000005E0000005EDC7EA508.png
D       Branding/LIBREOFFICE/Collabora/Pictures/10000000000000B4000000870A21987F.png
D       Branding/LIBREOFFICE/Collabora/mimetype

commit 0d9254d2c89eb34908bb25725xxxxxxxxxxxxxx
Author: Axxxxx Mxxxxxxxxx <axxxxxx.mxxxxxxxx@collabora.co.uk>
Date:   Fri Feb 23 18:49:23 2018 -0300

    + ‘Branding/LIBREOFFICE/Collabora/Content.xml’
    + ‘Branding/LIBREOFFICE/Collabora/META-INF/manifest.xml’
    + ‘Branding/LIBREOFFICE/Collabora/Pictures/100000000000000800000008DD0ADA29.png’
    + ‘Branding/LIBREOFFICE/Collabora/Pictures/100000000000005E0000005E1885C8B6.png’
    + ‘Branding/LIBREOFFICE/Collabora/Pictures/100000000000005E0000005E1A713443.png’
    + ‘Branding/LIBREOFFICE/Collabora/Pictures/100000000000005E0000005E1CAF87CD.png’
hbons commented 6 years ago

You sure you're on the right branch/install? Do the logs show the right log command arguments?

glunardi commented 6 years ago

You sure you're on the right branch/install? Do the logs show the right log command arguments?

Never sure of anything :-)

Here are the last commits that I pulled from your repo:

commit c7cc2680aa6b72a0182c1f52755f6ee3eccaf01c (HEAD -> master, origin/master, origin/HEAD, fix/parse-git-log)
Merge: 6554f929 66d79200
Author: Hylke Bons <hi@planetpeanut.uk>
Date:   Fri Feb 23 20:37:54 2018 +0000

    Merge pull request #1813 from hbons/fix/event-log

    fix/event-log

commit 66d79200586dd9cb216394d60c088973e26dbceb (origin/fix/event-log)
Author: Hylke Bons <hi@planetpeanut.uk>
Date:   Fri Feb 23 20:28:36 2018 +0000

    mac eventlog: Fix file action icon paths

commit 89849b80146365cebdaac231485edeead5c764e7
Author: Hylke Bons <hi@planetpeanut.uk>
Date:   Fri Feb 23 20:23:46 2018 +0000

    sparkles git: Fix git log parsing for new versions of git

commit 6c67b532417487683a20f3e00c5767fec772ccfc
Author: Hylke Bons <hi@planetpeanut.uk>
Date:   Fri Feb 23 20:21:01 2018 +0000

    mac: Bump git version

commit 6554f9298bbd22b6f1118c8e8344c43e91d64ab0
Author: Hylke Bons <hi@planetpeanut.uk>
Date:   Fri Feb 23 17:07:06 2018 +0000

    Update org.sparkleshare.SparkleShare.appdata.xml

Not sure which one makes the log command arguments change. Could you please help me make sure I have the right commit for that change?

hbons commented 6 years ago

this one: https://github.com/hbons/SparkleShare/pull/1817/commits/65edbd26a6c6b453fce89600a2907aa3dadd612e

It has a similar name, so that may have been the confusion. :)

glunardi commented 6 years ago

this one: 65edbd2 Thanks for that!

Ah! It would help if I tracked the right branch. Forgot to --set-upstream-to=origin/fix/parse-git-log

Yes :-) I can confirm that this works on F27 local install as well.

Sorry to have wasted a bit of your time. User error with git on my part. (git should really had warned me that this branch name matched an origin branch that was ahead of what I had just created...)

glunardi commented 6 years ago

Looks like with 65edbd2 you can close:

1814

1815

1816

\o/

hbons commented 6 years ago

No problem at all. Thanks for resting. :)

hbons commented 6 years ago

testing* !