For folks who're using the git integration from within VSCode, the top
level directory needs to be open in VSCode for using git GUI from
VSCode.
However, for using the Run & debug configurations they need to open
ente/mobile is opened in VSCode.
As a solution (at least to start with):
- gitignore .vscode at the top level
- provide sample VSCode configuration files is mobile/docs/vscode and
auth/docs/vscode
- mention it in the README
(will update the auth README later, have to do a few more changes to it
first)
For folks who're using the git integration from within VSCode, the top level
directory needs to be open in VSCode for using git GUI from VSCode.
However, for using the Run & debug configurations they need to open ente/mobile
is opened in VSCode.
As a solution
- gitignore .vscode
- provide sample VSCode configuration files is mobile/docs/vscode and auth/docs/vscode
- mention it in the README
(will update the auth README later, have to do a few more changes to it first)
Move all of our code into a monorepo in preparation of open sourcing our server.
First I describe the general plan, then later I've kept an exact log of the
commands that I used. This was all done prior to this commit, but this commit
(that introduces the various top level files) seems like a good way to summarize
the entire process.
Clone auth. Auth is our base repository.
```sh
git clone https://github.com/ente-io/auth.git && cd auth
```
Move all of auth's files into `auth/`.
```sh
mkdir auth
git mv `find . -maxdepth 1 | grep -v -e '\.$' -e '\.\/.git$' -e '\.\/auth$'` auth
git commit -m 'Move into auth/'
```
Add photos-web as a new remote, and fetch its main.
```sh
git remote add photos-web https://github.com/ente-io/photos-web.git
git fetch photos-web main
```
Switch to main of web-photos.
```sh
git checkout -b photos-web-main photos-web/main
```
Move all of its files into `web` (note, the find now has an extra exclusion for
`web`, but we keep all the old ones too):
```sh
mkdir web
git mv `find . -maxdepth 1 | grep -v -e '^\.$' -e '^\.\/.git$' -e '^\.\/auth$' -e '^\.\/web$'` web
git commit -m 'Move into web/'
```
Switch back to main main, and merge the photos-web branch. The
`--allow-unrelated-histories` flag is needed (since these two branches don't
have any previous common ancestor).
```sh
git checkout main
git merge --allow-unrelated-histories photos-web-main
```
That's it. We then repeat this process for all the other repositories that we
need to bring in.
There is no magic involved here, so regular git commands will continue working.
However, all the files get renamed, so to track the git history prior to this
rename commit we'll need to pass the `--follow` flag.
git log --follow -p -- auth/migration-guides/encrypted_export.md
For some file names like README.md which exist in multiple repositories, this
doesn't seem to work so good (I don't fully understand why). For example,
`git log --follow -p -- auth/README.md lists the changes to all the READMEs,
not just the auth README.md.
```sh
git clone https://github.com/ente-io/auth.git ente
cd ente
mkdir auth
git mv `find . -maxdepth 1 | grep -v -e '\.$' -e '\.\/.git$' -e '\.\/auth$'` auth
git commit -m 'Move into auth/'
git remote add photos-web https://github.com/ente-io/photos-web.git
git fetch photos-web main
git checkout -b photos-web-main photos-web/main
mkdir web
git mv `find . -maxdepth 1 | grep -v -e '^\.$' -e '^\.\/.git$' -e '^\.\/auth$' -e '^\.\/web$'` web
git commit -m 'Move into web/'
git checkout main
git merge --allow-unrelated-histories photos-web-main
git branch -D photos-web-main
git remote remove photos-web
git remote add photos-app https://github.com/ente-io/photos-app.git
git fetch photos-app main
git checkout -b photos-app-main photos-app/main
mkdir mobile
git mv `find . -maxdepth 1 | grep -v -e '^\.$' -e '^\.\/.git$' -e '^\.\/auth$' -e '^\.\/web$' -e '^\.\/mobile$'` mobile
git commit -m 'Move into mobile/'
git checkout main
git merge --allow-unrelated-histories photos-app-main
git branch -D photos-app-main
git remote remove photos-app
git remote add photos-desktop https://github.com/ente-io/photos-desktop.git
git fetch photos-desktop main
git checkout -b photos-desktop-main photos-desktop/main
mkdir desktop
git mv `find . -maxdepth 1 | grep -v -e '^\.$' -e '^\.\/.git$' -e '^\./.gitmodules$' -e '^\.\/desktop$'` desktop
git mv .gitmodules desktop
git commit -m 'Move into desktop/'
git checkout main
git merge --allow-unrelated-histories photos-desktop-main
git branch -D photos-desktop-main
git remote remove photos-desktop
git remote add cli https://github.com/ente-io/cli.git
git fetch cli main
git checkout -b cli-main cli/main
mkdir cli
git mv `find . -maxdepth 1 | grep -v -e '^\.$' -e '^\.\/.git$' -e '^\.\/cli$'` cli
git commit -m 'Move into cli/'
git checkout main
git merge --allow-unrelated-histories cli-main
git branch -D cli-main
git remote remove cli
git remote add docs https://github.com/ente-io/docs.git
git fetch docs main
git checkout -b docs-main docs/main
mkdir docs-1
git mv `find . -maxdepth 1 | grep -v -e '^\.$' -e '^\.\/.git$' -e '^\.\/docs-1$'` docs-1
git mv docs-1 docs
git commit -m 'Move into docs/'
git checkout main
git merge --allow-unrelated-histories docs-main
git branch -D docs-main
git remote remove docs
```
