Restructure repository

[RussKie]

• Rename Setup/ to setup/
• Rename Bin/ into assets/ and move under setup/
• Rename Externals/ to externals/
• Move app projects into src/
• Move test projects into tests/
• Move scripts/ to eng/
• Move TranslationApp/ into setup/

[gerhardol]

In general I am not fond of moving files around, it breaks patches and history.

[RussKie]

In general I am not fond of moving files around, it breaks patches and history.

Can't disagree, though renames/moves should work more or less.

The root of the repo is very messy, which is confusing, and it could be a barrier for prospective contributors.

This has been bothering me for many years, and this is my Nth attempt, which I finally pushed in.

[gerhardol]

I will approve if you rebase #10906 and consider taking it out of draft - it works fine as is (also mstv workaround)

[RussKie]

I will approve if you rebase #10906 and consider taking it out of draft - it works fine as is (also mstv workaround)

Sure thing.
I've rebased that branch on top of this one (there was only one file - FormBrowse.Designer.cs - that I had to manually re-apply) but I'm not going to push it in until this branch is merged to avoid making a mess of that PR.

[pmiossec]

In general I am not fond of moving files around, it breaks patches and history.

Yes, we can't say that Git (or GitExtensions) is handling move and rename perfectly. Crossing the fingers very hard that Blame is not "broken" and that WIP will rebase without problem....

Rename Setup/ to setup/
Rename Externals/ to externals/

Why not.

Rename Bin/ into assets/ and move under setup/

💯 "Bin" was always something to be careful when cleaning manually .net "bin" folders.
But I don't like to have a folder "assets" (so with the same name) remaining at the root of the folder and so that could be confusing.
Remove this gource image that doesn't bring added value? (and fix gouurce to gource in gource video.md)

Move app projects into src/
Move test projects into tests/

👍 (that's how I prefer to have it)

Move scripts/ to eng/

I absolutely don't have a clue of what "eng" could means: so either I will learn a new word/meaning or I'm not very convinced....

Move TranslationApp/ into setup/

Why not.

[RussKie]

Rename Bin/ into assets/ and move under setup/

💯 "Bin" was always something to be careful when cleaning manually .net "bin" folders. But I don't like to have a folder "assets" (so with the same name) remaining at the root of the folder and so that could be confusing. Remove this gource image that doesn't bring added value? (and fix gouurce to gource in gource video.md)

That's my plan to move that markdown and the gif to the wiki. These have little use or relevance in the repo itself.

Move scripts/ to eng/

I absolutely don't have a clue of what "eng" could means: so either I will learn a new word/meaning or I'm not very convinced....

"eng" is short for "engineering". That's a convention in the dotnet/* repos and many other MS internal repos. So for me that's kind of natural... Do you have any other preference?

[RussKie]

The latest repo layout:

Disk	VS

[pmiossec]

"eng" is short for "engineering". That's a convention in the dotnet/* repos and many other MS internal repos. So for me that's kind of natural... Do you have any other preference?

TIL. Ok for me (even if it makes me think more about "eng(lish)" than "eng(ineering)". No better idea. And let's not reinvent a convention (which, as a consequence, won't be a convention 🤔 )

That's my plan to move that markdown and the gif to the wiki. These have little use or relevance in the repo itself.

I will be more than happy if it is done in this PR...

[mstv]

Looks sensible, have not run
I do not see at the first and second glance why the AppVeyor build timed out > 4 minutes after "build success".

---

Crossing the fingers very hard that Blame is not "broken"

It worked well this time except for a few MSVS project files - if squashed into a single commit.

---

The "sorting" feature was a great help for the review:

[RussKie]

The "sorting" feature was a great help for the review:

TIL 🔥

[RussKie]

This is ready. Unless there are objections I'm planning to merge it tomorrow.

[RussKie]

That's my plan to move that markdown and the gif to the wiki. These have little use or relevance in the repo itself.

I will be more than happy if it is done in this PR...

Done. https://github.com/gitextensions/gitextensions/wiki/How-to-visualize-Git-repository's-history

[mstv]

Git is able to automatically resolve the MC when rebasing

[pmiossec]

Git is able to automatically resolve the MC when rebasing

They are some cases where Git is not good:

• new files added in commits rebased. Because Git handling only files and not directory rename, it still try to create the files in the old directory.
• code moved in another file or somewhere else in the same file and modified in the other branch. Most of the times, changes have to be reapplied manualy.

[mstv]

They are some cases where Git is not good:

We know - unfortunately.

Git is able to automatically resolve the MC when rebasing

the MC (of this PR)

[pmiossec]

I wonder if this PR does not break the update-loc.cmd. I have this error now:

C:\Users\pmios\Documents\Perso\Dev\GitHub\gitextensions\src\plugins\Statistics\GitStatistics\GitExtensions.Plugins.GitS
tatistics.csproj : error MSB4057: The target "_UpdateEnglishTranslations" does not exist in the project.
C:\Users\pmios\Documents\Perso\Dev\GitHub\gitextensions\src\plugins\Gource\GitExtensions.Plugins.Gource.csproj : error
MSB4057: The target "_UpdateEnglishTranslations" does not exist in the project.

[pmiossec]

Forget my comment. Found the issue, 1 min later....... 🙄