Skip to content

[0.4.x] libvisual: Backport lv-tool from master to 0.4.x - #150

Merged
hartwork merged 22 commits into
0.4.xfrom
0.4.x-lv-tool-backport
Jan 15, 2023
Merged

hartwork merged 22 commits into
0.4.xfrom
0.4.x-lv-tool-backport

Conversation

@hartwork

@hartwork hartwork commented Jan 7, 2023

Copy link
Copy Markdown
Member

No description provided.

@hartwork hartwork added this to the 0.4.2 milestone Jan 7, 2023
@hartwork
hartwork force-pushed the 0.4.x-lv-tool-backport branch from 5243c79 to da6e83d Compare January 14, 2023 16:46
@hartwork
hartwork requested a review from kaixiong January 14, 2023 16:47
@hartwork

hartwork commented Jan 14, 2023 •

Copy link
Copy Markdown
Member Author

@kaixiong I have taught lv-tool to only upgrade the actor to lv_gtltest if it appears available in commit lv-tool: Upgrade default actor plugin to "lv_gltest" if available now. I'll backport it to master after the merge.

@kaixiong kaixiong left a comment •

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@hartwork Code looks good but there seems to be some tab indentation mixed into lv_tool.cpp. I can't quite tell with Github's code viewer. The convention is four space characters for each indent level. Would be good to fix that.

We probably should try and get a usable editorconfig to make this easier to deal with. I run into the same problem now and then.

@hartwork

Copy link
Copy Markdown
Member Author

@hartwork Code looks good but there seems to be some tab indentation mixed into lv_tool.cpp. I can't quite tell with Github's code viewer. The convention is four space characters for each indent level. Would be good to fix that.

@kaixiong you're right, it's all spaces on master…

# grep $'^\t' ./libvisual/tools/lv-tool/lv-tool.cpp | wc -l
0
# grep '^ '   ./libvisual/tools/lv-tool/lv-tool.cpp | wc -l
511

…but some tab lines in here. I'll fix that 👍

We probably should try and get a usable editorconfig to make this easier to deal with. I run into the same problem now and then.

It would be over-simplified to say that we have no tabs on master:

# git grep -l $'^\t' | wc -l
290
# git grep -l $'^ ' | wc -l
681

For 0.4.x it's half and half:

# git grep -l $'^\t' | wc -l
373
# git grep -l $'^ ' | wc -l
361

I believe we need both an editorconfig and CI enforcing clang-format, e.g. similar to what this clang-format.yml is doing. The question to me is, when to best do mass-changes like that, e.g. because it affects/breaks cross-branch cherry-pickability and open pull requests. What do you think?

@hartwork
hartwork force-pushed the 0.4.x-lv-tool-backport branch from da6e83d to d0b92e1 Compare January 14, 2023 23:54
@hartwork

Copy link
Copy Markdown
Member Author

@kaixiong ./libvisual/tools/lv-tool/lv-tool.cpp is now free of tabs.

@hartwork
hartwork requested a review from kaixiong January 14, 2023 23:55
@hartwork
hartwork force-pushed the 0.4.x-lv-tool-backport branch from d0b92e1 to 6dddefb Compare January 15, 2023 00:43
@hartwork
hartwork force-pushed the 0.4.x-lv-tool-backport branch from 6dddefb to 2c75fe0 Compare January 15, 2023 00:45
@kaixiong

Copy link
Copy Markdown
Member

@hartwork You're right. That's mostly in the C source files and headers and have remained so due to the concern you just raised.

The worst violator in the C++ sections is lv_bin.cpp, lv_bin.h. The rest are kind of manageable.

@kaixiong kaixiong left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@hartwork, all good!

@hartwork

Copy link
Copy Markdown
Member Author

@hartwork, all good!

@kaixiong awesome, thanks for the review! 👍

@hartwork
hartwork merged commit 7e8fc23 into 0.4.x Jan 15, 2023
@hartwork
hartwork deleted the 0.4.x-lv-tool-backport branch January 15, 2023 02:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants