689 commits

Author	SHA1	Message	Date
Austin Seipp	e060ef20c1	cli: delete deprecated jj merge command ... This has been deprecated for almost a year now. Signed-off-by: Austin Seipp <aseipp@pobox.com>	2024-11-21 11:50:03 -06:00
Austin Seipp	037134147d	cli: delete deprecated jj checkout command ... This has been deprecated for almost a year now. Signed-off-by: Austin Seipp <aseipp@pobox.com>	2024-11-21 11:50:03 -06:00
Remo Senekowitsch	ac0e531de5	cli: provide short flags for rev ranges	2024-11-20 18:20:24 +01:00
Yuya Nishihara	1973c712a3	log: emit working-copy branch first if included in the revset ... The working-copy revision is usually the latest commit, but it's not always true. This patch ensures that the wc branch is emitted first so the graph node order is less dependent on rewrites.	2024-11-20 10:50:16 +09:00
Luke Randall	068fa0f37e	revset: allow tags() to take a pattern for an argument ... This makes it more consistent with `bookmarks()`. Co-authored-by: Austin Seipp <aseipp@pobox.com>	2024-11-20 00:47:23 +00:00
Yuya Nishihara	296961cb19	cli: git push: do not push new bookmarks by default ... If you have multiple remotes to push to, you might want to keep some changes (such as security patches) in your private fork. Git CLI has one upstream remote per branch, but jj supports multiple tracking remotes, and therefore "jj git push" can start tracking new remotes automatically. This patch makes new bookmarks not eligible for push by default. I considered adding a warning, but it's not always possible to interrupt the push shortly after a warning is emitted. --all implies --allow-new because otherwise it's equivalent to --tracked. It's also easier to write a conflict rule with --all/--deleted/--tracked than with two of them. -c/--change doesn't require --allow-new because it is the flag to create new tracking bookmark. #1278	2024-11-19 21:11:22 +09:00
Martin von Zweigbergk	7323c2e5e0	cli: delete the deprecated jj move command ... I hope we'll have support for copies and renames in not too long. It's good to have as many versions before that as possible without support for `jj move`, in case we want to later use that to record a moved file (maybe as an alias for `jj file move`).	2024-11-18 13:24:16 -08:00
Yuya Nishihara	896ab5f179	cli: fix "config unset" to not delete a whole table ... It can be a footgun, and is inconsistent because other mutation commands can't overwrite a table.	2024-11-18 09:15:40 +09:00
Benjamin Tan	4db4f413a7	revset: add fork_point function ... This can be used to find the fork point (best common ancestors) of a revset with an arbitrary number of commits, which cannot be expressed currently in the revset language.	2024-11-16 04:08:01 +08:00
Benjamin Tan	5a793f61d6	cli: duplicate: add --destination, --insert-after, and --insert-before options	2024-11-15 19:42:13 +08:00
dploch	49890fa2d9	cli_util: enable automatic update of stale workspaces if config is set ... This significantly reduces toil for multi-workspace users, resolving issue #3820	2024-11-14 11:12:02 -05:00
Benjamin Tan	9ea91dc02a	cli: rebase -b: add support for --insert-after and --insert-before options	2024-11-12 16:38:17 +08:00
Emily	7d9e9a1434	docs: remove trailing whitespace in .md	2024-11-12 01:16:08 +01:00
Yuya Nishihara	ce3436b92b	cli: add "absorb" machinery and command ... The destination commits are selected based on annotation, which I think is basically the same as "hg absorb" (except for handling of consecutive hunks.) However, we don't compute a full interleaved delta right now, and the hunks are merged in the same way as "jj squash". This means absorbed hunks might produce conflicts if no context lines exist. Still I think this is more intuitive than selecting destination commits based on patch commutativity. I've left inline comments to the tests where behavior is different from "hg absorb", but these aren't exhaustively checked. Closes #170	2024-11-12 08:26:42 +09:00
Yuya Nishihara	6739dccc6d	templater: add != operator as user would probably expect that it exists	2024-11-10 21:41:24 +09:00
Remo Senekowitsch	c9e751ae6e	completion: teach rename about local bookmarks	2024-11-10 07:26:22 +01:00
Remo Senekowitsch	db2b5890f8	util: add exec command for arbitrary aliases	2024-11-09 11:49:33 +01:00
Martin von Zweigbergk	fd271d39ad	cli: make jj desc and jj st aliases hidden ... Visible aliases interfere with shell completion, at least in Fish. For example, `jj des<tab>` stops as `jj desc` without adding a space afterwards, which make me stop for a second and wonder if I need to add more letters. They also show up in the auto-complete menu. I added "[aliases: <name>]" as part of the first line of the help text so the `jj help` output still looks the same.	2024-11-08 13:57:08 -08:00
Benjamin Tan	1372b39341	template: add support for logical equality operator	2024-11-08 01:55:18 +08:00
Martin von Zweigbergk	5de285f5eb	release: release version 0.23.0 ... I did some minor copy editing, mostly to group new features related commands, revsets, and templates near each other.	2024-11-06 20:51:38 -08:00
Yuya Nishihara	ded48ff6e7	local_working_copy: do not create file or write in directory named .jj or .git ... I originally considered adding deny-list-based implementation, but the Windows compatibility rules are super confusing and I don't have a machine to find out possible aliases. This patch instead adds directory equivalence tests. In order to test file entity equivalence, we first need to create a file or directory of the requested name. It's harmless to create an empty .jj or .git directory, but materializing .git file or symlink can temporarily set up RCE situation. That's why new empty file is created to test the path validity. We might want to add some optimization for safe names (e.g. ASCII, not contain "git" or "jj", not contain "~", etc.) That being said, I'm not pretty sure if .git/.jj in sub directory must be checked. It's not safe to cd into the directory and run "jj", but the same thing can be said to other tools such as "cargo". Perhaps, our minimum requirement is to protect our metadata (= the root .jj and .git) directories. Despite the crate name (and internal use of std::fs::File), same_file::is_same_file() can test equivalence of directories. This is documented and tested, so I've removed my custom implementation, which was slightly simpler but lacks Windows support.	2024-11-06 15:03:41 -08:00
Yuya Nishihara	1c30f3b3e8	repo_path: reject invalid path components by to_fs_path/name() ... This addresses a simple path traversal attack. I don't have a Windows machine, so the added Windows tests aren't checked locally.	2024-11-06 15:03:41 -08:00
Arthur Grillo	f2acb98ef2	help: Add a keyword feature ... It would be nice to not need to go the documentation website. This aims to solve that by introducing the concept of keyword to the help command. Basically, keywords are things that we want to add help messages to, but they don't necessarily have an associated subcommand. For now we only have two keywords: - `revsets`: Shows the docs for revsets - `tutorial`: Shows the tutorial that is on the documentation You get the keyword content by tipping `jj help --keyword revsets` or `jj help -k revsets`. You can also list the available keywords with `jj help --help`. It would be nice to have all the documentation on the keywords, maybe a next commit could do it.	2024-10-31 16:55:18 -03:00
Martin von Zweigbergk	30ab71d340	bookmarks: add support for git.auto-local-bookmark (to match docs) ... We had documented that we support `git.auto-local-bookmark` but we don't. The documentation has been incorrect since d9c68e08b1. This patch fixes it by adding support for `git.auto-local-bookmark` with fallback to the old/current `git.auto-local-branch`. .	2024-10-30 08:01:02 -07:00
pylbrecht	8b5b4c19ea	cli: add jj config unset ... Allow unsetting config values similar to `git config unset`. ```bash $ jj config set --user some-key some-val $ jj config get some-key some-val $ jj config unset --user some-key $ jj config get some-key Config error: configuration property "some-key" not found For help, see https://martinvonz.github.io/jj/latest/config/. ``` Unsetting a key, which is part of a table, might leave that table empty. For now we do not delete such empty tables, as there may be cases where an empty table is semantically meaningful (https://github.com/martinvonz/jj/issues/4458#issuecomment-2407109269). For example: ```toml [table] key = "value" [another-table] key = "value" ``` Running `jj config unset --user table.key` will leave us with `table` being empty: ```toml [table] [another-table] key = "value" ```	2024-10-30 06:50:15 +01:00
Arthur Grillo	bfaa5b8890	templates: Add new template alias builtin_log_compact_full_description ... For a new user, it is not clear how to view the full commit message/description of a change with `jj log`. This fix this, add a new template alias `builtin_log_compact_full_description` to display the commit like `builtin_log_compact` does but with a full description. The user can set it to true on the config like this: ``` templates.log = builtin_log_compact_full_description ``` Fixes: #3688	2024-10-26 14:01:18 -03:00
Dave Townsend	891fa88be0	diff: Allow setting the default level of context in config.	2024-10-25 17:56:56 +01:00
Samuel Tardieu	5895df7d02	bookmark list: add --remote to filter remote bookmarks listing	2024-10-24 18:34:43 +02:00
Yuya Nishihara	5dd6185fbc	templater: make "git_head" return boolean, render it as "git_head()" ... For the same reason as the root revision is indicated by "root()".	2024-10-21 09:21:34 +09:00
Yuya Nishihara	3d31928dac	revset: drop support for HEAD@git symbol resolution ... This was added at f5f61f6bfe "revset: resolve 'HEAD@git' just like other pseudo @git branches." As I said in this patch, there was no practical use case of the HEAD@git symbol. Suppose we implement colocated workspaces/worktrees #4436, there may be multiple Git HEAD revisions. This means HEAD can no longer be abstracted as a symbol of the "git" remote.	2024-10-21 09:21:34 +09:00
Yuya Nishihara	009284736d	templater: add pad/truncate functions ... As I said in the preceding patch, I settled on separate pad/truncate functions instead of a function taking multiple optional parameters. It's less efficient to process truncation and padding independently, but I don't think that would matter. The order of arguments follows the current f(..., content) convention. We can also add a method syntax, but I'm not sure if it's useful. In order to call a method of Template type, we'll need to coerce printable object to Template: concat(author.email()).truncate_end(10).pad_end(10) ^^^^^^ String -> Template FWIW, String type could provide more efficient truncate/pad methods. Closes #3183	2024-10-21 08:47:08 +09:00
Benjamin Tan	0f605b8aae	templates: Timestamp: add after, before methods ... This allows for more fine-grained control of timestamp formatting, for example: ``` [template-aliases] 'format_timestamp(timestamp)' = ''' if(timestamp.before("1 week ago"), timestamp.format("%b %d %Y %H:%M"), timestamp.ago() ) ''' ``` Closes #3782.	2024-10-16 13:46:06 +08:00
Benjamin Tan	aa46c02835	rebase -s: add support for --insert-after and --insert-before options	2024-10-16 11:26:59 +08:00
Benjamin Tan	8e817bc24b	revset: add coalesce(revsets...) ... The `coalesce` function takes a list of revsets and returns the commits in the first revset in the list which evalutes to a non-empty set of commits. It can be used to display fallbacks if a certain commit cannot be found, e.g. `coalesce(present(user_configured_trunk), builtin_trunk)`.	2024-10-16 10:36:27 +08:00
Ilya Grigoriev	eaab8bbc36	formatter & colors.toml: replace op_log color label with operation ... Cleans up after 7051effa8f It's split into "op_log operation" and just "operation" for the summaries (as suggested by Yuya). The color labels use "operation".	2024-10-15 19:30:19 -07:00
Alec Snyder	470275b0d0	cli: Add command jj file annotate ... A new module is added to jj_lib which exposes a function get_annotation_for_file. This annotates the given file line by line with commit information according to the commit that made the most recent change to the line. Similarly, a new command is added to the CLI called `jj file annotate` which accepts a file path. It then prints out line by line the commit information for the line and the line itself. Specific commit information can be configured via the templates.annotate_commit_summary config variable	2024-10-15 16:31:32 +03:00
Jakub Okoński	f741102f83	cargo: bump scm-record to 0.4.0	2024-10-14 21:01:53 -07:00
Ilya Grigoriev	f1bcd42883	operation templates: use end time instead of start time ... See also inline comment. For a second, I thought about replacing the word "lasted" with "after" to make it clearer, but I think it's not necessary.	2024-10-14 13:09:21 -07:00
Austin Seipp	346b16224c	changelog: move shallow clone support to unreleased section ... The change was originally made during the last release cycle, so the hunks were based and rebased on top of the previous release section. Signed-off-by: Austin Seipp <aseipp@pobox.com>	2024-10-14 21:06:36 +02:00
Lukas Wirth	9f16419202	git clone: Add depth argument	2024-10-14 20:01:08 +02:00
Lukas Wirth	802e3db27e	git_backend: Support shallow git repositories	2024-10-14 20:01:08 +02:00
Vamsi Avula	fb93394610	templates: add raw_escape_sequence ... Templates can be formatted (using labels) and are usually sanitized (unless for plain text output). `raw_escape_sequence(content)` bypasses both. ```toml 'hyperlink(url, text)' = ''' raw_escape_sequence("\e]8;;" ++ url ++ "\e\\") ++ text ++ raw_escape_sequence("\e]8;;\e\\") ''' ``` In this example, `raw_escape_sequence` not only outputs the intended escape codes, it also strips away any escape codes that might otherwise be part of the `url` (from any labels attached to the `url` content). Not all formatters (namely FormatRecorder) are supported yet. Change-Id: Id00000004492dbf39e50f3b7090706839d1d8d45	2024-10-13 12:02:40 +05:30
Vamsi Avula	a6aa25c9eb	templates: support hex bytes in string literals ... One particular use case for these is escape sequences -- and to that end, I'm also adding `\e` as a shorthand for `\x1b`. Change-Id: Id000000040ea6fd8e2d720219931485960c570dd	2024-10-13 12:02:40 +05:30
Vamsi Avula	93a4fcfe32	squash: add -f/-t shorthands for --from/--[in]to ... move already supports these, so this improves squash's parity (I believe squash is strictly a superset now) as we inch towards deleting move. Change-Id: Id00000005f2a7f551cb7a0aa598c6265091a32d1	2024-10-13 08:04:57 +05:30
Arthur Grillo	536c629df8	cli: Explicitly add a Help command to accept the early args after it ... The default clap's help command doesn't have the ability to accept flags (e.g --no-pager). The recommended way[1] to solve this is to manually implement it. [1]: https://github.com/clap-rs/clap/discussions/5332 Fixes: #4501	2024-10-12 10:17:12 -03:00
Yuya Nishihara	f166fd0726	revset: add at_operation(op, expression) ... This can be used in order to refer old working-copy commit, for example. If we find it's useful, maybe we can add an infix syntax later. Closes #1283	2024-10-12 07:57:55 +09:00
Yuya Nishihara	c6568787f3	cli: warn if trunk() alias cannot be resolved, fall back to none() ... This patch replaces all call sites with present(trunk()), and adds an explicit check for unresolvable trunk(). If we add coalesce() expression, maybe it can be rewritten to coalesce(present(trunk()), builtin_trunk()). Fixes #4616	2024-10-11 09:37:47 +09:00
Yuya Nishihara	09d91efea5	id_prefix: propagate error from disambiguation index ... The id.shortest() template prints a warning and falls back to repo-global resolution. This seems better than erroring out. There are a few edge cases in which the short-prefixes resolution can fail unexpectedly. For example, the trunk() revision might not exist in operations before "jj git clone".	2024-10-09 14:07:48 +09:00
Yuya Nishihara	f4df996242	changelog: fix conflict resolution error in 95344f9e	2024-10-08 09:58:06 +09:00
dploch	95344f9e05	simplify-parents: add a command to remove redundant parents	2024-10-07 20:15:33 -04:00