jj/.gitignore

/target/
/rendered-docs
.direnv
.envrc
# Generated by nix build, nix-build
result
# Generated by the insta crate
*.pending-snap
*.snap*
!cli/tests/cli-reference@.md.snap
# Per user insta settings.
# See https://insta.rs/docs/settings/#tool-config-file for details.
.config/insta.yaml

# mkdocs
/.venv
/.python-version

# Editor specific ignores
.idea
.vscode
.zed

# Generated by setting `JJ_TRACE` environment variable.
jj-trace-*.json

# To make working on buck2 easier (#1997, #4413)
/buck-out/
add .gitignore 2020-12-12 08:08:12 +00:00			`/target/`
docs: Set up `mkdocs` and `poetry` I initially was thinking of using `mdbook`, which looks a little better, but I think versioning the docs is important, and the features I want are pretty much only supported by the Mkdocs' "Material" theme. Mkdocs is written in Python. The prerequesites for building docs on your machine should be to install Python and Poetry, everything else should be installed automatically by Poetry. See the edits to `contributing.md` for more details. 2023-08-18 23:43:20 +00:00			`/rendered-docs`
Move .envrc to .envrc.recommended to make it opt-in 2023-03-26 21:54:24 +00:00			`.direnv`
			`.envrc`
gitignore: add `/buck-out/` to ignore list While working on the Buck branch, I have been bitten about a million times by the following setup: - Hack away - Switch back to main - Run `jj st` after editing a file - `/buck-out` gets snapshotted, because it isn't ignored - Trip max snapshot filesize error - Pain There are a few ways to skin the cat but this is simplest. It's an incredibly small addition and it may be all for naught in the long run, but this will stem the bleeding, at least. Signed-off-by: Austin Seipp <aseipp@pobox.com> 2024-09-06 22:09:05 +00:00			`# Generated by nix build, nix-build`
Add flake.nix 2022-02-20 18:42:01 +00:00			`result`
gitignore: add `/buck-out/` to ignore list While working on the Buck branch, I have been bitten about a million times by the following setup: - Hack away - Switch back to main - Run `jj st` after editing a file - `/buck-out` gets snapshotted, because it isn't ignored - Trip max snapshot filesize error - Pain There are a few ways to skin the cat but this is simplest. It's an incredibly small addition and it may be all for naught in the long run, but this will stem the bleeding, at least. Signed-off-by: Austin Seipp <aseipp@pobox.com> 2024-09-06 22:09:05 +00:00			`# Generated by the insta crate`
gitignore: add `*.pending-snap` created by the `insta` crate 2022-03-09 20:58:21 +00:00			`*.pending-snap`
Also ignore `.snap` files created by insta crate. 2024-01-04 14:55:15 +00:00			`.snap`
docs: store output of `jj util markdown-help`, render it on the website I am using a very hacky approach, using `insta` to generate the markdown help. This is based on a lucky coincidence that `insta` chose to use a header format for snapshot files that MkDocs interprets as a Markdown header (and ignores). I considered several other approaches, but I couldn't resist the facts that: - This doesn't require new developers to install any extra tools or run any extra commands. - There is no need for a new CI check. - There is no need to compile `jj` in the "Make HTML docs" GitHub action, which is currently very fast and cheap. Downside: I'm not sure how well MkDocs will work on Windows, unless the developer explicitly enables symbolic links (which IIUC is not trivial). ### Possible alternatives My next favorite approaches (which we could switch to later) would be: #### `xtask` Set up a CI check and a [Cargo `xtask`] so that `cargo xtask cli-help-to-md` essentially runs `cargo run -- util markdown-help > docs/cli-reference.md` from the project root. Every developer would have to know to run `cargo xtask cli-help-to-md` if they change the help text. Eventually, we could have `cargo xtask preflight` that runs `cargo +nightly fmt; cargo xtask cli-help-to-md; cargo nextest run`, or `cargo insta`. #### Only generate markdown for CLI help when building the website, don't track it in Git. I think that having the file in the repo will be nice to preview changes to docs, and it'll allow people to consult the file on GitHub or in their repo. The (currently) very fast job of building the website would now require installing Rust and building `jj`. #### Same as the `xtask`, but use a shell script instead of an `xtask` An `xtask` might seem like overkill, since it's Rust instead of a shell script. However, I don't want this to be a shell script so that new contributors on Windows can still easily run it ( since this will be necessary for the CI to pass) without us having to support a batch file. #### Cargo Alias My first attempt was to set up a [cargo alias] to run this, but that doesn't support redirection (so I had to change the `jj util` command to output to a file) and, worse, is incapable of executing the command in the project root regardless of where in the project the current directory is. Again, this seems to be too inconvenient for a command that every new PR author would have to run to pass CI. Overall, this just seems a bit ugly. I did file https://github.com/rust-lang/cargo/issues/13348, I'm not really sure that was worthwhile, though. Aside: For reference, the alias was: ```toml # .cargo/config.toml alias.gen-cli-reference = "run -p jj-cli -- util markdown-help docs/cli-reference.md" ``` ### Non-alternatives #### Clap's new feature `clap` recently obtained a similarly-sounding feature in https://github.com/clap-rs/clap/pull/5206. However, it only prints short help for subcommands and can't be triggered by an option AFAICT, so it won't help us too much. [Cargo `xtask`]: https://github.com/matklad/cargo-xtask [cargo alias]: https://doc.rust-lang.org/cargo/reference/config.html#alias 2024-01-28 03:31:27 +00:00			`!cli/tests/cli-reference@.md.snap`
Ignore .cargo/insta.yaml 2024-11-04 20:19:26 +00:00			`# Per user insta settings.`
			`# See https://insta.rs/docs/settings/#tool-config-file for details.`
			`.config/insta.yaml`
move .idea ignore to editor-specific section 2023-05-11 04:16:08 +00:00
docs: migrate from poetry to uv Our docs are built with MkDocs, which requires Python and several deps. Previously those deps were managed with Poetry, which is also written in Python. This commit replaces Poetry with `uv`, a Rust-based Python project/package manager, and thus removes several steps from the docs build process. Before: <install Python> <install pipx> pipx install poetry poetry install poetry run -- mkdocs serve After: <install uv> uv run mkdocs serve 2024-11-09 21:32:29 +00:00			`# mkdocs`
			`/.venv`
			`/.python-version`

move .idea ignore to editor-specific section 2023-05-11 04:16:08 +00:00			`# Editor specific ignores`
			`.idea`
docs: beginnings of an 'editor setup' section 2024-11-09 01:13:28 +00:00			`.vscode`
			`.zed`
perf: add chrome tracing layer This generates profiles in the Google Chrome JSON tracing format. They can be opened in Chrome's `chrome://tracing` page or in tools like https://ui.perfetto.dev. Enable by running e.g. `JJ_TRACE=1 cargo run -- status`. 2023-07-08 12:45:38 +00:00
			# Generated by setting `JJ_TRACE` environment variable.
			`jj-trace-*.json`
gitignore: add `/buck-out/` to ignore list While working on the Buck branch, I have been bitten about a million times by the following setup: - Hack away - Switch back to main - Run `jj st` after editing a file - `/buck-out` gets snapshotted, because it isn't ignored - Trip max snapshot filesize error - Pain There are a few ways to skin the cat but this is simplest. It's an incredibly small addition and it may be all for naught in the long run, but this will stem the bleeding, at least. Signed-off-by: Austin Seipp <aseipp@pobox.com> 2024-09-06 22:09:05 +00:00
			`# To make working on buck2 easier (#1997, #4413)`
			`/buck-out/`