mirrors/jj
1
0
Fork 1
mirror of https://github.com/martinvonz/jj.git synced 2024-12-01 03:45:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
jj/CHANGELOG.md

2151 lines
78 KiB
Markdown
Raw Normal View History

release: add a changelog
2022-03-12 18:48:51 +00:00
# Changelog
All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
feat(squash): Add `--keep-emptied` flag Fixes #3815
2024-06-04 23:34:50 +00:00
and this project adheres
to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
release: add a changelog
2022-03-12 18:48:51 +00:00
## [Unreleased]
release: release version 0.9.0 Thanks to everyone who's contributed!
2023-09-06 16:46:27 +00:00
release: release version 0.20.0 Thanks to everyone who's contributed!
2024-08-07 16:29:39 +00:00
### Breaking changes
### Deprecations
### New features
copy-tracking: Add copy tracking as a post iteration step - force each diff command to explicitly enable copy tracking - enable copy tracking in diff_summary - post-process for diff iterator - post-process for diff stream - update changelog
2024-08-06 18:04:58 +00:00
* The following diff formats now include information about copies and moves:
copy-tracking: improve --summary and add --stat - add support for copy tracking to `diff --stat` - switch `--summary` to match git's output more closely - rework `show_diff_summary` signature to be more consistent
2024-08-09 00:00:50 +00:00
`--color-words`, `--stat`, `--summary`
copy-tracking: Add copy tracking as a post iteration step - force each diff command to explicitly enable copy tracking - enable copy tracking in diff_summary - post-process for diff iterator - post-process for diff stream - update changelog
2024-08-06 18:04:58 +00:00
config: expand tilde in ssh key filepaths Add home directory expansion for SSH key filepaths. This allows the `signing.key` configuration value to work more universally across both Linux and macOS without requiring an absolute path. This moved and renamed the previous `expand_git_path` function to a more generic location, and the prior use was updated accordingly.
2024-08-12 16:39:35 +00:00
* A tilde (`~`) at the start of the path will now be expanded to the user's home
directory when configuring a `signing.key` for SSH commit signing.
release: release version 0.20.0 Thanks to everyone who's contributed!
2024-08-07 16:29:39 +00:00
### Fixed bugs
## [0.20.0] - 2024-08-07
cargo: enable vendored-libgit2, document how to properly dynamically link libgit2 This changes less than it seems. Our CI builds already mostly linked a vendored copy of libgit2. This is because before this commit, it turns out that `git2` could link `libgit2` *either* statically or dynamically based on whether it could find a version of libgit2 it liked to link dynamically. Our CI builds usually did not provide such a version AFAIK. This made the kind of binary `cargo install` would produce unpredictable and may have contributed to #2896. I was once very surprised when I did `brew upgrade libgit2` and then `cargo build --release` suddenly switched from building dynamically linked `jj` to the vendored version. Instead, if a packager wants to link `libgit2` dynamically, they should set an environment variable, as described inside the diff of this commit. I also think we should recommend static linking as `git2` is quite picky about the versions of `libgit2` it supports. See also https://github.com/rust-lang/git2-rs/pull/1073 This might be related to #4115.
2024-07-26 00:42:28 +00:00
### Note to packagers
* `jj` now links `libgit2` statically by default. To use dynamic linking, you
need to set the environment variable `LIBGIT2_NO_VENDOR=1` while compiling.
([#4163](https://github.com/martinvonz/jj/pull/4163))
release: release version 0.17.0 Thanks to everyone who's contributed! Unlike previous releases, I went through the changelog entries and reorganized them a bit. We didn't have anything under "Deprecations" this time, but I moved the heading after "Breaking changes" for next release. I think breaking changes are more important because deprecations are just about giving a heads up before it actually breaks.
2024-05-01 14:28:16 +00:00
### Breaking changes
changelog: move "rebase --skip-emptied" entry to unreleased section
2024-07-04 12:05:26 +00:00
* `jj rebase --skip-empty` has been renamed to `jj rebase --skip-emptied`
backout: accept multiple revisions to back out Closes #3339.
2024-07-06 21:06:56 +00:00
* `jj backout --revision` has been renamed to `jj backout --revisions`.
The short alias `-r` is still supported.
cli: include untracked remote branches in default immutable_heads() I used to use "remote_branches() & ~mine()" to exclude "their" branches from the default log, and I don't think that's uncommon requirement. Suppose untracked branches are usually read-only, it's probably okay to make them immutable by default.
2024-07-14 01:59:19 +00:00
* [The default `immutable_heads()` set](docs/config.md#set-of-immutable-commits)
now includes `untracked_remote_branches()` with the assumption that untracked
branches aren't managed by you. Therefore, untracked branches are no longer
displayed in `jj log` by default.
Enable the new graph nodes by default. It's been tested in various places now, so this is probably mature enough to be the default.
2024-07-15 22:20:10 +00:00
* Updated defaults for graph node symbol templates `templates.log_node` and
`templates.op_log_node`.
cli: enable fileset by default I've tested it for months and found no problems.
2024-07-23 10:16:22 +00:00
* [The "fileset" language](docs/filesets.md) is now enabled by default. It can
still be disable by setting `ui.allow-filesets=false`.
git: on abandoning unreachable commits, don't count HEAD ref This basically reverts 20eb9ecec10f "git: don't abandon HEAD commit when it loses a branch." I think the new behavior is more consistent because the Git HEAD is equivalent to @- in jj, so it shouldn't be considered a named ref. Note that we've made old HEAD branch not considered at 92cfffd84377 "git: on external HEAD move, do not abandon old branch." #4108
2024-07-24 09:50:10 +00:00
* On `jj git fetch`/`import`, commits referred to by `HEAD@git` are no longer
preserved. If a checked-out named branch gets deleted locally or remotely, the
corresponding commits will be abandoned.
cli: do not attempt to merge op heads if --at-op=@ is specified The idea is that --at-op specifies a certain operation, so --at-op=@ can be interpreted as the option to select _the_ known head operation. This helps eliminate special cases from "op log" which doesn't snapshot nor merge concurrent ops.
2024-07-21 10:27:36 +00:00
* `jj --at-op=@` no longer merges concurrent operations if explicitly specified.
cli: obslog: show diffs from all predecessors, not first predecessor Suppose a squash node in obslog is analogous to a merge in revisions log, it makes sense to show diffs from auto-merge (or auto-squash) parents. This basically means a non-partial squash node no longer shows diffs. This also fixes missing diffs at the root predecessors if there were.
2024-08-06 08:56:53 +00:00
* `jj obslog -p` no longer shows diffs at non-partial squash operations.
Previously, it showed the same diffs as the second predecessor.
release: version 0.19.0 Signed-off-by: Austin Seipp <aseipp@pobox.com>
2024-07-03 16:17:40 +00:00
### Deprecations
cli `jj fix`: add ability to configure multiple tools for different filesets The high level changes include: - Reworking `fix_file_ids()` to loop over multiple candidate tools per file, piping file content between them. Only the final file content is written to the store, and content is no longer read for changed files that don't match any of the configured patterns. - New struct `ToolsConfig` to represent the parsed/validated configuration. - New function `get_tools_config()` to create a `ToolsConfig` from a `Config`. - New tests; the only old behavior that has changed is that we don't require `fix.tool-command` if `fix.tools` defines one or more tools. The general approach to validating the config is to fail early if anything is weird. Co-Authored-By: Josh Steadmon <steadmon@google.com>
2024-07-10 23:22:08 +00:00
* The original configuration syntax for `jj fix` is now deprecated in favor of
one that allows defining multiple tools that can affect different filesets.
These can be used in combination for now. See `jj help fix` for details.
release: version 0.19.0 Signed-off-by: Austin Seipp <aseipp@pobox.com>
2024-07-03 16:17:40 +00:00
### New features
fix: fix change notes to move something from 0.19 to future
2024-07-04 00:13:14 +00:00
* External diff tools can now be configured to invoke the tool on each file
individually instead of being passed a directory by setting
`merge-tools.$TOOL.diff-invocation-mode="file-by-file"` in config.toml.
diff: highlight word-level changes in git diffs The output looks somewhat similar to color-words diffs. Unified diffs are verbose, but are easier to follow if adjacent lines are added/removed + modified for example. Word-level diffing is forcibly enabled. We can also add a config knob (or !color condition) to turn it off to save CPU time. I originally considered disabling highlights in block insertion/deletion, but that wasn't always great. This can be addressed separately as it also applies to color-words diffs. #3958
2024-06-28 03:11:04 +00:00
* In git diffs, word-level hunks are now highlighted with underline. See [diff
colors and styles](docs/config.md#diff-colors-and-styles) for customization.
templater: add commit.diff().<format>() methods This patch adds TreeDiff template type to host formatting options. The main reason of this API design is that diff formats have various incompatible parameters, so a single .diff(files, format[, options..]) method would become messy pretty quickly. Another reason is that we can probably add custom summary templating support as diff.files().map(|file| file.path()..). RepoPathUiConverter is passed to templater explicitly because the one stored in RevsetParseContext is behind Option<_>.
2024-07-15 09:08:45 +00:00
* New `.diff().<format>()` commit template methods are added. They can be used
in order to show diffs conditionally. For example,
`if(current_working_copy, diff.summary())`.
git init: add revset alias for `trunk()` when intializing with existing git repository
2024-05-31 10:56:05 +00:00
* `jj git clone` and `jj git init` with an existing git repository adds the
default branch of the remote as repository settings for
`revset-aliases."trunk()"`.`
git clone: add revset alias for `trunk()`
2024-03-04 10:52:48 +00:00
workspace: abandon discardable working copy on forget Forgetting a workspace removes its working-copy commit, so it makes sense for it to be abandoned if it is discardable just like editing a new commit will cause the old commit to be abandoned if it is discardable.
2024-06-27 23:26:47 +00:00
* `jj workspace forget` now abandons the workspace's working-copy commit if it
was empty.
backout: include backed out commit's subject in new commit
2024-05-30 16:39:36 +00:00
* `jj backout` now includes the backed out commit's subject in the new commit
message.
backout: accept multiple revisions to back out Closes #3339.
2024-07-06 21:06:56 +00:00
* `jj backout` can now back out multiple commits at once.
cli: recursively create clone destination path
2024-07-07 13:19:47 +00:00
* `jj git clone some/nested/path` now creates the full directory tree for
nested destination paths if they don't exist.
str_util: support case‐insensitive string patterns Partially resolve a 1.5‐year‐old TODO comment. Add opt‐in syntax for case‐insensitive matching, suffixing the pattern kind with `-i`. Not every context supports case‐insensitive patterns (e.g. Git branch fetch settings). It may make sense to make this the default in at least some contexts (e.g. the commit signature and description revsets), but it would require some thought to avoid more confusing context‐sensitivity. Make `mine()` match case‐insensitively unconditionally, since email addresses are conventionally case‐insensitive and it doesn’t take a pattern anyway. This currently only handles ASCII case folding, due to the complexities of case‐insensitive Unicode comparison and the `glob` crate’s lack of support for it. This is unlikely to matter for email addresses, which very rarely contain non‐ASCII characters, but is unfortunate for names and descriptions. However, the current matching behaviour is already seriously deficient for non‐ASCII text due to the lack of any normalization, so this hopefully shouldn’t be a blocker to adding the interface. An expository comment has been left in the code for anyone who wants to try and address this (perhaps a future version of myself).
2024-06-28 09:35:50 +00:00
* String patterns now support case‐insensitive matching by suffixing any
pattern kind with `-i`. `mine()` uses case‐insensitive matching on your email
address unconditionally. Only ASCII case folding is currently implemented,
but this will likely change in the future.
str_util: add regex pattern This patch adds minimal support for the regex pattern. We might have to add "regex-i:" for completeness, but it can be achieved by "regex:'(?i)..'".
2024-07-21 12:44:43 +00:00
* String patterns now support `regex:"pattern"`.
revset: add tracked/untracked_remote_branches() Adds support for revset functions `tracked_remote_branches()` and `untracked_remote_branches()`. I think this would be especially useful for configuring `immutable_heads()` because rewriting untracked remote branches usually wouldn't be desirable (since it wouldn't update the remote branch). It also makes it easy to hide branches that you don't care about from the log, since you could hide untracked branches and then only track branches that you care about.
2024-07-07 23:38:29 +00:00
* New `tracked_remote_branches()` and `untracked_remote_branches()` revset
functions can be used to select tracked/untracked remote branches.
revset: parse file() argument as fileset expression Since fileset and revset languages are syntactically close, we can reparse revset expression as a fileset. This might sound a bit scary, but helps eliminate nested quoting like file("~glob:'*.rs'"). One oddity exists in alias substitution, though. Another possible problem is that we'll need to add fake operator parsing rules if we introduce incompatibility in fileset, or want to embed revset expressions in a fileset. Since "file(x, y)" is equivalent to "file(x|y)", the former will be deprecated. I'll probably add a mechanism to collect warnings during parsing.
2024-07-06 10:50:04 +00:00
* The `file()` revset function now accepts fileset as argument.
revset: add diff_contains(text[, files]) to search diffs The text pattern is applied prior to comparison as we do in Mercurial. This might affect hunk selection, but is much faster than computing diff of full file contents. For example, the following hunk wouldn't be caught by diff_contains("a") because the line "b\n" is filtered out: - a b + a Closes #2933
2024-07-08 11:20:41 +00:00
* New `diff_contains()` revset function can be used to search diffs.
cli: add `jj operation diff` command
2024-05-02 08:29:31 +00:00
* New command `jj operation diff` that can compare changes made between two
operations.
cli: add `jj operation show` command
2024-05-02 08:29:31 +00:00
* New command `jj operation show` that can show the changes made in a single
operation.
git: add git.private-commits setting for preventing commits from being pushed The user can define the setting `git.private-commits` as they desire. For example: git.private-commits = 'description(glob:"wip:*")' If any commits are in this revset, then the push is aborted. If a commit would be private but already exists on the remote, then it does not block pushes, nor do its descendents block pushes unless they are also contained in `git.private-commits`. Closes #3376
2024-07-05 21:47:46 +00:00
* New config setting `git.private-commits` to prevent commits from being pushed.
cli: port description template to templater This implements a building block of "signed-off-by line" #1399 and "commit --verbose" #1946. We'll probably need an easy way to customize the diff part, but I'm not sure if it can be as simple as a template alias function. User might want to embed diffs without "JJ: " prefixes? Perhaps, we can deprecate "ui.default-description", but it's not addressed in this patch. It could be replaced with "default_description" template alias, but we might want to configure default per command. Suppose we add a default "backout_description" template, it would have to be rendered against the source commit, not the newly-created backout commit. The template key is named as "draft_commit_description" because it is the template to generate an editor template. "templates.commit_description_template" sounds a bit odd. There's one minor behavior change: the default description is now terminated by "\n". Closes #1354
2024-07-20 08:46:50 +00:00
* [The default commit description template](docs/config.md#default-description)
can now be configured by `templates.draft_commit_description`.
cli `jj fix`: add ability to configure multiple tools for different filesets The high level changes include: - Reworking `fix_file_ids()` to loop over multiple candidate tools per file, piping file content between them. Only the final file content is written to the store, and content is no longer read for changed files that don't match any of the configured patterns. - New struct `ToolsConfig` to represent the parsed/validated configuration. - New function `get_tools_config()` to create a `ToolsConfig` from a `Config`. - New tests; the only old behavior that has changed is that we don't require `fix.tool-command` if `fix.tools` defines one or more tools. The general approach to validating the config is to fail early if anything is weird. Co-Authored-By: Josh Steadmon <steadmon@google.com>
2024-07-10 23:22:08 +00:00
* `jj fix` can now be configured to run different tools on different filesets.
This simplifies the use case of configuring code formatters for specific file
types. See `jj help fix` for details.
revset: add author_date and committer_date revset functions Author dates and committer dates can be filtered like so: committer_date(before:"1 hour ago") # more than 1 hour ago committer_date(after:"1 hour ago") # 1 hour ago or less A date range can be created by combining revsets. For example, to see any revisions committed yesterday: committer_date(after:"yesterday") & committer_date(before:"today")
2024-06-08 00:42:15 +00:00
* Added revset functions `author_date` and `committer_date`.
describe: allow updating the description of multiple commits If multiple commits are provided, the description of each commit will be combined into a single file for editing.
2024-07-05 09:46:05 +00:00
* `jj describe` can now update the description of multiple commits.
release: version 0.19.0 Signed-off-by: Austin Seipp <aseipp@pobox.com>
2024-07-03 16:17:40 +00:00
### Fixed bugs
Change conflict hint depending on state of working commit. To avoid always printing the rebase instructions to fix a conflict even when a child commit to fix the conflict already exists, implement the following: * If working commit has conflicts: * Continue printing the same message we print today. * If working commit has no conflicts: * If any parent has conflicts, we print: "Conflict in parent is resolved in working copy". Also explicitly not printing the "conflicting parent" here, since a merge commit could have conflict in multiple parents. * If no parent has any conflicts: exit quietly. * Update unittests for conflict hinting update. * Update CHANGELOG
2024-07-25 08:10:41 +00:00
* `jj status` will show different messages in a conflicted tree, depending
on the state of the working commit. In particular, if a child commit fixes
a conflict in the parent, this will be reflected in the hint provided
by `jj status`
diff: do not emit unified diff for binary files
2024-07-14 10:49:57 +00:00
* `jj diff --git` no longer shows the contents of binary files.
cargo: build with crt-static on windows Avoids a runtime dependency on vcruntime140.dll Signed-off-by: Austin Seipp <aseipp@pobox.com>
2024-07-15 23:31:55 +00:00
* Windows binaries no longer require `vcruntime140.dll` to be installed
(normally through Visual Studio.)
ui: do not write() to channel if builtin pager has terminated
2024-08-04 06:51:07 +00:00
* On quit, the builtin pager no longer waits for all outputs to be discarded.
branch: ignore git tracking branches for rename warning Prevents a warning from being printed when renaming branches in a colocated repo, since git tracking branches were being considered as remote tracking branches.
2024-07-18 00:52:49 +00:00
* `jj branch rename` no longer shows a warning in colocated repos.
release: release version 0.20.0 Thanks to everyone who's contributed!
2024-08-07 16:29:39 +00:00
### Contributors
Thanks to the people who made this release happen!
* Anton Älgmyr (@algmyr)
* Austin Seipp (@thoughtpolice)
* Benjamin Tan (@bnjmnt4n)
* Daniel Ploch (@torquestomp)
* Danny Hooper (@hooper)
* Emily (@emilazy)
* Essien Ita Essien (@essiene)
* Fedor Sheremetyev (@sheremetyev)
* Ilya Grigoriev (@ilyagr)
* Jonathan Tan (@jonathantanmy)
* Julien Vincent (@julienvincent)
* Martin von Zweigbergk (@martinvonz)
* Matt Kulukundis (@fowles)
* Matt Stark (@matts1)
* mlcui (@mlcui-corp)
* Philip Metzger (@PhilipMetzger)
* Scott Taylor (@scott2000)
* Skyler Grey (@Minion3665)
* Stephen Jennings (@jennings)
* Tim Janik (@tim-janik)
* Vincent Ging Ho Yim (@cenviity)
* Vladimír Čunát (@vcunat)
* Vladimir (@0xdeafbeef)
* Yuya Nishihara (@yuja)
release: version 0.19.0 Signed-off-by: Austin Seipp <aseipp@pobox.com>
2024-07-03 16:17:40 +00:00
## [0.19.0] - 2024-07-03
### Breaking changes
revset: represent program modifier as AST node The goal is to remove special case from parsing functions and provide slightly better error message. I don't know if we'd want to use "all:" in aliases, but there are no strong reasons to disable it.
2024-06-03 07:26:52 +00:00
* In revset aliases, top-level `kind:pattern` expression is now parsed as
modifier. Surround with parentheses if it should be parsed as string/file
pattern.
repo/workspace: drop support for old repo formats It's been more than 6 months since we added support for dynamically selecting the working copy implementation. This patch drops support for selecting the default implementation of that and other stores.
2024-06-08 20:59:42 +00:00
* Dropped support for automatic upgrade of repo formats used by versions before
0.12.0.
cli `fix`: change default from `-s @` to `-s 'reachable(@, mutable())'` Most of the value of `jj fix` over a shell script is in formatting commits other than `@`. `@::` often doesn't contain those other commits, so `-s @` is a bad default. We could get the same effect from `-s 'mutable() & ::@'`, but `reachable()` is a bit more explicit and simple to read. We could also base this on excluding `trunk()`, but that just seems like an indirection for `mutable()` that might ignore the user's intent if they have configured part of trunk to be mutable.
2024-06-07 03:10:21 +00:00
* `jj fix` now defaults to the broader revset `-s reachable(@, mutable())`
instead of `-s @`.
cli: branch: drop support for deprecated --glob option It's been 8 months since the option got deprecated by 8dbe12da2a6d.
2024-06-20 11:20:01 +00:00
* Dropped support for deprecated `jj branch delete`/`forget` `--glob` option.
cli: branch: make "set" do upsert as before Since "set <thing>" often adds a <thing> if not exists, it make some sense that "branch set" does upsert. The current "branch set" use case is now covered by "branch move", so it's okay to change the "set" behavior. If new branch is created by "branch set", status message and hint will be printed to help migration. The user should be able to undo creation if it was a mistake. Closes #3584
2024-06-21 09:00:04 +00:00
* `jj branch set` now creates new branch if it doesn't exist. Use `jj branch
move` to ensure that the target branch already exists.
[#3584](https://github.com/martinvonz/jj/issues/3584)
release: version 0.18.0
2024-06-05 21:24:04 +00:00
### Deprecations
changelog: minor touchups Signed-off-by: Austin Seipp <aseipp@pobox.com>
2024-07-03 16:17:40 +00:00
* Replacing `-l` shorthand for `--limit` with `-n` in `jj log`, `jj op log`
and `jj obslog`.
cli: deprecate `-l` short alias for `--limit` in favour of `-n` This better matches `git log` and affects `jj log`, `jj op log` and `jj obslog`
2024-06-14 23:24:09 +00:00
cli: deprecate `jj split --siblings` in favor of `jj split --parallel` This better matches `jj parallelize`.
2024-06-12 00:07:08 +00:00
* `jj split --siblings` is deprecated in favor of `jj split --parallel` (to
match `jj parallelize`).
changelog: minor touchups Signed-off-by: Austin Seipp <aseipp@pobox.com>
2024-07-03 16:17:40 +00:00
* A new `jj file` subcommand now replaces several existing uncategorized
commands, which are deprecated.
- `jj file show` replaces `jj cat`.
- `jj file chmod` replaces `jj chmod`.
- `jj file list` replaces `jj files`.
cli: create `jj file list` and deprecate `jj files`
2024-06-15 17:27:01 +00:00
release: version 0.18.0
2024-06-05 21:24:04 +00:00
### New features
feat: add an option to monitor the filesystem asynchronously - make an internal set of watchman extensions until the client api gets updates with triggers - add a config option to enable using triggers in watchman Co-authored-by: Waleed Khan <me@waleedkhan.name>
2024-06-15 20:50:37 +00:00
* Support background filesystem monitoring via watchman triggers enabled with
Update CHANGELOG.md Fix config flag name in changelog.
2024-06-18 00:41:49 +00:00
the `core.watchman.register_snapshot_trigger = true` config.
feat: add an option to monitor the filesystem asynchronously - make an internal set of watchman extensions until the client api gets updates with triggers - add a config option to enable using triggers in watchman Co-authored-by: Waleed Khan <me@waleedkhan.name>
2024-06-15 20:50:37 +00:00
changelog: minor touchups Signed-off-by: Austin Seipp <aseipp@pobox.com>
2024-07-03 16:17:40 +00:00
* Show paths to config files when configuration errors occur.
Show paths of config files when configurations contain errors This addresses issue #3317, where as discussed we want to show the paths to configuration files if they contain errors, to make it easier for the user to locate them.
2024-06-09 13:11:41 +00:00
cli `fix`: add `revsets.fix` config for default revset to be fixed
2024-06-07 02:42:50 +00:00
* `jj fix` now supports configuring the default revset for `-s` using the
`revsets.fix` config.
give descendants a range arg
2024-06-13 16:38:02 +00:00
* The `descendants()` revset function now accepts an optional `depth` argument;
like the `ancestors()` depth argument, it limits the depth of the set.
revset, templater: implement arity-based alias overloading Still alias function shadows builtin function (of any arity) by name. This allows to detect argument error as such, but might be a bit inconvenient if user wants to overload heads() for example. If needed, maybe we can add some config/revset syntax to import builtin function to alias namespace. The functions table is keyed by name, not by (name, arity) pair. That's mainly because std collections require keys to be Borrow, and a pair of borrowed values is incompatible with owned pair. Another reason is it makes easy to look up overloads by name. Alias overloading could also be achieved by adding default parameters, but that will complicate the implementation a bit more, and can't prevent shadowing of 0-ary immutable_heads(). Closes #2966
2024-06-05 13:29:10 +00:00
* Revset/template aliases now support function overloading.
[#2966](https://github.com/martinvonz/jj/issues/2966)
conflicts: materialize simplified file conflicts
2024-05-30 22:58:36 +00:00
* Conflicted files are individually simplified before being materialized.
changelog: minor touchups Signed-off-by: Austin Seipp <aseipp@pobox.com>
2024-07-03 16:17:40 +00:00
* The `jj file` subcommand now contains several existing file utilities.
- `jj file show`, replacing `jj cat`.
- `jj file chmod` replacing `jj chmod`.
- `jj file list` replacing `jj files`.
feat: Create a `file` command containing `print` and `chmod` - rearrange the files involved to be more clear about structure - deprecate existing `jj cat` and `jj chmod`
2024-06-14 14:34:17 +00:00
cli: branch: add "move" command that can update branches by revset or name This basically supersedes the current "branch set" command. The plan is to turn "branch set" into an "upsert" command, and deprecate "branch create". (#3584) Maybe we can also add "branch set --new" flag to only allow creation of new branches. One reason behind this proposed change is that "set" usually allows both "creation" and "update". However, we also need a typo-safe version of "set" to not create new branches by accident. "jj branch move" is useful when advancing ancestor branches. Let's say you've added a couple of commits on top of an existing PR branch, you can advance the branch by "jj branch move --from 'heads(::@- & branches())' --to @-". If this pattern is super common, maybe we can add --advance flag for short. One drawback of this change is that "git branch --move" is equivalent to "jj branch rename". I personally don't find this is confusing, but it's true that "move" sometimes means "rename".
2024-06-16 06:40:53 +00:00
* New command `jj branch move` let you update branches by name pattern or source
revision.
cli: Add an option to diff to output only paths.
2024-06-19 17:19:51 +00:00
* New diff option `jj diff --name-only` allows for easier shell scripting.
docs: add customization example of color-words diff style The default style is compatible with various terminal emulators, but I suspect that many people wouldn't like underlines. Let's add an example to override it.
2024-06-30 06:41:44 +00:00
* In color-words diffs, hunks are now highlighted with underline. See [diff
colors and styles](docs/config.md#diff-colors-and-styles) for customization.
cli: let `jj git push --change` handle large revsets In a repo of mine I wanted to do something like the following to push all of my leaves to the remote as backup: jj git push -c 'all:heads(base::) & mine() ~ empty()' But couldn't, because `jj git push` doesn't handle large revsets, even though it does handle multiple `-c` arguments, so I had to work out some pipe-to-xargs command instead. Signed-off-by: Austin Seipp <aseipp@pobox.com>
2024-06-19 18:09:00 +00:00
* `jj git push -c <arg>` can now accept revsets that resolve to multiple
revisions. This means that `jj git push -c xyz -c abc` is now equivalent to
`jj git push -c 'all:(xyz | abc)'`.
next/prev: Implement `next/prev --conflict` This allows users to jump to the next conflict in the ancestors or children of the start commit. Continues work on #2126 Co-Authored-By: Noah Mayr <dev@noahmayr.com>
2024-02-18 17:57:55 +00:00
* `jj prev` and `jj next` have gained a `--conflict` flag which moves you
to the next conflict in a child commit.
cli: git: add `jj git remote set-url` command
2024-06-21 11:11:22 +00:00
* New command `jj git remote set-url` that sets the url of a git remote.
commit_builder: reset author timestamp on discardable commits It's common to create empty working-copy commits while using jj, and currently the author timestamp for a commit is only set when it is first created. If you create an empty commit, then don't work on a repo for a few days, and then start working on a new feature without abandoning the working-copy commit, the author timestamp will remain as the time the commit was created rather than being updated to the time that work began or finished. This commit changes the behavior so that discardable commits (empty commits with no description) by the current user have their author timestamps reset when they are rewritten, meaning that the author timestamp will become finalized whenever a commit is given a description or becomes non-empty.
2024-06-23 22:20:33 +00:00
* Author timestamp is now reset when rewriting discardable commits (empty
commits with no description) if authored by the current user.
[#2000](https://github.com/martinvonz/jj/issues/2000)
commit: add `--reset-author` option
2024-06-23 22:54:07 +00:00
* `jj commit` now accepts `--reset-author` option to match `jj describe`.
fix(changelog): Move --keep-emptied to the correct release. Thanks @scott2000 for catching this.
2024-07-03 04:33:12 +00:00
* `jj squash` now accepts a `--keep-emptied` option to keep the source commit.
release: version 0.18.0
2024-06-05 21:24:04 +00:00
### Fixed bugs
cli: Ignore `immutable()` in `jj git push` conflict/desc/user checks Fixes #3029.
2024-06-21 01:50:51 +00:00
* `jj git push` now ignores immutable commits when checking whether a
to-be-pushed commit has conflicts, or has no description / committer / author
set. [#3029](https://github.com/martinvonz/jj/issues/3029)
changelog: minor touchups Signed-off-by: Austin Seipp <aseipp@pobox.com>
2024-07-03 16:17:40 +00:00
* `jj` will look for divergent changes outside the short prefix set even if it
finds the change id inside the short prefix set.
[#2476](https://github.com/martinvonz/jj/issues/2476)
lib id_prefix: look for divergent changes outside short prefix set Fixes #2476. Previously, if there was a change id match within the short prefix lookup set, `jj` would not look for commits with that same change id outside the short prefix set. So, it wouldn't find the conflicted commits for a commit with a divergent (AKA conflicted) change id.
2024-06-28 22:35:13 +00:00
release: version 0.19.0 Signed-off-by: Austin Seipp <aseipp@pobox.com>
2024-07-03 16:17:40 +00:00
### Contributors
Thanks to the people who made this release happen!
* Austin Seipp (@thoughtpolice)
* Benjamin Tan (@bnjmnt4n)
* Daniel Ploch (@torquestomp)
* Danny Hooper (@hooper)
* Ilya Grigoriev (@ilyagr)
* James Sully (@sullyj3)
* Jonathan Tan (@jonathantanmy)
* Kyle J Strand (@BatmanAoD)
* Manuel Caldeira (@KiitoX)
* Martin von Zweigbergk (@martinvonz)
* Matt Kulukundis (@fowles)
* Matt Stark (@matts1)
* mlcui (@mlcui-corp)
* Philip Metzger (@PhilipMetzger)
* Scott Taylor (@scott2000)
* Simon Wollwage (@Kintaro)
* Tal Pressman (@tp-woven)
* Yuya Nishihara (@yuja)
release: version 0.18.0
2024-06-05 21:24:04 +00:00
## [0.18.0] - 2024-06-05
### Breaking changes
cli: drop support for old `ui.default-revset` config We replaced it by `revsets.log` in 0.8.0, which is long enough that users should have been able to switch.
2024-05-05 14:17:52 +00:00
* Dropped support for `ui.default-revset` config (replaced by `revsets.log` in
0.8.0).
cli: port "branch list" to template Perhaps, this can be used to generate parsable branches list. The hint for deleted branches isn't migrated to the template. I'm thinking of moving it out of the loop and printed once at the end. If we want to generate a hint in template, we'll probably need local_ref.tracking_remote_refs(), etc. that return a list of RefNames.
2024-04-30 06:00:07 +00:00
* The `commit_summary_no_branches` template is superseded by
`templates.branch_list`.
Refuse to split an empty commit with `jj split`. Rationale: The user may be confused by the empty diff in the diff editor tool if they accidentally run `jj split` on a wrong (empty) commit.
2024-05-10 14:44:49 +00:00
* `jj split` will now refuse to split an empty commit.
cli: config: leverage toml_edit::Value to serialize values I use ValueKind::Ty(ref v) here because (*v).into() looked rather noisy. Fixes #3374
2024-05-21 11:10:22 +00:00
* `jj config list` now uses multi-line strings and single-quoted strings in the
output when appropriate.
config: migrate "config get"/"set" to TOML-based name argument parsing
2024-05-22 09:31:42 +00:00
* `jj config get`/`list`/`set` now parse `name` argument as [TOML
key](https://toml.io/en/v1.0.0#keys). Quote meta characters as needed.
Example: `jj config get "revset-aliases.'trunk()'"`
repo: consider empty and undescribed merge commits as discardable
2024-05-28 05:24:02 +00:00
* When updating the working copy away from an empty and undescribed commit, it
is now abandoned even if it is a merge commit.
repo: when abandoning a working copy that a merge, recreate it I recently needed to test something on top of a two branches at the same time, so I created a new commit on top of both of them (i.e. a merge commit). I then ran tests and made some adjustments to the code. These adjustments belonged in one of the parent branches, so I used `jj squash --into` to squash it in there. Unfortunately, that meant that my working copy became a single-parent commit based on one of the branches only. We already had #2859 for tracking this issue. This patch changes the behavior so we create a new working-copy commit with all of the previous parents.
2024-05-28 04:40:46 +00:00
* If a new working-copy commit is created because the old one was abandoned, and
the old commit was merge, then the new commit will now also be.
[#2859](https://github.com/martinvonz/jj/issues/2859)
new: convert `--insert-before` and `--insert-after` into proper options
2024-05-31 21:07:41 +00:00
* `jj new`'s `--insert-before`/`--insert-after` options must now be set for each
commit the new commit will be inserted before/after. Previously, those options
were global flags and specifying them once would insert the new commit before/
after all the specified commits.
docs: update changelog with `checkout`/`merge` deprecations Summary: Put both notices together at once, for ease of reading and understanding. Signed-off-by: Austin Seipp <aseipp@pobox.com> Change-Id: I2aedb42fdab346b21990a106433512d7ec119ad4
2024-01-19 00:01:11 +00:00
### Deprecations
release: version 0.18.0
2024-06-05 21:24:04 +00:00
* Attempting to alias a built-in command now gives a warning, rather than being
silently ignored.
give a warning when trying to redefine a built-in command previously, aliases to built-in commands were silently ignored. this matches git's behavior, but seems unhelpful, especially if the user doesn't know that a command with that name already exists. give a warning rather than silently ignoring it.
2024-02-09 22:38:43 +00:00
release: release version 0.17.0 Thanks to everyone who's contributed! Unlike previous releases, I went through the changelog entries and reorganized them a bit. We didn't have anything under "Deprecations" this time, but I moved the heading after "Breaking changes" for next release. I think breaking changes are more important because deprecations are just about giving a heads up before it actually breaks.
2024-05-01 14:28:16 +00:00
### New features
cli: port "branch list" to template Perhaps, this can be used to generate parsable branches list. The hint for deleted branches isn't migrated to the template. I'm thinking of moving it out of the loop and printed once at the end. If we want to generate a hint in template, we'll probably need local_ref.tracking_remote_refs(), etc. that return a list of RefNames.
2024-04-30 06:00:07 +00:00
* `jj branch list`/`tag list` now accept `-T`/`--template` option. The tag list
prints commit summary along with the tag name by default.
cli: show commit summary in "tag list" This is basically a template version of print_branch_target().
2024-04-25 09:23:12 +00:00
conflicts.rs: label conflict number and sides next to conflict markers For example, ``` <<<<<<< Conflict 1 of 3 +++++++ Contents of side #1 left 3.1 left 3.2 left 3.3 %%%%%%% Changes from base to side #2 -line 3 +right 3.1 >>>>>>> ``` or ``` <<<<<<< Conflict 1 of 1 %%%%%%% Changes from base to side #1 -line 3 +right 3.1 +++++++ Contents of side #2 left 3.1 left 3.2 left 3.3 >>>>>>> ``` Currently, there is no way to disable these, this is TODO for a future PR. Other TODOs for future PRs: make these labels configurable. After that, we could support a `diff3/git`-like conflict format as well, in principle. Counting conflicts helps with knowing whether you fixed all the conflicts while you are in the editor. While labeling "side #1", etc, does not tell you the commit id or description as requested in #1176, I still think it's an improvement. Most importantly, I hope this will make `jj`'s conflict format less scary-looking for new users. I've used this for a bit, and I like it. Without the labels, I would see that the two conflicts have a different order of conflict markers, but I wouldn't be able to remember what that means. For longer diffs, it can be tricky for me to quickly tell that it's a diff as opposed to one of the sides. This also creates some hope of being able to navigate a conflict with more than 2 sides. Another not-so-secret goal for this is explained in https://github.com/martinvonz/jj/pull/3109#issuecomment-2014140627. The idea is a little weird, but I *think* it could be helpful, and I'd like to experiment with it.
2024-03-23 22:16:28 +00:00
* Conflict markers now include an explanation of what each part of the conflict
represents.
feat(squash): Add `--keep-emptied` flag Fixes #3815
2024-06-04 23:34:50 +00:00
* `ui.color = "debug"` prints active labels alongside the regular colored
output.
cli: add `ui.color = "debug"` When using `ui.color = "debug"`, changes in the output style additionally include delimiters << and >>, as well as all active labels at this point separated by ::. The output is otherwise unformatted and the delimiters and labels inherit the style of the content they apply to.
2024-05-06 16:23:36 +00:00
cli: make jj branch track show conflicts
2024-05-14 16:20:37 +00:00
* `jj branch track` now show conflicts if there are some.
changelog: fix typo and move 'reachable' announcement to correct section
2024-05-21 15:12:56 +00:00
* A new revset `reachable(srcs, domain)` will return all commits that are
reachable from `srcs` within `domain`.
github: add linux-aarch64 build
2024-05-19 16:38:40 +00:00
* There are now prebuilt binaries for `aarch64-linux-unknown-musl`.
Note, these are cross compiled and currently untested.
We plan on providing fully tested builds later once our CI system allows it.
Add the revsets `mutable` and `immutable`. I add them as aliases, since a user may instead choose to define `immutable_heads()`, for example, as `heads(immutable())`, and the define `immutable()` instead.
2024-05-16 23:34:43 +00:00
* Added new revsets `mutable()` and `immutable()`.
release: version 0.18.0
2024-06-05 21:24:04 +00:00
* Upgraded `scm-record` from v0.2.0 to v0.3.0. See release notes at
<https://github.com/arxanas/scm-record/releases/tag/v0.3.0>
deps: upgrade `scm-record` from v0.2.0 to v0.3.0 See release notes at https://github.com/arxanas/scm-record/releases/tag/v0.3.0
2024-05-26 23:35:06 +00:00
cli: implement enough of `jj fix` to run a single tool on all files
2024-05-15 22:19:55 +00:00
* New command `jj fix` that can be configured to update commits by running code
formatters (or similar tools) on changed files. The configuration schema and
flags are minimal for now, with a number of improvements planned (for example,
[#3800](https://github.com/martinvonz/jj/issues/3800) and
[#3801](https://github.com/martinvonz/jj/issues/3801)).
new: allow `--insert-before` and `--insert-after` simultaneously
2024-06-01 14:26:27 +00:00
* `jj new`'s `--insert-before` and `--insert-after` options can now be used
simultaneously.
cli: add --allow-empty-description flag to push This commit adds an optional flag to be able to push commits with an empty description to a remote git repo. While the default behavior is ideal we might need to interact with a repo that has an empty commit description in it. I ran into this issue a few weeks ago pushing commits from an open source repo to an empty repo and had to go back to using git for that push as I would not want to rewrite the history which was many many years long just for that. This flag allows users an escape hatch for pushing empty descriptions for commits and they're sure that they want that behavior. This commit adds the flag to the `git push` command and updates the docs for the command. It also updates the original test to make sure that the flag works as intended to reject the commit when not set and to allow the commit when the flag is set. Closes #2633
2024-05-09 17:26:07 +00:00
* `jj git push` now can push commits with empty descriptions with the
`--allow-empty-description` flag
release: release version 0.17.0 Thanks to everyone who's contributed! Unlike previous releases, I went through the changelog entries and reorganized them a bit. We didn't have anything under "Deprecations" this time, but I moved the heading after "Breaking changes" for next release. I think breaking changes are more important because deprecations are just about giving a heads up before it actually breaks.
2024-05-01 14:28:16 +00:00
### Fixed bugs
jj git push: safety checks in push negotiation, "force-with-lease" As explained in the commit, our logic is a bit more complicated than that of `git push --force-with-lease`. This is to match the behavior of `jj git fetch` and branch conflict resolution rules.
2024-05-09 02:31:19 +00:00
* Previously, `jj git push` only made sure that the branch is in the expected
location on the remote server when pushing a branch forward (as opposed to
sideways or backwards). Now, `jj git push` makes a safety check in all cases
and fails whenever `jj git fetch` would have introduced a conflict.
In other words, previously branches that moved sideways or backward were
pushed similarly to Git's `git push --force`; now they have protections
similar to `git push --force-with-lease` (though not identical to it, to match
the behavior of `jj git fetch`). Note also that because of the way `jj git
fetch` works, `jj` does not suffer from the same problems as Git's `git push
--force-with-lease` in situations when `git fetch` is run in the background.
feat(squash): Add `--keep-emptied` flag Fixes #3815
2024-06-04 23:34:50 +00:00
* When the working copy commit becomes immutable, a new one is automatically
created
release: version 0.18.0
2024-06-05 21:24:04 +00:00
on top of it to avoid letting the user edit the immutable one.
fix: changelog entry for PR #3600
2024-05-14 08:38:48 +00:00
`jj config list`: escape keys Fixes #1322. There may be more places where keys need escaping, I'm not completely sure.
2024-05-21 04:46:14 +00:00
* `jj config list` now properly escapes TOML keys (#1322).
feat(squash): Add `--keep-emptied` flag Fixes #3815
2024-06-04 23:34:50 +00:00
* Files with conflicts are now checked out as executable if all sides of the
local_working_copy: when all sides of a conflict are executable, materialise the conflicted file as executable Fixes #3579 and adds a testcase for an executable conflict treevalue.
2024-04-26 04:42:20 +00:00
conflict are executable.
cli: clear line after writing Clear the rest of the cursor line (from the cursor to the end of the row) after drawing the progress bar rather than clearing the entire line before drawing. This reduces flickering on terminal emulators which are able to redraw rapidly.
2024-05-30 16:05:21 +00:00
* The progress bar (visible when using e.g. `jj git clone`) clears the
remainder of the cursor row after drawing rather than clearing the entire row
before drawing, eliminating the "flicker" effect seen on some terminals.
release: version 0.18.0
2024-06-05 21:24:04 +00:00
### Contributors
Thanks to the people who made this release happen!
* Alexander Potashev (@aspotashev)
* Austin Seipp (@thoughtpolice)
* Benjamin Tan (@bnjmnt4n)
* Charles Crete (@Cretezy)
changelog: sort names in 0.18 release notes
2024-06-06 10:35:44 +00:00
* Daniel Ploch (@torquestomp)
release: version 0.18.0
2024-06-05 21:24:04 +00:00
* Danny Hooper (@hooper)
* Eidolon (@HybridEidolon)
* Glen Choo (@chooglen)
* Gregory Anders (@gpanders)
* Ilya Grigoriev (@ilyagr)
changelog: sort names in 0.18 release notes
2024-06-06 10:35:44 +00:00
* jyn (@jyn514)
release: version 0.18.0
2024-06-05 21:24:04 +00:00
* Martin von Zweigbergk (@martinvonz)
* Matt Stark (@matts1)
* Matthew Davidson (@KingMob)
* Michael Gattozzi (@mgattozzi)
changelog: sort names in 0.18 release notes
2024-06-06 10:35:44 +00:00
* mlcui (@mlcui-corp)
release: version 0.18.0
2024-06-05 21:24:04 +00:00
* Philip Metzger (@PhilipMetzger)
* Remo Senekowitsch (@senekor)
* Thomas Castiglione (@gulbanana)
changelog: fix @tdaron username
2024-06-06 08:18:58 +00:00
* Théo Daron (@tdaron)
changelog: sort names in 0.18 release notes
2024-06-06 10:35:44 +00:00
* tinger (@tingerrr)
release: version 0.18.0
2024-06-05 21:24:04 +00:00
* Waleed Khan (@arxanas)
* Yuya Nishihara (@yuja)
release: release version 0.17.1 This release includes a fix for a performance regression in `jj status`.
2024-05-07 14:49:58 +00:00
## [0.17.1] - 2024-05-07
### Fixed bugs
feat(squash): Add `--keep-emptied` flag Fixes #3815
2024-06-04 23:34:50 +00:00
* `jj status` no longer scans through the entire history to look for ancestors
with conflicts.
cli: status: only scan through mutable changes to find conflicts Fixes #3628
2024-05-06 21:52:09 +00:00
release: release version 0.17.0 Thanks to everyone who's contributed! Unlike previous releases, I went through the changelog entries and reorganized them a bit. We didn't have anything under "Deprecations" this time, but I moved the heading after "Breaking changes" for next release. I think breaking changes are more important because deprecations are just about giving a heads up before it actually breaks.
2024-05-01 14:28:16 +00:00
## [0.17.0] - 2024-05-01
release: release version 0.16.0 Thanks to everyone who's contributed!
2024-04-03 18:06:54 +00:00
### Breaking changes
templates: reimplement builtin_change_id_with_hidden_and_divergent_info alias This helps extract commit_summary template as an alias function.
2024-04-25 08:30:09 +00:00
* The default template aliases were replaced as follows:
* `builtin_op_log_root(op_id: OperationId)` ->
`format_root_operation(root: Operation)`
* `builtin_log_root(change_id: ChangeId, commit_id: CommitId)` ->
`format_root_commit(root: Commit)`
* `builtin_change_id_with_hidden_and_divergent_info` ->
`format_short_change_id_with_hidden_and_divergent_info(commit: Commit)`
templates: Change builtin_log_root to be consistent with other hooks
2024-04-05 12:16:45 +00:00
rebase: allow `-r` to accept multiple revisions
2024-04-23 14:47:55 +00:00
* The `--revision` option of `jj rebase` is renamed to `--revisions`. The short
alias `-r` is still supported.
release: release version 0.16.0 Thanks to everyone who's contributed!
2024-04-03 18:06:54 +00:00
### New features
docs: move new changelog entry to the unreleased section
2024-04-04 04:04:11 +00:00
* The list of conflicted paths is printed whenever the working copy changes.
This can be disabled with the `--quiet` option.
release: release version 0.17.0 Thanks to everyone who's contributed! Unlike previous releases, I went through the changelog entries and reorganized them a bit. We didn't have anything under "Deprecations" this time, but I moved the heading after "Breaking changes" for next release. I think breaking changes are more important because deprecations are just about giving a heads up before it actually breaks.
2024-05-01 14:28:16 +00:00
* Commit objects in templates now have a `mine() -> Boolean` method analog to
the same function in revsets. It evaluates to true if the email of the commit
author matches the current `user.email`.
template: add method mine() to commit type
2024-04-04 15:43:59 +00:00
release: release version 0.17.0 Thanks to everyone who's contributed! Unlike previous releases, I went through the changelog entries and reorganized them a bit. We didn't have anything under "Deprecations" this time, but I moved the heading after "Breaking changes" for next release. I think breaking changes are more important because deprecations are just about giving a heads up before it actually breaks.
2024-05-01 14:28:16 +00:00
* Commit objects in templates now have a `contained_in(revset: String) ->
Boolean` method.
cli: add `ui.always-allow-large-revsets` option This lets users use "large" revsets in commands such as `jj rebase`, without needing the `all:` modifier. Signed-off-by: Austin Seipp <aseipp@pobox.com> Change-Id: Ica80927324f3d634413d3cc79fbc73057ccefd8a
2024-04-04 21:07:39 +00:00
release: release version 0.17.0 Thanks to everyone who's contributed! Unlike previous releases, I went through the changelog entries and reorganized them a bit. We didn't have anything under "Deprecations" this time, but I moved the heading after "Breaking changes" for next release. I think breaking changes are more important because deprecations are just about giving a heads up before it actually breaks.
2024-05-01 14:28:16 +00:00
* Operation objects in templates now have a `snapshot() -> Boolean` method that
evaluates to true if the operation was a snapshot created by a non-mutating
command (e.g. `jj log`).
Implement jj parallelize Parallelize revisions by making them siblings Running `jj parallelize 1::2` will transform the history like this: ```text 3 | 3 2 / \ | -> 1 2 1 \ / | 0 0 ``` Each of the target revisions is rebased onto the parents of the root(s) of the target revset (not to be confused with the repo root). The children of the head(s) of the target revset are rebased onto the target revisions. The target revset is the union of the REVISIONS arguments. The target revset being parallelized must satisfy several conditions, otherwise the command will fail. 1. The heads of the target revset must not have different children. 2. The roots of the target revset must not have different parents. 3. The parents of all target revisions except the roots must also be parallelized. This means that the target revisions must be connected.
2024-03-31 12:46:55 +00:00
release: release version 0.17.0 Thanks to everyone who's contributed! Unlike previous releases, I went through the changelog entries and reorganized them a bit. We didn't have anything under "Deprecations" this time, but I moved the heading after "Breaking changes" for next release. I think breaking changes are more important because deprecations are just about giving a heads up before it actually breaks.
2024-05-01 14:28:16 +00:00
* Revsets and templates now support single-quoted raw string literals.
* A new config option `ui.always-allow-large-revsets` has been added to
allow large revsets expressions in some commands, without the `all:` prefix.
cli: support filtering by paths in `status`
2024-04-02 20:17:03 +00:00
cli: if enabled, parse path arguments as fileset expressions If this doesn't work out, maybe we can try one of these: a. fall back to bare file name if expression doesn't contain any operator-like characters (e.g. "f(x" is an error, but "f x" can be parsed as bare string) b. introduce command-line flag to opt in (e.g. -e FILESET) c. introduce pattern prefix to opt in (e.g. set:FILESET) Closes #3239, #2915, #2286
2024-04-08 07:43:18 +00:00
* A new config option `ui.allow-filesets` has been added to enable ["fileset"
expressions](docs/filesets.md). Note that filesets are currently experimental,
but will be enabled by default in a future release.
cli: add support for file kind:pattern syntax This is basically the same as string kind:pattern syntax in CLI. This will hopefully be superseded by filesets, but I'm not sure if that will work out. A file name is more likely to contain whitespaces, which will have to be quoted as '"Documents and Settings"'.
2024-04-06 07:46:24 +00:00
release: release version 0.17.0 Thanks to everyone who's contributed! Unlike previous releases, I went through the changelog entries and reorganized them a bit. We didn't have anything under "Deprecations" this time, but I moved the heading after "Breaking changes" for next release. I think breaking changes are more important because deprecations are just about giving a heads up before it actually breaks.
2024-05-01 14:28:16 +00:00
* A new global flag `--ignore-immutable` lets you rewrite immutable commits.
* New command `jj parallelize` that rebases a set of revisions into siblings.
* `jj status` now supports filtering by paths. For example, `jj status .` will
only list changed files that are descendants of the current directory.
fileset, revset, templater: add support for single-quoted raw string literals Since fileset/revset/template expressions are specified as command-line arguments, it's sometimes convenient to use single quotes instead of double quotes. Various scripting languages parse single-quoted strings in various ways, but I choose the TOML rule because it's simple and practically useful. TOML is our config language, so copying the TOML syntax would be less surprising than borrowing it from another language. https://github.com/toml-lang/toml/issues/188
2024-04-17 12:17:40 +00:00
Make `jj next` work when the working copy is a merge commit
2024-04-08 00:46:33 +00:00
* `jj prev` and `jj next` now work when the working copy revision is a merge.
Make `jj prev` work when the working copy is a merge commit Before this commit `jj prev` fails if the current working copy commit is a merge commit. After this commit it will prompt the user to choose the ancestor they want to select. #2126
2024-04-02 21:27:02 +00:00
Add a --use-destination-message option to `jj squash` if `--use-destination-message/-u` is passed to `jj squash`, the resulting revision will use the description of the destination revision and the description(s) of the source revision(s) will be discarded.
2024-04-02 15:19:12 +00:00
* `jj squash` now accepts a `--use-destination-message/-u` option that uses the
description of the destination for the new squashed revision and discards the
descriptions of the source revisions.
templater: Add `operation.snapshot()` boolean Expose the information we now record, to allow changing the default "snapshot working copy" message or to make snapshots more compact/less distracting in the log
2024-04-05 11:21:36 +00:00
New `jj debug watchman status` command This command checks not only whether Watchman works, but also whether it's enabled in the config. Also, the output is easier to understand than that of the other `jj debug watchman` commands. It would be nice if `jj debug watchman` called `jj debug watchman status`, but it's not trivial in `clap` to have a default subcommand.
2024-03-31 05:47:07 +00:00
* You can check whether Watchman fsmonitor is enabled or installed with the new
`jj debug watchman status` command.
rebase: allow `-r` to accept multiple revisions
2024-04-23 14:47:55 +00:00
* `jj rebase` now accepts revsets resolving to multiple revisions with the
feat(squash): Add `--keep-emptied` flag Fixes #3815
2024-06-04 23:34:50 +00:00
`--revisions`/`-r` option.
rebase: allow `-r` to accept multiple revisions
2024-04-23 14:47:55 +00:00
rebase: add `--insert-after` and `--insert-before` options for `--revisions`
2024-03-29 13:32:55 +00:00
* `jj rebase -r` now accepts `--insert-after` and `--insert-before` options to
customize the location of the rebased revisions.
release: release version 0.16.0 Thanks to everyone who's contributed!
2024-04-03 18:06:54 +00:00
### Fixed bugs
revset: backport \-escapes parsing from templater
2024-04-07 07:10:17 +00:00
* Revsets now support `\`-escapes in string literal.
Fix empty files can't be selected in the builtin diff editor This fixes several issues that made working with empty files difficult using the builtin diff editor. 1. The scm-record library used for the editor expects each file to have at least one section. For new empty files this should be a file mode section. jj wasn't rendering this mode section, which prevented empty files from being selected at all. 2. The scm-record library returns `SelectedContents::Absent` if the file has no contents after the diff editor is invoked. This can be because of several reasons: 1) the file is new and empty; 2) the file was empty before and is still empty; 3) the file has been deleted. Perhaps this is a bug in scm-record and it should return `SelectedContents::Unchanged` or `SelectedContents::Present` if the file hasn't been deleted. Until this is patched upstream, we can work around it by disambiguating these cases. See https://github.com/arxanas/scm-record/issues/26 for the upstream bug. Fixes #3016
2024-04-09 17:53:21 +00:00
* The builtin diff editor now allows empty files to be selected during
`jj split`.
Fix a bug when the target of `jj split` has merge commit children Ilya reported this in https://github.com/martinvonz/jj/issues/3483. The bug was introduced in https://github.com/martinvonz/jj/commit/976320726d99659936eeab0e71b42d816dffbac0. Before this fix, `jj split` dropped any parents what weren't involved in the split when it rebased the children of the commit being split. This meant that any children which were merge commits lost their other parents unintentionally. Fixes #3483
2024-04-11 13:27:17 +00:00
* Fixed a bug with `jj split` introduced in 0.16.0 that caused it to incorrectly
rebase the children of the revision being split if they had other parents
(i.e. if the child was a merge).
revset: backport \-escapes parsing from templater
2024-04-07 07:10:17 +00:00
cli: allow `snapshot.max-new-file-size` to be a raw u64 Previously, this command would work: jj --config-toml='snapshot.max-new-file-size="1"' st And is equivalent to this: jj --config-toml='snapshot.max-new-file-size="1B"' st But this would not work, despite looking like it should: jj --config-toml='snapshot.max-new-file-size=1' st This is extremely confusing for users. This config value is deserialized via serde; and while the `HumanByteSize` struct allegedly implemented Serde's `visit_u64` method, it was not called by the deserialize visitor. Strangely, adding an `visit_i64` method *did* work, but then requires handling of overflow, etc. This is likely because TOML integers are naturally specified in `i64`. Instead, just don't bother with any of that; implement a `TryFrom<String>` instance for `HumanByteSize` that uses `u64::from_str` to try parsing the string immediately; *then* fall back to `parse_human_byte_size` if that doesn't work. This not only fixes the behavior but, IMO, is much simpler to reason about; we get our `Deserialize` instance for free from the `TryFrom` instance. Finally, this adjusts the test for `max-new-file-size` to now use a raw integer literal, to ensure it doesn't regress. (There are already in-crate tests for parsing the human readable strings.) Signed-off-by: Austin Seipp <aseipp@pobox.com> Change-Id: I8dafa2358d039ad1c07e9a512c1d10fed5845738
2024-03-28 20:45:31 +00:00
* The `snapshot.max-new-file-size` option can now handle raw integer literals,
interpreted as a number of bytes, where previously it could only handle string
literals. This means that `snapshot.max-new-file-size="1"` and
`snapshot.max-new-file-size=1` are now equivalent.
Fix empty files can't be selected in the builtin diff editor This fixes several issues that made working with empty files difficult using the builtin diff editor. 1. The scm-record library used for the editor expects each file to have at least one section. For new empty files this should be a file mode section. jj wasn't rendering this mode section, which prevented empty files from being selected at all. 2. The scm-record library returns `SelectedContents::Absent` if the file has no contents after the diff editor is invoked. This can be because of several reasons: 1) the file is new and empty; 2) the file was empty before and is still empty; 3) the file has been deleted. Perhaps this is a bug in scm-record and it should return `SelectedContents::Unchanged` or `SelectedContents::Present` if the file hasn't been deleted. Until this is patched upstream, we can work around it by disambiguating these cases. See https://github.com/arxanas/scm-record/issues/26 for the upstream bug. Fixes #3016
2024-04-09 17:53:21 +00:00
squash: don't rewrite commits that didn't change Closes #3334
2024-04-28 22:51:55 +00:00
* `jj squash <path>` is now a no-op if the path argument didn't match any paths
(it used to create new commits with bumped timestamp).
[#3334](https://github.com/martinvonz/jj/issues/3334)
release: release version 0.17.0 Thanks to everyone who's contributed! Unlike previous releases, I went through the changelog entries and reorganized them a bit. We didn't have anything under "Deprecations" this time, but I moved the heading after "Breaking changes" for next release. I think breaking changes are more important because deprecations are just about giving a heads up before it actually breaks.
2024-05-01 14:28:16 +00:00
### Contributors
Thanks to the people who made this release happen!
* Anton Älgmyr (@algmyr)
* Anton Bulakh (@necauqua)
* Austin Seipp (@thoughtpolice)
* Benjamin Tan (@bnjmnt4n)
* Cretezy (@Cretezy)
* Daniel Ploch (@torquestomp)
* Evan Mesterhazy (@emesterhazy)
* Ilya Grigoriev (@ilyagr)
* Martin von Zweigbergk (@martinvonz)
* Noah Mayr (@noahmayr)
* Jeremy O'Brien (@neutralinsomniac)
* Jonathan Lorimer (@JonathanLorimer)
* Philip Metzger (@PhilipMetzger)
* Poliorcetics (@poliorcetics)
* Rowan Walsh (@rowan-walsh)
* Scott Olson (@solson)
changelog: fix @tdaron username
2024-06-06 08:18:58 +00:00
* Théo Daron (@tdaron)
release: release version 0.17.0 Thanks to everyone who's contributed! Unlike previous releases, I went through the changelog entries and reorganized them a bit. We didn't have anything under "Deprecations" this time, but I moved the heading after "Breaking changes" for next release. I think breaking changes are more important because deprecations are just about giving a heads up before it actually breaks.
2024-05-01 14:28:16 +00:00
* Yuya Nishihara (@yuja)
release: release version 0.16.0 Thanks to everyone who's contributed!
2024-04-03 18:06:54 +00:00
## [0.16.0] - 2024-04-03
### Deprecations
move: deprecate the command Per discussion in https://github.com/martinvonz/jj/discussions/2882. `jj squash` now has all the functionality.
2024-03-11 04:24:13 +00:00
* `jj move` was deprecated in favor of `jj squash`.
release: release version 0.14.0 Thanks to everyone who's contributed!
2024-02-07 21:06:18 +00:00
### Breaking changes
commit_templater: make git_head return Option<RefName> instead of Vec<_> Since we've introduced Option type, it no longer makes sense that git_head returns a Vec<RefName>.
2024-03-24 12:57:07 +00:00
* The `git_head` template keyword now returns an optional value instead of a
list of 0 or 1 element.
release: release version 0.14.0 Thanks to everyone who's contributed!
2024-02-07 21:06:18 +00:00
sparse: extract "set --reset" to subcommand Since --reset conflicts with the other flags, "set --reset" seems odd.
2024-03-28 12:19:24 +00:00
* The `jj sparse set --edit`/`--reset` flags were split up into `jj sparse
edit`/`reset` subcommands respectively.
sparse: extract "set --edit" to subcommand Even though --edit can be combined with --add/--remove/--clear/--reset, I don't think it's practically useful.
2024-03-28 12:10:47 +00:00
sparse: parse and print patterns as workspace-relative paths Per comment in https://github.com/martinvonz/jj/pull/3379#pullrequestreview-1963841604 Though cwd-relative path might be useful for --remove, I don't think that's the common use case. The new behavior is consistent with --edit.
2024-03-28 11:28:20 +00:00
* The `jj sparse` subcommands now parse and print patterns as workspace-relative
paths.
feat(squash): Add `--keep-emptied` flag Fixes #3815
2024-06-04 23:34:50 +00:00
* The `jj log` command no longer uses the default revset when a path is
specified.
cli: only use default log revset when neither path nor revset is provided
2024-03-31 09:47:31 +00:00
release: release version 0.15.0 Thanks to everyone who's contributed!
2024-03-06 19:14:30 +00:00
### New features
feat(squash): Add `--keep-emptied` flag Fixes #3815
2024-06-04 23:34:50 +00:00
* Config now supports rgb hex colors (in the form `#rrggbb`) wherever existing
color names are supported.
cli: allow colors in form #rrggbb Changes the formatter to accept not only existing color names (such as "red" or "green") but also those in the form #rrggbb, where rr, gg, and bb are two-digit hexadecimal numbers. This allows much finer control over colors used.
2024-03-16 08:45:40 +00:00
changelog: put entry in the right version section Commit b4c4d911 introduced this entry in the changelog, but put it in the 0.15.0 section rather than the new unreleased section. This was probably just because the original commit was authored before the 0.15.0 release, but merged after. Such is life. Signed-off-by: Austin Seipp <aseipp@pobox.com>
2024-03-08 05:07:40 +00:00
* `ui.default-command` now accepts multiple string arguments, for more complex
default `jj` commands.
Make node symbols templatable in the graphs. Adds config options * templates.log_graph_node * templates.log_graph_node_elided * templates.op_log_graph_node
2024-03-11 22:16:24 +00:00
* Graph node symbols are now configurable via templates
* `templates.log_node`
* `templates.op_log_node`
Add configuration options for node symbols in the graphs.
2024-03-06 22:46:02 +00:00
log: enable synthetic elided nodes by default We're early in the release cycle, so let's enable this feature and test it for a while before the next release.
2024-03-08 17:43:24 +00:00
* `jj log` now includes synthetic nodes in the graph where some revisions were
elided.
cmd `squash`: alias `--to` for the `--into` flag I keep typing `--to` since I'm used to `jj move` interface. It is also shorter. Currently, if I type `--to`, clap unhelpfully suggests whether I meant `--tool`.
2024-04-02 02:46:45 +00:00
* `jj squash` now accepts `--from` and `--into` (also aliased as `--to`) if `-r`
is not specified. It can now be used for all use cases where `jj move` could
previously be used. The `--from` argument accepts a revset that resolves to
more than one revision.
squash: learn `--from/--into` flags This was proposed by @Brixy in https://github.com/martinvonz/jj/discussions/2882 a while ago. There seems to be pretty strong consensus that it's a good idea. I've copied the added test cases from `test_move_command.rs`, just replacing `move` by `squash`, `--to` by `--into`, and deleting the test of a no-arg invocation (`jj move` fails, `jj squash` does not - it defaults to squashing into the parent).
2024-03-10 18:50:14 +00:00
commit_templater: add self.immutable() method I don't know how immutable revisions should be labeled by default, but users can customize templates whatever they like.
2024-03-13 07:45:41 +00:00
* Commit templates now support `immutable` keyword.
templater: add coalesce() function that selects first non-empty content This can be used to flatten nested "if()"s. It's not exactly the same as "case" or "switch" expression, but works reasonably well in template. It's not uncommon to show placeholder text in place of an empty content, and a nullish value (e.g. empty string, list, option) is usually rendered as an empty text.
2024-03-25 09:19:36 +00:00
* New template function `coalesce(content, ..)` is added.
cli: show timestamp in local timezone and without millis and offset As discussed in #2900, the milliseconds are rarely useful, and it can be confusing with different timezones because it makes harder to compare timestamps. I added an environment variable to control the timestamp in a cross-platform way. I didn't document because it exists only for tests (like `JJ_RANDOMNESS_SEED`). Closes #2900
2024-02-12 07:26:19 +00:00
* Timestamps are now shown in local timezone and without milliseconds and
timezone offset by default.
git-push: Display messages from remote The implementation of sideband progress message printing is aligned with Git's implementation. See https://github.com/git/git/blob/43072b4ca132437f21975ac6acc6b72dc22fd398/sideband.c#L178. Closes #3236.
2024-03-07 06:20:08 +00:00
* `jj git push` now prints messages from the remote.
feat(squash): Add `--keep-emptied` flag Fixes #3815
2024-06-04 23:34:50 +00:00
* `jj branch list` now supports a `--conflicted/-c` option to show only
conflicted branches.
cli: add option to list only conflicted branches As requested in #1471, I added a new flag for `jj branch list` to only show branches that are conflicted. Adds a unit test to check for listing only conflicted branches and regenerates the cli output to incorporate the new flag. Closes #1471 reformat
2024-03-22 12:43:43 +00:00
cli: allow multiple `-r` options for `duplicate`/`abandon` Commands like `new`, `duplicate`, and `abandon` can take multiple revset arguments which results in their collective union. They take the revisions directly as arguments. But for consistency with many other commands, they can also take the `-r` argument, which is a no-op. However, due to the flag being specified as a `bool`, the `-r` option can only be specified once, so e.g. `abandon -r x -r y` often fails. I normally use `-r` for consistency and muscle memory, so this bites me often. Instead, use `clap::ArgAction::Count` in order to allow `-r` to be specified multiple times. It remains unused, of course. With this change, all the following invocations are equivalent. Before this change, the second example would fail due to giving `-r` multiple times. jj abandon x y jj abandon -r x -r y jj abandon -r 'x | y' Note: `jj new` already supported this exact case actually, but it used an awkward trick where it used `.overrides_with()` in order to override *itself* so it could be specified multiple times. I believe this is a bit clearer. Signed-off-by: Austin Seipp <aseipp@pobox.com> Change-Id: Ib36cf81d46dae4f698f06d0a32e8fd3120bfb4a4
2024-03-23 17:35:27 +00:00
* `jj duplicate` and `jj abandon` can now take more than a single `-r` argument,
for consistency with other commands.
cli: unblock "branch list --all-remotes" with name patterns Like -r/--revisions, it should be okay to filter synced/non-tracking remote branches by name. conflicts_with_all = "tracked" is redundant, so removed as well. The tracked field declares that it conflicts with --all-remotes.
2024-04-02 06:53:20 +00:00
* `jj branch list` now allows combining `-r REVISIONS`/`NAMES` and `-a` options.
cli: allow branch list to combine -r and -a
2024-03-28 18:13:33 +00:00
cli: rename --all to --all-remotes for branch list
2024-03-31 09:54:11 +00:00
* `--all` is now named `--all-remotes` for `jj branch list`
cli: add a global `--quiet` flag, which silences status messages Note that `jj resolve` already had its own `--quiet` flag. The output with `--quiet` for that command got a lot quieter with the global `--quiet` also taking effect. That seems reasonable to me.
2024-03-30 17:18:56 +00:00
* There is a new global `--quiet` flag to silence commands' non-primary output.
Add a --siblings option to the jj split command If the --siblings option is used, the target commit is split into two sibling commits instead of parent and child commits. Any children of the original commit will have both siblings as their new parents. #2274
2024-02-08 01:37:07 +00:00
* `jj split` now supports a `--siblings/-s` option that splits the target
revision into siblings with the same parents and children.
feat(squash): Add `--keep-emptied` flag Fixes #3815
2024-06-04 23:34:50 +00:00
* New function `working_copies()` for revsets to show the working copy commits
of all workspaces.
revset: add working_copies() function It includes the working copy commit of every workspace of the repo. Implements #3384
2024-04-01 01:40:19 +00:00
release: release version 0.15.0 Thanks to everyone who's contributed!
2024-03-06 19:14:30 +00:00
### Fixed bugs
release: release version 0.16.0 Thanks to everyone who's contributed!
2024-04-03 18:06:54 +00:00
None.
### Contributors
Thanks to the people who made this release happen!
* Aleksey Kuznetsov (@zummenix)
* Anton Älgmyr (@algmyr)
* Austin Seipp (@thoughtpolice)
* Benjamin Tan (@bnjmnt4n)
* Chris Krycho (@chriskrycho)
* Christoph Koehler (@ckoehler)
* Daniel Ploch (@torquestomp)
* Evan Mesterhazy (@emesterhazy)
* Ilya Grigoriev (@ilyagr)
* Khionu Sybiern (@khionu)
* Martin von Zweigbergk (@martinvonz)
* Matthew Davidson (@KingMob)
* mrstanwell (@mrstanwell)
* Noah Mayr (@noahmayr)
* Patric Stout (@TrueBrain)
* Poliorcetics (@poliorcetics)
* Simon Wollwage (@Kintaro)
* Steve Klabnik (@steveklabnik)
* Tom Ward (@tomafro)
* TrashCan (@TrashCan69420)
* Yuya Nishihara (@yuja)
release: release version 0.15.1 This release is just so we can publish the crates to crates.io. We couldn't publish the 0.15.0 crates because `jj-lib-proc-macros` had `publish = false`.
2024-03-07 00:12:48 +00:00
## [0.15.1] - 2024-03-06
No code changes (fixing Rust `Cargo.toml` stuff).
release: release version 0.15.0 Thanks to everyone who's contributed!
2024-03-06 19:14:30 +00:00
## [0.15.0] - 2024-03-06
### Breaking changes
rust: bump MSRV to 1.76.0 Signed-off-by: Austin Seipp <aseipp@pobox.com>
2023-10-28 19:14:26 +00:00
* The minimum supported Rust version (MSRV) is now 1.76.0.
index: move segment files to sub directory, add version number I'm going to introduce breaking changes in index format. Some of them will affect the file size, so version number or signature won't be needed. However, I think it's safer to detect the format change as early as possible. I have no idea if embedded version number is the best way. Because segment files are looked up through the operation links, the version number could be stored there and/or the "segments" directory could be versioned. If we want to support multiple format versions and clients, it might be better to split the tables into data chunks (e.g. graph entries, commit id table, change id table), and add per-chunk version/type tag. I choose the per-file version just because it's simple and would be non-controversial. As I'm going to introduce format change pretty soon, this patch doesn't implement data migration. The existing index files will be deleted and new files will be created from scratch. Planned index format changes include: 1. remove unused "flags" field 2. inline commit parents up to two 3. add sorted change ids table
2024-02-09 12:33:05 +00:00
* The on-disk index format changed. New index files will be created
automatically, but it can fail if the repository is co-located and predates
Git GC issues [#815](https://github.com/martinvonz/jj/issues/815). If
reindexing failed, you'll need to clean up corrupted operation history by
`jj op abandon ..<bad operation ID>`.
cli: drop support for legacy graph style I don't think anyone uses the legacy graph style. It's very similar to the "ascii" style from Sapling's `renderdag` crate.
2024-02-11 18:43:06 +00:00
* Dropped support for the "legacy" graph-drawing style. Use "ascii" for a very
similar result.
cli: change default log revset to not include all tagged heads The default immutable_heads() includes tags(), which makes sense, but computing heads(tags()) can be expensive because the tags() set is usually sparse. For example, "jj bench revset 'heads(tags())'" took 157ms in my linux stable mirror. We can of course optimize the heads evaluation by using bit set or segmented index, but the query includes many historical heads if the repository has per-release branches, which are uninteresting anyway. So, this patch replaces heads(immutable_heads()) with trunk(). The reason we include heads(immutable_heads()) is to mitigate the following problem. Suppose trunk() is the branch to be based off, I think using trunk() here is pretty good. ``` A B *---*----* trunk() ⊆ immutable_heads() \ * C ``` https://github.com/martinvonz/jj/pull/2247#discussion_r1335078879
2024-02-19 14:20:13 +00:00
* The default log output no longer lists all tagged heads. Set `revsets.log =
"@ | ancestors(immutable_heads().., 2) | heads(immutable_heads())"` to restore
the old behavior.
revset: disable parsing rules of legacy dag range operator The legacy parsing rules are turned into compatibility errors. The x:y rule is temporarily enabled when parsing string patterns. It's weird, but we can't isolate the parsing function because a string pattern may be defined in an alias.
2024-02-13 05:46:21 +00:00
* Dropped support for the deprecated `:` revset operator. Use `::` instead.
cli: make `rebase --skip-empty` keep already empty commits I think the user usually wants to abandon only newly empty commits. I think they should use `jj abandon` if they want to get rid of already empty commits. By keeping already empty commits, we don't need to special-case the working copy and merge commits.
2024-02-25 17:41:07 +00:00
* `jj rebase --skip-empty` no longer abandons commits that were already empty
before the rebase.
release: release version 0.14.0 Thanks to everyone who's contributed!
2024-02-07 21:06:18 +00:00
### New features
changelog: clarify that commit signing support is partial
2024-03-08 06:30:40 +00:00
* Partial support for commit signing. Currently you can configure jj to "keep"
commit signatures by making new ones for rewritten commits, and to sign new
commits when they are created.
This comes with out-of-the-box support for the following backends:
sign: Update CHANGELOG.md
2024-02-13 02:09:24 +00:00
* GnuPG
* SSH
changelog: clarify that commit signing support is partial
2024-03-08 06:30:40 +00:00
Signature verification and an explicit sign command will hopefully come soon.
templater: evaluate logical operator expressions (||, &&, and !) #2924
2024-02-05 11:49:06 +00:00
* Templates now support logical operators: `||`, `&&`, `!`
templater: add special "self" variable to refer to top-level object This allows us to call alias function with the top-level object. For convenience, all self.<method>()s are available as keywords. I don't think we'll want to deprecate them. It would be tedious if we had to specify -T'self.commit_id()' instead of -Tcommit_id.
2024-02-22 09:57:29 +00:00
* Templates now support the `self` keyword, which is the current commit in `jj
log`/`obslog` templates.
cli: make `jj show` accept a template to render its output
2024-02-10 06:01:47 +00:00
* `jj show` now accepts `-T`/`--template` option to render its output using
template
cli: add "config list --template" support There's a caveat: "jj config list -Tname" will concatenate all names in a single line. That's correct but useless. We might want some option or config knob to complete missing "\n". This also applies to "log --no-graph".
2024-03-03 11:45:36 +00:00
* `jj config list` now accepts `-T`/`--template` option.
cli: add short `-b` option for `--branch` in `jj git fetch`
2024-02-10 17:01:20 +00:00
* `jj git fetch` now accepts `-b` as a shorthand for `--branch`, making it more
consistent with other commands that accept a branch
templater: add a local() method on Timestamps (#2900)
2024-02-12 07:09:33 +00:00
* In the templating language, Timestamps now have a `.local()` method for
converting to the local timezone.
next/prev: make --edit implied when already on non-head commit Users who edit non-head commits usually expect `jj next/prev` to continue to edit the next/previous commit, so let's make that the default behavior. This should not confuse users who don't edit non-head commits since they will simply not be in this state. My main concern is that doing `jj next; jj prev` will now usually take you back to the previous commit, but not if you started on the parent of a head commit.
2024-02-12 05:56:52 +00:00
* `jj next/prev` now infer `--edit` when you're already editing a non-head
commit (a commit with children).
changelog: minor copy edits Seen while reading over the changelog in preparation for the release this week. Signed-off-by: Austin Seipp <aseipp@pobox.com>
2024-03-04 19:31:10 +00:00
* A new built-in pager named `:builtin` is available on all platforms,
implemented with [minus](https://github.com/arijit79/minus/)
Use `minus` as a builtin pager
2024-02-11 02:55:02 +00:00
log: optionally render elided parts of the graph as a synthetic node This adds a config to render a synthetic node with a "(elided revisions)" description for elided segments of the graph. I didn't add any templating support for the elided nodes because I'm not sure how we would want that to work. In particular, I don't know what `commit_id` and most other keywords should return for elided revisions.
2024-02-11 18:09:31 +00:00
* Set config `ui.log-synthetic-elided-nodes = true` to make `jj log` include
synthetic nodes in the graph where some revisions were elided
([#1252](https://github.com/martinvonz/jj/issues/1252),
[#2971](https://github.com/martinvonz/jj/issues/2971)). This may become the
default depending on feedback.
cli: make new workspace inherit sparse pattern from old workspace
2024-02-17 17:04:21 +00:00
* When creating a new workspace, the sparse patterns are now copied over from
the current workspace.
cli: unblock "jj git init --colocate" in existing Git repo directory I'm not sure what's the conclusion in #2747, but I don't think there is a disagreement on allowing --colocate to import existing Git repo.
2024-02-25 11:39:42 +00:00
* `jj git init --colocate` can now import an existing Git repository. This is
equivalent to `jj git init --git-repo=.`.
feat(squash): Add `--keep-emptied` flag Fixes #3815
2024-06-04 23:34:50 +00:00
* `jj git fetch` now automatically prints new remote branches and tags by
default.
cli: list new remote branches during git fetch
2024-02-13 22:17:05 +00:00
feat(squash): Add `--keep-emptied` flag Fixes #3815
2024-06-04 23:34:50 +00:00
* `--verbose/-v` is now `--debug` (no short option since it's not intended to be
used often)
cli: rename --verbose to --debug to better fit what it does
2024-02-18 16:47:12 +00:00
feat(cli): Add -f/-t for --from/--to to `jj move`
2024-02-12 22:27:57 +00:00
* `jj move --from/--to` can now be abbreviated to `jj move -f/-t`
cli: add --tool=<name> option to diff/merge editing commands I didn't add e2e tests to all commands, but the added tests should cover diff_editor/diff_selector/merge_editor() calls. Closes #2575
2024-03-01 14:49:22 +00:00
* `jj commit`/`diffedit`/`move`/`resolve`/`split`/`squash`/`unsquash` now accept
`--tool=<NAME>` option to override the default.
feat(squash): Add `--keep-emptied` flag Fixes #3815
2024-06-04 23:34:50 +00:00
[#2575](https://github.com/martinvonz/jj/issues/2575)
cli: add --tool=<name> option to diff/merge editing commands I didn't add e2e tests to all commands, but the added tests should cover diff_editor/diff_selector/merge_editor() calls. Closes #2575
2024-03-01 14:49:22 +00:00
completion: Add support for Nushell completions
2024-02-16 20:23:41 +00:00
* Added completions for [Nushell](https://nushell.sh) to `jj util completion`
cli `branch list`: list tracked branches Add an option to list tracked branches only This option keeps most of the current `--all` printing logic, but: - Omits local Git-tracking branches by default (can be extended to support filtering by remote). - Skip over the branch altogether if it doesn't contain tracked remotes - Don't print the untracked_remote_refs at the end Usage: `jj branch list -t` `jj branch list --tracked` `jj branch list --tracked <branch name>`
2024-02-21 18:27:50 +00:00
* `jj branch list` now supports a `--tracked/-t` option which can be used to
show tracked branches only. Omits local Git-tracking branches by default.
Add --context flag for diffs. Allows specifying the number of lines of context to show around diffs. The logic was already in place, just some plumbing was needed.
2024-03-02 00:57:43 +00:00
* Commands producing diffs now accept a `--context` flag for the number of
lines of context to show.
cli: enrich the error about required template value with a hint Several `jj` commands accept `--template <TEMPLATE>` argument. When the argument is empty, `jj` will show the list of defined template aliases.
2024-03-03 06:04:59 +00:00
* `jj` commands with the `-T`/`--template` option now provide a hint containing
defined template names when no argument is given, assisting the user in making
a selection.
release: release version 0.14.0 Thanks to everyone who's contributed!
2024-02-07 21:06:18 +00:00
### Fixed bugs
feat(squash): Add `--keep-emptied` flag Fixes #3815
2024-06-04 23:34:50 +00:00
* On Windows, symlinks in the repo are now supported when Developer Mode is
enabled.
When symlink support is unavailable, they will be materialized as regular
files in the
working copy: materialize symlinks on Windows as regular files I was a bit surprised to learn (or be reminded?) that checking out symlinks on Windows leads to a panic. This patch fixes the crash by materializing symlinks from the repo as regular files. It also updates the snapshotting code so we preserve the symlink-ness of a path. The user can update the symlink in the repo by updating the regular file in the working copy. This seems to match Git's behavior on Windows when symlinks are disabled.
2024-02-08 18:16:42 +00:00
working copy (instead of resulting in a crash).
working_copy: implement symlinks on windows with a helper function enables symlink tests on windows, ignoring failures due to disabled developer mode, and updates windows.md
2024-02-04 08:03:03 +00:00
[#2](https://github.com/martinvonz/jj/issues/2)
templater: Add `operation.snapshot()` boolean Expose the information we now record, to allow changing the default "snapshot working copy" message or to make snapshots more compact/less distracting in the log
2024-04-05 11:21:36 +00:00
changelog: minor copy edits Seen while reading over the changelog in preparation for the release this week. Signed-off-by: Austin Seipp <aseipp@pobox.com>
2024-03-04 19:31:10 +00:00
* On Windows, the `:builtin` pager is now used by default, rather than being
disabled entirely.
Use `minus` as a builtin pager
2024-02-11 02:55:02 +00:00
rewrite: default to not simplifying ancestor merges This means auto-rebase will no longer simplify ancestor merges.
2024-01-29 05:41:21 +00:00
* Auto-rebase now preserves the shape of history even for merge commits where
one parent is an ancestor of another.
[#2600](https://github.com/martinvonz/jj/issues/2600)
release: release version 0.15.0 Thanks to everyone who's contributed!
2024-03-06 19:14:30 +00:00
### Contributors
Thanks to the people who made this release happen!
* Aleksey Kuznetsov (@zummenix)
* Anton Bulakh (@necauqua)
* Anton Älgmyr (@algmyr)
* Austin Seipp (@thoughtpolice)
* Benjamin Brittain (@benbrittain)
* Benjamin Tan (@bnjmnt4n)
* Daehyeok Mun (@daehyeok)
* Daniel Ploch (@torquestomp)
* Evan Mesterhazy (@emesterhazy)
* gulbanana (@gulbanana)
* Ilya Grigoriev (@ilyagr)
* Jonathan Tan (@jonathantanmy)
* Julien Vincent (@julienvincent)
* jyn (@jyn514)
* Martin von Zweigbergk (@martinvonz)
* Paulo Coelho (@prscoelho)
* Philip Metzger (@PhilipMetzger)
* Poliorcetics (@poliorcetics)
* Stephen Jennings (@jennings)
* Vladimir (@0xdeafbeef)
* Yuya Nishihara (@yuja)
release: release version 0.14.0 Thanks to everyone who's contributed!
2024-02-07 21:06:18 +00:00
## [0.14.0] - 2024-02-07
### Deprecations
docs: update changelog with `checkout`/`merge` deprecations Summary: Put both notices together at once, for ease of reading and understanding. Signed-off-by: Austin Seipp <aseipp@pobox.com> Change-Id: I2aedb42fdab346b21990a106433512d7ec119ad4
2024-01-19 00:01:11 +00:00
* `jj checkout` and `jj merge` are both deprecated; use `jj new` instead to
replace both of these commands in all instances.
**Rationale**: `jj checkout` and `jj merge` both implement identical
functionality, which is a subset of `jj new`. `checkout` creates a new working
copy commit on top of a single specified revision, i.e. with one parent.
`merge` creates a new working copy commit on top of *at least* two specified
revisions, i.e. with two or more parents.
templater: Add `operation.snapshot()` boolean Expose the information we now record, to allow changing the default "snapshot working copy" message or to make snapshots more compact/less distracting in the log
2024-04-05 11:21:36 +00:00
docs: update changelog with `checkout`/`merge` deprecations Summary: Put both notices together at once, for ease of reading and understanding. Signed-off-by: Austin Seipp <aseipp@pobox.com> Change-Id: I2aedb42fdab346b21990a106433512d7ec119ad4
2024-01-19 00:01:11 +00:00
The only difference between these commands and `jj new`, which *also* creates
a new working copy commit, is that `new` can create a working copy commit on
top of any arbitrary number of revisions, so it can handle both the previous
cases at once. The only actual difference between these three commands is the
command syntax and their name. These names were chosen to be familiar to users
of other version control systems, but we instead encourage all users to adopt
`jj new` instead; it is more general and easier to remember than both of
these.
`jj checkout` and `jj merge` will no longer be shown as part of `jj help`, but
will still function for now, emitting a warning about their deprecation.
**Deadline**: `jj checkout` and `jj merge` will be deleted and are expected
become a **hard error later in 2024**.
feat(squash): Add `--keep-emptied` flag Fixes #3815
2024-06-04 23:34:50 +00:00
* `jj init --git` and `jj init --git-repo` are now deprecated and will be
removed
cli: add a `jj git init` command. This initializes a git backed repo. * It does the same thing as `jj init --git` except that it has a --colocated flag to explicitly specify that we want the .git repo to be side-by-side the .jj repo in the working directory. * `jj init --git` will keep the current behaviour and will not be able to create colocated git backed repos. * Update test snapshots.
2024-01-08 10:41:07 +00:00
in the near future.
Use `jj git init` instead.
release: release version 0.9.0 Thanks to everyone who's contributed!
2023-09-06 16:46:27 +00:00
### Breaking changes
cli: change `R` to `D` for "deleted" in diff summary @joyously ponted out that `R` could be interpreted as "renamed" instead of "removed". "Deleted" is unambiguous.
2024-01-26 06:59:45 +00:00
* (Minor) Diff summaries (e.g. `jj diff -s`) now use `D` for "Deleted" instead
of `R` for "Removed". @joyously pointed out that `R` could also mean
"Renamed".
cli: use a positional argument for `jj util completion` this has two main advantages: - it makes it clear that the shells are mutually exclusive - it allows us to extend the command with shell-specific options in the future if necessary as a happy accident, it also adds support for `elvish` and `powershell`. for backwards compatibility, this also keeps the existing options as hidden flags. i am not super happy with how the new help looks; the instructions for setting up the shell are squished together and IMO a little harder to read. i'm open to suggestions.
2024-02-04 19:49:20 +00:00
* `jj util completion` now takes the shell as a positional argument, not a flag.
the previous behavior is deprecated, but supported for now. it will be removed
in the future.
cli: make `jj rebase` not simplify ancestor merges I think I prefer this behavior because it's less lossy. The user can manually simplify the history with `jj rebase -s <merge commit> -d <one of the parents>` afterwards. We can roll this change back later if we find it annoying.
2024-01-29 06:49:35 +00:00
* `jj rebase` now preserves the shape of history even for merge commits where
one parent is an ancestor of another. You can follow the `jj rebase` by
`jj rebase -s <merge commit> -d <single parent>` if you want to linearize the
history.
release: release version 0.13.0 Thanks to everyone who's contributed!
2023-12-28 17:15:06 +00:00
### New features
cli: use a positional argument for `jj util completion` this has two main advantages: - it makes it clear that the shells are mutually exclusive - it allows us to extend the command with shell-specific options in the future if necessary as a happy accident, it also adds support for `elvish` and `powershell`. for backwards compatibility, this also keeps the existing options as hidden flags. i am not super happy with how the new help looks; the instructions for setting up the shell are squished together and IMO a little harder to read. i'm open to suggestions.
2024-02-04 19:49:20 +00:00
* `jj util completion` now supports powershell and elvish.
github: use `macos-14`, add new `aarch64-apple-darwin` release binary GitHub announced these new Apple Silicon based runners today. Let's take them for a spin. Let's also add an entry in the release matrix to build and publish `aarch64- apple-darwin` binaries, too. This doesn't migrate the old release matrix entry; it still uses a `macos-11` runner. This means the x86 binaries should work on a few older macOS versions if users need it. Signed-off-by: Austin Seipp <aseipp@pobox.com>
2024-01-29 17:13:29 +00:00
* Official binaries for macOS running on Apple Silicon (`aarch64-apple-darwin`)
are now available, alongside the existing macOS x86 binaries.
git_backend: on gc(), remove unreachable no-gc refs and compact them With my jj repo, the number of jj/keep refs went down from 87887 to 27733. The .git directory size is halved, but we'll need to clean up extra and index files to save disk space. "git gc --prune=now && jj debug reindex" passed, so the repo wouldn't be corrupted. #12
2024-01-09 08:31:40 +00:00
* New `jj op abandon` command is added to clean up the operation history. Git
refs and commit objects can be further compacted by `jj util gc`.
cli: add "op abandon root..head" command that "reparents" operations In order to implement GC (#12), we'll need to somehow prune old operations. Perhaps the easiest implementation is to just remove unwanted operation files and put tombstone file instead (like git shallow.) However, the removed operations might be referenced by another jj process running in parallel. Since the parallel operation thinks all the historical head commits are reachable, the removed operations would have to be resurrected (or fix up index data, etc.) when the op heads get merged. The idea behind this patch is to split the "op log" GC into two steps: 1. recreate operations to be retained and make the old history unreachable, 2. delete unreachable operations if the head was created e.g. 3 days ago. The latter will be run by "jj util gc". I don't think GC can be implemented 100% safe against lock-less append-only storage, and we'll probably need some timestamp-based mechanism to not remove objects that might be referenced by uncommitted operation. FWIW, another nice thing about this implementation is that the index is automatically invalidated as the op id changes. The bad thing is that the "undo" description would contain an old op id. It seems the performance is pretty okay.
2023-12-29 07:02:56 +00:00
git_backend: on gc(), remove unreachable no-gc refs and compact them With my jj repo, the number of jj/keep refs went down from 87887 to 27733. The .git directory size is halved, but we'll need to clean up extra and index files to save disk space. "git gc --prune=now && jj debug reindex" passed, so the repo wouldn't be corrupted. #12
2024-01-09 08:31:40 +00:00
* `jj util gc` now removes unreachable operation, view, and Git objects.
op_store: implement GC of unreachble operations and views Since new operations and views may be added concurrently by another process, there's a risk of data corruption. The keep_newer parameter is a mitigation for this problem. It's set to preserve files modified within the last 2 weeks, which is the default of "git gc". Still, a concurrent process may replace an existing view which is about to be deleted by the gc process, and the view file would be lost. #12
2024-01-07 09:21:10 +00:00
feat(squash): Add `--keep-emptied` flag Fixes #3815
2024-06-04 23:34:50 +00:00
* `jj branch rename` will now warn if the renamed branch has a remote branch,
since
Issue warning if renaming branch with a remote tracking branch.
2024-01-04 14:55:15 +00:00
those will have to be manually renamed outside of `jj`.
cli `git push`: new --tracked option
2024-02-03 03:38:54 +00:00
* `jj git push` gained a `--tracked` option, to push all the tracked branches.
op_store: add a virtual root operation, similar to root commit It seems obvious in hindsight to have a virtual root operation just like we have a virtual root commit. It removes the same kind of problems by making sure there's always a common ancestor (or multiple) between any two commits. I think the reason I didn't add a root operation from the beginning was that there used to be a mandatory working-copy commit in the view (this was before support for multiple workspaces). Perhaps we should remove the "initialize repo" operation now. The only difference between their view objects is that the "initialize repo" operation adds the root commit as a head. We could add that to the root operation, but then the root operation's value depends on the commit backend.
2024-01-07 18:32:31 +00:00
* There's now a virtual root operation, similar to the [virtual root
commit](docs/glossary.md#root-commit). It appears at the end of `jj op log`.
Allow printing overridden config values via `--include-overridden`.
2024-01-15 19:24:27 +00:00
* `jj config list` gained a `--include-overridden` option to allow
printing overridden config values.
Support `--user` and `--repo` argument for `config list` command
2024-01-14 01:38:55 +00:00
* `jj config list` now accepts `--user` or `--repo` option to specify
config origin.
cli `jj config`: add `jj config path` command
2024-02-01 04:53:23 +00:00
* New `jj config path` command to print the config file path without launching
an editor.
Implement tag command.
2024-01-21 22:06:46 +00:00
* `jj tag list` command prints imported git tags.
changelog: update changelog for next/prev changes
2024-01-19 20:08:07 +00:00
* `jj next` and `jj prev` now prompt in the event of the next/previous commit
being ambiguous, instead of failing outright.
cli: display which file's conflicts are being resolved
2023-12-20 01:25:01 +00:00
* `jj resolve` now displays the file being resolved.
cli: move `jj workspace root` to `jj root, for discoverability This is a convenient command, for scripting things like `cd $(jj root) && do something`, and it seems better to allow people to find it before they learn about workspaces.
2024-01-10 12:54:09 +00:00
* `jj workspace root` was aliased to `jj root`, for ease of discoverability
don't try to diff binary files previously, `jj diff` would show the full contents of binary files such as images. after this change, it instead shows "(binary)". it still shows the filename and metadata so that users can open the file in the viewer of their choce. future work could involve showing binary files as Sixel or similar; finding a way to compare large non-binary files without filling up the screen; or extending the data backends to avoid having to read the whole file contents into memory.
2024-02-02 06:26:24 +00:00
* `jj diff` no longer shows the contents of binary files.
cli: add a `jj git init` command. This initializes a git backed repo. * It does the same thing as `jj init --git` except that it has a --colocated flag to explicitly specify that we want the .git repo to be side-by-side the .jj repo in the working directory. * `jj init --git` will keep the current behaviour and will not be able to create colocated git backed repos. * Update test snapshots.
2024-01-08 10:41:07 +00:00
* `jj git` now has an `init` command that initializes a git backed repo.
templater: add surround(prefix, suffix, content) function I'll probably add infix logical operators later, but the surround() function is still useful because we don't have to repeat the condition: if(x || y, "<" ++ separate(" ", x, y) ++ ">") surround("<", ">", separate(" ", x, y)) It can't be used if we want to add placeholder text, though: if(x || y, "<" ++ separate(" ", x, y) ++ ">", "(none)") Closes #2924
2024-02-06 10:28:51 +00:00
* New template function `surround(prefix, suffix, content)` is added.
cli: add a `jj git init` command. This initializes a git backed repo. * It does the same thing as `jj init --git` except that it has a --colocated flag to explicitly specify that we want the .git repo to be side-by-side the .jj repo in the working directory. * `jj init --git` will keep the current behaviour and will not be able to create colocated git backed repos. * Update test snapshots.
2024-01-08 10:41:07 +00:00
release: release version 0.13.0 Thanks to everyone who's contributed!
2023-12-28 17:15:06 +00:00
### Fixed bugs
working_copy: don't follow symlinks when visiting files in gitignored directory Fixes #2878
2024-01-24 03:29:33 +00:00
* Fixed snapshots of symlinks in `gitignore`-d directory.
[#2878](https://github.com/martinvonz/jj/issues/2878)
cli: reorder import of git head/refs and snapshot Since import_git_refs() may check out new working-copy commit, it shouldn't be triggered before the snapshot. Fixes #2876
2024-01-25 10:41:42 +00:00
* Fixed data loss in dirty working copy when checked-out branch is rebased or
abandoned by Git.
[#2876](https://github.com/martinvonz/jj/issues/2876)
release: release version 0.14.0 Thanks to everyone who's contributed!
2024-02-07 21:06:18 +00:00
### Contributors
Thanks to the people who made this release happen!
* Austin Seipp (@thoughtpolice)
* Benjamin Brittain (@benbrittain)
* Chris Krycho (@chriskrycho)
* Daehyeok Mun (@daehyeok)
* Daniel Ploch (@torquestomp)
* Essien Ita Essien (@essiene)
* Ikko Eltociear Ashimine (@eltociear)
* Ilya Grigoriev (@ilyagr)
* Jonathan Tan (@jonathantanmy)
* jyn (@jyn514)
* Martin von Zweigbergk (@martinvonz)
* Matt Stark (@matts1)
* Michael Pratt (prattmic)
* Philip Metzger (@PhilipMetzger)
* Stephen Jennings (@jennings)
* Valentin Gatien-Baron (@v-gb)
* vwkd (@vwkd)
* Yuya Nishihara (@yuja)
release: release version 0.13.0 Thanks to everyone who's contributed!
2023-12-28 17:15:06 +00:00
## [0.13.0] - 2024-01-03
### Breaking changes
git: turn git.auto-local-branch off by default As far as I can see in the chat, there's no objection to changing the default, and git.auto-local-branch = false is generally preferred. docs/branches.md isn't updated as it would otherwise conflict with #2625. I think the "Remotes" section will need a non-trivial rewrite. #1136, #1862
2023-12-16 10:01:44 +00:00
* `jj git fetch` no longer imports new remote branches as local branches. Set
`git.auto-local-branch = true` to restore the old behavior.
release: release version 0.12.0 Thanks to everyone who's contributed!
2023-12-05 22:24:43 +00:00
### New features
cli: print a message about new and resolved conflicts When e.g. `jj rebase` results in new conflicts, it's useful for the user to learn about that without having to run `jj log` right after. This patch adds reporting of new conflicts created by an operation. It also add reporting of conflicts that were resolved or abandoned by the operation. There was no measurable performance impact when rebasing a single commit in the Linux kernel repo.
2023-11-20 02:10:39 +00:00
* Information about new and resolved conflicts is now printed by every command.
release: release version 0.13.0 Thanks to everyone who's contributed!
2023-12-28 17:15:06 +00:00
Implement a `rename` subcommand for the `branch` command. This is really a simple change that does the following in a transaction: * Set the new branch name to point to the same commit as the old branch name. * Set the old branch name to point to no commit (hence deleting the old name). Before it starts, it confirms that the new branch name is not already in use.
2023-10-18 20:00:10 +00:00
* `jj branch` has gained a new `rename` subcommand that allows changing a branch
name atomically. `jj branch help rename` for details.
cli: print a message about new and resolved conflicts When e.g. `jj rebase` results in new conflicts, it's useful for the user to learn about that without having to run `jj log` right after. This patch adds reporting of new conflicts created by an operation. It also add reporting of conflicts that were resolved or abandoned by the operation. There was no measurable performance impact when rebasing a single commit in the Linux kernel repo.
2023-11-20 02:10:39 +00:00
release: release version 0.12.0 Thanks to everyone who's contributed!
2023-12-05 22:24:43 +00:00
### Fixed bugs
cli: use cwd-relative workspace config to resolve default command and aliases This is basically the same as Mercurial's workaround. I don't know about Git, but arguments order is very restricted in git, so -C path can be parsed prior to alias expansion. In hg and jj, doing that would be messy and unreliable. Closes #2414
2023-12-22 03:31:46 +00:00
* Command aliases can now be loaded from repository config relative to the
current working directory.
[#2414](https://github.com/martinvonz/jj/issues/2414)
release: release version 0.13.0 Thanks to everyone who's contributed!
2023-12-28 17:15:06 +00:00
### Contributors
Thanks to the people who made this release happen!
* Austin Seipp (@thoughtpolice)
* Essien Ita Essien (@essiene)
* Gabriel Scherer (@gasche)
* Ilya Grigoriev (@ilyagr)
* Martin von Zweigbergk (@martinvonz)
* Philip Metzger (@PhilipMetzger)
* Waleed Khan (@arxanas)
* Yuya Nishihara (@yuja)
release: release version 0.12.0 Thanks to everyone who's contributed!
2023-12-05 22:24:43 +00:00
## [0.12.0] - 2023-12-05
### Breaking changes
revset: exclude @git branches from remote_branches() As discussed in Discord, it's less useful if remote_branches() included Git-tracking branches. Users wouldn't consider the backing Git repo as a remote. We could allow explicit 'remote_branches(remote=exact:"git")' query by changing the default remote pattern to something like 'remote=~exact:"git"'. I don't know which will be better overall, but we don't have support for negative patterns anyway.
2023-11-07 08:47:13 +00:00
* The `remote_branches()` revset no longer includes branches exported to the Git
repository (so called Git-tracking branches.)
cli: disallow to create new branch by "jj branch set" Per discussion in https://github.com/martinvonz/jj/discussions/2555. I'm okay with either way, but it's confusing if we had "branch create" and "branch set" and both of these could create a new branch.
2023-11-10 00:38:03 +00:00
* `jj branch set` no longer creates a new branch. Use `jj branch create`
instead.
templater: Add `operation.snapshot()` boolean Expose the information we now record, to allow changing the default "snapshot working copy" message or to make snapshots more compact/less distracting in the log
2024-04-05 11:21:36 +00:00
cli: do not allow `jj init --git` in existing Git repo Allowing `jj init --git` in an existing Git repo creates a second Git store in `.jj/repo/store/git`, totally disconnected from the existing Git store. This will only produce extremely confusing bugs for users, since any operations they make in Git will *not* be reflected in the jj repo.
2023-11-26 22:29:03 +00:00
* `jj init --git` in an existing Git repository now errors and exits rather than
creating a second Git store.
cli: disallow to create new branch by "jj branch set" Per discussion in https://github.com/martinvonz/jj/discussions/2555. I'm okay with either way, but it's confusing if we had "branch create" and "branch set" and both of these could create a new branch.
2023-11-10 00:38:03 +00:00
release: release version 0.11.0 Thanks to everyone who's contributed!
2023-11-01 15:58:30 +00:00
### New features
cli: support multiple `--revision` arguments to `workspace add` Summary: A natural extension of the existing support, as suggested by Scott Olson. Closes #2496. Signed-off-by: Austin Seipp <aseipp@pobox.com> Change-Id: I91c9c8c377ad67ccde7945ed41af6c79
2023-11-03 01:36:18 +00:00
* `jj workspace add` can now take _multiple_ `--revision` arguments, which will
create a new workspace with its working-copy commit on top of all the parents,
as if you had run `jj new r1 r2 r3 ...`.
git: add config to disable abandoning of unreachable commits Some users prefer to have commits not get abandoned when importing refs. This adds a config option for that. Closes #2504.
2023-11-05 05:15:41 +00:00
* You can now set `git.abandon-unreachable-commits = false` to disable the
usual behavior where commits that became unreachable in the Git repo are
abandoned ([#2504](https://github.com/martinvonz/jj/pull/2504)).
cli new: add `--no-edit` option This allows, for example, creating a merge commit with `jj new a b --no-edit -m Merge`, without affecting the working copy.
2023-11-20 20:39:16 +00:00
* `jj new` gained a `--no-edit` option to prevent editing the newly created
commit. For example, `jj new a b --no-edit -m Merge` creates a merge commit
without affecting the working copy.
cli: Add a --skip-empty flag to rebase
2023-11-21 05:49:31 +00:00
* `jj rebase` now takes the flag `--skip-empty`, which doesn't copy over commits
that would become empty after a rebase.
gc: implement basic GC for Git backend This adds an initial `jj util gc` command, which simply calls `git gc` when using the Git backend. That should already be useful in non-colocated repos because it's not obvious how to GC (repack) such repos. In my own jj repo, it shrunk `.jj/repo/store/` from 2.4 GiB to 780 MiB, and `jj log --ignore-working-copy` was sped up from 157 ms to 86 ms. I haven't added any tests because the functionality depends on having `git` binary on the PATH, which we don't yet depend on anywhere else. I think we'll still be able to test much of the future parts of garbage collection without a `git` binary because the interesting parts are about manipulating the Git repo before calling `git gc` on it.
2023-12-01 22:00:22 +00:00
* There is a new `jj util gc` command for cleaning up the repository storage.
For now, it simply runs `git gc` on the backing Git repo (when using the Git
backend).
release: release version 0.11.0 Thanks to everyone who's contributed!
2023-11-01 15:58:30 +00:00
### Fixed bugs
merged_tree: remove canceling terms prior to resolving file-level conflict I think this is a variant of the problem fixed by 7fda80fc2221 "tree: simplify conflict before resolving at hunk level." We need to simplify() the conflict before and after extracting file ids because the source conflict values may contain trees to be cancelled out, and the file values may differ only in exec bits. Since the legacy tree passes a simplified conflict in to this function, I made the merged tree do the same. Fixes #2654
2023-12-02 01:50:09 +00:00
* Fixed another file conflict resolution issue where `jj status` would disagree
with the actual file content.
[#2654](https://github.com/martinvonz/jj/issues/2654)
release: release version 0.12.0 Thanks to everyone who's contributed!
2023-12-05 22:24:43 +00:00
### Contributors
Thanks to the people who made this release happen!
* Antoine Cezar (@AntoineCezar)
* Anton Bulakh (@necauqua)
* Austin Seipp (@thoughtpolice)
* Benjamin Saunders (@Ralith)
* Carlos Precioso (@cprecioso)
* Chris Krycho (@chriskrycho)
* Ilya Grigoriev (@ilyagr)
* Jason R. Coombs (@jaraco)
* Jesse Somerville (@jessesomerville)
* Łukasz Kurowski (@crackcomm)
* Martin von Zweigbergk (@martinvonz)
changelog: Fix @mlcui-corp username I have renamed myself from @mlcui-google to @mlcui-corp, but the changelog still had the old username. (That username is now taken by a squatter...)
2024-06-06 00:05:18 +00:00
* mlcui (@mlcui-corp)
release: release version 0.12.0 Thanks to everyone who's contributed!
2023-12-05 22:24:43 +00:00
* Philip Metzger (@PhilipMetzger)
* Waleed Khan (@arxanas)
* Yuya Nishihara (@yuja)
Fix 0.11 title in CHANGELOG.md As reported by several people on Discord.
2023-11-02 01:54:01 +00:00
## [0.11.0] - 2023-11-01
release: release version 0.11.0 Thanks to everyone who's contributed!
2023-11-01 15:58:30 +00:00
### Breaking changes
cli: enable tree-level conflicts by default I have used the tree-level conflict format for several weeks without problem (after the fix in 51b5d168aed0). Now - right after the 0.10.0 release - seems like a good time to enable the config by default. I enabled the config in our default configs in the CLI crate to reduce impact on tests (compared to changing the default in `settings.rs`).
2023-10-05 04:30:29 +00:00
* Conflicts are now stored in a different way. Commits written by a new `jj`
binary will not be read correctly by older `jj` binaries. The new model
solves some performance problems with the old model. For example, `jj log`
should be noticeably faster on large repos. You may need to create a new
clone to see the full speedup.
git: on deserialize/import/export, copy refs/heads/* to remote named "git" I've added a boolean flag to the store to ensure that the migration never runs more than once after the view gets "op restore"-d. I'll probably reorganize the branches structure to support non-tracking branches later, but updating the storage format in a single commit would be too involved. If jj is downgraded, these "git" remote refs would be exported to the Git repo. Users might have to remove them manually.
2023-09-25 11:05:24 +00:00
* The `remote_branches()` revset now includes branches exported to the Git
revset: exclude @git branches from remote_branches() As discussed in Discord, it's less useful if remote_branches() included Git-tracking branches. Users wouldn't consider the backing Git repo as a remote. We could allow explicit 'remote_branches(remote=exact:"git")' query by changing the default remote pattern to something like 'remote=~exact:"git"'. I don't know which will be better overall, but we don't have support for negative patterns anyway.
2023-11-07 08:47:13 +00:00
repository (so called Git-tracking branches.) *This change will be reverted
in 0.12.0.*
git: on deserialize/import/export, copy refs/heads/* to remote named "git" I've added a boolean flag to the store to ensure that the migration never runs more than once after the view gets "op restore"-d. I'll probably reorganize the branches structure to support non-tracking branches later, but updating the storage format in a single commit would be too involved. If jj is downgraded, these "git" remote refs would be exported to the Git repo. Users might have to remove them manually.
2023-09-25 11:05:24 +00:00
cli: send status messages to stderr, specify stdout/stderr explicitly Many of &mut UI can be changed to immutable borrows, but I'm not gonna update them in this patch.
2023-10-10 11:07:06 +00:00
* Status messages are now printed to stderr.
cli: accept TOML arrays and tables to `jj config set`
2023-10-11 03:47:46 +00:00
* `jj config set` now interprets the value as TOML also if it's a valid TOML
array or table. For example, `jj config set --user 'aliases.n' '["new"]'`
git: on import_refs(), respect tracking state of existing remote refs In this commit, new behavior is tested by using in-memory view data. Data persistence and track/untrack commands will be implemented soon.
2023-10-12 09:22:19 +00:00
* Remote branches now have tracking or non-tracking flags. The
`git.auto-local-branch` setting is applied only to newly fetched remote
branches. Existing remote branches are migrated as follows:
* If local branch exists, the corresponding remote branches are considered
tracking branches.
* Otherwise, the remote branches are non-tracking branches.
cli: add API and branch subcommand to track/untrack remote branches This patch adds MutableRepo::track_remote_branch() as we'll probably need to track the default branch on "jj git clone". untrack_remote_branch() is also added for consistency.
2023-10-12 18:29:53 +00:00
If the deduced tracking flags are wrong, use `jj branch track`/`untrack`
commands to fix them up.
git: on import_refs(), respect tracking state of existing remote refs In this commit, new behavior is tested by using in-memory view data. Data persistence and track/untrack commands will be implemented soon.
2023-10-12 09:22:19 +00:00
See [automatic local branch creation](docs/config.md#automatic-local-branch-creation)
for details.
cli: do not list non-tracking remote branches by default I personally don't mind if "jj branch list" showed all non-tracking branches, but I agree it would be a mess if ~500 remote branches were listed. So let's hide them by default as non-tracking branches aren't so interesting. Closes #1136
2023-10-18 06:56:02 +00:00
* Non-tracking remote branches aren't listed by default. Use `jj branch list
--all` to show all local and remote branches.
refs: error out push if non-tracking remote branches exist We can provide more actionable error message than "not fast-forwardable". If the push was fast-forwardable, "jj branch track" should be able to merge the remote branch without conflicts, so the added step would be minimal.
2023-10-15 17:43:45 +00:00
* It's not allowed to push branches if non-tracking remote branches of the same
name exist.
git: on push, update jj's view of remote branches without using import_refs() This means that the commits previously pinned by remote branches are no longer abandoned. I think that's more correct since "push" is the operation to propagate local view to remote, and uninteresting commits should have been locally abandoned.
2023-10-14 19:27:44 +00:00
* Pushing deleted/moved branches no longer abandons the local commits referenced
by the remote branches.
cli: parse "git fetch --branch" parameter as string pattern Even though "*" can't be used as a branch name to fetch, it should be better to explicitly enable glob matching like the other commands.
2023-10-23 23:29:42 +00:00
* `jj git fetch --branch` now requires `glob:` prefix to expand `*` in branch
name.
release: release version 0.10.0 Thanks to everyone who's contributed!
2023-10-04 18:59:33 +00:00
### New features
feat(squash): Add `--keep-emptied` flag Fixes #3815
2024-06-04 23:34:50 +00:00
* `jj`'s stable release can now be installed
with [`cargo binstall jj-cli`](https://github.com/cargo-bins/cargo-binstall).
install-and-setup.md: Document binary installation with `cargo-binstall` I also mentioned this in the changelog, since people reading it are more likely to use `binstall` than most.
2023-09-20 05:54:42 +00:00
workspace: add '--revision' argument to 'workspace add' Summary: Workspaces are most useful to test different versions (commits) of the tree within the same repository, but in many cases you want to check out a specific commit within a workspace. Make that trivial with a `--revision` option which will be used as the basis for the new workspace. If no `-r` option is given, then the previous behavior applies: the workspace is created with a working copy commit created on top of the current working copy commit's parent. Signed-off-by: Austin Seipp <aseipp@pobox.com> Change-Id: I23549efe29bc23fb9f75437b6023c237
2023-10-11 19:01:57 +00:00
* `jj workspace add` now takes a `--revision` argument.
workspace: `workspace forget` multiple names at once Summary: This allows `workspace forget` to forget multiple workspaces in a single action; it now behaves more consistently with other verbs like `abandon` which can take multiple revisions at one time. There's some hoop-jumping involved to ensure the oplog transaction description looks nice, but as they say: small conveniences cost a lot. Signed-off-by: Austin Seipp <aseipp@pobox.com> Change-Id: Id91da269f87b145010c870b7dc043748
2023-10-13 14:37:15 +00:00
* `jj workspace forget` can now forget multiple workspaces at once.
revset: add support for glob:pattern
2023-10-19 17:46:26 +00:00
* `branches()`/`remote_branches()`/`author()`/`committer()`/`description()`
revsets now support glob matching.
cli: add "branch list [NAMES]..." filter Like "jj log PATHS...", unmatched name isn't an error. I don't think "jj branch list glob:'push-*'" should fail just because there are no in-flight PR branches.
2023-11-01 03:01:17 +00:00
* `jj branch delete`/`forget`/`list`, and `jj git push --branch` now support
[string pattern syntax](docs/revsets.md#string-patterns). The `--glob` option
is deprecated in favor of `glob:` pattern.
cli: add kind:pattern syntax to branch delete/forget commands The parse rule is lax compared to revset. We could require the pattern to be quoted, but that would mean glob patterns have to be quoted like 'glob:"foo*"'.
2023-10-19 20:17:58 +00:00
templater: make branches, tags, git_refs, and git_head return list type I'm not going to change the default output, but this allows us to highlight or dim only the @remote component.
2023-10-25 07:31:18 +00:00
* The `branches`/`tags`/`git_refs`/`git_head` template keywords now return a
list of `RefName`s. They were previously pre-formatted strings.
templater: add local/remote_branches keywords
2023-10-25 08:50:52 +00:00
* The new template keywords `local_branches`/`remote_branches` are added to show
only local/remote branches.
cli: make `jj workspace add` preserve all parents of current workspace
2023-10-29 19:43:17 +00:00
* `jj workspace add` now preserves all parents of the old working-copy commit
instead of just the first one.
cli rebase: Allow `jj rebase -r` to rebase a commit onto a descendant #1188 There are some additional test changes because children and descendants are now rebased before the commit itself.
2023-10-28 02:29:13 +00:00
* `jj rebase -r` gained the ability to rebase a revision `A` onto a descendant
of `A`.
release: release version 0.10.0 Thanks to everyone who's contributed!
2023-10-04 18:59:33 +00:00
### Fixed bugs
working_copy: don't crash when updating and tracked file exits on disk Before this patch, when updating to a commit that has a file that's currently an ignored file on disk, jj would crash. After this patch, we instead leave the conflicting files or directories on disk. We print a helpful message about how to inspect the differences between the intended working copy and the actual working copy, and how to discard the unintended changes. Closes #976.
2023-10-07 00:23:23 +00:00
* Updating the working copy to a commit where a file that's currently ignored
in the working copy no longer leads to a crash
([#976](https://github.com/martinvonz/jj/issues/976)).
merge: materialize conflicts in executable files like regular files AFAICT, all callers of `Merge::to_file_merge()` are already well prepared for working with executable files. It's called from these places: * `local_working_copy.rs`: Materialized conflicts are correctly updated using `Merge::with_new_file_ids()`. * `merge_tools/`: Same as above. * `cmd_cat()`: We already ignore the executable bit when we print non-conflicted files, so it makes sense to also ignore it for conflicted files. * `git_diff_part()`: We print all conflicts with mode "100644" (the mode for regular files). Maybe it's best to use "100755" for conflicts that are unambiguously executable, or maybe it's better to use a fake mode like "000000" for all conflicts. Either way, the current behavior seems fine. * `diff_content()`: We use the diff content in various diff formats. We could add more detail about the executable bits in some of them, but I think the current output is fine. For example, instead of our current "Created conflict in my-file", we could say "Created conflict in executable file my-file" or "Created conflict in ambiguously executable file my-file". That's getting verbose, though. So, I think all we need to do is to make `Merge::to_file_merge()` not require its inputs to be non-executable. Closes #1279.
2023-10-24 03:01:00 +00:00
* Conflicts in executable files can now be resolved just like conflicts in
non-executable files ([#1279](https://github.com/martinvonz/jj/issues/1279)).
cli new: have `--before/--after` respect immutable commits I wasn't very careful to make the function pretty; I'm planning to refactor it anyway as part of implementing `rebase --before` and `rebase --after`.
2023-10-30 02:56:42 +00:00
* `jj new --insert-before` and `--insert-after` now respect immutable revisions
([#2468](https://github.com/martinvonz/jj/pull/2468)).
release: release version 0.11.0 Thanks to everyone who's contributed!
2023-11-01 15:58:30 +00:00
### Contributors
Thanks to the people who made this release happen!
* Antoine Cezar (@AntoineCezar)
* Austin Seipp (@thoughtpolice)
* Benjamin Saunders (@Ralith)
* Gabriel Scherer (@gasche)
* Ilya Grigoriev (@ilyagr)
* Infra (@1011X)
* Isabella Basso (@isinyaaa)
* Martin von Zweigbergk (@martinvonz)
* Tal Pressman (@talpr)
* Waleed Khan (@arxanas)
* Yuya Nishihara (@yuja)
release: release version 0.10.0 Thanks to everyone who's contributed!
2023-10-04 18:59:33 +00:00
## [0.10.0] - 2023-10-04
### Breaking changes
feat(squash): Add `--keep-emptied` flag Fixes #3815
2024-06-04 23:34:50 +00:00
* A default revset-alias function `trunk()` now exists. If you previously
defined
revsets: add trunk alias with default to main/master/root
2023-08-15 21:49:11 +00:00
your own `trunk()` alias it will continue to overwrite the built-in one.
feat(squash): Add `--keep-emptied` flag Fixes #3815
2024-06-04 23:34:50 +00:00
Check [revsets.toml](cli/src/config/revsets.toml)
and [revsets.md](docs/revsets.md)
revsets: add trunk alias with default to main/master/root
2023-08-15 21:49:11 +00:00
to understand how the function can be adapted.
release: release version 0.9.0 Thanks to everyone who's contributed!
2023-09-06 16:46:27 +00:00
### New features
templater: Add `operation.snapshot()` boolean Expose the information we now record, to allow changing the default "snapshot working copy" message or to make snapshots more compact/less distracting in the log
2024-04-05 11:21:36 +00:00
* The `ancestors()` revset function now takes an optional `depth` argument
to limit the depth of the ancestor set. For example, use `jj log -r
revset: Add optional argument n to ancestors() in revset language
2023-09-02 06:02:35 +00:00
'ancestors(@, 5)` to view the last 5 commits.
cargo: enable the watchman feature by default I think the feature is requested by enough users that we should include it by default, also for people who install from source (we include it in the `packaging` feature already). It increases the size of the binary from 16.5 MiB to 17.8 MiB. I suspect we'd see some of that increase in size soon anyway, as I'm probably going to use Tokio for making async backend requests.
2023-09-07 16:09:59 +00:00
* Support for the Watchman filesystem monitor is now bundled by default. Set
`core.fsmonitor = "watchman"` in your repo to enable.
cli: make set of immutable commits configurable This adds a new `revset-aliases.immutable_heads()s` config for defining the set of immutable commits. The set is defined as the configured revset, as well as its ancestors, and the root commit commit (even if the configured set is empty). This patch also adds enforcement of the config where we already had checks preventing rewrite of the root commit. The working-copy commit is implicitly assumed to be writable in most cases. Specifically, we won't prevent amending the working copy even if the user includes it in the config but we do prevent `jj edit @` in that case. That seems good enough to me. Maybe we should emit a warning when the working copy is in the set of immutable commits. Maybe we should add support for something more like [Mercurial's phases](https://wiki.mercurial-scm.org/Phases), which is propagated on push and pull. There's already some affordance for that in the view object's `public_heads` field. However, this is simpler, especially since we can't propagate the phase to Git remotes, and seems like a good start. Also, it lets you say that commits authored by other users are immutable, for example. For now, the functionality is in the CLI library. I'm not sure if we want to move it into the library crate. I'm leaning towards letting library users do whatever they want without being restricted by immutable commits. I do think we should move the functionality into a future `ui-lib` or `ui-util` crate. That crate would have most of the functionality in the current `cli_util` module (but in a non-CLI-specific form).
2023-09-02 02:12:01 +00:00
* You can now configure the set of immutable commits via
`revset-aliases.immutable_heads()`. For example, set it to
`"remote_branches() | tags()"` to prevent rewriting those those. Their
ancestors are implicitly also immutable.
cli: add `jj op log --no-graph` Seems useful, and makes it consistent with the `jj log` and `jj obslog`.
2023-09-10 16:34:30 +00:00
* `jj op log` now supports `--no-graph`.
Allow \0 escape for nulls This allows safely getting e.g. multiple descriptions, and knowing where the boundaries are
2023-09-13 17:50:12 +00:00
* Templates now support an additional escape: `\0`. This will output a literal
null byte. This may be useful for e.g.
`jj log -T 'description ++ "\0"' --no-graph` to output descriptions only, but
be able to tell where the boundaries are
merge_tools: enable `:builtin` as default diff/merge editor
2023-08-29 21:13:36 +00:00
* jj now bundles a TUI tool to use as the default diff and merge editors. (The
previous default was `meld`.)
commands: add `--interactive` flag to `jj split` `jj split` with no arguments operates interactively, but I am nonetheless constantly running `jj split -i` because I expect an `--interactive` flag to exist for consistency. However, `jj split <paths>` before this commit always operates non-interactively, so this commit has the nice practical effect that you can restrict your interactive splitting to a certain set of paths.
2023-09-25 00:33:19 +00:00
* `jj split` supports the `--interactive` flag. (This is already the default if
no paths are provided.)
commands: support path arguments to `jj commit`
2023-09-25 00:41:43 +00:00
* `jj commit` accepts an optional list of paths indicating a subset of files to
include in the first commit
command: add `--interactive` flag to `jj commit`
2023-09-25 00:48:17 +00:00
* `jj commit` accepts the `--interactive` flag.
release: release version 0.9.0 Thanks to everyone who's contributed!
2023-09-06 16:46:27 +00:00
### Fixed bugs
release: release version 0.10.0 Thanks to everyone who's contributed!
2023-10-04 18:59:33 +00:00
### Contributors
Thanks to the people who made this release happen!
* Austin Seipp (@thoughtpolice)
* Emily Kyle Fox (@emilykfox)
* glencbz (@glencbz)
* Hong Shin (@honglooker)
* Ilya Grigoriev (@ilyagr)
* James Sully (@sullyj3)
* Martin von Zweigbergk (@martinvonz)
* Philip Metzger (@PhilipMetzger)
* Ruben Slabbert (@rslabbert)
* Vamsi Avula (@avamsi)
* Waleed Khan (@arxanas)
* Willian Mori (@wmrmrx))
* Yuya Nishihara (@yuja)
* Zachary Dremann (@Dr-Emann)
release: release version 0.9.0 Thanks to everyone who's contributed!
2023-09-06 16:46:27 +00:00
## [0.9.0] - 2023-09-06
revset: remove redundant candidates argument from filter predicates
2022-10-25 13:08:11 +00:00
### Breaking changes
chore(rust): bump MSRV to 1.71.0 Summary: Let's be more aggressive about tracking the latest stable Rust release. There's little benefit to being conservative so early on, especially when no users seem to have faced any issue with upgrading, or strictly required an old Rust version. Right now, just lagging Rust by 1 major release probably seems fine. We're targeting 1.71.0 to get ahead of the curve, since 1.72.0 will likely release sometime before the next `jj` release. Signed-off-by: Austin Seipp <aseipp@pobox.com> Change-Id: I4e691b6ba63b5b9023a75ae0a6917672
2023-07-11 13:08:13 +00:00
* The minimum supported Rust version (MSRV) is now 1.71.0.
simple_op_store: serialize RefTarget in new format (breaks downgrades) This is breaking change. Old jj binary will panic if it sees a view saved by new jj. Alternatively, we can store both new and legacy data for backward compatibility.
2023-07-15 15:54:50 +00:00
* The storage format of branches, tags, and git refs has changed. Newly-stored
repository data will no longer be loadable by older binaries.
cli: warn when using `:` revset operator
2023-07-28 00:33:54 +00:00
* The `:` revset operator is deprecated. Use `::` instead. We plan to delete the
`:` form in jj 0.15+.
cli: replace `--allow-large-revsets` by use of `all:` prefix See the earlier commit introducing the `::` operator for reasoning.
2023-07-25 16:07:03 +00:00
* The `--allow-large-revsets` flag for `jj rebase` and `jj new` was replaced by
a `all:` before the revset. For example, use `jj rebase -d 'all:foo-'`
instead of `jj rebase --allow-large-revsets -d 'foo-'`.
rebase/new: make `--allow-large-revset` no longer also allow duplicates The `--allow-large-revset` option for `jj rebase` and `jj new` is used for allowing a single revset to resolve to more than one destination commit. It also means that duplicate commits between individual revsets are allowed (e.g. `jj rebase -d x -d 'x|y'`). I'm about to replace the first meaning of the flag by a revset function. I don't think it's worth keeping the flag only for the second meaning, so I'm just removing the feature instead. We can add it back under a different name (`--allow-duplicate-destinations`?) if people care about it.
2023-07-25 17:17:36 +00:00
* The `--allow-large-revsets` flag for `jj rebase` and `jj new` can no longer be
used for allowing duplicate destinations. Include the potential duplicates
cli: replace `--allow-large-revsets` by use of `all:` prefix See the earlier commit introducing the `::` operator for reasoning.
2023-07-25 16:07:03 +00:00
in a single expression instead (e.g. `jj new 'all:x|y'`).
rebase/new: make `--allow-large-revset` no longer also allow duplicates The `--allow-large-revset` option for `jj rebase` and `jj new` is used for allowing a single revset to resolve to more than one destination commit. It also means that duplicate commits between individual revsets are allowed (e.g. `jj rebase -d x -d 'x|y'`). I'm about to replace the first meaning of the flag by a revset function. I don't think it's worth keeping the flag only for the second meaning, so I'm just removing the feature instead. We can add it back under a different name (`--allow-duplicate-destinations`?) if people care about it.
2023-07-25 17:17:36 +00:00
config: Rename `push.branch-prefix` option to `git.push-branch-prefix` This is for consistency with other `git.` options. See also https://github.com/martinvonz/jj/pull/1962#discussion_r1282605185
2023-08-07 22:36:39 +00:00
* The `push.branch-prefix` option was renamed to `git.push-branch-prefix`.
configs: use Notepad as default editor on Windows
2023-08-10 15:50:25 +00:00
* The default editor on Windows is now `Notepad` instead of `pico`.
feat(squash): Add `--keep-emptied` flag Fixes #3815
2024-06-04 23:34:50 +00:00
* `jj` will fail attempts to snapshot new files larger than 1MiB by default.
This behavior
working_copy: don't snapshot new files larger than 1MiB by default
2023-06-28 22:10:19 +00:00
can be customized with the `snapshot.max-new-file-size` config option.
commits: use empty strings instead of placeholders for missing name or email This commit replaces the functions `UserSettings::user_name_placeholder()`` and `UserSettings::user_email_placeholder()` with `const` `&str`s to emphasize that the placeholder strings must not be changed to support commits without names or email addresses made before this change.
2023-08-16 21:10:54 +00:00
* Author and committer signatures now use empty strings to represent unset
templater: move empty signature placeholder to user template This patch also extracts format_detailed_signature() function to deduplicate the "show" template bits. The added placeholder templates aren't labeled as "empty". If needed, I think the whole template can be labeled as "empty" (or "empty_commit") just like "working_copy". Closes #2112
2023-08-26 06:08:22 +00:00
names and email addresses. The `author`/`committer` template keywords and
methods also return empty strings.
commits: use empty strings instead of placeholders for missing name or email This commit replaces the functions `UserSettings::user_name_placeholder()`` and `UserSettings::user_email_placeholder()` with `const` `&str`s to emphasize that the placeholder strings must not be changed to support commits without names or email addresses made before this change.
2023-08-16 21:10:54 +00:00
Older binaries may not warn user when attempting to `git push` commits
with such signatures.
revset: parse @ like operator (but without alias substitution) This is what I proposed in #2095. @ is now an operator to concatenate symbols. Unlike the other operators, lhs/rhs of @ is not a target of alias substitution. 'x' in 'x@y' doesn't look like a named variable, though it's technically possible to allow definition of an alias expanded to a symbol of specific remote or vice versa. This will probably apply to the kind:pattern syntax, where aliases are expanded due to the current implementation restriction. I've added a TODO comment about that.
2023-08-23 06:48:45 +00:00
* In revsets, the working-copy or remote symbols (such as `@`, `workspace_id@`,
and `branch@remote`) can no longer be quoted as a unit. If a workspace or
branch name contains whitespace, quote the name like `"branch name"@remote`.
Also, these symbols will not be resolved as revset aliases or function
parameters. For example, `author(foo@)` is now an error, and the revset alias
`'revset-aliases.foo@' = '@'` will be failed to parse.
working_copy: don't snapshot new files larger than 1MiB by default
2023-06-28 22:10:19 +00:00
revset: convert root symbol to function The idea is that we can fully eliminate special symbols that would otherwise shadow user branches, tags, or change ID prefixes. Closes #2095
2023-09-03 03:47:23 +00:00
* The `root` revset symbol has been converted to function `root()`.
revset: evaluate "..y" expression to "root()..y" This seems useful since the root commit is often uninteresting. It's also consistent with "x::y" in a way that the left operand defaults to "root()".
2023-09-04 23:38:28 +00:00
* The `..x` revset is now evaluated to `root()..x`, which means the root commit
is no longer included.
cli: make `jj git push` default to `-r 'remote_branches()..@'` The way `jj git push` without arguments chooses branches pointing to either `@` or `@-` is unusual and difficult to explain. Now that we have `-r`, we could instead default it to `-r '@-::@'`. However, I think it seems likely that users will want to push all local branches leading up to `@` from the closest remote branch. That's typically what I want. This patch changes the default to do that.
2023-08-21 20:11:40 +00:00
* `jj git push` will now push all branches in the range `remote_branches()..@`
instead of only branches pointing to `@` or `@-`.
git: prohibit creation of remote named "git" #1690
2023-08-19 05:01:49 +00:00
* It's no longer allowed to create a Git remote named "git". Use `jj git remote
rename` to rename the existing remote.
[#1690](https://github.com/martinvonz/jj/issues/1690)
revset: do not lookup unimported tags or remote branches by unqualified name Since e7e49527efdf "git: ensure that remote branches never diverge", the last known "refs/remotes" ref should be synced with the corresponding remote branch. So we can always trust the branch@remote expression. We don't need "refs/tags" lookup either since tags should have been imported by git::import_refs(). FWIW, I'm thinking of reorganizing view.git_refs() map as per-remote views. It would be nice if we can get rid of revsets and template keywords exposing low-level Git ref primitives.
2023-09-06 01:24:11 +00:00
* Revset expression like `origin/main` will no longer resolve to a
remote-tracking branch. Use `main@origin` instead.
release: release version 0.8.0 Thanks to everyone who's contributed!
2023-07-09 04:41:55 +00:00
### New features
cli: hide irrelevant information about root commit in default log templates I've extracted the `builtin_log_root` template for users to customize the default templates without fully overriding them, for example I would remove the change_id/commit_id for myself - and we discussed in Discord that leaving those makes sense for the user to be reminded/teached that the root commit has a change id made from z's.
2023-08-15 13:18:56 +00:00
* Default template for `jj log` now does not show irrelevant information
(timestamp, empty, message placeholder etc.) about the root commit.
templater: add `root` keyword Similar to other boolean flags, such as "working_copy" or "empty". We could test something like `"0000000000000000000000000000000000000000".contains(commit_id)` like I did for myself, but first of all this is ugly, and secondly the root commit id is not guaranteed to be 40 zeroes as custom backend implementations could have some other root.
2023-08-15 13:18:56 +00:00
* Commit templates now support the `root` keyword, which is `true` for the root
commit and `false` for every other commit.
Allow initializing with bare git repositories
2023-08-01 03:29:54 +00:00
* `jj init --git-repo` now works with bare repositories.
Allow editing non-existent configs Addresses #1571.
2023-07-12 21:08:58 +00:00
* `jj config edit --user` and `jj config set --user` will now pick a default
feat(squash): Add `--keep-emptied` flag Fixes #3815
2024-06-04 23:34:50 +00:00
config location if no existing file is found, potentially creating parent
directories.
Allow editing non-existent configs Addresses #1571.
2023-07-12 21:08:58 +00:00
revset_graph: group commits topologically The original idea was similar to Mercurial's "topo" sorting, but it was bad at handling merge-heavy history. In order to render merges of topic branches nicely, we need to prioritize branches at merge point, not at fork point. OTOH, we do also want to place unmerged branches as close to the fork point as possible. This commit implements the former requirement, and the latter will be addressed by the next commit. I think this is similar to Git's sorting logic described in the following blog post. In our case, the in-degree walk can be dumb since topological order is guaranteed by the index. We keep HashSet<CommitId> instead of an in-degree integer value, which will be used in the next commit to resolve new heads as late as possible. https://github.blog/2022-08-30-gits-database-internals-ii-commit-history-queries/#topological-sorting Compared to Sapling's beautify_graph(), this is lazy, and can roughly preserve the index (or chronological) order. I tried beautify_graph() with prioritizing the @ commit, but the result seemed too aggressively reordered. Perhaps, for more complex history, beautify_graph() would produce a better result. For my wip branches (~30 branches, a couple of commits per branch), this works pretty well. #242
2023-07-16 10:47:46 +00:00
* `jj log` output is now topologically grouped.
[#242](https://github.com/martinvonz/jj/issues/242)
commands: Support the option of colocating a git repo with a jj repo This adds the new --colocate flag to `jj git clone`. ``` jj git clone --colocate https://github.com/foo/bar ``` is effectively equivalent to: ``` git clone https://github.com/foo/bar cd bar jj init --git-repo=. ```
2023-07-24 09:38:16 +00:00
* `jj git clone` now supports the `--colocate` flag to create the git repo
in the same directory as the jj repo.
cli: New `-changes-in` argument to `jj restore` + docs Also updates docstrings for `diffedit`, `abandon` in related ways. The changes are a bit too intertwined to comfortable split into a separate commit.
2023-02-20 08:45:23 +00:00
* `jj restore` gained a new option `--changes-in` to restore files
from a merge revision's parents. This undoes the changes that `jj diff -r`
would show.
cli: add option to generate textual diff by external command This is basic implementation. There's no config knob to enable the external diff command by default. It reuses the merge-tools table because that's how external diff/merge commands are currently configured. We might want to reorganize them in #1285. If you run "jj diff --tool meld", GUI diff will open and jj will wait for meld to quit. This also applies to "jj log -p". The "diff --tool gui" behavior is somewhat useful, but "log -p --tool gui" wouldn't. We might want some flag to mark the tool output can't be streamed. Another thing to consider is tools that can't generate directory diffs. Git executes ext-diff tool per file, but we don't. Difftastic can compare directories, and doing that should be more efficient since diffs can be computed in parallel (at the expense of unsorted output.) Closes #1886
2023-08-02 03:12:11 +00:00
* `jj diff`/`log` now supports `--tool <name>` option to generate diffs by
external program. For configuration, see [the documentation](docs/config.md).
[#1886](https://github.com/martinvonz/jj/issues/1886)
cli: New `-changes-in` argument to `jj restore` + docs Also updates docstrings for `diffedit`, `abandon` in related ways. The changes are a bit too intertwined to comfortable split into a separate commit.
2023-02-20 08:45:23 +00:00
merge_tools: Allow 3-pane diff editing As discussed in https://github.com/martinvonz/jj/discussions/1905#discussioncomment-6589673
2023-08-07 23:40:10 +00:00
* A new experimental diff editor `meld-3` is introduced that sets up Meld to
allow you to see both sides of the original diff while editing. This can be
used with `jj split`, `jj move -i`, etc.
cli: add "--limit N" option to log-like commands Copied from Mercurial. This isn't a revset predicate since our revset is conceptually unordered.
2023-08-10 09:14:54 +00:00
* `jj log`/`obslog`/`op log` now supports `--limit N` option to show the first
`N` entries.
configs: add the ability to disable paging via `ui.paginate`
2023-08-11 04:22:19 +00:00
* Added the `ui.paginate` option to enable/disable pager usage in commands
cli: Allow repeated `-m` options for multi-paragraph descriptions Emulates git's behavior: https://www.git-scm.com/docs/git-commit#Documentation/git-commit.txt--mltmsggt
2023-08-12 01:38:11 +00:00
* `jj checkout`/`jj describe`/`jj commit`/`jj new`/`jj squash` can take repeated
`-m/--message` arguments. Each passed message will be combined into paragraphs
(separated by a blank line)
cli: add support for setting default description That is, jj will use ui.default_description as a starting point when user is about to describe an empty change. I think it might be confusing to do this with -m / --stdin (violates WYSIWYG), so I'm only doing this when jj invokes an editor. Also, this could evolve into a proper template in the future instead of just plain text, to allow inheriting from parent change(s), for example. Partially addresses #1354.
2023-08-12 10:19:27 +00:00
* It is now possible to set a default description using the new
`ui.default-description` option, to use when describing changes with an empty
description.
cli: when splitting change without description, skip it on second part One use case for `jj split` is when creating a new commit from some of the changes in the working copy. If there's no description on the working-copy commit in that case, it seems better to not ask the user to provide one when they're splitting the commit either.
2023-08-15 16:35:45 +00:00
* `jj split` will now leave the description empty on the second part if the
description was empty on the input commit.
revset: add literal:"string" pattern syntax The syntax is slightly different from Mercurial. In Mercurial, a pattern must be quoted like "<kind>:<needle>". In JJ, <kind> is a separate parsing node, and it must not appear in a quoted string. This allows us to report unknown prefix as an error. There's another subtle behavior difference. In Mercurial, branch(unknown) is an error, whereas our branches(literal:unknown) is resolved to an empty set. I think erroring out doesn't make sense for JJ since branches() by default performs substring matching, so its behavior is more like a filter. The parser abuses DAG range syntax for now. It can be rewritten once we remove the deprecated x:y range syntax.
2023-08-16 09:41:21 +00:00
* `branches()`/`remote_branches()`/`author()`/`committer()`/`description()`
revset: rename literal:"" prefix to exact:"" Per discussion in #2107, I believe "exact" is preferred. We can also change the default to exact match, but it doesn't always make sense. Exact match would be useful for branches(), but not for description(). We could define default per predicate function, but I'm pretty sure I cannot remember which one is which.
2023-08-19 00:59:40 +00:00
revsets now support exact matching. For example, `branch(exact:main)`
selects the branch named "main", but not "maint". `description(exact:"")`
revset: add literal:"string" pattern syntax The syntax is slightly different from Mercurial. In Mercurial, a pattern must be quoted like "<kind>:<needle>". In JJ, <kind> is a separate parsing node, and it must not appear in a quoted string. This allows us to report unknown prefix as an error. There's another subtle behavior difference. In Mercurial, branch(unknown) is an error, whereas our branches(literal:unknown) is resolved to an empty set. I think erroring out doesn't make sense for JJ since branches() by default performs substring matching, so its behavior is more like a filter. The parser abuses DAG range syntax for now. It can be rewritten once we remove the deprecated x:y range syntax.
2023-08-16 09:41:21 +00:00
selects commits whose description is empty.
feat(squash): Add `--keep-emptied` flag Fixes #3815
2024-06-04 23:34:50 +00:00
* Revsets gained a new function `mine()` that
aliases `author(exact:"your_email")`.
CHANGELOG: more precise description of `mine()`
2023-08-18 21:00:35 +00:00
revset: add 0-ary "::" and ".." operators as short for "all()" and "~root()" Suppose "x::y" is the operator that defaults to "root()::visible_heads()" respectively, "::" is identical to "all()". Since we've just changed the behavior of "..y", ".." is now "root()..visible_heads()" meaning "~root()".
2023-09-03 08:08:16 +00:00
* Added support for `::` and `..` revset operators with both left and right
operands omitted. These expressions are equivalent to `all()` and `~root()`
respectively.
Add UTC format for timestamp formats. Thanks to @rauljordan for these changes. Add tests for new UTC timestamp format Add documentation for timestamp utc Update CHANGELOG.md
2023-08-11 20:31:47 +00:00
* `jj log` timestamp format now accepts `.utc()` to convert a timestamp to UTC.
templater: Add `operation.snapshot()` boolean Expose the information we now record, to allow changing the default "snapshot working copy" message or to make snapshots more compact/less distracting in the log
2024-04-05 11:21:36 +00:00
feat(squash): Add `--keep-emptied` flag Fixes #3815
2024-06-04 23:34:50 +00:00
* templates now support additional string
methods `.starts_with(x)`, `.ends_with(x)`
templates: Add more string methods Add starts_with/ends_with/remove_prefix/remove_suffix/substr methods to string when templating.
2023-08-22 18:40:51 +00:00
`.remove_prefix(x)`, `.remove_suffix(x)`, and `.substr(start, end)`.
Add UTC format for timestamp formats. Thanks to @rauljordan for these changes. Add tests for new UTC timestamp format Add documentation for timestamp utc Update CHANGELOG.md
2023-08-11 20:31:47 +00:00
commands: Implement `next` and `prev` This is a naive implementation, which cannot deal with multiple children or parents stemming from merges. Note: I gave each command separate a separate argument struct for extensibility. Fixes #878
2023-01-21 23:07:42 +00:00
* `jj next` and `jj prev` are added, these allow you to traverse the history
in a linear style. For people coming from Sapling and `git-branchles`
templater: Add `operation.snapshot()` boolean Expose the information we now record, to allow changing the default "snapshot working copy" message or to make snapshots more compact/less distracting in the log
2024-04-05 11:21:36 +00:00
see [#2126](https://github.com/martinvonz/jj/issues/2126) for
commands: Implement `next` and `prev` This is a naive implementation, which cannot deal with multiple children or parents stemming from merges. Note: I gave each command separate a separate argument struct for extensibility. Fixes #878
2023-01-21 23:07:42 +00:00
further pending improvements.
changelog: more orphan entries under headings
2023-09-06 18:13:46 +00:00
* `jj diff --stat` has been implemented. It shows a histogram of the changes,
feat(squash): Add `--keep-emptied` flag Fixes #3815
2024-06-04 23:34:50 +00:00
same as `git diff --stat`.
Fixes [#2066](https://github.com/martinvonz/jj/issues/2066)
changelog: more orphan entries under headings
2023-09-06 18:13:46 +00:00
* `jj git fetch --all-remotes` has been implemented. It fetches all remotes
instead of just the default remote
release: release version 0.8.0 Thanks to everyone who's contributed!
2023-07-09 04:41:55 +00:00
### Fixed bugs
Fix .gitignore handling of ignored directories - Ignore .gitignore files from untracked directories - Do not allow un-ignoring files within ignored directories
2023-08-17 23:48:33 +00:00
* Fix issues related to .gitignore handling of untracked directories
[#2051](https://github.com/martinvonz/jj/issues/2051).
feat(squash): Add `--keep-emptied` flag Fixes #3815
2024-06-04 23:34:50 +00:00
* `jj config set --user` and `jj config edit --user` can now be used outside of
any repository.
Allow editing user-specific config file outside of a repo This addresses #2054.
2023-08-13 00:38:46 +00:00
git: add support for SSH authentication with ed25519 or ed25519-sk This makes it possible to use ed25519 and ed25519-sk keys by trying them one at a time. However, it still fails if one of them is password-protected; we don't try the next key in that case.
2023-08-08 17:51:42 +00:00
* SSH authentication could hang when ssh-agent couldn't be reached
git: only try to use ssh-agent once per connection As reported in #1970, SSH authentication would sometimes run into a loop where it repeatedly tries to use ssh-agent for authentication without making progess. The problem can be reproduced by simply removing `$SSH_AUTH_KEY` from your environment (and not having a Git credentials helper configured, I think). This seems to be a bug introduced by b104f8e154c21. That commit meant to make it so we attempt to use ssh-agent and fall back to using (password-less) keys after that. The problem is that `git2::Cred::ssh_key_from_agent()` just returns an object that will be used later for looking up the credentials from ssh-agent, so the call will not fail because ssh-agent is not reachable. This commit attempts to fix the problem by having the credentials callback attempt to use ssh-agent only once.
2023-08-08 04:30:23 +00:00
[#1970](https://github.com/martinvonz/jj/issues/1970)
cli: add support for setting default description That is, jj will use ui.default_description as a starting point when user is about to describe an empty change. I think it might be confusing to do this with -m / --stdin (violates WYSIWYG), so I'm only doing this when jj invokes an editor. Also, this could evolve into a proper template in the future instead of just plain text, to allow inheriting from parent change(s), for example. Partially addresses #1354.
2023-08-12 10:19:27 +00:00
git: add support for SSH authentication with ed25519 or ed25519-sk This makes it possible to use ed25519 and ed25519-sk keys by trying them one at a time. However, it still fails if one of them is password-protected; we don't try the next key in that case.
2023-08-08 17:51:42 +00:00
* SSH authentication can now use ed25519 and ed25519-sk keys. They still need
to be password-less.
git: only try to use ssh-agent once per connection As reported in #1970, SSH authentication would sometimes run into a loop where it repeatedly tries to use ssh-agent for authentication without making progess. The problem can be reproduced by simply removing `$SSH_AUTH_KEY` from your environment (and not having a Git credentials helper configured, I think). This seems to be a bug introduced by b104f8e154c21. That commit meant to make it so we attempt to use ssh-agent and fall back to using (password-less) keys after that. The problem is that `git2::Cred::ssh_key_from_agent()` just returns an object that will be used later for looking up the credentials from ssh-agent, so the call will not fail because ssh-agent is not reachable. This commit attempts to fix the problem by having the credentials callback attempt to use ssh-agent only once.
2023-08-08 04:30:23 +00:00
cli: detect .git symlink as a colocated workspace Maybe we could load GitBackend without resolving .git symlink, but that would introduce more subtle bugs. Instead, we calculate the expected Git workdir path from the canonical ".git" path. Fixes #2011
2023-08-10 00:11:17 +00:00
* Git repository managed by the repo tool can now be detected as a "colocated"
repository.
[#2011](https://github.com/martinvonz/jj/issues/2011)
release: release version 0.9.0 Thanks to everyone who's contributed!
2023-09-06 16:46:27 +00:00
### Contributors
Thanks to the people who made this release happen!
* Alexander Potashev (@aspotashev)
* Anton Bulakh (@necauqua)
* Austin Seipp (@thoughtpolice)
* Benjamin Brittain (@benbrittain)
* Benjamin Saunders (@Ralith)
* Christophe Poucet (@poucet)
* Emily Kyle Fox (@emilykfox)
* Glen Choo (@chooglen)
* Ilya Grigoriev (@ilyagr)
* Kevin Liao (@kevincliao)
* Linus Arver (@listx)
* Martin Clausen (@maacl)
* Martin von Zweigbergk (@martinvonz)
* Matt Freitas-Stavola (@mbStavola)
* Oscar Bonilla (@ob)
* Philip Metzger (@PhilipMetzger)
* Piotr Kufel (@qfel)
* Preston Van Loon (@prestonvanloon)
* Tal Pressman (@talpr)
* Vamsi Avula (@avamsi)
* Vincent Breitmoser (@Valodim)
* Vladimir (@0xdeafbeef)
* Waleed Khan (@arxanas)
* Yuya Nishihara (@yuja)
* Zachary Dremann (@Dr-Emann)
release: release version 0.8.0 Thanks to everyone who's contributed!
2023-07-09 04:41:55 +00:00
## [0.8.0] - 2023-07-09
### Breaking changes
cargo: rename crates from `jujutsu`/`jujutsu-lib` to `jj-cli`/`jj-lib` Almost everyone calls the project "jj", and there seeems to be consensus that we should rename the crates. I originally wanted the crates to be called `jj` and `jj-lib`, but `jj` was already taken. `jj-cli` is probably at least as good for it anyway. Once we've published a 0.8.0 under the new names, we'll release 0.7.1 versions under the old names with pointers to the new crates names.
2023-06-28 14:12:40 +00:00
* The `jujutsu` and `jujutsu-lib` crates were renamed to `jj-cli` and `jj-lib`,
respectively.
templater: migrate op log to template language The outermost "op-log" label isn't moved to the default template. I think it belongs to the command's formatter rather than the template. Old bikeshedding items: - "current_head", "is_head", or "is_head_op" => renamed to "current_operation" - "templates.op-log" vs "templates.op_log" (the whole template is labeled as "op-log") => renamed to "op_log" - "template-aliases.'format_operation_duration(time_range)'" => renamed to 'format_time_range(time_range)'
2023-02-19 08:05:50 +00:00
* The `ui.oplog-relative-timestamps` option has been removed. Use the
`format_time_range()` template alias instead. For details, see
[the documentation](docs/config.md).
templater: require infix ++ operator to concatenate expressions This eliminates ambiguous parsing between "func()" and "expr ()". I chose "++" as template concatenation operator in case we want to add bit-wise negate operator. It's also easier to find/replace than "~".
2023-02-28 11:30:57 +00:00
* Implicit concatenation of template expressions has been disabled. Use
`++` operator, `concat()`, or `separate()` function instead.
Example: `description ++ "\n"`
git push: do not consider @- if @ has non-empty content or description
2023-03-05 20:27:03 +00:00
* `jj git push` will consider pushing the parent commit only when the
current commit has no content and no description, such as right after
a `jj squash`.
cargo: update MSRV to 1.64 We need 1.64 to bump `clap` to `4.1`. We don't really need to upgrade to that, but being on an older version causes minor confusions like #1393. Rust 1.64 is very close to 6 months old at this point.
2023-03-17 22:42:55 +00:00
* The minimum supported Rust version (MSRV) is now 1.64.0.
revset: split out no-args `head()` to `visible_heads()` The `heads()` revset function with one argument is the counterpart to `roots()`. Without arguments, it returns the visible heads in the repo, i.e. `heads(all())`. The two use cases are quite different, and I think it would be good to clarify that the no-arg form returns the visible heads, so let's split that out to a new `visible_heads()` function.
2023-03-28 06:13:31 +00:00
* The `heads()` revset function was split up into two functions. `heads()`
without arguments is now called `visible_heads()`. `heads()` with one argument
is unchanged.
cli: rename `ui.default-revset` to `revsets.log` I plan to add `revsets.short-prefixes` and `revsets.immutable` soon, and I think `[revsets]` seems like reasonable place to put them. It seems consistent with our `[templates]` section. However, it also suffers from the same problem as that section, which is that the difference between `[templates]` and `[template-aliases]` is not clear. We can decide about about templates and revsets later.
2023-05-11 06:26:23 +00:00
* The `ui.default-revset` config was renamed to `revsets.log`.
cli: make `jj sparse --list` a subcommand `jj sparse` is a bit different from other commands in that its `jj sparse --list` is practically a separate command. Let's make it an actual subcommand for consistency, and so we can more cleanly add additional flags for `jj sparse list` in the future. I moved all the other arguments to `jj sparse set`. I'm not sure if `jj sparse set --reset` would have been better as `jj sparse reset`, but it is technically just updating the sparse patterns just like the other arguments (`--clear`, `--add` , `--remove`).
2023-05-21 21:07:54 +00:00
* The `jj sparse` command was split up into `jj sparse list` and
`jj sparse set`.
changelog: removing the `jj hide` alias is a breaking change
2023-06-03 16:47:43 +00:00
* `jj hide` (alias for `jj abandon`) is no longer available. Use `jj abandon`
instead.
changelog: consider renamed `jj debug` commands a breaking change I think I originally didn't consider changing debug commands as a breaking change, but it's better to be conservative.
2023-06-04 02:07:35 +00:00
* `jj debug completion`, `jj debug mangen` and `jj debug config-schema` have
been moved from `jj debug` to `jj util`.
revsets: stop `jj` parsing `br` as a git_ref `refs/heads/br` Use `br@git` instead. Before, if there is not a local branch `br`, jj tried to resolve it as a git ref `refs/heads/br`. Unchanged from before, `br` can still be resolved as a tag `refs/tag/br`.
2023-06-12 18:59:15 +00:00
* `jj` will no longer parse `br` as a git_ref `refs/heads/br` when a branch `br`
does not exist but the git_ref does (this is rare). Use `br@git` instead.
git: consistently ignore unrelated refs on fetch() Since "jj git fetch --branch '*'" doesn't import unrelated remote and local refs, "jj git fetch" shouldn't do either.
2023-07-04 07:18:17 +00:00
* `jj git fetch` will no longer import unrelated branches from the underlying
Git repo.
release: release version 0.7.0 It's been about 10 weeks and 730 commits since 0.6.0, compared to about 7 weeks and 350 commits between 0.5.0 and 0.6.0, so it's time for a new release. There's been significant user-visible changes and code-quality improvements. Thanks, everyone!
2023-02-16 17:26:40 +00:00
### New features
feat(squash): Add `--keep-emptied` flag Fixes #3815
2024-06-04 23:34:50 +00:00
* `jj git push --deleted` will remove all locally deleted branches from the
remote.
git push: add --deleted option
2023-02-19 12:08:24 +00:00
cmd: Make `jj restore` work if `@` is a merge commit To be clear, this applies to `jj restore` without any arguments. Fixes #1228
2023-02-10 05:48:47 +00:00
* `jj restore` without `--from` works correctly even if `@` is a merge
commit.
cmd: Allow multiple `-b` for `jj rebase` This also makes `rebase_branch` reuse `rebase_descendants`. This addresses a portion of #1158
2023-02-19 03:31:48 +00:00
* `jj rebase` now accepts multiple `-s` and `-b` arguments. Revsets with
multiple commits are allowed with `--allow-large-revsets`.
cmd: Allow multiple `-s` for `jj rebase` This addresses a portion of #1158 One application (not the prettiest, but useful until we have `jj sync`): jj rebase -s oldmain+~:main -d main -L
2023-02-19 03:31:48 +00:00
cmd: `--branch` option for `git fetch`. Thanks to @samueltardieu for noticing a subtle bug in the refspecs, providing the fix, as well as the two `conflicting_branches` tests.
2023-01-12 22:53:26 +00:00
* `jj git fetch` now supports a `--branch` argument to fetch some of the
branches only.
feat(config): add `jj config get` for scripting The motivating use-case was this `jj signoff` script: https://gist.github.com/thoughtpolice/8f2fd36ae17cd11b8e7bd93a70e31ad6 Which includes lines like this: ```sh NAME=$(jj config list user.name | awk '{split($0, a, "="); print a[2];}' | tr -d '"') MAIL=$(jj config list user.email | awk '{split($0, a, "="); print a[2];}' | tr -d '"') ``` There is no reason that we should have to clumsily parse out the config values. This `jj config get` command supports scripting use-cases like this.
2023-06-23 18:55:11 +00:00
* `jj config get` command allows retrieving config values for use in scripting.
Implement "config set" subcommand Uses toml_edit to support simple config edits like: jj config set --repo user.email "somebody@example.com"
2023-01-15 04:23:44 +00:00
* `jj config set` command allows simple config edits like
`jj config set --repo user.email "somebody@example.com"`
cli: add ui.log-word-wrap option Unlike Mercurial, this isn't a template keyword/function, but a config knob. Exposing graph_width to templater wouldn't be easy, and I don't think it's better to handle terminal wrapping in template. I'm not sure if patch content should be wrapped, so this option only applies to the template output for now. Closes #1043
2023-03-05 04:10:02 +00:00
* Added `ui.log-word-wrap` option to wrap `jj log`/`obslog`/`op log` content
based on terminal width. [#1043](https://github.com/martinvonz/jj/issues/1043)
Switch graph node to use `◉` for commit instead of `●` This follows up on 5c703aeb0397b560a383bdd57a87235834074b64. The only reason for this change is that, subjectively, the result looks better to me. I'm not sure why, but I couldn't get used to the old symbol in spite of its seeming reasonableness. It felt really bold and heavy. If people agree, we can wait until we need to update the screenshots for some other reason before merging this. Sorry I didn't figure this out while the discussion about the referenced commit was going on. I'm not 100% certain how many fonts support each symbol. Please try it out and let me know if it doesn't work for you. Compare after: ![image](https://user-images.githubusercontent.com/4123047/229251383-563b889d-7233-42e2-a3c5-bf9368a4d1fd.png) and before: ![image](https://user-images.githubusercontent.com/4123047/229251695-7fd0ff2c-2832-4262-ade5-5120288cccdf.png)
2023-03-15 03:37:56 +00:00
* Nodes in the (text-based) graphical log output now use a `◉` symbol instead
cmd: when a single remote is defined, default to it for git fetch/push A simple quick implementation of what I've suggested on discord
2023-04-04 13:34:12 +00:00
of the letter `o`. The ASCII-based graph styles still use `o`.
cli: replace `o` as graph node by `●` when using unicode graph @joyously found `o` confusing because it's a valid change id prefix. I don't have much preference, but `●` seems fine. The "ascii", "ascii-large", and "legacy" graph styles still use "o". I didn't change `@` since it seems useful to have that match the symbol used on the CLI. I don't think we want to have users do something like `jj co ◎-`.
2023-03-11 07:10:31 +00:00
cli: show diff summary as two states instead of transition By using one letter for the path type before and one letter for path type after, we can encode much more information than just the current 'M'/'A'/'R'. In particular, we can indicate new and resolved conflicts. The color still encodes the same information as before. The output looks a bit weird after many years of using `hg status`. It's a bit more similar to the `git status -s` format with one letter for the index and one with the working copy. Will we get used to it and find it useful?
2021-09-16 05:46:54 +00:00
* Commands that accept a diff format (`jj diff`, `jj interdiff`, `jj show`,
`jj log`, and `jj obslog`) now accept `--types` to show only the type of file
before and after.
cli: add `jj describe --reset-author` I think requests to reset the author came up twice in the last week, so let's just add support for it. I copied git's behavior of resetting the name, email, and timestamp. The flag name is also from git.
2023-03-18 05:34:25 +00:00
* `jj describe` now supports `--reset-author` for resetting a commit's author
cli: add `jj describe --no-edit` to not open editor
2023-03-18 06:33:48 +00:00
to the configured user. `jj describe` also gained a `--no-edit` option to
avoid opening the editor.
cli: add `jj describe --reset-author` I think requests to reset the author came up twice in the last week, so let's just add support for it. I copied git's behavior of resetting the name, email, and timestamp. The flag name is also from git.
2023-03-18 05:34:25 +00:00
revset: add latest(candidates, count) predicate This serves the role of limit() in Mercurial. Since revsets in JJ is (conceptually) an unordered set, a "limit" predicate should define its ordering criteria. That's why the added predicate is named as "latest". Closes #1110
2023-03-25 03:14:26 +00:00
* Added `latest(x[, n])` revset function to select the latest `n` commits.
revset: add a revset function for finding commits with conflicts This adds `conflict()` revset that selects commits with conflicts. We may want to extend it later to consider only conflicts at certain paths.
2023-04-05 03:05:51 +00:00
* Added `conflict()` revset function to select commits with conflicts.
`squash`/`amend`: Add `-m` argument to set description This prevents an editor opening, and is useful in scripts/tests.
2023-04-03 22:16:23 +00:00
* `jj squash` AKA `jj amend` now accepts a `--message` option to set the
description of the squashed commit on the command-line.
cli: include total downloaded size in progress output With this change, the output looks like this: ``` 3% 165.9 Mi at 13.4 MiB/s [█▋ ] ``` Closes #1483.
2023-04-05 12:26:47 +00:00
* The progress display on `jj git clone/fetch` now includes the downloaded size.
formatter: allow using "default" terminal color The "default" color resets the terminal color to default.
2023-04-08 06:25:30 +00:00
* The formatter now supports a "default" color that can override another color
defined by a parent style.
Templater: label hidden commits (aka abandoned commits) Looks like "change_id normal" + color. Picture for `jj obslog`: https://user-images.githubusercontent.com/4123047/230708271-4108cf5f-255d-419e-bd3e-fc97dc8b8660.png This should also be occasionally be useful for e.g. `jj log commit_id`. I also considered the wording `(Was change_id)` or `change_id (old)`, `change_id (obs)`.
2023-04-08 01:28:16 +00:00
* `jj obslog` and `jj log` now show abandoned commits as hidden.
cli: allow `jj git push --change xyz --branch foo` This was pretty simple. I simplified a bit by making the transaction description mention only branches, not changes. It still mentions the branches created for the changes, however. Also, since the operation "tags" contain the full command line, I think it'll still be relatively easy for the user to understand what the operation was about.
2023-06-03 06:24:28 +00:00
* `jj git fetch` and `jj git push` will now use the single defined remote even
if it is not named "origin".
cli: add `jj git push -r` for pushing branches pointing to revset I think I will find this useful in at least two cases: 1. When you already have a branch pointing to some commit, it's easier to do `jj git push -r xyz` than `jj git push --branch push-xyzxyzyxzxyz`. 2. When you have a stack of changes, it's useful to be able to push all of them at once. I think we should also update the default behavior of `jj git push` to be `jj git push -r 'remote_branches()..@'` or something like that. That removes the ugliness of having a default behavior that the user can't reproduce using flags. I'll leave that change for a separate PR.
2023-06-03 05:39:33 +00:00
* `jj git push` now accepts `--branch` and `--change` arguments together.
* `jj git push` now accepts a `-r/--revisions` flag to specify revisions to
push. All branches pointing to any of the specified revisions will be pushed.
The flag can be used together with `--branch` and `--change`.
cmd: when a single remote is defined, default to it for git fetch/push A simple quick implementation of what I've suggested on discord
2023-04-04 13:34:12 +00:00
cli: default to log when no subcommand is provided This is a convenience optimization to improve the default user experience, since `jj log` is a frequently run command. Accessing the help information explicitly still follows normal CLI conventions, and instructions are displayed appropriately if the user happens to make a mistake. Discoverability should not be adversely harmed. Note that this behavior mirrors what Sapling does [2], where `sl` will display the smartlog by default. [1] https://github.com/clap-rs/clap/issues/975 [2] https://sapling-scm.com/docs/overview/smartlog
2023-04-14 01:49:35 +00:00
* `jj` with no subcommand now defaults to `jj log` instead of showing help. This
command can be overridden by setting `ui.default-command`.
cli: use a unique file extension for description tempfiles Establishing a unique file extension for the temporary files created via `jj describe` helps to ensure that text editors can recognize the filetype and alter settings accordingly. This will open the door for an improved user experience, and allow for setting things like the appropriate text-width/rulers, syntax highlighting of the diff summary (see Git's commit tree-sitter grammer [1]), easy toggling of the `JJ:` comment lines, etc. I examined the behavior of filetype detection across a number of common text editors, and the most universally-support mechanism was to have a unique extension that does not include any periods. Meaning that namespacing via something like `.jj.txt` instead, won't always be detected due to inconsistent matching prioritization across editors. It also makes sense to assume that we may want other Jujutsu-specific filetypes in the future. The filename prefix has also been switched to be `editor-` for clarity, as well as to ease matching a glob-pattern if we ever need to garbage collect leftover tempfiles. This structure is similar to what Mercurial and Sapling do as well. [1] https://github.com/the-mikedavis/tree-sitter-git-commit
2023-04-18 14:59:24 +00:00
* Description tempfiles created via `jj describe` now have the file extension
`.jjdescription` to help external tooling detect a unique filetype.
cli: allow resolving shorter ids within a configured revset This adds a config called `revsets.short-prefixes`, which lets the user specify a revset in which to disambiguate otherwise ambiguous change/commit ids. It defaults to the value of `revsets.log`. I made it so you can disable the feature by setting `revsets.short-prefixes = ""`. I don't like that the default value (using `revsets.log`) cannot be configured explicitly by the user. That will be addressed if we decide to merge the `[revsets]` and `[revset-aliases]` sections some day.
2023-05-06 00:12:08 +00:00
* The shortest unique change ID prefixes and commit ID prefixes in `jj log` are
now shorter within the default log revset. You can override the default by
setting the `revsets.short-prefixes` config to a different revset.
cmd: have `jj branch list` report git-tracking (`@git`) branches This doesn't change the way @git branches are stored in `git_refs` as opposed to inside `BranchTarget` like normal remote-tracking branches. There are subtle differences in behavior with e.g. `jj branch forget` and I'm not sure how easy it is to rewrite `jj git import/export` to support a different way of storage. I've decided to call these "local-git tracking branches" since they track branches in the local git repository. "local git-tracking" branches sounds a bit more natural, but these could be confused with there are no remote git-tracking branches. If one had the idea these might exist, they would be confused with remote-tracking branches in the local git repo. This addresses a portion of #1666
2023-06-11 04:44:48 +00:00
* The last seen state of branches in the underlying git repo is now presented by
templater: include pseudo @git targets in branches keyword #1666
2023-07-07 16:49:28 +00:00
`jj branch list`/`jj log` as a remote called `git` (e.g. `main@git`). They can
also be referenced in revsets. Such branches exist in colocated repos or if
you use `jj git export`.
cmd: have `jj branch list` report git-tracking (`@git`) branches This doesn't change the way @git branches are stored in `git_refs` as opposed to inside `BranchTarget` like normal remote-tracking branches. There are subtle differences in behavior with e.g. `jj branch forget` and I'm not sure how easy it is to rewrite `jj git import/export` to support a different way of storage. I've decided to call these "local-git tracking branches" since they track branches in the local git repository. "local git-tracking" branches sounds a bit more natural, but these could be confused with there are no remote git-tracking branches. If one had the idea these might exist, they would be confused with remote-tracking branches in the local git repo. This addresses a portion of #1666
2023-06-11 04:44:48 +00:00
cli: new `jj chmod` command to set executable bit
2023-06-12 19:51:56 +00:00
* The new `jj chmod` command allows setting or removing the executable bit on
paths. Unlike the POSIX `chmod`, it works on Windows, on conflicted files, and
on arbitrary revisions. Bits other than the executable bit are not planned to
be supported.
add --edit option to `jj sparse set`
2023-06-06 05:32:11 +00:00
* `jj sparse set` now accepts an `--edit` flag which brings up the `$EDITOR` to
edit sparse patterns.
cli: add revset filter to "branch list" Typical query would be something like -r 'mine()' or -r 'branches()' to exclude remote-only branches #1136. The query matches against local targets only. This means there's no way to select deleted/forgotten branches by -r option. If we add a default revset configuration, we'll need some way to turn the default off.
2023-06-28 02:53:01 +00:00
* `jj branch list` can now be filtered by revset.
docs(fsmonitor): add filesystem monitor/Watchman documentation
2023-07-08 09:23:09 +00:00
* Initial support for the Watchman filesystem monitor. Set
`core.fsmonitor = "watchman"` in your repo to enable.
release: release version 0.7.0 It's been about 10 weeks and 730 commits since 0.6.0, compared to about 7 weeks and 350 commits between 0.5.0 and 0.6.0, so it's time for a new release. There's been significant user-visible changes and code-quality improvements. Thanks, everyone!
2023-02-16 17:26:40 +00:00
### Fixed bugs
conflicts: replace missing files by empty in materialized conflict When we materialize modify/delete conflicts, we currently don't include any context lines. That's because modify/delete conflicts have only two sides, so there's no common base to compare to. Hunks that are unchanged on the "modify" side are therefore not considered conflicting, and since they they don't contribute new changes, they're simply skipped (here: https://github.com/martinvonz/jj/blob/3dfedf581458f88982289f58db884bc65f1e635b/lib/src/files.rs#L228-L230). It seems more useful to instead pretend that the missing side is an empty file. That way we'll get a conflict in the entire file. We can still decide later to make e.g. `jj resolve` prompt the user on modify/delete conflicts just like `hg resolve` does (or maybe it actually happens earlier there, I don't remember). Closes #1244.
2023-02-17 18:05:47 +00:00
* Modify/delete conflicts now include context lines
[#1244](https://github.com/martinvonz/jj/issues/1244).
conflicts: fix bug when modifying modify/delete conflicts Currently, if the user modifies a modify/delete conflict, we always consider the result resolved. That happens because we materialize the missing side of the conflict as an empty string but when we parse the conflict, we expect only the number of sides in the input conflict. For example, if the input is a regular modify/delete conflict with one remove and one add, the materialized markers will have one remove and two adds (one of them empty), but when we try to parse it, we expect one remove and only one add. When we fail to parse it, we consider it resolved. This commit fixes the bug by using `conflicts::Conflict<Option<TreeValue>>` and keeping track of which sides were supposed to be empty. We could have fixed the bug without switching to `conflicts::Conflict`, but we want to switch anyway, and the fix happens naturally when switching.
2023-05-31 18:02:23 +00:00
* It is now possible to modify either side of a modify/delete conflict (any
change used to be considered a resolution).
conflicts: preserve order of adds in materialized conflict We write conflict to the working copy by materializing them as conflict markers in a file. When the file has been modified (or just the mtime has changed), we parse the markers to reconstruct the conflict. For example, let's say we see this conflict marker: ``` <<<<<<< +++++++ b %%%%%%% -a +c >>>>>>> ``` Then we will create a hunk with ["a"] as removed and ["b", "c"] as added. Now, since commit b84be06c0822, when we materialize conflicts, we minimize the diff part of the marker (the `%%%%%%%` part). The problem is that that minimization may result in a different order of the positive conflict terms. That's particularly bad because we do the minimization per hunk, so we can end up reconstructing an input that never existed. This commit fixes the bug by only considering the next add and the one after that, and emitting either only the first with `%%%%%%%`, or both of them, with the first one in `++++++++` and the second one in `%%%%%%%`. Note that the recent fix to add context to modify/delete conflicts means that when we parse modified such conflicts, we'll always consider them resolved, since the expected adds/removes we pass will not match what's actually in the file. That doesn't seem so bad, and it's not obvious what the fix should be, so I'll leave that for later.
2023-02-18 06:29:30 +00:00
* Fixed a bug that could get partially resolved conflicts to be interpreted
incorrectly.
git_fetch: when removing a remote branch, remove git ref as well
2023-02-24 17:24:48 +00:00
* `jj git fetch`: when re-adding a remote repository that had been previously
removed, in some situations the remote branches were not recreated.
git remote rename: rename git refs as well
2023-02-25 09:51:19 +00:00
* `jj git remote rename`: the git remote references were not rewritten with
the new name. If a new remote with the old name and containing the same
branches was added, the remote branches may not be recreated in some cases.
cli: snapshot stale working copy before updating Since there's no easy API to snapshot the stale working copy without releasing the lock, we have to compare the tree ids after reacquiring the lock. We could instead manually snapshot and rebase the working-copy commit, but that would require more copy-paste codes. Closes #1310
2023-02-26 11:52:06 +00:00
* `jj workspace update-stale` now snapshots the working-copy changes before
updating to the new working-copy commit.
cmd: prohibit creating branches at the root commit Such branches lead to confusing errors on git expoert or push.
2023-04-04 02:02:12 +00:00
* It is no longer allowed to create branches at the root commit.
git: on external HEAD move, do not abandon old branch The current behavior was introduced by 20eb9ecec10f "git: don't abandon HEAD commit when it loses a branch." While the change made HEAD mutation behavior more consistent with a plain ref operation, HEAD can also move on checkout, and checkout shouldn't be considered a history rewriting operation. I'm not saying the new behavior is always correct, but I think it's safer than losing old HEAD branch. I also think this change will help if we want to extract HEAD management function from git::import_refs(). Fixes #1042.
2023-05-10 10:10:40 +00:00
* `git checkout` (without using `jj`) in colocated repo no longer abandons
the previously checked-out anonymous branch.
[#1042](https://github.com/martinvonz/jj/issues/1042).
git.rs: properly abandon commits from moved/deleted branches on remote (#864) This bug concerns the way `import_refs` that gets called by `fetch` computes the heads that should be visible after the import. Previously, the list of such heads was computed *before* local branches were updated based on changes to the remote branches. So, commits that should have been abandoned based on this update of the local branches weren't properly abandoned. Now, `import_refs` tracks the heads that need to be visible because of some ref in a mapping keyed by the ref. If the ref moves or is deleted, the corresponding heads are updated. Fixes #864
2023-05-08 19:54:37 +00:00
* `jj git fetch` in a colocated repo now abandons branches deleted on the
remote, just like in a non-colocated repo.
[#864](https://github.com/martinvonz/jj/issues/864)
git fetch: do a `git export` of deleted branches before fetch
2023-06-30 02:20:00 +00:00
* `jj git fetch` can now fetch forgotten branches even if they didn't move on
the remote.
[#1714](https://github.com/martinvonz/jj/pull/1714)
[#1771](https://github.com/martinvonz/jj/pull/1771)
`branch forget`: allow forgetting deleted branches Partially fixes #1537
2023-06-24 04:48:48 +00:00
* It is now possible to `jj branch forget` deleted branches.
[#1537](https://github.com/martinvonz/jj/issues/1537)
changelog: mention fixes for #924 and #1608 (racy change id / snapshot)
2023-06-26 04:59:18 +00:00
* Fixed race condition when assigning change id to Git commit. If you've
already had unreachable change ids, run `jj debug reindex`.
[#924](https://github.com/martinvonz/jj/issues/924)
* Fixed false divergence on racy working-copy snapshots.
[#697](https://github.com/martinvonz/jj/issues/697),
[#1608](https://github.com/martinvonz/jj/issues/1608)
undo: preserve git-tracking refs in colocated repos by default
2023-06-01 03:55:46 +00:00
* In colocated repos, a bug causing conflicts when undoing branch moves (#922)
has been fixed. Some surprising behaviors related to undoing `jj git push` or
`jj git fetch` remain.
release: release version 0.8.0 Thanks to everyone who's contributed!
2023-07-09 04:41:55 +00:00
### Contributors
Thanks to the people who made this release happen!
* Aaron Bull Schaefer (@elasticdog)
* Anton Bulakh (@necauqua)
* Austin Seipp (@thoughtpolice)
* Benjamin Saunders (@Ralith)
* B Wilson (@xelxebar)
* Christophe Poucet (@poucet)
* David Barnett (@dbarnett)
* Glen Choo (@chooglen)
* Grégoire Geis (@71)
* Ilya Grigoriev (@ilyagr)
* Isabella Basso (@isinyaaa)
* Kevin Liao (@kevincliao)
* Martin von Zweigbergk (@martinvonz)
changelog: Fix @mlcui-corp username I have renamed myself from @mlcui-google to @mlcui-corp, but the changelog still had the old username. (That username is now taken by a squatter...)
2024-06-06 00:05:18 +00:00
* mlcui (@mlcui-corp)
release: release version 0.8.0 Thanks to everyone who's contributed!
2023-07-09 04:41:55 +00:00
* Samuel Tardieu (@samueltardieu)
* Tal Pressman (@talpr)
* Vamsi Avula (@avamsi)
* Waleed Khan (@arxanas)
* Yuya Nishihara (@yuja)
release: release version 0.7.0 It's been about 10 weeks and 730 commits since 0.6.0, compared to about 7 weeks and 350 commits between 0.5.0 and 0.6.0, so it's time for a new release. There's been significant user-visible changes and code-quality improvements. Thanks, everyone!
2023-02-16 17:26:40 +00:00
## [0.7.0] - 2023-02-16
### Breaking changes
Update MSRV to 1.61 This is needed for compatibility with the sapling dag crate.
2023-01-19 04:54:19 +00:00
* The minimum supported Rust version (MSRV) is now 1.61.0.
Rename `jj touchup` to `jj diffedit`
2022-12-18 03:56:21 +00:00
* The `jj touchup` command was renamed to `jj diffedit`.
cmd: Remove the `-i` option to `jj restore`. It is superceded by the new options to the `jj diffedit` command.
2022-12-21 01:36:51 +00:00
* The `-i` option to `jj restore` was removed in favor of new `--from`/`--to`
options to `jj diffedit`.
`jj log`: Replace divergent label with ?? and red color This follows up on a [discussion] in a previous PR #941. [discussion]: https://github.com/martinvonz/jj/pull/941#issuecomment-1363551162 Screenshot: https://user-images.githubusercontent.com/4123047/209286340-bb83df2d-4020-4608-9755-d965477799c3.png
2023-01-07 01:49:31 +00:00
* To report the situation when a change id corresponds to multiple visible
commits, `jj log` now prints the change id in red and puts `??` after it.
Previously, it printed the word "divergent".
log: add (empty) in front of an empty commit description
2023-01-14 10:43:23 +00:00
* `jj log` prefixes commit descriptions with "(empty)" when they contain no
change compared to their parents.
templater: display both name and email by author/committer keywords This is an example of labeled output of structured value types. I think "{name} <{email}>" is a good default formatting, but I should note that the signature also contains timestamp field.
2023-01-22 12:16:52 +00:00
* The `author`/`committer` templates now display both name and email. Use
`author.name()`/`committer.name()` to extract the name.
git: allow conflicts in "HEAD@git" Git's HEAD ref is similar to other refs and can logically have conflicts just like the other refs in `git_refs`. As with the other refs, it can happen if you run concurrent commands importing two different updates from Git. So let's treat `git_head` the same as `git_refs` by making it an `Option<RefTarget>`.
2022-12-17 17:34:09 +00:00
* Storage of the "HEAD@git" reference changed and can now have conflicts.
Operations written by a new `jj` binary will have a "HEAD@git" reference that
is not visible to older binaries.
templater: do not complete "(no commit description)" by default This allows us to use "if(description,)" to test empty description. And I think this change is unavoidable if we want to add support for commit template.
2023-01-31 09:17:46 +00:00
* The `description` template keyword is now empty if no description set.
Use `if(description, description, "(no description set)\n")` to get back
the previous behavior.
config: rename [template] section to [templates], drop .graph suffix This should be more consistent with the other tables.
2023-02-14 14:55:30 +00:00
* The `template.log.graph` and `template.commit_summary` config keys were
renamed to `templates.log` and `templates.commit_summary` respectively.
* If a custom `templates.log` template is set, working-copy commit will
cli: use label() to highlight "working_copy" commit in log template I think this is a proper way to label the working-copy commit. This also fixes "jj obslog" output, but I don't think anyone would care.
2023-02-03 03:49:40 +00:00
no longer be highlighted automatically. Wrap your template with
`label(if(current_working_copy, "working_copy"), ...)` to label the
working-copy entry.
Rename `ui.relative-timestamps` to `ui.oplog-relative-timestamps`
2023-02-16 03:26:31 +00:00
* The `ui.relative-timestamps` option has been removed. Use the
`format_timestamp()` template alias instead. For details on showing relative
timestamps in `jj log` and `jj show`, see [the documentation](docs/config.md).
config: migrate log/show timestamp format away from config knob Since oplog still relies on ui.relative-timestamps, this config key isn't removed.
2023-02-15 10:49:10 +00:00
Rename `ui.relative-timestamps` to `ui.oplog-relative-timestamps`
2023-02-16 03:26:31 +00:00
* `jj op log` now shows relative timestamps by default. To disable, set
`ui.oplog-relative-timestamps` to `false`.
Make `ui.relative-timestamps` default to true This seems like a better default for `jj op log`, which is now the only thing this option affects.
2023-02-16 03:19:41 +00:00
cli: rename `--no-commit-working-copy` to `--ignore-working-copy` We have moved from saying "committing the working copy" towards saying "snapshotting the working copy". More importantly, the option also means that we don't update the working copy at the end. I went with the `--ignore-working-copy` name suggested by Ilya. I also updated the documentation of the option.
2023-02-02 23:11:18 +00:00
* The global `--no-commit-working-copy` is now called `--ignore-working-copy`.
cli: rename `diff.format` to `ui.diff.format` I felt that the config is too narrow to have it's own top-level [diff] section, and I couldn't think of another good place to have it. I'm happy to hear other suggestions.
2023-02-06 06:42:27 +00:00
* The `diff.format` config option is now called `ui.diff.format`. The old name
is still supported for now.
cli: expand $left/$right parameters in merge-tools.<name>.edit-args And set edit_args = ["$left", "$right"] by default.
2023-02-06 10:38:51 +00:00
* `merge-tools.<name>.edit-args` now requires `$left`/`$right` parameters.
The default is `edit-args = ["$left", "$right"]`.
cli: delete builtin `update/up` aliases These don't seem used much, and maybe we (or a customized build) will want to use the name in the future.
2023-02-10 15:52:14 +00:00
* The builtin `jj update` and `jj up` aliases for `jj checkout` have been
deleted.
cli: use reverse-alphabet hex for branch name in `jj git push --change`
2023-02-12 19:49:05 +00:00
* Change IDs are now rendered using letters from the end of the alphabet (from
'z' through 'k') instead of the usual hex digits ('0' through '9' and 'a'
through 'f'). This is to clarify the distinction between change IDs and commit
IDs, and to allow more efficient lookup of unique prefixes. This change
doesn't affect the storage format; existing repositories will remain usable.
templater: use reverse-alphabet hex for change ids
2023-02-12 20:07:28 +00:00
release: release version 0.6.0 Lots of new features and important bugfixes. Thanks, everyone!
2022-12-05 16:38:47 +00:00
### New features
cli: use committer timestamp instead of author timestamp in log output The author timestamp is rarely useful (in my experience). The committer timestamp, on the other hand, can be useful for understanding when a change was most recently modified. IIRC, I originally picked the author timestamp to match the email (which is the author's), but it's probably not confusing to use the author email and the committer timestamp. I suspect few users will even reflect on it.
2022-12-14 22:33:00 +00:00
* The default log format now uses the committer timestamp instead of the author
timestamp.
cli: allow multiple diff outputs "jj log -p --summary" now shows summary and color-words diff, like "hg log -p --stat". Handling of "-p" is tricky. I first considered "-p" would turn on the default diff output, but I found it would be confusing if "jj log -p --git" showed both color-words and git diffs. So the default format is inserted only if no --git nor --color-words is explicitly specified.
2022-12-13 12:24:24 +00:00
* `jj log --summary --patch` now shows both summary and diff outputs.
Allow `jj git push` to push multiple branches/changes at once Also creates short arg `-b` for `--branch`.
2022-12-17 22:31:12 +00:00
* `jj git push` now accepts multiple `--branch`/`--change` arguments
Add a `config edit` command to open jj config in editor Part of #531 to define the overall `config` command.
2023-01-05 04:55:20 +00:00
* `jj config list` command prints values from config and `config edit` opens
the config in an editor.
Add a "config" command with "get" and "list" subcommands Partially fixes #531.
2022-12-13 06:22:08 +00:00
Add "jj debug config-schema" command to output JSON schema Extends TOML/JSON schema changes from #966 to allow jj to output the schema directly. Context in #879.
2023-01-03 02:26:59 +00:00
* `jj debug config-schema` command prints out JSON schema for the jj TOML config
file format.
`jj resolve --list`: Add descriptions of conflict complexity The descriptions focus on adds, not the deletions. The deletions are used to compute the number of deleted files that must be sides of the conflict.
2023-01-05 00:34:56 +00:00
* `jj resolve --list` can now describe the complexity of conflicts.
`jj resolve`: List remaining conflicts (if any) on success This can be prevented by the new `--quiet` option.
2022-12-24 01:57:10 +00:00
* `jj resolve` now notifies the user of remaining conflicts, if any, on success.
This can be prevented by the new `--quiet` option.
cli: load configs from .jj/repo/config.toml Since per-repo config may contain CLI settings, it must be visible to CLI. Therefore, UserSettings::with_repo() -> RepoSettings isn't used, and its implementation is nullified by this commit. #616
2023-01-02 05:18:38 +00:00
* Per-repository configuration is now read from `.jj/repo/config.toml`.
formatter: add support for underlined text
2023-01-10 02:59:21 +00:00
* Background colors, bold text, and underlining are now supported. You can set
e.g. `color.error = { bg = "red", bold = true, underline = true }` in your
`~/.jjconfig.toml`.
formatter: add support for setting background color
2023-01-07 17:34:15 +00:00
template: add "empty" template item
2023-01-14 10:43:23 +00:00
* The `empty` condition in templates is true when the commit makes no change to
the three compared to its parents.
let branches and remote_branches revset functions take needles as arguments - branches has the signature branches([needle]), meaning the needle is optional (branches() is equivalent to branches("")) and it matches all branches whose name contains needle as a substring - remote_branches has the signature remote_branches([branch_needle[, remote_needle]]), meaning it can be called with no arguments, or one argument (in which case, it's similar to branches), or two arguments where the first argument matches branch names and the second argument matches remote names (similar to branches, remote_branches(), remote_branches("") and remote_branches("", "") are all equivalent)
2023-01-12 10:01:35 +00:00
* `branches([needle])` revset function now takes `needle` as an optional
argument and matches just the branches whose name contains `needle`.
* `remote_branches([branch_needle[, remote_needle]])` now takes `branch_needle`
and `remote_needle` as optional arguments and matches just the branches whose
name contains `branch_needle` and remote contains `remote_needle`.
git fetch: accept several remotes The "--remote" option can be repeated, and the "git.fetch" key is now a list.
2023-02-02 18:31:11 +00:00
* `jj git fetch` accepts repeated `--remote` arguments.
config: allow configuration of git remotes for fetch and push operations The `git.fetch` and `git.push` keys can be used in the configuration file for the default to use in `jj git fetch` and `jj git push` operations. By defaut, "origin" is used in both cases.
2023-01-17 13:27:49 +00:00
* Default remotes can be configured for the `jj git fetch` and `jj git push`
operations ("origin" by default) using the `git.fetch` and `git.push`
git fetch: accept several remotes The "--remote" option can be repeated, and the "git.fetch" key is now a list.
2023-02-02 18:31:11 +00:00
configuration entries. `git.fetch` can be a list if multiple remotes must
be fetched from.
config: allow configuration of git remotes for fetch and push operations The `git.fetch` and `git.push` keys can be used in the configuration file for the default to use in `jj git fetch` and `jj git push` operations. By defaut, "origin" is used in both cases.
2023-01-17 13:27:49 +00:00
`jj duplicate`: Allow duplicating several commits at once The `indexmap` crate is used to make `duplicate`'s output have a sane order, making it easier to test. It's also used later to remove duplicate revisions in the `abandon` command.
2023-01-10 06:54:10 +00:00
* `jj duplicate` can now duplicate multiple changes in one go. This preserves
any parent-child relationships between them. For example, the entire tree of
descendants of `abc` can be duplicated with `jj duplicate abc:`.
`jj log`: Change the default of `ui.unique-prefixes` to "styled"
2023-01-22 06:30:10 +00:00
* `jj log` now highlights the shortest unique prefix of every commit and change
config: remove ui.unique-prefixes/log-id-preferred-length in favor of alias
2023-02-14 14:35:40 +00:00
id and shows the rest in gray. To customize the length and style, use the
`format_short_id()` template alias. For details, see
[the documentation](docs/config.md).
`jj log`: option to specify preferred id length The new option is `ui.log-id-preferred-length`. Setting it to 6 is quite convenient for the `jj` repo, for example. Screenshot: https://user-images.githubusercontent.com/4123047/216535699-ad1e2ac8-73dd-44be-b28a-ebdebc00c63c.png
2023-02-06 00:10:25 +00:00
cli: rename `print` to `cat` `jj cat` better matches `hg cat` and, of course, `cat`. I apparently called it `jj print` when I added it in 7a013a59ae98 because I haven't found `hg cat` useful for actually concatenating files. That's still true, and I don't know if we will ever bother to teach `jj cat` to actually concatenate files, but I think the familiarity of `cat` is more important. For reference, Git calls it `git show <rev>:<file>`. I kept `print` as an alias and added a test for it. I also documented the test better. By the way, I've considered adding a command for writing from stdin directly to a specific commit. If we ever do, it might make sense to call that command `write` (e.g. `echo foo | jj write -r @- README.md`). Then it would make sense to add `read` as an alias to `cat`. I'm not sure that's a good idea, but let's leave that for later anyway.
2023-01-18 06:56:09 +00:00
* `jj print` was renamed to `jj cat`. `jj print` remains as an alias.
cmd: when a single remote is defined, default to it for git fetch/push A simple quick implementation of what I've suggested on discord
2023-04-04 13:34:12 +00:00
cli: also sanitize non-colored output printed to a terminal This makes us sanitize ANSI escape bytes in the output if it goes to the terminal, even when it's not colored (by us), such as when using `--color=never`. That means that e.g. `jj cat tests/test_commit_template.rs` will not be colored, but `jj cat tests/test_commit_template.rs | cat` will be. Sanitizing output sent to the terminal might help reduce some security threats based on hiding content by using ANSI escapes. We could add a config option for sanitizing the output, but I'm not sure it'll be useful.
2023-01-21 21:55:34 +00:00
* In content that goes to the terminal, the ANSI escape byte (0x1b) is replaced
by a "␛" character. That prevents them from interfering with the ANSI escapes
jj itself writes.
cli: rename `print` to `cat` `jj cat` better matches `hg cat` and, of course, `cat`. I apparently called it `jj print` when I added it in 7a013a59ae98 because I haven't found `hg cat` useful for actually concatenating files. That's still true, and I don't know if we will ever bother to teach `jj cat` to actually concatenate files, but I think the familiarity of `cat` is more important. For reference, Git calls it `git show <rev>:<file>`. I kept `print` as an alias and added a test for it. I also documented the test better. By the way, I've considered adding a command for writing from stdin directly to a specific commit. If we ever do, it might make sense to call that command `write` (e.g. `echo foo | jj write -r @- README.md`). Then it would make sense to add `read` as an alias to `cat`. I'm not sure that's a good idea, but let's leave that for later anyway.
2023-01-18 06:56:09 +00:00
workspace: add a root subcommand to print the workspace root path
2023-01-24 11:46:59 +00:00
* `jj workspace root` prints the root path of the current workspace.
config: rename [alias] to [aliases], still supporting old name The name of the [alias] section is inconsistent with other table-valued sections ([revset-aliases], [colors], [merge-tools]), so let's rename it. For comparison, `Cargo.toml` also uses plural names (e.g. `[dependencies]`).
2023-01-26 22:26:05 +00:00
* The `[alias]` config section was renamed to `[aliases]`. The old name is
still accepted for backwards compatibility for some time.
graphlog: enable Sapling's graph styles by default I would also rename the feature, but I hope we can instead soon make it a non-optional dependency and delete the feature.
2023-01-27 06:33:24 +00:00
* Commands that draw an ASCII graph (`jj log`, `jj op log`, `jj obslog`) now
cli: rename `ui.graph.format` to `ui.graph.style` I think of it more as style than a format, so using `style` in the config key makes sense to me. I didn't bother making upgrades easy by supporting the old name since this was just released and only a few developers probably have it set.
2023-01-27 18:15:51 +00:00
have different styles available by setting e.g. `ui.graph.style = "curved"`.
graphlog: enable Sapling's graph styles by default I would also rename the feature, but I hope we can instead soon make it a non-optional dependency and delete the feature.
2023-01-27 06:33:24 +00:00
split: allow creation of empty parent or child jj split . => create an empty child jj split nonexistent => create an empty parent
2023-01-29 06:35:41 +00:00
* `jj split` accepts creating empty commits when given a path. `jj split .`
inserts an empty commit between the target commit and its children if any,
and `jj split any-non-existent-path` inserts an empty commit between the
target commit and its parents.
cli: allow to set ui.diff/merge-editor arguments inline For stock merge-tools, having name -> args indirection makes sense. For user-specific settings, it's simpler to set command name and arguments together. It might be a bit odd that "name with whitespace" can be parsed differently depending on the existence of merge-tools."name with whitespace".
2023-02-05 07:41:28 +00:00
* Command arguments to `ui.diff-editor`/`ui.merge-editor` can now be specified
inline without referring to `[merge-tools]` table.
`jj rebase -d` and `jj new`: Allow several commits per argument with `--allow-large-revsets` Eventually, we should be able to rely on `jj op restore` and the `--allow-large-revsets`. argument should likely be removed. This is a temporary measure until we figure out https://github.com/martinvonz/jj/issues/922 and the like. Fixes https://github.com/martinvonz/jj/issues/571
2023-01-31 06:32:18 +00:00
* `jj rebase` now accepts a new `--allow-large-revsets` argument that allows the
revset in the `-d` argument to expand to several revisions. For example,
`jj rebase -s B -d B- -d C` now works even if `B` is a merge commit.
* `jj new` now also accepts a `--allow-large-revsets` argument that behaves
similarly to `jj rebase --allow-large-revsets`.
jj new --insert-before
2023-01-31 19:01:44 +00:00
* `jj new --insert-before` inserts the new commit between the target commit and
its parents.
jj new --insert-after
2023-02-04 20:42:03 +00:00
* `jj new --insert-after` inserts the new commit between the target commit and
its children.
`author`/`committer` templates: add a `username` method I haven't used a proper email address parser as I'm not really sure if it's worth the extra dependency and effort -- thoughts?
2023-02-10 17:01:28 +00:00
* `author`/`committer` templates now support `.username()`, which leaves out the
config: add and parse `ui.log_author_format` for use in the default template Supported values are, - `none` for no author information, - `full` for both the name and email, - `name` for just the name, - `username` for username part of the email, - (default) `email` (or any other gibberish for that matter) for the full email.
2023-02-11 11:07:58 +00:00
domain information of `.email()`.
config: remove ui.log-author-format in favor of template alias
2023-02-15 10:58:18 +00:00
* It is now possible to change the author format of `jj log` with the
`format_short_signature()` template alias. For details, see
[the documentation](docs/config.md).
`author`/`committer` templates: add a `username` method I haven't used a proper email address parser as I'm not really sure if it's worth the extra dependency and effort -- thoughts?
2023-02-10 17:01:28 +00:00
templater: implement symbol/function alias expansion Test vectors are mainly copied from revset.rs and adapted to the template syntax. Closes #1190
2023-02-12 09:41:53 +00:00
* Added support for template aliases. New symbols and functions can be
configured by `template-aliases.<name> = <expression>`. Be aware that
the template syntax isn't documented yet and is likely to change.
feat(diff): add `ui.diff-instructions` option to suppress `JJ-INSTRUCTIONS` file
2023-06-07 02:33:32 +00:00
* The `ui.diff-instructions` config setting can be set to `false` to inhibit the
creation of the `JJ-INSTRUCTIONS` file as part of diff editing.
release: release version 0.6.0 Lots of new features and important bugfixes. Thanks, everyone!
2022-12-05 16:38:47 +00:00
### Fixed bugs
cli: when colocated with Git, export refs on snapshot This fixes the bug described in the previous commit. Because we now print the message about failed exports also while snapshotting, we may end up reporting it twice on one command. I'm not sure it's worth worrying about that. We can deal with that later if it turns out to be a common complaint.
2022-12-09 04:04:33 +00:00
* When sharing the working copy with a Git repo, we used to forget to export
branches to Git when only the working copy had changed. That's now fixed.
cli: append "\n" to commit description specified by -m/--message Otherwise the description set by -m would differ from the one set by editor. This fixes test_describe() which says "make no changes", but previously "\n" would be added by the second "jj describe". As you can see, almost all hashes change in CLI tests. This means in-flight PRs will need to be rebased to update insta snapshots. Description text could be normalized by CommitBuilder, but the caller would have to normalize it beforehand to compare with the current description, so we would need an explicit function anyway. Another idea is to add a newtype that represents a normalized description, and make CommitBuilder require it. Commit::description() will return &Description in place of &str to ensure that commit.description() == raw_str wouldn't compile. Git CLI provides --cleanup=<mode> option to switch normalization rules, but I don't think we'll need such feature.
2022-12-21 04:47:10 +00:00
* Commit description set by `-m`/`--message` is now terminated with a newline
character, just like descriptions set by editor are.
cli: do not search ancestor paths specified by -R/--repository If a workspace path is explicitly specified, it must point to the exact workspace directory. This is the same behavior as 'hg -R'. OTOH, 'git -C' is the option to chdir, so it makes sense to search .git from that directory. This also fixes 'jj -R ../..' which would previously look up '../..', '..', '.', ...
2023-01-10 03:52:06 +00:00
* The `-R`/`--repository` path must be a valid workspace directory. Its
ancestor directories are no longer searched.
revset: ignore valid commit ids unknown to jj
2023-01-13 20:01:50 +00:00
* Fixed a crash when trying to access a commit that's never been imported into
the jj repo from a Git repo. They will now be considered as non-existent if
referenced explicitly instead of crashing.
gitignore: any character can be backslash-escaped You may use "abc\\" in .gitignore to ignore a file named "abc\". In this case, removing training spaces on "abc\\ " must result in "abc\\" as the trailing space is not escaped, the preceeding backslash being part of the previous "\\" escaping sequence.
2023-01-14 17:56:33 +00:00
* Fixed handling of escaped characters in .gitignore (only keep trailing spaces
if escaped properly).
Make `jj undo` work after `jj duplicate` Fixes https://github.com/martinvonz/jj/issues/1050 Thanks to Martin for suggesting the exact fix. The tests go into the new tests/test_duplicate_command.rs, which will be expanded shortly with other tests depending on this bugfix.
2023-01-16 19:22:10 +00:00
* `jj undo` now works after `jj duplicate`.
Git backend: Allow simultaneous rebasing of duplicate commits Fixes https://github.com/martinvonz/jj/issues/27 Fixes https://github.com/martinvonz/jj/issues/694
2023-01-15 07:28:36 +00:00
* `jj duplicate` followed by `jj rebase` of a tree containing both the original
feat(squash): Add `--keep-emptied` flag Fixes #3815
2024-06-04 23:34:50 +00:00
and duplicate commit no longer crashes. The fix should also resolve any
remaining
Git backend: Allow simultaneous rebasing of duplicate commits Fixes https://github.com/martinvonz/jj/issues/27 Fixes https://github.com/martinvonz/jj/issues/694
2023-01-15 07:28:36 +00:00
instances of https://github.com/martinvonz/jj/issues/27.
Fix output of `jj debug completion --help` The help strings for fish and zsh were inverted.
2023-01-22 09:24:20 +00:00
* Fix the output of `jj debug completion --help` by reversing fish and zsh text.
git fetch: prune old branch names before adding new ones
2023-02-12 00:43:38 +00:00
* Fixed edge case in `jj git fetch` when a pruned branch is a prefix of another
branch.
release: release version 0.6.0 Lots of new features and important bugfixes. Thanks, everyone!
2022-12-05 16:38:47 +00:00
### Contributors
Thanks to the people who made this release happen!
feat(squash): Add `--keep-emptied` flag Fixes #3815
2024-06-04 23:34:50 +00:00
* Aleksandr Mikhailov (@AM5800)
* Augie Fackler (@durin42)
* Benjamin Saunders (@Ralith)
* Daniel Ploch (@torquestomp)
* Danny Hooper (@hooper)
* David Barnett (@dbarnett)
* Glen Choo (@chooglen)
* Herby Gillot (@herbygillot)
* Ilya Grigoriev (@ilyagr)
* Luke Granger-Brown (@lukegb)
* Martin von Zweigbergk (@martinvonz)
* Michael Forster (@MForster)
* Philip Metzger (@PhilipMetzger)
* Ruben Slabbert (@rslabbert)
* Samuel Tardieu (@samueltardieu)
* Tal Pressman (@talpr)
* Vamsi Avula (@avamsi)
* Waleed Khan (@arxanas)
* Yuya Nishihara (@yuja)
docs: mention that the "view" object knows about all workspaces I seem to have forgotten to update this when I added support for workspaces a while back. I made some other little touchups while at it.
2022-12-08 23:40:48 +00:00
release: release version 0.6.1 The only changes is that we now depend on a released version of `thrift`.
2022-12-06 04:31:59 +00:00
## [0.6.1] - 2022-12-05
No changes, only changed to a released version of the `thrift` crate dependency.
release: release version 0.6.0 Lots of new features and important bugfixes. Thanks, everyone!
2022-12-05 16:38:47 +00:00
## [0.6.0] - 2022-12-05
### Breaking changes
revset: remove redundant candidates argument from filter predicates
2022-10-25 13:08:11 +00:00
* Dropped candidates set argument from `description(needle)`, `author(needle)`,
revset: remove redundant candidates argument from merges() Since 'merges()' just filters the candidates set per item, it doesn't need a candidates argument. Perhaps, 'merges(x)' could be a predicate to select merge commits within a subgraph 'x', but I don't know if that would be useful.
2022-10-25 13:20:59 +00:00
`committer(needle)`, `merges()` revsets. Use `x & description(needle)`
instead.
revset: remove redundant candidates argument from filter predicates
2022-10-25 13:08:11 +00:00
revset: give higher precedence to intersection/difference operators Just like hg revsets and major programming languages.
2022-11-16 14:35:12 +00:00
* Adjusted precedence of revset union/intersection/difference operators.
`x | y & z` is now equivalent to `x | (y & z)`.
let branches and remote_branches revset functions take needles as arguments - branches has the signature branches([needle]), meaning the needle is optional (branches() is equivalent to branches("")) and it matches all branches whose name contains needle as a substring - remote_branches has the signature remote_branches([branch_needle[, remote_needle]]), meaning it can be called with no arguments, or one argument (in which case, it's similar to branches), or two arguments where the first argument matches branch names and the second argument matches remote names (similar to branches, remote_branches(), remote_branches("") and remote_branches("", "") are all equivalent)
2023-01-12 10:01:35 +00:00
cli: drop support for `ui.enable-open-commits` config
2022-11-05 01:24:20 +00:00
* Support for open commits has been dropped. The `ui.enable-open-commits` config
cli: remove `open`/`close` commands
2022-11-05 00:15:35 +00:00
that was added in 0.5.0 is no longer respected. The `jj open/close` commands
have been deleted.
let branches and remote_branches revset functions take needles as arguments - branches has the signature branches([needle]), meaning the needle is optional (branches() is equivalent to branches("")) and it matches all branches whose name contains needle as a substring - remote_branches has the signature remote_branches([branch_needle[, remote_needle]]), meaning it can be called with no arguments, or one argument (in which case, it's similar to branches), or two arguments where the first argument matches branch names and the second argument matches remote names (similar to branches, remote_branches(), remote_branches("") and remote_branches("", "") are all equivalent)
2023-01-12 10:01:35 +00:00
cli: remove `open`/`close` commands
2022-11-05 00:15:35 +00:00
* `jj commit` is now a separate command from `jj close` (which no longer
exists). The behavior has changed slightly. It now always asks for a
description, even if there already was a description set. It now also only
works on the working-copy commit (there's no `-r` argument).
cli: add `commit` as its own command (not an alias for `close`) It seems very likely that we're going to remove support for open commits, but it's still useful to have a `commit` command that lets the user enter a description and starts a new change. Calling it `commit` seems good to make the transition from other VCSs simpler.
2022-10-29 21:48:13 +00:00
cli: add a command for updating a stale working copy When a workspace's working-copy commit is updated from another workspace, the workspace becomes "stale". That means that the working copy on disk doesn't represent the commit that the repo's view says it should. In this state, we currently automatically it to the desired commit next time the user runs any command in the workspace. That can be undesirable e.g. if the user had a slow build or test run started in the working copy. It can also be surprising that a checkout happens when the user ran a seemingly readonly command like `jj status`. This patch makes most commands instead error out if the working copy is stale, and adds a `jj workspace update-stale` to update it. The user can still run commands with `--no-commit-working-copy` in this state (doing e.g. `jj --no-commit-working-copy rebase -r @ -d @--` is another way of getting into the stale-working-copy state, by the way).
2022-10-02 17:09:46 +00:00
* If a workspace's working-copy commit has been updated from another workspace,
most commands in that workspace will now fail. Use the new
`jj workspace update-stale` command to update the workspace to the new
working-copy commit. (The old behavior was to automatically update the
workspace.)
cli: add git remote rename subcommand
2022-10-19 18:44:39 +00:00
### New features
ui: add pager Teach Ui's writing functions to write to a pager without touching the process's file descriptors. This is done by introducing UiOutput::Paged, which spawns a pager that Ui's functions can write to. The pager program can be chosen via `ui.pager`. (defaults to Defaults to $PAGER, and 'less' if that is unset (falling back to 'less' also makes the tests pass). Currently, commands are paginated if: - they have "long" output (as defined by jj developers) - jj is invoked in a terminal The next commit will allow pagination to be turned off via a CLI option. More complex pagination toggling (e.g. showing a pager even if the output doesn't look like a terminal, using a pager for shorter ouput) is left for a future PR.
2022-10-18 18:07:35 +00:00
* Commands with long output are paginated.
pager: default to `less -FRX` As dbarnett@ reported on #9, our default of `less`, combined with our default of enabling color on TTYs, means that we print ANSI codes to `less` by default. Unless the user has set e.g. `$LESS=R`, `less` is going to escape those codes, resulting in garbage like this: ``` @ ESC[1;35mbb39c26a29feESC[0m ESC[1;33m(no email configured)ESC[0m ESC[1;36m2022-12-03.... ``` I guess most of us didn't notice because we have something like `$LESS=FRX` set. This patch changes our default from `less` to `less -FRX`. Those are the flags we're using for our internal hg distribution at Google, and that has seemed quite uncontroversial. I added a pointer from the changelog to the tracking issue while at it.
2022-12-04 06:03:38 +00:00
[#9](https://github.com/martinvonz/jj/issues/9)
ui: add pager Teach Ui's writing functions to write to a pager without touching the process's file descriptors. This is done by introducing UiOutput::Paged, which spawns a pager that Ui's functions can write to. The pager program can be chosen via `ui.pager`. (defaults to Defaults to $PAGER, and 'less' if that is unset (falling back to 'less' also makes the tests pass). Currently, commands are paginated if: - they have "long" output (as defined by jj developers) - jj is invoked in a terminal The next commit will allow pagination to be turned off via a CLI option. More complex pagination toggling (e.g. showing a pager even if the output doesn't look like a terminal, using a pager for shorter ouput) is left for a future PR.
2022-10-18 18:07:35 +00:00
cli: add git remote rename subcommand
2022-10-19 18:44:39 +00:00
* The new `jj git remote rename` command allows git remotes to be renamed
in-place.
Documentation for `jj resolve` and merge tool config
2022-10-30 08:23:45 +00:00
* The new `jj resolve` command allows resolving simple conflicts with
an external 3-way-merge tool.
cli: search @- for branches to push when @ has none
2022-10-20 21:18:34 +00:00
* `jj git push` will search `@-` for branches to push if `@` has none.
revset: extend file() predicate to accept more than one paths 'file(a, b)' could be expressed as 'file(a) | file(b)', but the former is easier to type and can be evaluated efficiently without optimization step.
2022-11-01 08:11:22 +00:00
* The new revset function `file(pattern..)` finds commits modifying the
paths specified by the `pattern..`.
revset: implement file(pattern[, candidates]) predicate The name "file()" is just copied from hg. I'm not sure if it's good in jj's context, but I couldn't find a better name.
2022-10-23 04:14:00 +00:00
revset: add empty() predicate to find commits with no file change The expression 'x ~ empty()' is identical to 'x & file(".")', but more intuitive. Note that 'x ~ empty()' is slower than 'x & file(".")' since the negative intersection isn't optimized right now. I think that can be handled as follows: 'x ~ filter(f)' -> 'x & filter(!f)' -> 'filter(!f, x)'
2022-11-15 08:12:37 +00:00
* The new revset function `empty()` finds commits modifying no files.
revset: implement function alias expansion Function parameters are processed as local symbols while substituting alias expression. This isn't as efficient as Mercurial which caches a tree of fully-expanded function template, but that wouldn't matter in practice.
2022-11-26 11:41:55 +00:00
* Added support for revset aliases. New symbols and functions can be configured
by `revset-aliases.<name> = <expression>`.
cli: load revset aliases from config file Aliases are loaded at WorkspaceCommandHelper::new() as it's easier to warn invalid declarations there. Not all commands use revsets, but many do, so I think it's okay to always pay the loading cost. Parsing the declaration part (i.e. a symbol) should be fast anyway. The nested error message isn't super readable, but seems good enough. Config syntax to bikeshed: - naming: [revset-alias] vs [revset-aliases] ? - function alias will need quotes: 'f(x)' = 'x'
2022-11-25 10:27:13 +00:00
changelog: fix typo ("specity")
2022-11-07 21:35:34 +00:00
* It is now possible to specify configuration options on the command line
changelog: fix typo ("he" instead of "the")
2022-11-14 17:26:04 +00:00
with the new `--config-toml` global option.
Add --config-toml command-line argument for additional TOML config Unfortunately, TOML requires quotes around the argument. So, the usage is `jj --config-toml ui.color=\"always\"` in bash. The plan is to eventually have a `--config` option with simpler syntax for simple cases. As discussed in https://github.com/martinvonz/jj/discussions/688.
2022-10-31 01:29:26 +00:00
changelog: copy formatting of links to issues from Cargo I thought I had seen our current formatting, i.e. `(#123)`, get auto-linked by GitHub, but it seems it doesn't. This patch therefore changes to use markdown links. I copied the style from Cargo (and Clippy).
2022-12-03 17:44:21 +00:00
* `jj git` subcommands will prompt for credentials when required for HTTPS
remotes rather than failing.
[#469](https://github.com/martinvonz/jj/issues/469)
git: prompt for credentials when needed
2022-11-06 18:15:44 +00:00
changelog: copy formatting of links to issues from Cargo I thought I had seen our current formatting, i.e. `(#123)`, get auto-linked by GitHub, but it seems it doesn't. This patch therefore changes to use markdown links. I copied the style from Cargo (and Clippy).
2022-12-03 17:44:21 +00:00
* Branches that have a different target on some remote than they do locally are
now indicated by an asterisk suffix (e.g. `main*`) in `jj log`.
[#254](https://github.com/martinvonz/jj/issues/254)
templater: indicate if branch needs to be pushed to a remote It's useful to know when you've modified a branch that exists on a remote. A typical case is when you have pushed a branch to a remote and then rewritten it. This commit adds an indication in the `branches` template keyword. A branch that needs to be pushed to a remote now has a `*` at the end (similar to how conflicted branches have a `?` at the end). Note that the indication only considers remotes where the branch currently exists, so there won't be an indication that the branch has not been pushed to a remote. Closes #254
2022-11-04 16:39:46 +00:00
log: move commit ID off to the right We have talked about showing the commit ID only for divergent changes because it's generally easier to work with the change ID, and it's less likely to result in a divergent change. However, it's useful to have the commit ID available for pasting into e.g. a commit message or the GitHub UI. To try to steer users towards using the change ID, this commit moves the commit ID off to the right in the log output. I put it just after the "divergent" field, because that makes it close to how I imagine it would look if we decided to hide the commit ID except for divergent changes. I was thinking that could be rendered as "divergent (abc123)". So if we add config to hide the commit ID, then it would be rendered almost the same for divergent commits (just with the added parentheses). It would also make sense to replace the "divergent" field by a question mark on the change ID, since change IDs basically behave like branches. If we do that, then the placement of the commit ID I picked in this commit does not make sense.
2022-11-13 18:01:11 +00:00
* The commit ID was moved from first on the line in `jj log` output to close to
the end. The goal is to encourage users to use the change ID instead, since
that is generally more convenient, and it reduces the risk of creating
divergent commits.
operations: make hostname and username configurable We currently get the hostname and username from the `whoami` crate. We do that in lib crate, without giving the caller a way to override them. That seems wrong since it might be used in a server and performing operations on behalf of some other user. This commit makes the hostname and username configurable, so the calling crate can pass them in. If they have not been passed in, we still default to the values from the `whoami` crate.
2022-11-13 06:29:06 +00:00
* The username and hostname that appear in the operation log are now
configurable via config options `operation.username` and `operation.hostname`.
feature: support git credential helpers
2022-11-20 00:13:39 +00:00
* `jj git` subcommands now support credential helpers.
log: warn if the provided path looks like a revset
2022-11-18 23:41:35 +00:00
* `jj log` will warn if it appears that the provided path was meant to be a
revset.
feature: add verbose flag and tracing library
2022-11-20 03:38:25 +00:00
* The new global flag `-v/--verbose` will turn on debug logging to give
let branches and remote_branches revset functions take needles as arguments - branches has the signature branches([needle]), meaning the needle is optional (branches() is equivalent to branches("")) and it matches all branches whose name contains needle as a substring - remote_branches has the signature remote_branches([branch_needle[, remote_needle]]), meaning it can be called with no arguments, or one argument (in which case, it's similar to branches), or two arguments where the first argument matches branch names and the second argument matches remote names (similar to branches, remote_branches(), remote_branches("") and remote_branches("", "") are all equivalent)
2023-01-12 10:01:35 +00:00
some additional insight into what is happening behind the scenes.
feature: add verbose flag and tracing library
2022-11-20 03:38:25 +00:00
Note: This is not comprehensively supported by all operations yet.
feature: support relative timestamps as a config option
2022-11-26 01:33:24 +00:00
* `jj log`, `jj show`, and `jj obslog` now all support showing relative
timestamps by setting `ui.relative-timestamps = true` in the config file.
repo: forbid checking out the root commit Prevents `jj edit root` from succeeding, which would otherwise place the repo in a state where every operation panics.
2022-10-20 23:33:14 +00:00
### Fixed bugs
changelog: copy formatting of links to issues from Cargo I thought I had seen our current formatting, i.e. `(#123)`, get auto-linked by GitHub, but it seems it doesn't. This patch therefore changes to use markdown links. I copied the style from Cargo (and Clippy).
2022-12-03 17:44:21 +00:00
* A bug in the export of branches to Git caused spurious conflicted branches.
This typically occurred when running in a working copy colocated with Git
(created by running `jj init --git-dir=.`).
[#463](https://github.com/martinvonz/jj/issues/463)
let branches and remote_branches revset functions take needles as arguments - branches has the signature branches([needle]), meaning the needle is optional (branches() is equivalent to branches("")) and it matches all branches whose name contains needle as a substring - remote_branches has the signature remote_branches([branch_needle[, remote_needle]]), meaning it can be called with no arguments, or one argument (in which case, it's similar to branches), or two arguments where the first argument matches branch names and the second argument matches remote names (similar to branches, remote_branches(), remote_branches("") and remote_branches("", "") are all equivalent)
2023-01-12 10:01:35 +00:00
changelog: copy formatting of links to issues from Cargo I thought I had seen our current formatting, i.e. `(#123)`, get auto-linked by GitHub, but it seems it doesn't. This patch therefore changes to use markdown links. I copied the style from Cargo (and Clippy).
2022-12-03 17:44:21 +00:00
* When exporting branches to Git, we used to fail if some branches could not be
exported (e.g. because Git doesn't allow a branch called `main` and another
branch called `main/sub`). We now print a warning about these branches
changelog: list fix for #493 was a bugfix, not a feature
2022-12-03 08:02:15 +00:00
instead.
changelog: copy formatting of links to issues from Cargo I thought I had seen our current formatting, i.e. `(#123)`, get auto-linked by GitHub, but it seems it doesn't. This patch therefore changes to use markdown links. I copied the style from Cargo (and Clippy).
2022-12-03 17:44:21 +00:00
[#493](https://github.com/martinvonz/jj/issues/493)
changelog: list fix for #493 was a bugfix, not a feature
2022-12-03 08:02:15 +00:00
git: when exporting, don't overwrite changes made by git This fixes the bugs shown by the tests added in the previous patch by checking that the git branches we're about to update have not been updated by git since our last export. If they have, we fail those branches. The user can then re-import from the git repo and resolve any conflicts before exporting again. I had to update the `test_export_import_sequence` to make it pass. That shows a new bug, which I'll fix next. The problem is that the exported view doesn't get updated on import, so we would try to export changes compared to an earlier export, even though we actually knew (because of the `jj git import`) that the state in git had changed.
2022-12-02 23:09:07 +00:00
* If you had modified branches in jj and also modified branches in conflicting
ways in Git, `jj git export` used to overwrite the changes you made in Git.
We now print a warning about these branches instead.
repo: forbid checking out the root commit Prevents `jj edit root` from succeeding, which would otherwise place the repo in a state where every operation panics.
2022-10-20 23:33:14 +00:00
* `jj edit root` now fails gracefully.
git: don't abandon HEAD commit when it loses a branch I was trying to create a reproduction script for #412, but the script ran into another bug first. The script removed all the local and remote branches from the backing Git repo. I noticed that we would then try to abandon all commits. We should still count Git HEAD's target as visible and not try to abandon it. This patch fixes that.
2022-10-28 19:39:28 +00:00
* `jj git import` used to abandon a commit if Git branches and tags referring
to it were removed. We now keep it if a detached HEAD refers to it.
git: don't abandon root commit when all refs are gone If you remove all refs from the backing Git repo and then run `jj git import`, we would see that all commits disappeared from the Git repo, so we would remove them from the jj repo too. However, we do that by doing a history walk from old heads to the new heads, which includes the root commit when the new heads is an empty set. That means that we mark the root commit as abandoned, which led to a crash in `rewrite.rs` (when we try pick the root commit's first parent to use as parent for rebased commits).
2022-10-28 23:18:56 +00:00
* `jj git import` no longer crashes when all Git refs are removed.
git: do not delete or track git submodules. A new FileType, GitSubmodule is added which is ignored. Files or directories having this type are not added to the work queue and are ignored in snapshot. Submodules are not created by jujutsu when resetting or checking out a tree, they should be currently managed using git.
2022-11-23 19:34:38 +00:00
* Git submodules are now ignored completely. Earlier, files present in the
submodule directory in the working copy would become added (tracked), and
later removed if you checked out another commit. You can now use `git` to
populate the submodule directory and `jj` will leave it alone.
git: on import, add GC-preventing refs to all seen refs To prevent git's GC from breaking a repo, we already add a git ref to commits we create in the git backend. However, we don't add refs to commits we import from git. This fixes that. Closes #815.
2022-12-03 17:49:09 +00:00
* Git's GC could remove commits that were referenced from jj in some cases. We
are now better at adding Git refs to prevent that.
[#815](https://github.com/martinvonz/jj/issues/815)
cli: make `jj status` not just care about the first parent It seems like I forgot to update the `jj status` output when I decided (years ago?) that the changes in a commit should always be compared to the auto-merged parents. I was very confused before I realized that `jj status` was showing the diff summary against the first parent. I suppose the fact that `jj status` lists only one parent should have been a hint. Thanks to ilyagr@ for finding this odd behavior. This patch fixes it by making the command list all parents, and changes the diff summary to be against the auto-merged parents.
2022-12-05 04:56:02 +00:00
* When the working-copy commit was a merge, `jj status` would list only the
first parent, and the diff summary would be against that parent. The output
now lists all parents and the diff summary is against the auto-merged parents.
changelog: thank people who contributed to a release Thanks, everyone! :) I'm happy to rephrase the text. I included people in order of their first contribution in the release. I included their full name and the GitHub username.
2022-11-28 07:38:17 +00:00
### Contributors
Thanks to the people who made this release happen!
feat(squash): Add `--keep-emptied` flag Fixes #3815
2024-06-04 23:34:50 +00:00
* Martin von Zweigbergk (@martinvonz)
* Benjamin Saunders (@Ralith)
* Yuya Nishihara (@yuja)
* Glen Choo (@chooglen)
* Ilya Grigoriev (@ilyagr)
* Ruben Slabbert (@rslabbert)
* Waleed Khan (@arxanas)
* Sean E. Russell (@xxxserxxx)
* Pranay Sashank (@pranaysashank)
* Luke Granger-Brown (@lukegb)
changelog: thank people who contributed to a release Thanks, everyone! :) I'm happy to rephrase the text. I included people in order of their first contribution in the release. I included their full name and the GitHub username.
2022-11-28 07:38:17 +00:00
release: release version 0.5.1 This point of this release is just to trigger the release automation on GitHub.
2022-10-18 04:45:04 +00:00
## [0.5.1] - 2022-10-17
No changes (just trying to get automated GitHub release to work).
release: release version 0.5.0 It's been several months since the last release and a lot has changed. Probably the biggest change is that open commits are now disabled by default.
2022-10-17 20:41:46 +00:00
## [0.5.0] - 2022-10-17
cli: make operation to undo or restore to a positional argument I originally made the operation argument a named argument (`--operation`) to allow for a change ID to be passed as a positional argument, matching e.g. `hg revert -r <rev> <path>`. However, even if we add support for undoing changes only to certain change IDs, it's going to be done much less frequently than full undo/restore. We can therefore make that a named argument if we ever add it.
2022-04-24 19:31:54 +00:00
### Breaking changes
cli: disable open commits by default
2022-08-25 22:18:14 +00:00
* Open commits are now disabled by default. That means that `jj checkout` will
always create a new change on top of the specified commit and will let you
edit that in the working copy. Set `ui.enable-open-commits = true` to restore
the old behavior and let us know that you did so we know how many people
prefer the workflow with open commits.
cli: make operation to undo or restore to a positional argument I originally made the operation argument a named argument (`--operation`) to allow for a change ID to be passed as a positional argument, matching e.g. `hg revert -r <rev> <path>`. However, even if we add support for undoing changes only to certain change IDs, it's going to be done much less frequently than full undo/restore. We can therefore make that a named argument if we ever add it.
2022-04-24 19:31:54 +00:00
* `jj [op] undo` and `jj op restore` used to take the operation to undo or
restore to as an argument to `-o/--operation`. It is now a positional
argument instead (i.e. `jj undo -o abc123` is now written `jj undo abc123`).
cli: make invalid alias definition an error
2022-05-07 13:57:13 +00:00
* An alias that is not configured as a string list (e.g. `my-status = "status"`
instead of `my-status = ["status"]`) is now an error instead of a warning.
changelog: copy formatting of links to issues from Cargo I thought I had seen our current formatting, i.e. `(#123)`, get auto-linked by GitHub, but it seems it doesn't. This patch therefore changes to use markdown links. I copied the style from Cargo (and Clippy).
2022-12-03 17:44:21 +00:00
* `jj log` now defaults to showing only commits that are not on any remote
branches (plus their closest commit on the remote branch for context). This
set of commits can be overridden by setting `ui.default-revset`. Use
`jj log -r 'all()'` for the old behavior. Read more about revsets
cli: make `log` show only local commits by default The default log output of showing all commits is not very useful when contributing to an existing repo. Let's have it default to showing commits not on any remote branch instead. I think that's the best we can do since we don't have a configurable main branch yet, and we don't even have per-repo configuration.. Closes #250.
2022-05-14 15:55:46 +00:00
[here](https://github.com/martinvonz/jj/blob/main/docs/revsets.md).
changelog: copy formatting of links to issues from Cargo I thought I had seen our current formatting, i.e. `(#123)`, get auto-linked by GitHub, but it seems it doesn't. This patch therefore changes to use markdown links. I copied the style from Cargo (and Clippy).
2022-12-03 17:44:21 +00:00
[#250](https://github.com/martinvonz/jj/issues/250)
cli: make `log` show only local commits by default The default log output of showing all commits is not very useful when contributing to an existing repo. Let's have it default to showing commits not on any remote branch instead. I think that's the best we can do since we don't have a configurable main branch yet, and we don't even have per-repo configuration.. Closes #250.
2022-05-14 15:55:46 +00:00
cli: make `jj new` always check out the new commit Before this change, `jj new` would check out the new commit only if it was created on top of the current commit. I never liked that special-casing, and after thinking more about how the open/closed should work (see discussion #321), I think we want `jj new` to behave similar to how `git/hg checkout` works, so it can effectively replace the current `jj checkout` command for the use case of starting new work on top of an existing commit.
2022-05-21 13:38:56 +00:00
* `jj new` now always checks out the new commit (used to be only if the parent
was `@`).
cli: make `jj merge` delegate to `jj new`
2022-08-31 05:31:18 +00:00
* `jj merge` now checks out the new commit. The command now behaves exactly
like `jj new`, except that it requires at least two arguments.
rewrite: create new checkout on top iff commit abandoned When rebasing commits after rewrites, we also update all workspaces' checkouts. If the new commit is closed, we create a new commit on top. Since we're hoping to remove the open/closed concept, we need a new condition. I considered creating a new commit on top if the change ID was different from before the rewrite. However, that would make at least `jj split` more complicated because it makes the first commit keep the change ID but it wants the second commit to be checked out. This patch instead creates the new commit on top only when the original commit was abandoned.
2022-06-23 09:14:11 +00:00
* When the working-copy commit is abandoned by `jj abandon` and the parent
commit is open, a new working-copy commit will be created on top (the open
parent commit used to get checked out).
changelog: copy formatting of links to issues from Cargo I thought I had seen our current formatting, i.e. `(#123)`, get auto-linked by GitHub, but it seems it doesn't. This patch therefore changes to use markdown links. I copied the style from Cargo (and Clippy).
2022-12-03 17:44:21 +00:00
* `jj branch` now uses subcommands like `jj branch create` and
cli: make `jj branch` take subcommands, not flags As per https://github.com/martinvonz/jj/issues/330.
2022-06-06 03:23:01 +00:00
`jj branch forget` instead of options like `jj branch --forget`.
changelog: copy formatting of links to issues from Cargo I thought I had seen our current formatting, i.e. `(#123)`, get auto-linked by GitHub, but it seems it doesn't. This patch therefore changes to use markdown links. I copied the style from Cargo (and Clippy).
2022-12-03 17:44:21 +00:00
[#330](https://github.com/martinvonz/jj/issues/330)
cli: make `jj branch` take subcommands, not flags As per https://github.com/martinvonz/jj/issues/330.
2022-06-06 03:23:01 +00:00
config: move NO_COLOR handling from ui, don't override user setting According to the NO_COLOR FAQ, "user-level configuration files [...] should override $NO_COLOR." https://no-color.org/ Unfortunately this makes it harder to test the $NO_COLOR behavior since the test environment isn't attached to a tty. We could allocate a pty or LD_PRELOAD shim to intercept isatty(), but I feel it would be too much to do. https://github.com/assert-rs/assert_cmd/issues/138
2022-06-10 02:42:15 +00:00
* The [`$NO_COLOR` environment variable](https://no-color.org/) no longer
overrides the `ui.color` configuration if explicitly set.
cli: add `jj edit` for editing a commit in the wokring copy
2022-06-28 00:36:13 +00:00
* `jj edit` has been renamed to `jj touchup`, and `jj edit` is now a new command
with different behavior. The new `jj edit` lets you edit a commit in the
working copy, even if the specified commit is closed.
cli: rename `jj edit` to `jj touchup`
2022-06-19 03:22:54 +00:00
cli: allow pushing open commits Since we're thinking of removing the concept of open and closed commits, we can't use that open/closed distinction to decide to not push some commits.
2022-06-19 03:05:08 +00:00
* `jj git push` no longer aborts if you attempt to push an open commit (but it
now aborts if a commit does not have a description).
cli: push only branches pointing to `@` by default Since we now allow pushing open commits, we can implement support for pushing the "current" branch by defining a "current" branch as any branch pointing to `@`. That definition of a current/active seems to have been the consensus in discussion #411. Closes #246.
2022-07-13 04:14:02 +00:00
* `jj git push` now pushes only branches pointing to the `@` by default. Use
`--all` to push all branches.
cli: rename `checkout` to `working_copy` in template
2022-09-18 21:46:12 +00:00
* The `checkouts` template keyword is now called `working_copies`, and
`current_checkout` is called `current_working_copy`.
cli: add a command for printing the contents of a file in a revision I'm adding this mostly because it's useful for testing. That's also the reason it supports displaying conflicts. I didn't call it `cat` like `hg cat` because I haven't found `hg cat` on multiple files useful.
2022-04-06 18:00:27 +00:00
### New features
cli: add interdiff command Add the `jj interdiff` command for comparing only the diffs of commits. Its args are identical to that of `jj diff`, minus `--revision` (because interdiff always requires two commits). Like `jj obslog -p`, Changes introduced by intervening commits are ignored by rebasing `--from` onto `--to` 's parents.
2022-08-30 18:47:38 +00:00
* The new `jj interdiff` command compares the changes in commits, ignoring
changes from intervening commits.
cli: add mode for rebasing branch onto destination (#168)
2022-04-13 17:53:50 +00:00
* `jj rebase` now accepts a `--branch/-b <revision>` argument, which can be used
instead of `-r` or `-s` to specify which commits to rebase. It will rebase the
cli: make `jj rebase` default to `-b @` (#168) Closes #168.
2022-04-14 06:53:35 +00:00
whole branch, relative to the destination. The default mode has changed from
`-r @` to `-b @`.
cli: add mode for rebasing branch onto destination (#168)
2022-04-13 17:53:50 +00:00
cli: add a command for printing the contents of a file in a revision I'm adding this mostly because it's useful for testing. That's also the reason it supports displaying conflicts. I didn't call it `cat` like `hg cat` because I haven't found `hg cat` on multiple files useful.
2022-04-06 18:00:27 +00:00
* The new `jj print` command prints the contents of a file in a revision.
changelog: copy formatting of links to issues from Cargo I thought I had seen our current formatting, i.e. `(#123)`, get auto-linked by GitHub, but it seems it doesn't. This patch therefore changes to use markdown links. I copied the style from Cargo (and Clippy).
2022-12-03 17:44:21 +00:00
* The new `jj git remotes list` command lists the configured remotes and their
URLs.
[#243](https://github.com/martinvonz/jj/issues/243)
cli: add a command for listing git remotes and their URLs As requested by @talpr. I added this is a separate new command `jj git remote list`. One could also imagine showing the listing when there is no sub-command specified to `jj git remote`, but we don't have other commands that behave that way yet. Closes #243
2022-04-25 20:34:13 +00:00
cli: teach `jj squash` to move only changes to specified paths
2022-04-09 17:27:17 +00:00
* `jj move` and `jj squash` now lets you limit the set of changes to move by
specifying paths on the command line (in addition to the `--interactive`
mode). For example, use `jj move --to @-- foo` to move the changes to file
(or directory) `foo` in the working copy to the grandparent commit.
cli: teach `jj move` to move only changes to specified paths I quite often want to move the changes to a particular file from one commit to another. We already support that using `jj move -i`, but that can be annoying to run because we don't have a TUI for it (#48). Let's make it possible to do `jj move --from X --to Y <path>`.
2022-04-09 16:58:33 +00:00
changelog: asking for a combined description is a feature, not a bug fix I suppose it could be seen as a bug fix that we no longer discard a description without asking, but it was intentionally done the way it was before. While at it, I also clarified that the source commit gets abandoned if it becomes empty.
2022-08-31 05:24:35 +00:00
* When `jj move/squash/unsquash` abandons the source commit because it became
empty and both the source and the destination commits have non-empty
descriptions, it now asks for a combined description. If either description
was empty, it uses the other without asking.
cli: teach `jj split` to include all specified paths in first commit
2022-04-09 18:35:28 +00:00
* `jj split` now lets you specify on the CLI which paths to include in the first
commit. The interactive diff-editing is not started when you do that.
cli: add commands for working with sparse patterns (#52) This adds a `jj sparse` command with options to list and manage the set of paths to include in the working copy. It only supports includes (postive matches) for now. I'm not sure "sparse" is the best name for the feature. Perhaps it would make sense as a subcommand under `jj workspace` - maybe `jj workspace track`? However, there's also `jj untrack` for removing a file from the working copy and leaving it in the working copy. I'm happy to hear suggestions, or we can get back to the naming later.
2022-02-06 23:10:50 +00:00
* Sparse checkouts are now supported. In fact, all working copies are now
"sparse", only to different degrees. Use the `jj sparse` command to manage
cli: `jj branch` can accept any number of branches
2022-05-02 19:58:32 +00:00
the paths included in the sparse checkout.
cli: add commands for working with sparse patterns (#52) This adds a `jj sparse` command with options to list and manage the set of paths to include in the working copy. It only supports includes (postive matches) for now. I'm not sure "sparse" is the best name for the feature. Perhaps it would make sense as a subcommand under `jj workspace` - maybe `jj workspace track`? However, there's also `jj untrack` for removing a file from the working copy and leaving it in the working copy. I'm happy to hear suggestions, or we can get back to the naming later.
2022-02-06 23:10:50 +00:00
cli: allow config in `~/.jjconfig.toml` As I said in 095fb9fef4b1, removing support for `~/.jjconfig` was an experiment. I've heard from a few people (including in #233) that they would prefer to have configs in the home directory. This patch therefore restores that functionality, except I added a `.toml` extension to the file to clarify the expected format to users and editors. After this patch, we still allow configs in `$XDG_CONFIG_HOME` (and the other paths used by `dirs::config_dir()`), but we error out there are config files in both that location and `~/.jjconfig.toml`.
2022-05-08 06:54:51 +00:00
* Configuration is now also read from `~/.jjconfig.toml`.
cli: if `$JJ_CONFIG` points to a directory, read all files in it It's annoying especially for tests to not be able to append to a config file without knowing the contents (as you have to do with TOML). Let's read all files in a directory if `$JJ_CONFIG` points to a directory. Mercurial does that for its `$HGRCPATH` variable.
2022-04-09 23:14:42 +00:00
* The `$JJ_CONFIG` environment variable can now point to a directory. If it
does, all files in the directory will be read, in alphabetical order.
cli: respect `$VISUAL`, overriding `$EDITOR` With this patch, the order is this: `$JJ_EDITOR` environement variable `ui.editor` config `$VISUAL` environement variable `$EDITOR` environement variable `pico` That matches git, except that git falls back to an editor determined at compile time (usually `vi`) instead of using `pico`.
2022-05-10 17:04:10 +00:00
* The `$VISUAL` environment is now respected and overrides `$EDITOR`. The new
`ui.editor` config has higher priority than both of them. There is also a new
`$JJ_EDITOR` environment variable, which has even higher priority than the
config.
cli: allow overriding `$EDITOR` variable by `ui.editor` config
2022-04-10 05:42:27 +00:00
revsets: allow single internal `-` and `+` characters in symbols (#46)
2022-04-27 16:42:18 +00:00
* You can now use `-` and `+` in revset symbols. You used to have to quote
branch names like `my-feature` in nested quotes (outer layer for your shell)
like `jj co '"my-feature"'`. The quoting is no longer needed.
revset: add a `connected()` function This introduces a `connected(x)` function, which is simply the same as `x:x`. It's occasionally useful if `x` is a long expression. It's also useful as a building block for `root(x)` (coming soon).
2022-04-14 04:26:21 +00:00
* The new revset function `connected(x)` is the same as `x:x`.
revset: add a `roots()` function
2022-04-13 20:55:47 +00:00
* The new revset function `roots(x)` finds commits in the set that are not
descendants of other commits in the set.
Remove out-of-date parenthetical in tutorial.md
2022-04-23 04:30:33 +00:00
* ssh-agent is now detected even if `$SSH_AGENT_PID` is not set (as long as
`$SSH_AUTH_SOCK` is set). This should help at least macOS users where
ssh-agent is launched by default and only `$SSH_AUTH_SOCK` is set.
git: when importing refs, abandon commits that were abandoned in git Now that I'm using GitHub PRs instead of pushing directly to the main branch, it's quite annoying to have to abandon the old commits after GitHub rebases them. This patch makes it so we compare the remote's previous heads to the new heads and abandons any commits that were removed on the remote. As usual, that means that descendants get rebased onto the closest remaining commit. This is half of #241. The other half is to detect rewritten branches and rebase on top.
2022-03-27 05:33:08 +00:00
* When importing from a git, any commits that are no longer referenced on the
git side will now be abandoned on the jj side as well. That means that
`jj git fetch` will now abandon unreferenced commits and rebase any local
changes you had on top.
cli: add a mode of pushing with branch taken from change ID This adds `jj git push --change <revision>` which creates a branch with a name based on the revision's change ID, and then pushes that like with `--branch`. That can be useful so you don't have to manually add the branch (and come up with a name for it). The created branch behaves like any other branch, so it's possible to make it point to a commit with a different change ID.
2022-04-29 03:58:41 +00:00
* `jj git push` gained a `--change <revision>` argument. When that's used, it
will create a branch named after the revision's change ID, so you don't have
Add configuration option to override branch name prefix.
2022-05-24 09:52:45 +00:00
to create a branch yourself. By default, the branch name will start with
`push-`, but this can be overridden by the `push.branch-prefix` config
setting.
cli: add a mode of pushing with branch taken from change ID This adds `jj git push --change <revision>` which creates a branch with a name based on the revision's change ID, and then pushes that like with `--branch`. That can be useful so you don't have to manually add the branch (and come up with a name for it). The created branch behaves like any other branch, so it's possible to make it point to a commit with a different change ID.
2022-04-29 03:58:41 +00:00
cli: prevent pushing commits without description, author, or committer This patch prevents perhaps pushing commits with an empty description or the placeholder "(no user/email configured)" values for author/committer. Closes #322.
2022-05-27 15:54:47 +00:00
* `jj git push` now aborts if you attempt to push a commit without a
description or with the placeholder "(no name/email configured)" values for
author/committer.
diff_edit: load command arguments from merge-tools.<name> config Apparently, I need to pass `--merge` option to use kdiff3 as a diff editor. We could add `diff-editor-args` or extend `diff-editor` to a list of command arguments, but we'll eventually add stock merge tools and the configuration would look like: [merge-tools.<name>] program = ... diff-args = [...] edit-args = [...] merge-args = [...]
2022-05-01 01:45:22 +00:00
* Diff editor command arguments can now be specified by config file.
Example:
[merge-tools.kdiff3]
program = "kdiff3"
edit-args = ["--merge", "--cs", "CreateBakFiles=0"]
cli: `jj branch` can accept any number of branches
2022-05-02 19:58:32 +00:00
* `jj branch` can accept any number of branches to update, rather than just one.
cli: allow alias after global args, and recursive aliases Our support for aliases is very naively implemented; it assumes the alias is the first argument in argv. It therefore fails to resolve aliases after global arguments such as `--at-op`. This patch fixes that by modifying the command defintion to have an "external subcommand" in the list of available commands. That makes `clap` give us the remainder of the arguments when it runs into an unknown command. The first in the list will then be an alias or simply an unknown command. Thanks to @epage for the suggestion on in clap-rs/clap#3672. With the new structure, it was easy to handle recursive alias definitions, so I added support for that too. Closes #292.
2022-05-01 15:54:35 +00:00
* Aliases can now call other aliases.
cli: teach `log` flag to show commits in reverse order This adds a `--reversed` flag to `jj log` to show commits with later commits further down. It works both with and without the graph. Since the graph-drawing code is already independent of the relationship between commits, it doesn't need any updating.
2022-05-09 17:38:23 +00:00
* `jj log` now accepts a `--reversed` option, which will show older commits
first.
cli: add basic support for 'jj log PATH' In the current implementation, tree is diffed twice if both PATH and -p are specified. If this adds significant cost, we'll need to reimplement it without using a revset abstraction (or maybe adjust revset/graph API.)
2022-09-13 07:26:23 +00:00
* `jj log` now accepts file paths.
cli: teach `obslog` an option to show diff This patch adds `jj obslog -p` for including the diff compared to the predecessor (the first predecessor if there are several). If the predecessor's parents are different, then we create a temporary tree by rebasing the predecessor to have the same parents and we use the result as base for the diff. That way, we avoid polluting the diff with the changes caused by the rebase. (I don't think we currently have any commands that can change both parents and content, so the diff should always be empty for rewrites caused by a rebase.) Working on this also reminded me that it'll be really nice when we replace `jj obslog` by something based on the operation log - I really miss seeing information about the operation in the output (like `hg obslog` gets from its obsmarkers).
2022-06-03 22:25:56 +00:00
* `jj obslog` now accepts `-p`/`--patch` option, which will show the diff
compared to the previous version of the change.
CommitBuilder: when rewriting commit, replace placeholder user/email If a commit's author field has the placeholder user/email values (i.e. "(no name configured)" and "(no email configured)"), and they have now configured their email and username, they probably want us to update the author field with the new information, so that's what this patch does. Thanks to durin42@ for the suggestion on #322.
2022-06-04 23:18:03 +00:00
* The "(no name/email configured)" placeholder value for name/email will now be
replaced if once you modify a commit after having configured your name/email.
cli: parse --color option and reconfigure ui I often redirect the jj output to pager, so I set ui.color = "always" in config file. This patch allows me to remove such config, and instead specify --color=always only when needed.
2022-06-09 04:16:34 +00:00
* Color setting can now be overridden by `--color=always|never|auto` option.
cli: teach `jj checkout` a `-m` flag, to match `jj new` The two commands are very similar and we should probably make one an alias of the other (or just delete one), but for now let's at least make them more similar by supporting `-m` for both. I currently think `jj new` is more natural when starting a new change on top of the current one and `jj checkout` is more natural when starting a new change on top of another one, as well as when you just want to look around or run tests. `jj checkout` doesn't currently default to the working copy like `jj new` does. Perhaps we should make it do that. Will people eventually feel that it's natural to run `jj checkout` to create a new change on top of the working copy, or will they feel that it's natural to run `jj new` on an unrelated commit even to just look around, or will we want them as synonyms forever?
2022-08-27 05:03:51 +00:00
* `jj checkout` now lets you specify a description with `--message/-m`.
cli: make `jj new` create a merge commit if more than one arg given `jj merge` just creates an empty change, which is practically the same as `jj new`. The main difference is that the former requires more than one argument and the latter requires at most one argument. It seems cleaner to generalize them and make them aliases. This patch starts doing that by making `jj new` accept more than one argument. Instead of having `jj merge` be exactly an alias for `jj new`, we may want to make it a thin wrapper that just checks that more than one argument was given. That would probably be less confusing to users who run `jj merge` without arguments to see what it does. We should probably make `jj checkout` also be an alias for `jj new`, but that will have to wait until we have removed support for open commits (since `jj checkout` still has logic for dealing with open commits).
2022-08-31 04:35:56 +00:00
* `jj new` can now be used for creating merge commits. If you pass more than
one argument to it, the new commit will have all of them as parents.
cli: print errors to stderr
2022-04-07 06:25:01 +00:00
### Fixed bugs
merge: fix modify/delete conflict to not resolve
2022-04-06 19:18:24 +00:00
* When rebasing a conflict where one side modified a file and the other side
deleted it, we no longer automatically resolve it in favor of the modified
content (this was a regression from commit c0ae4b16e8c4).
cli: print errors to stderr
2022-04-07 06:25:01 +00:00
* Errors are now printed to stderr (they used to be printed to stdout).
working_copy: fix crash when updating and only executable bit changed
2022-04-15 06:03:08 +00:00
* Updating the working copy to a commit where a file's executable bit changed
but the contents was the same used to lead to a crash. That has now been
cli: `jj branch` can accept any number of branches
2022-05-02 19:58:32 +00:00
fixed.
working_copy: fix crash when updating and only executable bit changed
2022-04-15 06:03:08 +00:00
trees: when merging trees and one is missing, treat it as empty When a directory is missing in one merge input (base or one side), we would consider that a merge conflict. This patch changes that so we instead merge trees by treating the missing tree as empty.
2022-04-18 03:51:24 +00:00
* If one side of a merge modified a directory and the other side deleted it, it
used to be considered a conflict. The same was true if both sides added a
directory with different files in. They are now merged as if the missing
directory had been empty.
rebase: update bookkeeping for branches as we rebase descendants The `DescendantRebaser` keeps a map of branches from the source commit, so it gets efficient lookup of branches to update when a commit has been rebased. This map was not kept up to date as we rebased. That could lead to branches getting left on hidden intermediate commits. Specifically, if a commit with a branch was rewritten by some command, and an ancestor of it was also rewritten, then we'd only update the branch only the first step and not update it again when rebasing onto the rewritten ancestor.
2022-04-23 05:58:16 +00:00
* When using `jj move` to move part of a commit into an ancestor, any branches
pointing to the source commit used to be left on a hidden intermediate commit.
They are now correctly updated.
cli: require at least one path for `jj untrack` It seems very unlikely that the user would want to untrack all paths (that's still possible with `jj untrack .`, if they really want to, and have added all their current paths to the `.gitignore`).
2022-04-09 16:20:00 +00:00
* `jj untrack` now requires at least one path (allowing no arguments was a UX
bug).
cli: require at least one destination for rebase Rebasing onto no commits (i.e. onto the root commit) is almost definitely not what you meant to do if you run `jj rebase` (without any arguments).
2022-04-11 17:40:56 +00:00
* `jj rebase` now requires at least one destination (allowing no arguments was a
UX bug).
cli: make `jj restore --to <rev>` restore from the working copy
2022-04-24 19:13:43 +00:00
* `jj restore --to <rev>` now restores from the working copy (it used to restore
from the working copy's parent).
cli: don't crash if $EDITOR fails
2022-04-09 22:53:32 +00:00
* You now get a proper error message instead of a crash when `$EDITOR` doesn't
exist or exits with an error.
cli: allow alias after global args, and recursive aliases Our support for aliases is very naively implemented; it assumes the alias is the first argument in argv. It therefore fails to resolve aliases after global arguments such as `--at-op`. This patch fixes that by modifying the command defintion to have an "external subcommand" in the list of available commands. That makes `clap` give us the remainder of the arguments when it runs into an unknown command. The first in the list will then be an alias or simply an unknown command. Thanks to @epage for the suggestion on in clap-rs/clap#3672. With the new structure, it was easy to handle recursive alias definitions, so I added support for that too. Closes #292.
2022-05-01 15:54:35 +00:00
* Global arguments, such as `--at-op=<operation>`, can now be passed before
an alias.
cli: use `.` in output for current directory instead of empty string
2022-04-20 05:15:38 +00:00
* Fixed relative path to the current directory in output to be `.` instead of
empty string.
cli: some fixes and touch-ups for `jj workspace`, plus tests
2022-04-22 04:49:57 +00:00
* When adding a new workspace, the parent of the current workspace's current
checkout will be checked out. That was always the intent, but the root commit
was accidentally checked out instead.
checkout: don't abandon old commit if it has non-empty description If the user entered a description, we shouldn't abandon it even if it has no changes to the content.
2022-05-21 17:23:46 +00:00
* When checking out a commit, the previous commit is no longer abandoned if it
has a non-empty description.
cli: snapshot working copy even on e.g. `jj diff -r <some hash>` I was initially worried about the cost of always snapshotting the working copy, so that's why e.g. `jj diff -r <some hash>` doesn't do it. However, there's been a few caused by missing snapshotting, and there are still a few (I just noticed it in `jj undo` while writing this patch). Let's always do the snapshotting and if the user really doesn't want it, they can pass `--no-commit-working-copy` (which we should probably rename to `--no-snapshot-working-copy` or maybe just `--no-snapshot`). That should reduce bugs and make the CLI more predictable. Two test cases were affected becasue `jj merge` also didn't snapshot the working copy. Before this patch, e.g. `jj co --no-commit-working-copy` would error out, but now it will succeed (without touching the working copy, leaving the working copy stale). That may be confusing, but it should be easy to recover from (e.g. by `jj undo`). We can consider adding a check for it later if it seems too confusing (it's probably rarely something the user wanted).
2022-07-15 18:09:11 +00:00
* All commands now consistently snapshot the working copy (it was missing from
let branches and remote_branches revset functions take needles as arguments - branches has the signature branches([needle]), meaning the needle is optional (branches() is equivalent to branches("")) and it matches all branches whose name contains needle as a substring - remote_branches has the signature remote_branches([branch_needle[, remote_needle]]), meaning it can be called with no arguments, or one argument (in which case, it's similar to branches), or two arguments where the first argument matches branch names and the second argument matches remote names (similar to branches, remote_branches(), remote_branches("") and remote_branches("", "") are all equivalent)
2023-01-12 10:01:35 +00:00
e.g. `jj undo` and `jj merge` before).
cli: snapshot working copy even on e.g. `jj diff -r <some hash>` I was initially worried about the cost of always snapshotting the working copy, so that's why e.g. `jj diff -r <some hash>` doesn't do it. However, there's been a few caused by missing snapshotting, and there are still a few (I just noticed it in `jj undo` while writing this patch). Let's always do the snapshotting and if the user really doesn't want it, they can pass `--no-commit-working-copy` (which we should probably rename to `--no-snapshot-working-copy` or maybe just `--no-snapshot`). That should reduce bugs and make the CLI more predictable. Two test cases were affected becasue `jj merge` also didn't snapshot the working copy. Before this patch, e.g. `jj co --no-commit-working-copy` would error out, but now it will succeed (without touching the working copy, leaving the working copy stale). That may be confusing, but it should be easy to recover from (e.g. by `jj undo`). We can consider adding a check for it later if it seems too confusing (it's probably rarely something the user wanted).
2022-07-15 18:09:11 +00:00
release: release version 0.4.0 This release is mostly about the fix for #177, which looks pretty bad even though I think it is actually harmless. It also has `jj log -p` contributed by @yuja!
2022-04-03 05:56:59 +00:00
## [0.4.0] - 2022-04-02
config: drop support for `~/.jjconfig` I'm a little hesitant to do this because most tools I'm familiar with have the config file directly in `~/`. It's also easier to describe where to put the file if it doesn't vary across platforms. But we're still early in the project, so let's try it and see if we get any complaints.
2022-03-19 17:17:30 +00:00
### Breaking changes
* Dropped support for config in `~/.jjconfig`. Your configuration is now read
from `<config dir>/jj/config.toml`, where `<config dir>` is
`${XDG_CONFIG_HOME}` or `~/.config/` on Linux,
`~/Library/Application Support/` on macOS, and `~\AppData\Roaming\` on
Windows.
config: add support for a `$JJ_CONFIG` environment variable It's useful for tests, scripts, and debugging to be able to use specific config instead of the user's config. That's especially true for our automated tests because they didn't have a place to read config from on Windows before this patch (they read their config from `{FOLDERID_RoamingAppData}`, which I don't think we can override in tests).
2022-03-19 17:37:13 +00:00
### New features
* You can now set an environment variable called `$JJ_CONFIG` to a path to a
config file. That will then be read instead of your regular config file. This
is mostly intended for testing and scripts.
cli: respect `$NO_COLOR` environment variable
2022-03-19 17:00:13 +00:00
* The [standard `$NO_COLOR` environment variable](https://no-color.org/) is now
respected.
cli: teach `jj new` to set initial description with `-m` I rarely use `jj new`, so this feature is mostly for use in tests.
2022-03-26 21:02:04 +00:00
* `jj new` now lets you specify a description with `--message/-m`.
repo: don't abandon empty commit if it has descendants It's unusual for the current commit to have descendants, but it can happen. In particular, it can easily happen when you run `jj new`. You probably don't want to abandon it in those cases.
2022-03-26 21:53:51 +00:00
* When you check out a commit, the old commit no longer automatically gets
abandoned if it's empty and has descendants, it only gets abandoned if it's
empty and does not have descendants.
changelog: copy formatting of links to issues from Cargo I thought I had seen our current formatting, i.e. `(#123)`, get auto-linked by GitHub, but it seems it doesn't. This patch therefore changes to use markdown links. I copied the style from Cargo (and Clippy).
2022-12-03 17:44:21 +00:00
* When undoing an earlier operation, any new commits on top of commits from the
undone operation will be rebased away. For example, let's say you rebase
commit A so it becomes a new commit A', and then you create commit B on top of
A'. If you now undo the rebase operation, commit B will be rebased to be on
top of A instead. The same logic is used if the repo was modified by
concurrent operations (so if one operation added B on top of A, and one
repo: when merging in removed head, rebase descendants (#111)
2022-03-17 03:58:04 +00:00
operation rebased A as A', then B would be automatically rebased on top of
A'). See #111 for more examples.
changelog: copy formatting of links to issues from Cargo I thought I had seen our current formatting, i.e. `(#123)`, get auto-linked by GitHub, but it seems it doesn't. This patch therefore changes to use markdown links. I copied the style from Cargo (and Clippy).
2022-12-03 17:44:21 +00:00
[#111](https://github.com/martinvonz/jj/issues/111)
repo: when merging in removed head, rebase descendants (#111)
2022-03-17 03:58:04 +00:00
log: add -p/--patch option to show diff along with commit meta data "log -p | less" is the option I often use with hg/git to find interesting bits from the changelog, and I think it's also valid with jj. Unlike "hg log -p --stat", "jj log -p --summary" does not show both diff summary and patch to reflect the internal structure. This behavoir is arguable and may be changed later. The logic of show_patch() is extracted from cmd_show().
2022-03-28 09:12:08 +00:00
* `jj log` now accepts `-p`/`--patch` option.
cli: fix git-colocated working copy on Windows This patch adds a very simple e2e test of having a working copy shared with Git. The test initially failed on Windows. The symptom was that the "master" branch did not get updated when we create a commit using `jj`. That suggested that we didn't correctly detect that the working copy was shared. After a lot of troubleshooting, I think I mostly understand what we going on here (thanks to @arxanas for suggesting https://github.com/mxschmitt/action-tmate). The path we get from `git2::Repository::workdir()` seems to not be canonicalized in the same way as `std::fs::canonicalize()` canonicalizes. Specifically, it does not have the "\\?\" prefix we get from that function. I suppose that's because libgit2 is a C library and canonicalizes the path using some other system call.
2022-03-29 06:03:37 +00:00
### Fixed bugs
cli: fix crash when initializing workspace colocated with Git repo When initializing a workspace that shares its working copy with a Git repo (i.e. `jj init --git-repo=.`), we import refs and HEAD when creating the `WorkspaceCommandHelper` (as we do for all commands when the working copy is shared). That makes the explicit import we do in `cmd_init()` unnecessary. It also makes the checkout of HEAD I added for the fix of #102 unnecessary. More importantly, as @yuja reported in #177, it makes the command crash (at least if the repo is small enough that the two checkouts happen within a second). I think the problem is that the second checkout tries to create the same commit except that the Change ID is different (the problem is not the predecessors as I speculated in the issue tracker). The fix is to simply avoid doing the redundant work. We still need a proper fix for #27 eventually. Closes #177.
2022-03-28 13:46:21 +00:00
* Fixed crash on `jj init --git-repo=.` (it almost always crashed).
cli: fix git-colocated working copy on Windows This patch adds a very simple e2e test of having a working copy shared with Git. The test initially failed on Windows. The symptom was that the "master" branch did not get updated when we create a commit using `jj`. That suggested that we didn't correctly detect that the working copy was shared. After a lot of troubleshooting, I think I mostly understand what we going on here (thanks to @arxanas for suggesting https://github.com/mxschmitt/action-tmate). The path we get from `git2::Repository::workdir()` seems to not be canonicalized in the same way as `std::fs::canonicalize()` canonicalizes. Specifically, it does not have the "\\?\" prefix we get from that function. I suppose that's because libgit2 is a C library and canonicalizes the path using some other system call.
2022-03-29 06:03:37 +00:00
* When sharing the working copy with a Git repo, the automatic importing and
exporting (sometimes?) didn't happen on Windows.
release: include the two recent no-op releases in the changelog I keep forgetting to update things while doing a release...
2022-03-17 06:01:42 +00:00
## [0.3.3] - 2022-03-16
No changes, only trying to get the automated build to work.
## [0.3.2] - 2022-03-16
No changes, only trying to get the automated build to work.
release: update release notes for 0.3.1 I forgot to do this when I bumped the version number.
2022-03-14 04:51:21 +00:00
## [0.3.1] - 2022-03-13
cli: expand `~` in `core.excludesFile`, don't crash when missing I thought that `std::fs::canonicalize()` expanded "~", but it doesn't seem to do that, which caused #131. Git seems to do the expansion itself, so we probably also should. More importantly `std::fs::canonicalize()` crashes when the file doesn't exist. The manual expansion we do now does not. Closes #131.
2022-03-13 15:14:01 +00:00
### Fixed bugs
feat(squash): Add `--keep-emptied` flag Fixes #3815
2024-06-04 23:34:50 +00:00
- Fixed crash when `core.excludesFile` pointed to nonexistent file, and made
leading `~/` in that config expand to `$HOME/`
[#131](https://github.com/martinvonz/jj/issues/131)
cli: expand `~` in `core.excludesFile`, don't crash when missing I thought that `std::fs::canonicalize()` expanded "~", but it doesn't seem to do that, which caused #131. Git seems to do the expansion itself, so we probably also should. More importantly `std::fs::canonicalize()` crashes when the file doesn't exist. The manual expansion we do now does not. Closes #131.
2022-03-13 15:14:01 +00:00
release: add a changelog
2022-03-12 18:48:51 +00:00
## [0.3.0] - 2022-03-12
Last release before this changelog started.
Reference in a new issue Copy permalink