beenull/ente
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity
ente/architecture/assets/e2ee.svg

12 lines
22 KiB
XML
Raw 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="408" height="51" viewBox="0 0 408 51" fill="none" xmlns="http://www.w3.org/2000/svg">
<path fill-rule="evenodd" clip-rule="evenodd" d="M68 37H67V35H56V48H61V49.617C61 50.141 61.121 50.675 61.502 51H56.5C56.102 51 55.721 50.842 55.439 50.561C55.158 50.279 55 49.898 55 49.5V34.5C55 34.102 55.158 33.721 55.439 33.439C55.721 33.158 56.102 33 56.5 33H66.5C66.898 33 67.279 33.158 67.561 33.439C67.842 33.721 68 34.102 68 34.5V37ZM70 39.25C70 38.56 69.44 38 68.75 38H63.25C62.56 38 62 38.56 62 39.25V49.75C62 50.44 62.56 51 63.25 51H68.75C69.44 51 70 50.44 70 49.75V39.25ZM54.593 51H48L50.599 48H54V49.804C54 50.383 54.337 50.894 54.593 51ZM66 50C65.447 50 65 49.552 65 49C65 48.448 65.447 48 66 48C66.552 48 66.999 48.448 66.999 49C66.999 49.552 66.552 50 66 50ZM69 47V40.976H63V47H69ZM67 32H65V29H48V44H54V46H46V27H67V32ZM66.5 39H65.5C65.224 39 65 39.224 65 39.5C65 39.776 65.224 40 65.5 40H66.5C66.775 40 67 39.776 67 39.5C67 39.224 66.775 39 66.5 39Z" fill="#757575"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M360 37H359V35H348V48H353V49.617C353 50.141 353.121 50.675 353.502 51H348.5C348.102 51 347.721 50.842 347.439 50.561C347.158 50.279 347 49.898 347 49.5V34.5C347 34.102 347.158 33.721 347.439 33.439C347.721 33.158 348.102 33 348.5 33H358.5C358.898 33 359.279 33.158 359.561 33.439C359.842 33.721 360 34.102 360 34.5V37ZM362 39.25C362 38.56 361.44 38 360.75 38H355.25C354.56 38 354 38.56 354 39.25V49.75C354 50.44 354.56 51 355.25 51H360.75C361.44 51 362 50.44 362 49.75V39.25ZM346.593 51H340L342.599 48H346V49.804C346 50.383 346.337 50.894 346.593 51ZM358 50C357.447 50 357 49.552 357 49C357 48.448 357.447 48 358 48C358.552 48 358.999 48.448 358.999 49C358.999 49.552 358.552 50 358 50ZM361 47V40.976H355V47H361ZM359 32H357V29H340V44H346V46H338V27H359V32ZM358.5 39H357.5C357.224 39 357 39.224 357 39.5C357 39.776 357.224 40 357.5 40H358.5C358.775 40 359 39.776 359 39.5C359 39.224 358.775 39 358.5 39Z" fill="#757575"/>
<path d="M31.6667 18.6683C31.6667 25.11 26.4433 30.335 20 30.335C13.5567 30.335 8.33333 25.11 8.33333 18.6683C8.33333 12.2233 13.5567 7 20 7C26.4433 7 31.6667 12.2233 31.6667 18.6683V18.6683ZM29.0033 30.635C26.4933 32.53 23.38 33.6683 20 33.6683C16.6167 33.6683 13.5017 32.5267 10.9883 30.6317C4.20167 33.62 0 42.925 0 47H40C40 42.9617 35.6667 33.6567 29.0033 30.635V30.635Z" fill="#757575"/>
<path d="M399.667 18.6683C399.667 25.11 394.443 30.335 388 30.335C381.557 30.335 376.333 25.11 376.333 18.6683C376.333 12.2233 381.557 7 388 7C394.443 7 399.667 12.2233 399.667 18.6683V18.6683ZM397.003 30.635C394.493 32.53 391.38 33.6683 388 33.6683C384.617 33.6683 381.502 32.5267 378.988 30.6317C372.202 33.62 368 42.925 368 47H408C408 42.9617 403.667 33.6567 397.003 30.635V30.635Z" fill="#757575"/>
<path d="M193.068 12.096C192.332 12.096 191.684 11.952 191.124 11.664C190.572 11.376 190.144 10.984 189.84 10.488C189.536 9.984 189.384 9.412 189.384 8.772C189.384 8.124 189.532 7.552 189.828 7.056C190.132 6.552 190.544 6.16 191.064 5.88C191.584 5.592 192.172 5.448 192.828 5.448C193.46 5.448 194.028 5.584 194.532 5.856C195.044 6.12 195.448 6.504 195.744 7.008C196.04 7.504 196.188 8.1 196.188 8.796C196.188 8.868 196.184 8.952 196.176 9.048C196.168 9.136 196.16 9.22 196.152 9.3H190.908V8.208H195.168L194.448 8.532C194.448 8.196 194.38 7.904 194.244 7.656C194.108 7.408 193.92 7.216 193.68 7.08C193.44 6.936 193.16 6.864 192.84 6.864C192.52 6.864 192.236 6.936 191.988 7.08C191.748 7.216 191.56 7.412 191.424 7.668C191.288 7.916 191.22 8.212 191.22 8.556V8.844C191.22 9.196 191.296 9.508 191.448 9.78C191.608 10.044 191.828 10.248 192.108 10.392C192.396 10.528 192.732 10.596 193.116 10.596C193.46 10.596 193.76 10.544 194.016 10.44C194.28 10.336 194.52 10.18 194.736 9.972L195.732 11.052C195.436 11.388 195.064 11.648 194.616 11.832C194.168 12.008 193.652 12.096 193.068 12.096ZM201.358 5.448C201.87 5.448 202.326 5.552 202.726 5.76C203.134 5.96 203.454 6.272 203.686 6.696C203.918 7.112 204.034 7.648 204.034 8.304V12H202.162V8.592C202.162 8.072 202.046 7.688 201.814 7.44C201.59 7.192 201.27 7.068 200.854 7.068C200.558 7.068 200.29 7.132 200.05 7.26C199.818 7.38 199.634 7.568 199.498 7.824C199.37 8.08 199.306 8.408 199.306 8.808V12H197.434V5.544H199.222V7.332L198.886 6.792C199.118 6.36 199.45 6.028 199.882 5.796C200.314 5.564 200.806 5.448 201.358 5.448ZM208.371 12.096C207.611 12.096 207.019 11.904 206.595 11.52C206.171 11.128 205.959 10.548 205.959 9.78V4.116H207.831V9.756C207.831 10.028 207.903 10.24 208.047 10.392C208.191 10.536 208.387 10.608 208.635 10.608C208.931 10.608 209.183 10.528 209.391 10.368L209.895 11.688C209.703 11.824 209.471 11.928 209.199 12C208.935 12.064 208.659 12.096 208.371 12.096ZM204.963 7.128V5.688H209.439V7.128H204.963ZM213.951 12.096C213.215 12.096 212.567 11.952 212.007 11.664C211.455 11.376 211.027 10.984 210.723 10.488C210.419 9.984 210.267 9.412 210.267 8.772C210.267 8.124 210.415 7.552 210.711 7.056C211.015 6.552 211.427 6.16 211.947 5.88C212.467 5.592 213.055 5.448 213.711 5.448C214.343 5.448 214.911 5.584 215.415 5.856C215.927 6.12 216.331 6.504 216.627 7.008C216.923 7.504 217.071 8.1 217.071 8.796C217.071 8.868 217.067 8.952 217.059 9.048C217.051 9.136 217.043 9.22 217.035 9.3H211.791V8.208H216.051L215.331 8.532C215.331 8.196 215.263 7.904 215.127 7.656C214.991 7.408 214.803 7.216 214.563 7.08C214.323 6.936 214.043 6.864 213.723 6.864C213.403 6.864 213.119 6.936 212.871 7.08C212.631 7.216 212.443 7.412 212.307 7.668C212.171 7.916 212.103 8.212 212.103 8.556V8.844C212.103 9.196 212.179 9.508 212.331 9.78C212.491 10.044 212.711 10.248 212.991 10.392C213.279 10.528 213.615 10.596 213.999 10.596C214.343 10.596 214.643 10.544 214.899 10.44C215.163 10.336 215.403 10.18 215.619 9.972L216.615 11.052C216.319 11.388 215.947 11.648 215.499 11.832C215.051 12.008 214.535 12.096 213.951 12.096Z" fill="#757575"/>
<rect x="172" y="17" width="64" height="30" fill="#757575"/>
<line x1="76.999" y1="31.9961" x2="331.001" y2="31.9961" stroke="#1DB954" stroke-dasharray="2 2"/>
<path d="M102.408 39.928C102.408 39.56 102.461 39.24 102.568 38.968C102.675 38.6907 102.816 38.4613 102.992 38.28C103.168 38.0987 103.371 37.9627 103.6 37.872C103.829 37.7813 104.064 37.736 104.304 37.736C104.864 37.736 105.293 37.912 105.592 38.264C105.891 38.6107 106.04 39.1413 106.04 39.856C106.04 39.888 106.04 39.9307 106.04 39.984C106.04 40.032 106.037 40.0773 106.032 40.12H103.184C103.216 40.552 103.341 40.88 103.56 41.104C103.779 41.328 104.12 41.44 104.584 41.44C104.845 41.44 105.064 41.4187 105.24 41.376C105.421 41.328 105.557 41.2827 105.648 41.24L105.752 41.864C105.661 41.912 105.501 41.9627 105.272 42.016C105.048 42.0693 104.792 42.096 104.504 42.096C104.141 42.096 103.827 42.0427 103.56 41.936C103.299 41.824 103.083 41.672 102.912 41.48C102.741 41.288 102.613 41.0613 102.528 40.8C102.448 40.5333 102.408 40.2427 102.408 39.928ZM105.264 39.52C105.269 39.184 105.184 38.9093 105.008 38.696C104.837 38.4773 104.6 38.368 104.296 38.368C104.125 38.368 103.973 38.4027 103.84 38.472C103.712 38.536 103.603 38.6213 103.512 38.728C103.421 38.8347 103.349 38.9573 103.296 39.096C103.248 39.2347 103.216 39.376 103.2 39.52H105.264ZM107.109 37.96C107.279 37.9173 107.506 37.872 107.789 37.824C108.071 37.776 108.397 37.752 108.765 37.752C109.095 37.752 109.37 37.8 109.589 37.896C109.807 37.9867 109.981 38.1173 110.109 38.288C110.242 38.4533 110.335 38.6533 110.389 38.888C110.442 39.1227 110.469 39.3813 110.469 39.664V42H109.725V39.824C109.725 39.568 109.706 39.3493 109.669 39.168C109.637 38.9867 109.581 38.84 109.501 38.728C109.421 38.616 109.314 38.536 109.181 38.488C109.047 38.4347 108.882 38.408 108.685 38.408C108.605 38.408 108.522 38.4107 108.437 38.416C108.351 38.4213 108.269 38.4293 108.189 38.44C108.114 38.4453 108.045 38.4533 107.981 38.464C107.922 38.4747 107.879 38.4827 107.853 38.488V42H107.109V37.96ZM113.511 42.096C113.175 42.096 112.879 42.0427 112.623 41.936C112.372 41.8293 112.159 41.68 111.983 41.488C111.812 41.296 111.684 41.0693 111.599 40.808C111.513 40.5413 111.471 40.248 111.471 39.928C111.471 39.608 111.516 39.3147 111.607 39.048C111.703 38.7813 111.836 38.552 112.007 38.36C112.177 38.1627 112.385 38.0107 112.631 37.904C112.881 37.792 113.159 37.736 113.463 37.736C113.649 37.736 113.836 37.752 114.023 37.784C114.209 37.816 114.388 37.8667 114.559 37.936L114.391 38.568C114.279 38.5147 114.148 38.472 113.999 38.44C113.855 38.408 113.7 38.392 113.535 38.392C113.119 38.392 112.799 38.5227 112.575 38.784C112.356 39.0453 112.247 39.4267 112.247 39.928C112.247 40.152 112.271 40.3573 112.319 40.544C112.372 40.7307 112.452 40.8907 112.559 41.024C112.671 41.1573 112.812 41.2613 112.983 41.336C113.153 41.4053 113.361 41.44 113.607 41.44C113.804 41.44 113.983 41.4213 114.143 41.384C114.303 41.3467 114.428 41.3067 114.519 41.264L114.623 41.888C114.58 41.9147 114.519 41.9413 114.439 41.968C114.359 41.9893 114.268 42.008 114.167 42.024C114.065 42.0453 113.956 42.0613 113.839 42.072C113.727 42.088 113.617 42.096 113.511 42.096ZM116.957 37.752C117.021 37.752 117.093 37.7573 117.173 37.768C117.259 37.7733 117.341 37.784 117.421 37.8C117.501 37.8107 117.573 37.824 117.637 37.84C117.707 37.8507 117.757 37.8613 117.789 37.872L117.661 38.52C117.603 38.4987 117.504 38.4747 117.365 38.448C117.232 38.416 117.059 38.4 116.845 38.4C116.707 38.4 116.568 38.416 116.429 38.448C116.296 38.4747 116.208 38.4933 116.165 38.504V42H115.421V38.016C115.597 37.952 115.816 37.8933 116.077 37.84C116.339 37.7813 116.632 37.752 116.957 37.752ZM118.191 42.776C118.25 42.8027 118.324 42.8267 118.415 42.848C118.511 42.8747 118.604 42.888 118.695 42.888C118.988 42.888 119.218 42.8213 119.383 42.688C119.548 42.56 119.698 42.3493 119.831 42.056C119.495 41.416 119.18 40.7387 118.887 40.024C118.599 39.304 118.359 38.576 118.167 37.84H118.967C119.026 38.08 119.095 38.3387 119.175 38.616C119.26 38.8933 119.354 39.1787 119.455 39.472C119.556 39.7653 119.666 40.0587 119.783 40.352C119.9 40.6453 120.023 40.928 120.151 41.2C120.354 40.64 120.53 40.0853 120.679 39.536C120.828 38.9867 120.97 38.4213 121.103 37.84H121.871C121.679 38.624 121.466 39.3787 121.231 40.
<path d="M268.408 39.928C268.408 39.56 268.461 39.24 268.568 38.968C268.675 38.6907 268.816 38.4613 268.992 38.28C269.168 38.0987 269.371 37.9627 269.6 37.872C269.829 37.7813 270.064 37.736 270.304 37.736C270.864 37.736 271.293 37.912 271.592 38.264C271.891 38.6107 272.04 39.1413 272.04 39.856C272.04 39.888 272.04 39.9307 272.04 39.984C272.04 40.032 272.037 40.0773 272.032 40.12H269.184C269.216 40.552 269.341 40.88 269.56 41.104C269.779 41.328 270.12 41.44 270.584 41.44C270.845 41.44 271.064 41.4187 271.24 41.376C271.421 41.328 271.557 41.2827 271.648 41.24L271.752 41.864C271.661 41.912 271.501 41.9627 271.272 42.016C271.048 42.0693 270.792 42.096 270.504 42.096C270.141 42.096 269.827 42.0427 269.56 41.936C269.299 41.824 269.083 41.672 268.912 41.48C268.741 41.288 268.613 41.0613 268.528 40.8C268.448 40.5333 268.408 40.2427 268.408 39.928ZM271.264 39.52C271.269 39.184 271.184 38.9093 271.008 38.696C270.837 38.4773 270.6 38.368 270.296 38.368C270.125 38.368 269.973 38.4027 269.84 38.472C269.712 38.536 269.603 38.6213 269.512 38.728C269.421 38.8347 269.349 38.9573 269.296 39.096C269.248 39.2347 269.216 39.376 269.2 39.52H271.264ZM273.109 37.96C273.279 37.9173 273.506 37.872 273.789 37.824C274.071 37.776 274.397 37.752 274.765 37.752C275.095 37.752 275.37 37.8 275.589 37.896C275.807 37.9867 275.981 38.1173 276.109 38.288C276.242 38.4533 276.335 38.6533 276.389 38.888C276.442 39.1227 276.469 39.3813 276.469 39.664V42H275.725V39.824C275.725 39.568 275.706 39.3493 275.669 39.168C275.637 38.9867 275.581 38.84 275.501 38.728C275.421 38.616 275.314 38.536 275.181 38.488C275.047 38.4347 274.882 38.408 274.685 38.408C274.605 38.408 274.522 38.4107 274.437 38.416C274.351 38.4213 274.269 38.4293 274.189 38.44C274.114 38.4453 274.045 38.4533 273.981 38.464C273.922 38.4747 273.879 38.4827 273.853 38.488V42H273.109V37.96ZM279.511 42.096C279.175 42.096 278.879 42.0427 278.623 41.936C278.372 41.8293 278.159 41.68 277.983 41.488C277.812 41.296 277.684 41.0693 277.599 40.808C277.513 40.5413 277.471 40.248 277.471 39.928C277.471 39.608 277.516 39.3147 277.607 39.048C277.703 38.7813 277.836 38.552 278.007 38.36C278.177 38.1627 278.385 38.0107 278.631 37.904C278.881 37.792 279.159 37.736 279.463 37.736C279.649 37.736 279.836 37.752 280.023 37.784C280.209 37.816 280.388 37.8667 280.559 37.936L280.391 38.568C280.279 38.5147 280.148 38.472 279.999 38.44C279.855 38.408 279.7 38.392 279.535 38.392C279.119 38.392 278.799 38.5227 278.575 38.784C278.356 39.0453 278.247 39.4267 278.247 39.928C278.247 40.152 278.271 40.3573 278.319 40.544C278.372 40.7307 278.452 40.8907 278.559 41.024C278.671 41.1573 278.812 41.2613 278.983 41.336C279.153 41.4053 279.361 41.44 279.607 41.44C279.804 41.44 279.983 41.4213 280.143 41.384C280.303 41.3467 280.428 41.3067 280.519 41.264L280.623 41.888C280.58 41.9147 280.519 41.9413 280.439 41.968C280.359 41.9893 280.268 42.008 280.167 42.024C280.065 42.0453 279.956 42.0613 279.839 42.072C279.727 42.088 279.617 42.096 279.511 42.096ZM282.957 37.752C283.021 37.752 283.093 37.7573 283.173 37.768C283.259 37.7733 283.341 37.784 283.421 37.8C283.501 37.8107 283.573 37.824 283.637 37.84C283.707 37.8507 283.757 37.8613 283.789 37.872L283.661 38.52C283.603 38.4987 283.504 38.4747 283.365 38.448C283.232 38.416 283.059 38.4 282.845 38.4C282.707 38.4 282.568 38.416 282.429 38.448C282.296 38.4747 282.208 38.4933 282.165 38.504V42H281.421V38.016C281.597 37.952 281.816 37.8933 282.077 37.84C282.339 37.7813 282.632 37.752 282.957 37.752ZM284.191 42.776C284.25 42.8027 284.324 42.8267 284.415 42.848C284.511 42.8747 284.604 42.888 284.695 42.888C284.988 42.888 285.218 42.8213 285.383 42.688C285.548 42.56 285.698 42.3493 285.831 42.056C285.495 41.416 285.18 40.7387 284.887 40.024C284.599 39.304 284.359 38.576 284.167 37.84H284.967C285.026 38.08 285.095 38.3387 285.175 38.616C285.26 38.8933 285.354 39.1787 285.455 39.472C285.556 39.7653 285.666 40.0587 285.783 40.352C285.9 40.6453 286.023 40.928 286.151 41.2C286.354 40.64 286.53 40.0853 286.679 39.536C286.828 38.9867 286.97 38.4213 287.103 37.84H287.871C287.679 38.624 287.466 39.3787 287.231 40.
</svg>
Reference in a new issue Copy permalink