beenull/ente
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity
ente/.github/assets/web-badge.svg

8 lines
16 KiB
XML
Raw Permalink Normal View History

Move to monorepo 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 ```
2024-03-01 07:31:41 +00:00
<svg width="197" height="59" viewBox="0 0 197 59" fill="none" xmlns="http://www.w3.org/2000/svg">
<rect x="0.5" y="0.5" width="196" height="58" rx="5.5" fill="black" stroke="#A8A8A8"/>
<path d="M35.1055 27.833L37.8884 46.6631L42.0209 41.1062L46.5418 47.3657L48.9034 45.6663L44.55 39.6345L51.0937 38.6674L35.1055 27.833Z" fill="#66FF91"/>
<path d="M49.7876 25.847C49.7616 25.671 49.7137 25.5021 49.6733 25.3321C49.66 25.2423 49.6462 25.1487 49.6104 25.0622C49.5591 24.8441 49.4959 24.6239 49.4376 24.4106L49.4221 24.3058C49.3579 24.0782 49.2862 23.8516 49.2107 23.6256L49.204 23.5807C47.9539 19.872 45.5208 16.6764 42.2785 14.4846C39.0362 12.2928 35.164 11.2261 31.2566 11.4483L31.223 11.4533C30.9763 11.4668 30.7302 11.484 30.4665 11.5115C30.2028 11.539 29.9279 11.5682 29.6508 11.6091C29.3738 11.6501 29.0968 11.691 28.8268 11.7538C28.5569 11.8167 28.3408 11.8563 28.0859 11.9169L28.0671 11.9197C24.268 12.8398 20.8754 14.9804 18.4092 18.0132C15.9431 21.0461 14.5395 24.804 14.4136 28.7109L14.4202 28.7559C14.4142 28.9914 14.4122 29.2276 14.414 29.4645L14.4295 29.5693C14.4322 29.7946 14.4386 30.0193 14.4526 30.243C14.4658 30.3328 14.4797 30.4264 14.4705 30.5196C14.4959 30.6918 14.4957 30.8716 14.51 31.0454C14.5509 31.3225 14.5699 31.6066 14.6114 31.8873C14.6529 32.1681 14.6939 32.4451 14.7567 32.7151C14.7838 32.8985 14.8345 33.0861 14.8749 33.2561C14.8871 33.3385 14.8993 33.4208 14.9302 33.5004C14.9864 33.7254 15.0463 33.9499 15.11 34.1739L15.1216 34.2525C15.1918 34.4946 15.2652 34.7324 15.3483 34.984C16.5147 38.4251 18.7023 41.4289 21.6195 43.5949C24.5367 45.7608 28.0449 46.986 31.6762 47.1071L31.8412 47.1363L32.347 47.1418L32.714 47.1144L33.1859 47.0982L33.6476 47.0644L34.0259 47.0353C34.3101 47.0086 34.5944 46.9742 34.879 46.9321L34.9314 46.9244L34.3228 42.8065L34.2704 42.8142C33.4934 42.9281 32.7082 42.975 31.9232 42.9545C30.8732 40.7776 30.0422 38.5016 29.4425 36.1602C30.674 36.0547 31.9341 35.9105 33.2219 35.7202L33.2743 35.7125L32.9302 33.384L32.8703 33.3928C31.459 33.6014 30.1266 33.7486 28.8715 33.8499C28.6055 32.6192 28.3546 31.3098 28.1455 29.8947C27.9363 28.4797 27.7891 27.1473 27.6878 25.8922C28.9185 25.6262 30.2365 25.3817 31.6478 25.1731C33.0592 24.9645 34.3878 24.8179 35.6391 24.7171C35.6496 24.7882 35.6596 24.8556 35.6701 24.9267C36.0564 25.0027 36.4236 25.1553 36.7501 25.3753L38.3953 26.4902C38.2803 25.8416 38.1525 25.2102 38.0216 24.583C40.4446 24.4755 42.8724 24.6101 45.2687 24.9847C45.5154 25.7302 45.6976 26.4954 45.8133 27.2721C45.9259 28.0468 45.9712 28.8298 45.9488 29.6123C45.4213 29.8739 44.8474 30.1576 44.2101 30.401L45.7833 31.4691L49.4903 33.9815C49.8558 32.6344 50.0632 31.2494 50.1083 29.8544C50.1033 29.8207 50.0983 29.787 50.0928 29.7496C50.0962 29.5655 50.0974 29.3664 50.0992 29.1978C50.0849 29.1005 50.0967 28.9993 50.0935 28.9003C50.0905 28.7247 50.0838 28.5498 50.0765 28.3711C50.0692 28.1923 50.0591 28.0982 50.0504 27.9618C50.0418 27.8254 50.0314 27.6777 50.0184 27.5381C49.9764 27.2536 49.9568 26.9657 49.9142 26.6775C49.8716 26.3892 49.8424 26.1143 49.7876 25.847ZM18.708 31.2895C18.5929 30.509 18.5454 29.7199 18.566 28.9312C20.7425 27.8796 23.0184 27.0473 25.3598 26.4467C25.4653 27.6782 25.6063 28.9426 25.7966 30.2304C25.9869 31.5182 26.2134 32.7662 26.4697 33.9563C24.057 34.0681 21.6393 33.9398 19.252 33.5732C19.0057 32.8289 18.8237 32.0649 18.708 31.2895ZM20.4044 36.1418C22.6027 36.3752 24.8157 36.4395 27.0238 36.334C27.5619 38.4782 28.2635 40.578 29.1226 42.6149C27.3066 42.1831 25.5973 41.3867 24.0986 40.2739C22.5998 39.1612 21.343 37.7553 20.4044 36.1418ZM25.2117 24.0472C23.0675 24.5849 20.9677 25.2866 18.9309 26.146C19.3626 24.3299 20.1591 22.6206 21.2718 21.1219C22.3846 19.6232 23.7905 18.3663 25.404 17.4277C25.1708 19.626 25.1065 21.839 25.2117 24.0472ZM31.3079 22.821C30.0201 23.0114 28.7721 23.2379 27.5628 23.4931C27.4597 21.0783 27.5968 18.6593 27.972 16.2716C29.4629 15.7763 31.0287 15.5449 32.5991 15.5878C33.6451 17.7658 34.4723 20.0423 35.0686 22.3838C33.8521 22.4871 32.5919 22.6313 31.3079 22.821ZM37.4943 22.2319C36.9573 20.0877 36.2569 17.9878 35.3993 15.9505C37.2163 16.3821 38.9266 17.1788 40.4262 18.2921C41.9257 19.4055 43.183 20.8122 44.1218 22.4268C41.9208 22.1927 39.7052 22.1275 37.4943 22.2319Z" fill="#66FF91"/>
<path d="M118.004 29.156C117.452 31.268 116.852 33.332 116.204 35.348C115.58 37.34 114.956 39.224 114.332 41H110.768C110.288 39.896 109.784 38.636 109.256 37.22C108.728 35.804 108.2 34.292 107.672 32.684C107.144 31.076 106.616 29.384 106.088 27.608C105.56 25.832 105.044 24.02 104.54 22.172H109.148C109.364 23.18 109.616 24.272 109.904 25.448C110.192 26.6 110.492 27.788 110.804 29.012C111.116 30.212 111.44 31.388 111.776 32.54C112.112 33.692 112.448 34.748 112.784 35.708C113.144 34.604 113.492 33.464 113.828 32.288C114.188 31.112 114.524 29.936 114.836 28.76C115.148 27.584 115.436 26.444 115.7 25.34C115.988 24.212 116.24 23.156 116.456 22.172H119.804C120.02 23.156 120.26 24.212 120.524 25.34C120.788 26.444 121.064 27.584 121.352 28.76C121.664 29.936 121.988 31.112 122.324 32.288C122.684 33.464 123.044 34.604 123.404 35.708C123.716 34.748 124.04 33.692 124.376 32.54C124.712 31.388 125.036 30.212 125.348 29.012C125.684 27.788 125.996 26.6 126.284 25.448C126.572 24.272 126.824 23.18 127.04 22.172H131.54C131.036 24.02 130.52 25.832 129.992 27.608C129.464 29.384 128.936 31.076 128.408 32.684C127.88 34.292 127.352 35.804 126.824 37.22C126.296 38.636 125.78 39.896 125.276 41H121.748C121.124 39.224 120.476 37.34 119.804 35.348C119.156 33.332 118.556 31.268 118.004 29.156ZM134.178 31.676C134.178 30.02 134.418 28.568 134.898 27.32C135.402 26.072 136.062 25.04 136.878 24.224C137.694 23.384 138.63 22.76 139.686 22.352C140.742 21.92 141.822 21.704 142.926 21.704C145.518 21.704 147.534 22.508 148.974 24.116C150.438 25.724 151.17 28.124 151.17 31.316C151.17 31.556 151.158 31.832 151.134 32.144C151.134 32.432 151.122 32.696 151.098 32.936H138.678C138.798 34.448 139.326 35.624 140.262 36.464C141.222 37.28 142.602 37.688 144.402 37.688C145.458 37.688 146.418 37.592 147.282 37.4C148.17 37.208 148.866 37.004 149.37 36.788L149.946 40.352C149.706 40.472 149.37 40.604 148.938 40.748C148.53 40.868 148.05 40.976 147.498 41.072C146.97 41.192 146.394 41.288 145.77 41.36C145.146 41.432 144.51 41.468 143.862 41.468C142.206 41.468 140.766 41.228 139.542 40.748C138.318 40.244 137.31 39.56 136.518 38.696C135.726 37.808 135.138 36.776 134.754 35.6C134.37 34.4 134.178 33.092 134.178 31.676ZM146.814 29.732C146.814 29.132 146.73 28.568 146.562 28.04C146.394 27.488 146.142 27.02 145.806 26.636C145.494 26.228 145.098 25.916 144.618 25.7C144.162 25.46 143.61 25.34 142.962 25.34C142.29 25.34 141.702 25.472 141.198 25.736C140.694 25.976 140.262 26.3 139.902 26.708C139.566 27.116 139.302 27.584 139.11 28.112C138.918 28.64 138.786 29.18 138.714 29.732H146.814ZM168.64 31.532C168.64 29.684 168.268 28.22 167.524 27.14C166.804 26.06 165.652 25.52 164.068 25.52C163.348 25.52 162.664 25.628 162.016 25.844C161.392 26.06 160.888 26.3 160.504 26.564V37.4C160.816 37.472 161.212 37.544 161.692 37.616C162.196 37.664 162.796 37.688 163.492 37.688C165.1 37.688 166.36 37.148 167.272 36.068C168.184 34.964 168.64 33.452 168.64 31.532ZM173.104 31.604C173.104 33.116 172.876 34.484 172.42 35.708C171.988 36.908 171.352 37.94 170.512 38.804C169.696 39.668 168.7 40.328 167.524 40.784C166.348 41.24 165.016 41.468 163.528 41.468C162.088 41.468 160.708 41.36 159.388 41.144C158.092 40.928 157.012 40.688 156.148 40.424V13.784L160.504 13.064V22.82C161.008 22.556 161.62 22.316 162.34 22.1C163.084 21.884 163.9 21.776 164.788 21.776C166.108 21.776 167.284 22.016 168.316 22.496C169.372 22.952 170.248 23.612 170.944 24.476C171.64 25.34 172.168 26.384 172.528 27.608C172.912 28.808 173.104 30.14 173.104 31.604Z" fill="white"/>
<path d="M66.288 26.043C66.64 26.043 66.8967 26.0027 67.058 25.922C67.2193 25.834 67.3 25.6873 67.3 25.482C67.3 25.2913 67.212 25.1337 67.036 25.009C66.8673 24.8843 66.585 24.7487 66.189 24.602C65.947 24.514 65.7233 24.4223 65.518 24.327C65.32 24.2243 65.1477 24.107 65.001 23.975C64.8543 23.843 64.737 23.6853 64.649 23.502C64.5683 23.3113 64.528 23.0803 64.528 22.809C64.528 22.281 64.7223 21.8667 65.111 21.566C65.4997 21.258 66.0277 21.104 66.695 21.104C67.0323 21.104 67.355 21.137 67.663 21.203C67.971 21.2617 68.202 21.3203 68.356 21.379L68.114 22.457C67.9673 22.391 67.7803 22.3323 67.553 22.281C67.3257 22.2223 67.0617 22.193 66.761 22.193C66.4897 22.193 66.2697 22.2407 66.101 22.336C65.9323 22.424 65.848 22.5633 65.848 22.754C65.848 22.8493 65.8627 22.9337 65.892 23.007C65.9287 23.0803 65.9873 23.15 66.068 23.216C66.1487 23.2747 66.255 23.337 66.387 23.403C66.519 23.4617 66.6803 23.524 66.871 23.59C67.1863 23.7073 67.454 23.8247 67.674 23.942C67.894 24.052 68.0737 24.1803 68.213 24.327C68.3597 24.4663 68.466 24.6277 68.532 24.811C68.598 24.9943 68.631 25.2143 68.631 25.471C68.631 26.021 68.4257 26.439 68.015 26.725C67.6117 27.0037 67.0323 27.143 66.277 27.143C65.771 27.143 65.364 27.099 65.056 27.011C64.748 26.9303 64.5317 26.8643 64.407 26.813L64.638 25.702C64.836 25.7827 65.0707 25.8597 65.342 25.933C65.6207 26.0063 65.936 26.043 66.288 26.043ZM71.5463 27H70.2153V21.247H71.5463V27ZM71.6893 19.564C71.6893 19.8133 71.6087 20.0113 71.4473 20.158C71.286 20.3047 71.0953 20.378 70.8753 20.378C70.648 20.378 70.4537 20.3047 70.2923 20.158C70.131 20.0113 70.0503 19.8133 70.0503 19.564C70.0503 19.3073 70.131 19.1057 70.2923 18.959C70.4537 18.8123 70.648 18.739 70.8753 18.739C71.0953 18.739 71.286 18.8123 71.4473 18.959C71.6087 19.1057 71.6893 19.3073 71.6893 19.564ZM74.6194 23.975C74.6194 24.5397 74.7404 24.954 74.9824 25.218C75.2317 25.4747 75.5507 25.603 75.9394 25.603C76.152 25.603 76.35 25.5737 76.5334 25.515C76.724 25.4563 76.878 25.3867 76.9954 25.306V22.325C76.9 22.303 76.7827 22.2847 76.6434 22.27C76.504 22.248 76.328 22.237 76.1154 22.237C75.6314 22.237 75.261 22.3983 75.0044 22.721C74.7477 23.0363 74.6194 23.4543 74.6194 23.975ZM78.3264 26.417C78.3264 27.3337 78.0917 28.0047 77.6224 28.43C77.1604 28.8553 76.449 29.068 75.4884 29.068C75.1364 29.068 74.7917 29.0387 74.4544 28.98C74.1244 28.9213 73.8237 28.8443 73.5524 28.749L73.7944 27.616C74.0217 27.7113 74.2784 27.7883 74.5644 27.847C74.8577 27.9057 75.173 27.935 75.5104 27.935C76.0457 27.935 76.427 27.825 76.6544 27.605C76.8817 27.385 76.9954 27.0587 76.9954 26.626V26.406C76.8634 26.472 76.6874 26.538 76.4674 26.604C76.2547 26.67 76.009 26.703 75.7304 26.703C75.3637 26.703 75.0264 26.6443 74.7184 26.527C74.4177 26.4097 74.1574 26.2373 73.9374 26.01C73.7247 25.7827 73.556 25.5003 73.4314 25.163C73.314 24.8183 73.2554 24.4223 73.2554 23.975C73.2554 23.557 73.3177 23.172 73.4424 22.82C73.5744 22.468 73.7614 22.1673 74.0034 21.918C74.2527 21.6687 74.5534 21.4743 74.9054 21.335C75.2574 21.1957 75.657 21.126 76.1044 21.126C76.537 21.126 76.9477 21.159 77.3364 21.225C77.725 21.291 78.055 21.3607 78.3264 21.434V26.417ZM80.3497 21.434C80.6064 21.3607 80.94 21.291 81.3507 21.225C81.7614 21.159 82.216 21.126 82.7147 21.126C83.184 21.126 83.5764 21.192 83.8917 21.324C84.207 21.4487 84.4564 21.6283 84.6397 21.863C84.8304 22.0903 84.9624 22.369 85.0357 22.699C85.1164 23.0217 85.1567 23.3773 85.1567 23.766V27H83.8257V23.975C83.8257 23.667 83.8037 23.4067 83.7597 23.194C83.723 22.974 83.657 22.798 83.5617 22.666C83.4737 22.5267 83.349 22.4277 83.1877 22.369C83.0337 22.303 82.843 22.27 82.6157 22.27C82.447 22.27 82.271 22.281 82.0877 22.303C81.9044 22.325 81.7687 22.3433 81.6807 22.358V27H80.3497V21.434ZM91.3536 27H90.0226V21.247H91.3536V27ZM91.4966 19.564C91.4966 19.8133 91.416 20.0113 91.2546 20.158C91.0933 20.3047 90.9026 20.378 90.6826 20.378C90.4553 20.378 90.261 20.3047 90.0996 20.158C89.9383 20.0113 89.8576 19.8133 89.8576 19.564C89.8576 19.3073 89.9383 19.1057 90.0996 18.959C90.261 18.8123 90.4553 18.739 90.6826 18.739C90.9026 18.739 91.0933 18.8123 91.2546 18.959C91.416 19
</svg>
Reference in a new issue Copy permalink