davvid
commented
2 years ago Integrating better with git worktree is a great idea.
Right now garden does support git-worktree-created worktrees in that you can configure and use them as if they were just another full-blown git tree and garden will recognize and work with them.
There's a few places where it could be extended to better support git-worktree worktrees.
The garden grow command that does cloning and setting up of repos could be taught to know about worktrees. An off-the-cuff idea might be to perhaps annotate trees to refer to a parent tree as its worktree-parent: <tree-name> and then garden could know to set them up as worktrees.
The garden plant command adds an existing tree to the config could be extended to setup these relationships, and perhaps automatically register, or require the user to manually register the worktree parent as well if it isn't already part of the config when a child worktree is planted.
I'm glad you found garden useful! I've been using to manage my git annex music/photo/video archives and for defining ad-hoc scripts and workflows for stuff.
I also tend to use it for random spelunking in repos that require some custom setup or actions to be performed. I can never remember that stuff ;-) so I try to write it down...
# garden.yaml
garden:
root: "${GARDEN_CONFIG_DIR}"
variables:
env_py3: $ python3 -c 'import sys; print("env%s%s" % sys.version_info[:2])'
trees:
photo-restoration:
description: |
AI restoration of old photos
$ garden grow photo-restoration
$ garden cmd photo-restoration init
$ garden run photo-restoration -- --help
links:
- "https://colab.research.google.com/drive/1NEm6AsybIiC5TwTU_4DqDkQO0nFRB-uA?usp=sharing&authuser=2#scrollTo=32jCofdSr8AW"
- "https://news.ycombinator.com/item?id=25148253"
- "http://raywzy.com/Old_Photo/"
environment:
PATH: "${TREE_PATH}/${env_py3}/bin"
commands:
init: |
set -x
(
cd ./Face_Detection && (
test -f shape_predictor_68_face_landmarks.dat || (
wget --no-adjust-extension http://dlib.net/files/shape_predictor_68_face_landmarks.dat.bz2 &&
bzip2 -v -d shape_predictor_68_face_landmarks.dat.bz2
)
)
)
(
cd ./Face_Enhancement && (
test -f checkpoints.zip ||
wget --no-adjust-extension https://facevc.blob.core.windows.net/zhanbo/old_photo/pretrain/Face_Enhancement/checkpoints.zip
test -d checkpoints || unzip checkpoints.zip
)
)
(
cd ./Global && (
test -f checkpoints.zip ||
wget --no-adjust-extension https://facevc.blob.core.windows.net/zhanbo/old_photo/pretrain/Global/checkpoints.zip
test -d checkpoints || unzip checkpoints.zip
)
)
test -d env3 || (
python3 -m venv ${env_py3} &&
${env_py3}/bin/pip install -r requirements.txt
)
run: ${env_py3}/bin/python3 run.py "$@"
url: "git://github.com/microsoft/Bringing-Old-Photos-Back-to-Life.git"
remotes:
davvid: "git@github.com:davvid/Bringing-Old-Photos-Back-to-Life.git"
...Usually I'd end up with a smattering of random shell scripts and notes and stuff, but now I can stick my random experimental dabbles into a garden file and then come back to it later.
Once you run the setup steps in the comments then garden run photo-restoration -- --GPU -1 --input_folder $PWD/input --output_folder $PWD/output performs photo restoration using some fancy machine learning tools.
Sorry.. that's a distraction, but since this is the first garden issue I figured I'd share an example of what I use it with in case it helps others see what it can do.
BTW, what does your typical git worktree workflow look like? Do you clone a bare repo first and then create worktrees inside the bare.git/ directory, or do you place them sibling to each other? Do you use a non-bare repo as the "main" parent worktree, or is it bare so that all of the actual checked out files are git-worktree trees?
Git supports both and we'd probably want to support any arbitrary valid usage, but just curious how folks are using that tool these days.
nickgarber
Hello and thank you for
garden!I wonder if
gardenhas support for https://git-scm.com/docs/git-worktree or could be extended to support them? It's useful for me to checkout many worktrees which can get tricky when switching among different workspaces.I'm still learning about Garden but I appreciate the sanity it brings this challenge and look forward to understanding and using it more over time.