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/),
|
|
|
|
|
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
|
|
|
|
|
|
|
|
|
|
## [Unreleased]
|
2023-09-06 16:46:27 +00:00
|
|
|
|
2024-05-01 14:28:16 +00:00
|
|
|
### Breaking changes
|
|
|
|
|
|
2024-05-05 14:17:52 +00:00
|
|
|
* Dropped support for `ui.default-revset` config (replaced by `revsets.log` in
|
|
|
|
|
0.8.0).
|
|
|
|
|
|
2024-04-30 06:00:07 +00:00
|
|
|
* The `commit_summary_no_branches` template is superseded by
|
|
|
|
|
`templates.branch_list`.
|
|
|
|
|
|
2024-05-10 14:44:49 +00:00
|
|
|
* `jj split` will now refuse to split an empty commit.
|
|
|
|
|
|
2024-01-19 00:01:11 +00:00
|
|
|
### Deprecations
|
|
|
|
|
|
2024-02-09 22:38:43 +00:00
|
|
|
- Attempting to alias a built-in command now gives a warning, rather than being silently ignored.
|
|
|
|
|
|
2024-05-01 14:28:16 +00:00
|
|
|
### New features
|
|
|
|
|
|
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.
|
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.
|
|
|
|
|
|
2024-05-06 16:23:36 +00:00
|
|
|
* `ui.color = "debug"` prints active labels alongside the regular colored output.
|
|
|
|
|
|
2024-05-14 16:20:37 +00:00
|
|
|
* `jj branch track` now show conflicts if there are some.
|
|
|
|
|
|
2024-05-01 14:28:16 +00:00
|
|
|
### Fixed bugs
|
|
|
|
|
|
2024-05-14 08:38:48 +00:00
|
|
|
* When the working copy commit becomes immutable, a new one is automatically created on top of it
|
|
|
|
|
to avoid letting the user edit the immutable one.
|
|
|
|
|
|
2024-05-07 14:49:58 +00:00
|
|
|
## [0.17.1] - 2024-05-07
|
|
|
|
|
|
|
|
|
|
### Fixed bugs
|
|
|
|
|
|
2024-05-06 21:52:09 +00:00
|
|
|
* `jj status` no longer scans through the entire history to look for ancestors with conflicts.
|
|
|
|
|
|
2024-05-01 14:28:16 +00:00
|
|
|
## [0.17.0] - 2024-05-01
|
|
|
|
|
|
2024-04-03 18:06:54 +00:00
|
|
|
### Breaking changes
|
|
|
|
|
|
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)`
|
2024-04-05 12:16:45 +00:00
|
|
|
|
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.
|
|
|
|
|
|
2024-04-03 18:06:54 +00:00
|
|
|
### New features
|
|
|
|
|
|
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.
|
|
|
|
|
|
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`.
|
2024-04-04 15:43:59 +00:00
|
|
|
|
2024-05-01 14:28:16 +00:00
|
|
|
* Commit objects in templates now have a `contained_in(revset: String) ->
|
|
|
|
|
Boolean` method.
|
2024-04-04 21:07:39 +00:00
|
|
|
|
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`).
|
2024-03-31 12:46:55 +00:00
|
|
|
|
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.
|
2024-04-02 20:17:03 +00:00
|
|
|
|
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.
|
2024-04-06 07:46:24 +00:00
|
|
|
|
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.
|
2024-04-17 12:17:40 +00:00
|
|
|
|
2024-04-08 00:46:33 +00:00
|
|
|
* `jj prev` and `jj next` now work when the working copy revision is a merge.
|
2024-04-02 21:27:02 +00:00
|
|
|
|
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.
|
2024-04-05 11:21:36 +00:00
|
|
|
|
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.
|
|
|
|
|
|
2024-04-23 14:47:55 +00:00
|
|
|
* `jj rebase` now accepts revsets resolving to multiple revisions with the
|
|
|
|
|
`--revisions`/`-r` option.
|
|
|
|
|
|
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.
|
|
|
|
|
|
2024-04-03 18:06:54 +00:00
|
|
|
### Fixed bugs
|
|
|
|
|
|
2024-04-07 07:10:17 +00:00
|
|
|
* Revsets now support `\`-escapes in string literal.
|
|
|
|
|
|
2024-04-09 17:53:21 +00:00
|
|
|
* The builtin diff editor now allows empty files to be selected during
|
|
|
|
|
`jj split`.
|
|
|
|
|
|
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).
|
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.
|
2024-04-09 17:53:21 +00:00
|
|
|
|
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)
|
|
|
|
|
|
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)
|
|
|
|
|
* Théo Daron (@Kaporos)
|
|
|
|
|
* Yuya Nishihara (@yuja)
|
|
|
|
|
|
|
|
|
|
|
2024-04-03 18:06:54 +00:00
|
|
|
## [0.16.0] - 2024-04-03
|
|
|
|
|
|
|
|
|
|
### Deprecations
|
|
|
|
|
|
2024-03-11 04:24:13 +00:00
|
|
|
* `jj move` was deprecated in favor of `jj squash`.
|
|
|
|
|
|
2024-02-07 21:06:18 +00:00
|
|
|
### Breaking changes
|
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.
|
2024-02-07 21:06:18 +00:00
|
|
|
|
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.
|
2024-03-28 12:10:47 +00:00
|
|
|
|
2024-03-28 11:28:20 +00:00
|
|
|
* The `jj sparse` subcommands now parse and print patterns as workspace-relative
|
|
|
|
|
paths.
|
|
|
|
|
|
2024-03-31 09:47:31 +00:00
|
|
|
* The `jj log` command no longer uses the default revset when a path is specified.
|
|
|
|
|
|
2024-03-06 19:14:30 +00:00
|
|
|
### New features
|
|
|
|
|
|
2024-03-16 08:45:40 +00:00
|
|
|
* Config now supports rgb hex colors (in the form `#rrggbb`) wherever existing color names are supported.
|
|
|
|
|
|
2024-03-08 05:07:40 +00:00
|
|
|
* `ui.default-command` now accepts multiple string arguments, for more complex
|
|
|
|
|
default `jj` commands.
|
|
|
|
|
|
2024-03-11 22:16:24 +00:00
|
|
|
* Graph node symbols are now configurable via templates
|
|
|
|
|
* `templates.log_node`
|
|
|
|
|
* `templates.op_log_node`
|
2024-03-06 22:46:02 +00:00
|
|
|
|
2024-03-08 17:43:24 +00:00
|
|
|
* `jj log` now includes synthetic nodes in the graph where some revisions were
|
|
|
|
|
elided.
|
|
|
|
|
|
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.
|
2024-03-10 18:50:14 +00:00
|
|
|
|
2024-03-13 07:45:41 +00:00
|
|
|
* Commit templates now support `immutable` keyword.
|
|
|
|
|
|
2024-03-25 09:19:36 +00:00
|
|
|
* New template function `coalesce(content, ..)` is added.
|
|
|
|
|
|
2024-02-12 07:26:19 +00:00
|
|
|
* Timestamps are now shown in local timezone and without milliseconds and
|
|
|
|
|
timezone offset by default.
|
|
|
|
|
|
2024-03-07 06:20:08 +00:00
|
|
|
* `jj git push` now prints messages from the remote.
|
|
|
|
|
|
2024-03-22 12:43:43 +00:00
|
|
|
* `jj branch list` now supports a `--conflicted/-c` option to show only conflicted branches.
|
|
|
|
|
|
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.
|
|
|
|
|
|
2024-04-02 06:53:20 +00:00
|
|
|
* `jj branch list` now allows combining `-r REVISIONS`/`NAMES` and `-a` options.
|
2024-03-28 18:13:33 +00:00
|
|
|
|
2024-03-31 09:54:11 +00:00
|
|
|
* `--all` is now named `--all-remotes` for `jj branch list`
|
|
|
|
|
|
2024-03-30 17:18:56 +00:00
|
|
|
* There is a new global `--quiet` flag to silence commands' non-primary output.
|
|
|
|
|
|
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.
|
|
|
|
|
|
2024-05-01 14:28:16 +00:00
|
|
|
* New function `working_copies()` for revsets to show the working copy commits of all workspaces.
|
2024-04-01 01:40:19 +00:00
|
|
|
|
2024-03-06 19:14:30 +00:00
|
|
|
### Fixed bugs
|
|
|
|
|
|
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)
|
|
|
|
|
|
|
|
|
|
|
2024-03-07 00:12:48 +00:00
|
|
|
## [0.15.1] - 2024-03-06
|
|
|
|
|
|
|
|
|
|
No code changes (fixing Rust `Cargo.toml` stuff).
|
2024-03-06 19:14:30 +00:00
|
|
|
|
|
|
|
|
## [0.15.0] - 2024-03-06
|
|
|
|
|
|
|
|
|
|
### Breaking changes
|
|
|
|
|
|
2023-10-28 19:14:26 +00:00
|
|
|
* The minimum supported Rust version (MSRV) is now 1.76.0.
|
|
|
|
|
|
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>`.
|
|
|
|
|
|
2024-02-11 18:43:06 +00:00
|
|
|
* Dropped support for the "legacy" graph-drawing style. Use "ascii" for a very
|
|
|
|
|
similar result.
|
|
|
|
|
|
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.
|
|
|
|
|
|
2024-02-13 05:46:21 +00:00
|
|
|
* Dropped support for the deprecated `:` revset operator. Use `::` instead.
|
|
|
|
|
|
2024-02-25 17:41:07 +00:00
|
|
|
* `jj rebase --skip-empty` no longer abandons commits that were already empty
|
|
|
|
|
before the rebase.
|
|
|
|
|
|
2024-02-07 21:06:18 +00:00
|
|
|
### New features
|
|
|
|
|
|
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:
|
2024-02-13 02:09:24 +00:00
|
|
|
* GnuPG
|
|
|
|
|
* SSH
|
|
|
|
|
|
2024-03-08 06:30:40 +00:00
|
|
|
Signature verification and an explicit sign command will hopefully come soon.
|
|
|
|
|
|
2024-02-05 11:49:06 +00:00
|
|
|
* Templates now support logical operators: `||`, `&&`, `!`
|
|
|
|
|
|
2024-02-22 09:57:29 +00:00
|
|
|
* Templates now support the `self` keyword, which is the current commit in `jj
|
|
|
|
|
log`/`obslog` templates.
|
|
|
|
|
|
2024-02-10 06:01:47 +00:00
|
|
|
* `jj show` now accepts `-T`/`--template` option to render its output using
|
|
|
|
|
template
|
|
|
|
|
|
2024-03-03 11:45:36 +00:00
|
|
|
* `jj config list` now accepts `-T`/`--template` option.
|
|
|
|
|
|
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
|
|
|
|
|
|
2024-02-12 07:09:33 +00:00
|
|
|
* In the templating language, Timestamps now have a `.local()` method for
|
|
|
|
|
converting to the local timezone.
|
|
|
|
|
|
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).
|
|
|
|
|
|
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/)
|
2024-02-11 02:55:02 +00:00
|
|
|
|
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.
|
|
|
|
|
|
2024-02-17 17:04:21 +00:00
|
|
|
* When creating a new workspace, the sparse patterns are now copied over from
|
|
|
|
|
the current workspace.
|
|
|
|
|
|
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=.`.
|
|
|
|
|
|
2024-02-13 22:17:05 +00:00
|
|
|
* `jj git fetch` now automatically prints new remote branches and tags by default.
|
|
|
|
|
|
2024-02-18 16:47:12 +00:00
|
|
|
* `--verbose/-v` is now `--debug` (no short option since it's not intended to be used often)
|
|
|
|
|
|
2024-02-12 22:27:57 +00:00
|
|
|
* `jj move --from/--to` can now be abbreviated to `jj move -f/-t`
|
|
|
|
|
|
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.
|
|
|
|
|
[#2575](https://github.com/martinvonz/jj/issues/2575)
|
|
|
|
|
|
2024-02-16 20:23:41 +00:00
|
|
|
* Added completions for [Nushell](https://nushell.sh) to `jj util completion`
|
|
|
|
|
|
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.
|
|
|
|
|
|
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.
|
|
|
|
|
|
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.
|
|
|
|
|
|
2024-02-07 21:06:18 +00:00
|
|
|
### Fixed bugs
|
|
|
|
|
|
2024-02-04 08:03:03 +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
|
2024-02-08 18:16:42 +00:00
|
|
|
working copy (instead of resulting in a crash).
|
2024-02-04 08:03:03 +00:00
|
|
|
[#2](https://github.com/martinvonz/jj/issues/2)
|
2024-04-05 11:21:36 +00:00
|
|
|
|
2024-03-04 19:31:10 +00:00
|
|
|
* On Windows, the `:builtin` pager is now used by default, rather than being
|
|
|
|
|
disabled entirely.
|
2024-02-11 02:55:02 +00:00
|
|
|
|
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)
|
|
|
|
|
|
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)
|
|
|
|
|
|
|
|
|
|
|
2024-02-07 21:06:18 +00:00
|
|
|
## [0.14.0] - 2024-02-07
|
|
|
|
|
|
|
|
|
|
### Deprecations
|
|
|
|
|
|
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.
|
2024-04-05 11:21:36 +00:00
|
|
|
|
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**.
|
|
|
|
|
|
2024-01-08 10:41:07 +00:00
|
|
|
* `jj init --git` and `jj init --git-repo` are now deprecated and will be removed
|
|
|
|
|
in the near future.
|
|
|
|
|
|
|
|
|
|
Use `jj git init` instead.
|
|
|
|
|
|
|
|
|
|
|
2023-09-06 16:46:27 +00:00
|
|
|
### Breaking changes
|
|
|
|
|
|
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".
|
|
|
|
|
|
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.
|
|
|
|
|
|
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.
|
|
|
|
|
|
2023-12-28 17:15:06 +00:00
|
|
|
### New features
|
|
|
|
|
|
2024-02-04 19:49:20 +00:00
|
|
|
* `jj util completion` now supports powershell and elvish.
|
|
|
|
|
|
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.
|
|
|
|
|
|
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`.
|
2023-12-29 07:02:56 +00:00
|
|
|
|
2024-01-09 08:31:40 +00:00
|
|
|
* `jj util gc` now removes unreachable operation, view, and Git objects.
|
2024-01-07 09:21:10 +00:00
|
|
|
|
2024-01-04 14:55:15 +00:00
|
|
|
* `jj branch rename` will now warn if the renamed branch has a remote branch, since
|
|
|
|
|
those will have to be manually renamed outside of `jj`.
|
|
|
|
|
|
2024-02-03 03:38:54 +00:00
|
|
|
* `jj git push` gained a `--tracked` option, to push all the tracked branches.
|
|
|
|
|
|
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`.
|
|
|
|
|
|
2024-01-15 19:24:27 +00:00
|
|
|
* `jj config list` gained a `--include-overridden` option to allow
|
|
|
|
|
printing overridden config values.
|
|
|
|
|
|
2024-01-14 01:38:55 +00:00
|
|
|
* `jj config list` now accepts `--user` or `--repo` option to specify
|
|
|
|
|
config origin.
|
|
|
|
|
|
2024-02-01 04:53:23 +00:00
|
|
|
* New `jj config path` command to print the config file path without launching
|
|
|
|
|
an editor.
|
|
|
|
|
|
2024-01-21 22:06:46 +00:00
|
|
|
* `jj tag list` command prints imported git tags.
|
|
|
|
|
|
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.
|
|
|
|
|
|
2023-12-20 01:25:01 +00:00
|
|
|
* `jj resolve` now displays the file being resolved.
|
|
|
|
|
|
2024-01-10 12:54:09 +00:00
|
|
|
* `jj workspace root` was aliased to `jj root`, for ease of discoverability
|
|
|
|
|
|
2024-02-02 06:26:24 +00:00
|
|
|
* `jj diff` no longer shows the contents of binary files.
|
|
|
|
|
|
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.
|
2024-01-08 10:41:07 +00:00
|
|
|
|
2023-12-28 17:15:06 +00:00
|
|
|
### Fixed bugs
|
|
|
|
|
|
2024-01-24 03:29:33 +00:00
|
|
|
* Fixed snapshots of symlinks in `gitignore`-d directory.
|
|
|
|
|
[#2878](https://github.com/martinvonz/jj/issues/2878)
|
|
|
|
|
|
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)
|
|
|
|
|
|
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)
|
|
|
|
|
|
2023-12-28 17:15:06 +00:00
|
|
|
|
|
|
|
|
## [0.13.0] - 2024-01-03
|
|
|
|
|
|
|
|
|
|
### Breaking changes
|
|
|
|
|
|
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.
|
|
|
|
|
|
2023-12-05 22:24:43 +00:00
|
|
|
### New features
|
|
|
|
|
|
2023-11-20 02:10:39 +00:00
|
|
|
* Information about new and resolved conflicts is now printed by every command.
|
2023-12-28 17:15:06 +00:00
|
|
|
|
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.
|
2023-11-20 02:10:39 +00:00
|
|
|
|
2023-12-05 22:24:43 +00:00
|
|
|
### Fixed bugs
|
|
|
|
|
|
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)
|
|
|
|
|
|
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)
|
|
|
|
|
|
2023-12-05 22:24:43 +00:00
|
|
|
|
|
|
|
|
## [0.12.0] - 2023-12-05
|
|
|
|
|
|
|
|
|
|
### Breaking changes
|
|
|
|
|
|
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.)
|
|
|
|
|
|
2023-11-10 00:38:03 +00:00
|
|
|
* `jj branch set` no longer creates a new branch. Use `jj branch create`
|
|
|
|
|
instead.
|
2024-04-05 11:21:36 +00:00
|
|
|
|
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.
|
2023-11-10 00:38:03 +00:00
|
|
|
|
2023-11-01 15:58:30 +00:00
|
|
|
### New features
|
|
|
|
|
|
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 ...`.
|
|
|
|
|
|
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)).
|
|
|
|
|
|
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.
|
|
|
|
|
|
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.
|
|
|
|
|
|
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).
|
|
|
|
|
|
2023-11-01 15:58:30 +00:00
|
|
|
### Fixed bugs
|
|
|
|
|
|
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)
|
|
|
|
|
|
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)
|
|
|
|
|
* mlcui (@mlcui-google)
|
|
|
|
|
* Philip Metzger (@PhilipMetzger)
|
|
|
|
|
* Waleed Khan (@arxanas)
|
|
|
|
|
* Yuya Nishihara (@yuja)
|
|
|
|
|
|
2023-11-01 15:58:30 +00:00
|
|
|
|
2023-11-02 01:54:01 +00:00
|
|
|
## [0.11.0] - 2023-11-01
|
2023-11-01 15:58:30 +00:00
|
|
|
|
|
|
|
|
### Breaking changes
|
|
|
|
|
|
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.
|
|
|
|
|
|
2023-09-25 11:05:24 +00:00
|
|
|
* The `remote_branches()` revset now includes branches exported to the Git
|
2023-11-07 08:47:13 +00:00
|
|
|
repository (so called Git-tracking branches.) *This change will be reverted
|
|
|
|
|
in 0.12.0.*
|
2023-09-25 11:05:24 +00:00
|
|
|
|
2023-10-10 11:07:06 +00:00
|
|
|
* Status messages are now printed to stderr.
|
|
|
|
|
|
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"]'`
|
|
|
|
|
|
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.
|
|
|
|
|
|
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.
|
|
|
|
|
|
2023-10-12 09:22:19 +00:00
|
|
|
See [automatic local branch creation](docs/config.md#automatic-local-branch-creation)
|
|
|
|
|
for details.
|
|
|
|
|
|
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.
|
|
|
|
|
|
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.
|
|
|
|
|
|
2023-10-14 19:27:44 +00:00
|
|
|
* Pushing deleted/moved branches no longer abandons the local commits referenced
|
|
|
|
|
by the remote branches.
|
|
|
|
|
|
2023-10-23 23:29:42 +00:00
|
|
|
* `jj git fetch --branch` now requires `glob:` prefix to expand `*` in branch
|
|
|
|
|
name.
|
|
|
|
|
|
2023-10-04 18:59:33 +00:00
|
|
|
### New features
|
|
|
|
|
|
2023-09-20 05:54:42 +00:00
|
|
|
* `jj`'s stable release can now be installed with [`cargo binstall jj-cli`](https://github.com/cargo-bins/cargo-binstall).
|
|
|
|
|
|
2023-10-11 19:01:57 +00:00
|
|
|
* `jj workspace add` now takes a `--revision` argument.
|
|
|
|
|
|
2023-10-13 14:37:15 +00:00
|
|
|
* `jj workspace forget` can now forget multiple workspaces at once.
|
|
|
|
|
|
2023-10-19 17:46:26 +00:00
|
|
|
* `branches()`/`remote_branches()`/`author()`/`committer()`/`description()`
|
|
|
|
|
revsets now support glob matching.
|
|
|
|
|
|
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.
|
2023-10-19 20:17:58 +00:00
|
|
|
|
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.
|
|
|
|
|
|
2023-10-25 08:50:52 +00:00
|
|
|
* The new template keywords `local_branches`/`remote_branches` are added to show
|
|
|
|
|
only local/remote branches.
|
|
|
|
|
|
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.
|
|
|
|
|
|
2023-10-28 02:29:13 +00:00
|
|
|
* `jj rebase -r` gained the ability to rebase a revision `A` onto a descendant
|
|
|
|
|
of `A`.
|
|
|
|
|
|
2023-10-04 18:59:33 +00:00
|
|
|
### Fixed bugs
|
|
|
|
|
|
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)).
|
|
|
|
|
|
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)).
|
|
|
|
|
|
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)).
|
|
|
|
|
|
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)
|
|
|
|
|
|
|
|
|
|
|
2023-10-04 18:59:33 +00:00
|
|
|
## [0.10.0] - 2023-10-04
|
|
|
|
|
|
|
|
|
|
### Breaking changes
|
|
|
|
|
|
2023-08-15 21:49:11 +00:00
|
|
|
* A default revset-alias function `trunk()` now exists. If you previously defined
|
|
|
|
|
your own `trunk()` alias it will continue to overwrite the built-in one.
|
2023-09-25 00:21:22 +00:00
|
|
|
Check [revsets.toml](cli/src/config/revsets.toml) and [revsets.md](docs/revsets.md)
|
2023-08-15 21:49:11 +00:00
|
|
|
to understand how the function can be adapted.
|
|
|
|
|
|
2023-09-06 16:46:27 +00:00
|
|
|
### New features
|
|
|
|
|
|
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
|
2023-09-02 06:02:35 +00:00
|
|
|
'ancestors(@, 5)` to view the last 5 commits.
|
|
|
|
|
|
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.
|
|
|
|
|
|
2023-09-10 16:34:30 +00:00
|
|
|
* `jj op log` now supports `--no-graph`.
|
|
|
|
|
|
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
|
|
|
|
|
|
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`.)
|
|
|
|
|
|
2023-09-25 00:33:19 +00:00
|
|
|
* `jj split` supports the `--interactive` flag. (This is already the default if
|
|
|
|
|
no paths are provided.)
|
|
|
|
|
|
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
|
|
|
|
|
|
2023-09-25 00:48:17 +00:00
|
|
|
* `jj commit` accepts the `--interactive` flag.
|
|
|
|
|
|
2023-09-06 16:46:27 +00:00
|
|
|
### Fixed bugs
|
|
|
|
|
|
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)
|
|
|
|
|
|
|
|
|
|
|
2023-09-06 16:46:27 +00:00
|
|
|
## [0.9.0] - 2023-09-06
|
|
|
|
|
|
2022-10-25 13:08:11 +00:00
|
|
|
### Breaking changes
|
|
|
|
|
|
2023-07-11 13:08:13 +00:00
|
|
|
* The minimum supported Rust version (MSRV) is now 1.71.0.
|
|
|
|
|
|
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.
|
|
|
|
|
|
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+.
|
|
|
|
|
|
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-'`.
|
|
|
|
|
|
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
|
2023-07-25 16:07:03 +00:00
|
|
|
in a single expression instead (e.g. `jj new 'all:x|y'`).
|
2023-07-25 17:17:36 +00:00
|
|
|
|
2023-08-07 22:36:39 +00:00
|
|
|
* The `push.branch-prefix` option was renamed to `git.push-branch-prefix`.
|
|
|
|
|
|
2023-08-10 15:50:25 +00:00
|
|
|
* The default editor on Windows is now `Notepad` instead of `pico`.
|
|
|
|
|
|
2023-06-28 22:10:19 +00:00
|
|
|
* `jj` will fail attempts to snapshot new files larger than 1MiB by default. This behavior
|
|
|
|
|
can be customized with the `snapshot.max-new-file-size` config option.
|
|
|
|
|
|
2023-08-16 21:10:54 +00:00
|
|
|
* Author and committer signatures now use empty strings to represent unset
|
2023-08-26 06:08:22 +00:00
|
|
|
names and email addresses. The `author`/`committer` template keywords and
|
|
|
|
|
methods also return empty strings.
|
2023-08-16 21:10:54 +00:00
|
|
|
Older binaries may not warn user when attempting to `git push` commits
|
|
|
|
|
with such signatures.
|
|
|
|
|
|
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.
|
2023-06-28 22:10:19 +00:00
|
|
|
|
2023-09-03 03:47:23 +00:00
|
|
|
* The `root` revset symbol has been converted to function `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.
|
|
|
|
|
|
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 `@-`.
|
|
|
|
|
|
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)
|
|
|
|
|
|
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.
|
|
|
|
|
|
2023-07-09 04:41:55 +00:00
|
|
|
### New features
|
|
|
|
|
|
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.
|
|
|
|
|
|
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.
|
|
|
|
|
|
2023-08-01 03:29:54 +00:00
|
|
|
* `jj init --git-repo` now works with bare repositories.
|
|
|
|
|
|
2023-07-12 21:08:58 +00:00
|
|
|
* `jj config edit --user` and `jj config set --user` will now pick a default
|
|
|
|
|
config location if no existing file is found, potentially creating parent directories.
|
|
|
|
|
|
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)
|
|
|
|
|
|
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.
|
|
|
|
|
|
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.
|
|
|
|
|
|
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)
|
2023-02-20 08:45:23 +00:00
|
|
|
|
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.
|
|
|
|
|
|
2023-08-10 09:14:54 +00:00
|
|
|
* `jj log`/`obslog`/`op log` now supports `--limit N` option to show the first
|
|
|
|
|
`N` entries.
|
|
|
|
|
|
2023-08-11 04:22:19 +00:00
|
|
|
* Added the `ui.paginate` option to enable/disable pager usage in commands
|
|
|
|
|
|
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)
|
|
|
|
|
|
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.
|
|
|
|
|
|
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.
|
|
|
|
|
|
2023-08-16 09:41:21 +00:00
|
|
|
* `branches()`/`remote_branches()`/`author()`/`committer()`/`description()`
|
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:"")`
|
2023-08-16 09:41:21 +00:00
|
|
|
selects commits whose description is empty.
|
|
|
|
|
|
2023-08-19 00:59:40 +00:00
|
|
|
* Revsets gained a new function `mine()` that aliases `author(exact:"your_email")`.
|
2023-08-18 21:00:35 +00:00
|
|
|
|
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.
|
|
|
|
|
|
2023-08-11 20:31:47 +00:00
|
|
|
* `jj log` timestamp format now accepts `.utc()` to convert a timestamp to UTC.
|
2024-04-05 11:21:36 +00:00
|
|
|
|
2023-08-22 18:40:51 +00:00
|
|
|
* templates now support additional string methods `.starts_with(x)`, `.ends_with(x)`
|
|
|
|
|
`.remove_prefix(x)`, `.remove_suffix(x)`, and `.substr(start, end)`.
|
2023-08-11 20:31:47 +00:00
|
|
|
|
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`
|
2024-04-05 11:21:36 +00:00
|
|
|
see [#2126](https://github.com/martinvonz/jj/issues/2126) for
|
2023-01-21 23:07:42 +00:00
|
|
|
further pending improvements.
|
|
|
|
|
|
2023-09-06 18:13:46 +00:00
|
|
|
* `jj diff --stat` has been implemented. It shows a histogram of the changes,
|
|
|
|
|
same as `git diff --stat`. Fixes [#2066](https://github.com/martinvonz/jj/issues/2066)
|
|
|
|
|
|
|
|
|
|
* `jj git fetch --all-remotes` has been implemented. It fetches all remotes
|
|
|
|
|
instead of just the default remote
|
|
|
|
|
|
2023-07-09 04:41:55 +00:00
|
|
|
### Fixed bugs
|
|
|
|
|
|
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).
|
|
|
|
|
|
2023-08-13 00:38:46 +00:00
|
|
|
* `jj config set --user` and `jj config edit --user` can now be used outside of any repository.
|
|
|
|
|
|
2023-08-08 17:51:42 +00:00
|
|
|
* SSH authentication could hang when ssh-agent couldn't be reached
|
2023-08-08 04:30:23 +00:00
|
|
|
[#1970](https://github.com/martinvonz/jj/issues/1970)
|
2023-08-12 10:19:27 +00:00
|
|
|
|
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.
|
2023-08-08 04:30:23 +00:00
|
|
|
|
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)
|
|
|
|
|
|
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)
|
|
|
|
|
|
|
|
|
|
|
2023-07-09 04:41:55 +00:00
|
|
|
## [0.8.0] - 2023-07-09
|
|
|
|
|
|
|
|
|
|
### Breaking changes
|
|
|
|
|
|
2023-06-28 14:12:40 +00:00
|
|
|
* The `jujutsu` and `jujutsu-lib` crates were renamed to `jj-cli` and `jj-lib`,
|
|
|
|
|
respectively.
|
|
|
|
|
|
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).
|
|
|
|
|
|
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"`
|
|
|
|
|
|
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`.
|
|
|
|
|
|
2023-03-17 22:42:55 +00:00
|
|
|
* The minimum supported Rust version (MSRV) is now 1.64.0.
|
|
|
|
|
|
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.
|
|
|
|
|
|
2023-05-11 06:26:23 +00:00
|
|
|
* The `ui.default-revset` config was renamed to `revsets.log`.
|
|
|
|
|
|
2023-05-21 21:07:54 +00:00
|
|
|
* The `jj sparse` command was split up into `jj sparse list` and
|
|
|
|
|
`jj sparse set`.
|
|
|
|
|
|
2023-06-03 16:47:43 +00:00
|
|
|
* `jj hide` (alias for `jj abandon`) is no longer available. Use `jj abandon`
|
|
|
|
|
instead.
|
|
|
|
|
|
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`.
|
|
|
|
|
|
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.
|
|
|
|
|
|
2023-07-04 07:18:17 +00:00
|
|
|
* `jj git fetch` will no longer import unrelated branches from the underlying
|
|
|
|
|
Git repo.
|
|
|
|
|
|
2023-02-16 17:26:40 +00:00
|
|
|
### New features
|
|
|
|
|
|
2023-02-19 12:08:24 +00:00
|
|
|
* `jj git push --deleted` will remove all locally deleted branches from the remote.
|
|
|
|
|
|
2023-02-10 05:48:47 +00:00
|
|
|
* `jj restore` without `--from` works correctly even if `@` is a merge
|
|
|
|
|
commit.
|
|
|
|
|
|
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`.
|
2023-02-19 03:31:48 +00:00
|
|
|
|
2023-01-12 22:53:26 +00:00
|
|
|
* `jj git fetch` now supports a `--branch` argument to fetch some of the
|
|
|
|
|
branches only.
|
|
|
|
|
|
2023-06-23 18:55:11 +00:00
|
|
|
* `jj config get` command allows retrieving config values for use in scripting.
|
|
|
|
|
|
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"`
|
|
|
|
|
|
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)
|
|
|
|
|
|
2023-03-15 03:37:56 +00:00
|
|
|
* Nodes in the (text-based) graphical log output now use a `◉` symbol instead
|
2023-04-04 13:34:12 +00:00
|
|
|
of the letter `o`. The ASCII-based graph styles still use `o`.
|
2023-03-11 07:10:31 +00:00
|
|
|
|
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.
|
|
|
|
|
|
2023-03-18 05:34:25 +00:00
|
|
|
* `jj describe` now supports `--reset-author` for resetting a commit's author
|
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.
|
2023-03-18 05:34:25 +00:00
|
|
|
|
2023-03-25 03:14:26 +00:00
|
|
|
* Added `latest(x[, n])` revset function to select the latest `n` commits.
|
|
|
|
|
|
2023-04-05 03:05:51 +00:00
|
|
|
* Added `conflict()` revset function to select commits with conflicts.
|
|
|
|
|
|
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.
|
|
|
|
|
|
2023-04-05 12:26:47 +00:00
|
|
|
* The progress display on `jj git clone/fetch` now includes the downloaded size.
|
|
|
|
|
|
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.
|
|
|
|
|
|
2023-04-08 01:28:16 +00:00
|
|
|
* `jj obslog` and `jj log` now show abandoned commits as hidden.
|
|
|
|
|
|
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".
|
|
|
|
|
|
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`.
|
2023-04-04 13:34:12 +00:00
|
|
|
|
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`.
|
|
|
|
|
|
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.
|
|
|
|
|
|
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.
|
|
|
|
|
|
2023-06-11 04:44:48 +00:00
|
|
|
* The last seen state of branches in the underlying git repo is now presented by
|
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`.
|
2023-06-11 04:44:48 +00:00
|
|
|
|
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.
|
|
|
|
|
|
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.
|
|
|
|
|
|
2023-06-28 02:53:01 +00:00
|
|
|
* `jj branch list` can now be filtered by revset.
|
|
|
|
|
|
2023-07-08 09:23:09 +00:00
|
|
|
* Initial support for the Watchman filesystem monitor. Set
|
|
|
|
|
`core.fsmonitor = "watchman"` in your repo to enable.
|
|
|
|
|
|
2023-02-16 17:26:40 +00:00
|
|
|
### Fixed bugs
|
|
|
|
|
|
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.
|
|
|
|
|
|
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.
|
|
|
|
|
|
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.
|
|
|
|
|
|
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.
|
|
|
|
|
|
2023-04-04 02:02:12 +00:00
|
|
|
* It is no longer allowed to create branches at the root commit.
|
|
|
|
|
|
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).
|
|
|
|
|
|
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)
|
|
|
|
|
|
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)
|
|
|
|
|
|
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)
|
|
|
|
|
|
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)
|
|
|
|
|
|
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.
|
|
|
|
|
|
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)
|
2023-07-16 20:48:37 +00:00
|
|
|
* mlcui (@mlcui-google)
|
2023-07-09 04:41:55 +00:00
|
|
|
* Samuel Tardieu (@samueltardieu)
|
|
|
|
|
* Tal Pressman (@talpr)
|
|
|
|
|
* Vamsi Avula (@avamsi)
|
|
|
|
|
* Waleed Khan (@arxanas)
|
|
|
|
|
* Yuya Nishihara (@yuja)
|
|
|
|
|
|
|
|
|
|
|
2023-02-16 17:26:40 +00:00
|
|
|
## [0.7.0] - 2023-02-16
|
|
|
|
|
|
|
|
|
|
### Breaking changes
|
|
|
|
|
|
2023-01-19 04:54:19 +00:00
|
|
|
* The minimum supported Rust version (MSRV) is now 1.61.0.
|
|
|
|
|
|
2022-12-18 03:56:21 +00:00
|
|
|
* The `jj touchup` command was renamed to `jj diffedit`.
|
|
|
|
|
|
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`.
|
|
|
|
|
|
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".
|
|
|
|
|
|
2023-01-14 10:43:23 +00:00
|
|
|
* `jj log` prefixes commit descriptions with "(empty)" when they contain no
|
|
|
|
|
change compared to their parents.
|
|
|
|
|
|
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.
|
|
|
|
|
|
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.
|
|
|
|
|
|
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.
|
|
|
|
|
|
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
|
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.
|
|
|
|
|
|
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).
|
2023-02-15 10:49:10 +00:00
|
|
|
|
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`.
|
2023-02-16 03:19:41 +00:00
|
|
|
|
2023-02-02 23:11:18 +00:00
|
|
|
* The global `--no-commit-working-copy` is now called `--ignore-working-copy`.
|
|
|
|
|
|
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.
|
|
|
|
|
|
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"]`.
|
|
|
|
|
|
2023-02-10 15:52:14 +00:00
|
|
|
* The builtin `jj update` and `jj up` aliases for `jj checkout` have been
|
|
|
|
|
deleted.
|
|
|
|
|
|
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.
|
2023-02-12 20:07:28 +00:00
|
|
|
|
2022-12-05 16:38:47 +00:00
|
|
|
### New features
|
|
|
|
|
|
2022-12-14 22:33:00 +00:00
|
|
|
* The default log format now uses the committer timestamp instead of the author
|
|
|
|
|
timestamp.
|
|
|
|
|
|
2022-12-13 12:24:24 +00:00
|
|
|
* `jj log --summary --patch` now shows both summary and diff outputs.
|
|
|
|
|
|
2022-12-17 22:31:12 +00:00
|
|
|
* `jj git push` now accepts multiple `--branch`/`--change` arguments
|
|
|
|
|
|
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.
|
2022-12-13 06:22:08 +00:00
|
|
|
|
2023-01-03 02:26:59 +00:00
|
|
|
* `jj debug config-schema` command prints out JSON schema for the jj TOML config
|
|
|
|
|
file format.
|
|
|
|
|
|
2023-01-05 00:34:56 +00:00
|
|
|
* `jj resolve --list` can now describe the complexity of conflicts.
|
|
|
|
|
|
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.
|
|
|
|
|
|
2023-01-02 05:18:38 +00:00
|
|
|
* Per-repository configuration is now read from `.jj/repo/config.toml`.
|
|
|
|
|
|
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`.
|
2023-01-07 17:34:15 +00:00
|
|
|
|
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.
|
|
|
|
|
|
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`.
|
|
|
|
|
|
2023-02-02 18:31:11 +00:00
|
|
|
* `jj git fetch` accepts repeated `--remote` arguments.
|
|
|
|
|
|
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`
|
2023-02-02 18:31:11 +00:00
|
|
|
configuration entries. `git.fetch` can be a list if multiple remotes must
|
|
|
|
|
be fetched from.
|
2023-01-17 13:27:49 +00:00
|
|
|
|
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:`.
|
|
|
|
|
|
2023-01-22 06:30:10 +00:00
|
|
|
* `jj log` now highlights the shortest unique prefix of every commit and change
|
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).
|
2023-02-06 00:10:25 +00:00
|
|
|
|
2023-01-18 06:56:09 +00:00
|
|
|
* `jj print` was renamed to `jj cat`. `jj print` remains as an alias.
|
2023-04-04 13:34:12 +00:00
|
|
|
|
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.
|
2023-01-18 06:56:09 +00:00
|
|
|
|
2023-01-24 11:46:59 +00:00
|
|
|
* `jj workspace root` prints the root path of the current workspace.
|
|
|
|
|
|
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.
|
|
|
|
|
|
2023-01-27 06:33:24 +00:00
|
|
|
* Commands that draw an ASCII graph (`jj log`, `jj op log`, `jj obslog`) now
|
2023-01-27 18:15:51 +00:00
|
|
|
have different styles available by setting e.g. `ui.graph.style = "curved"`.
|
2023-01-27 06:33:24 +00:00
|
|
|
|
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.
|
|
|
|
|
|
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.
|
|
|
|
|
|
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`.
|
|
|
|
|
|
2023-01-31 19:01:44 +00:00
|
|
|
* `jj new --insert-before` inserts the new commit between the target commit and
|
|
|
|
|
its parents.
|
|
|
|
|
|
2023-02-04 20:42:03 +00:00
|
|
|
* `jj new --insert-after` inserts the new commit between the target commit and
|
|
|
|
|
its children.
|
|
|
|
|
|
2023-02-10 17:01:28 +00:00
|
|
|
* `author`/`committer` templates now support `.username()`, which leaves out the
|
2023-02-11 11:07:58 +00:00
|
|
|
domain information of `.email()`.
|
|
|
|
|
|
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).
|
2023-02-10 17:01:28 +00:00
|
|
|
|
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.
|
|
|
|
|
|
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.
|
|
|
|
|
|
2022-12-05 16:38:47 +00:00
|
|
|
### Fixed bugs
|
|
|
|
|
|
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.
|
|
|
|
|
|
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.
|
|
|
|
|
|
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.
|
|
|
|
|
|
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.
|
|
|
|
|
|
2023-01-14 17:56:33 +00:00
|
|
|
* Fixed handling of escaped characters in .gitignore (only keep trailing spaces
|
|
|
|
|
if escaped properly).
|
|
|
|
|
|
2023-01-16 19:22:10 +00:00
|
|
|
* `jj undo` now works after `jj duplicate`.
|
|
|
|
|
|
2023-01-15 07:28:36 +00:00
|
|
|
* `jj duplicate` followed by `jj rebase` of a tree containing both the original
|
|
|
|
|
and duplicate commit no longer crashes. The fix should also resolve any remaining
|
|
|
|
|
instances of https://github.com/martinvonz/jj/issues/27.
|
|
|
|
|
|
2023-01-22 09:24:20 +00:00
|
|
|
* Fix the output of `jj debug completion --help` by reversing fish and zsh text.
|
|
|
|
|
|
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.
|
|
|
|
|
|
2022-12-05 16:38:47 +00:00
|
|
|
### Contributors
|
|
|
|
|
|
|
|
|
|
Thanks to the people who made this release happen!
|
|
|
|
|
|
2023-02-16 17:26:40 +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)
|
2022-12-08 23:40:48 +00:00
|
|
|
* Martin von Zweigbergk (@martinvonz)
|
2023-02-16 17:26:40 +00:00
|
|
|
* Michael Forster (@MForster)
|
|
|
|
|
* Philip Metzger (@PhilipMetzger)
|
|
|
|
|
* Ruben Slabbert (@rslabbert)
|
|
|
|
|
* Samuel Tardieu (@samueltardieu)
|
|
|
|
|
* Tal Pressman (@talpr)
|
|
|
|
|
* Vamsi Avula (@avamsi)
|
|
|
|
|
* Waleed Khan (@arxanas)
|
2022-12-09 13:55:59 +00:00
|
|
|
* Yuya Nishihara (@yuja)
|
2022-12-08 23:40:48 +00:00
|
|
|
|
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.
|
|
|
|
|
|
2022-12-05 16:38:47 +00:00
|
|
|
## [0.6.0] - 2022-12-05
|
|
|
|
|
|
|
|
|
|
### Breaking changes
|
|
|
|
|
|
2022-10-25 13:08:11 +00:00
|
|
|
* Dropped candidates set argument from `description(needle)`, `author(needle)`,
|
2022-10-25 13:20:59 +00:00
|
|
|
`committer(needle)`, `merges()` revsets. Use `x & description(needle)`
|
|
|
|
|
instead.
|
2022-10-25 13:08:11 +00:00
|
|
|
|
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)`.
|
2023-01-12 10:01:35 +00:00
|
|
|
|
2022-11-05 01:24:20 +00:00
|
|
|
* Support for open commits has been dropped. The `ui.enable-open-commits` config
|
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.
|
2023-01-12 10:01:35 +00:00
|
|
|
|
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).
|
2022-10-29 21:48:13 +00:00
|
|
|
|
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.)
|
|
|
|
|
|
2022-10-19 18:44:39 +00:00
|
|
|
### New features
|
|
|
|
|
|
2022-10-18 18:07:35 +00:00
|
|
|
* Commands with long output are paginated.
|
2022-12-04 06:03:38 +00:00
|
|
|
[#9](https://github.com/martinvonz/jj/issues/9)
|
2022-10-18 18:07:35 +00:00
|
|
|
|
2022-10-19 18:44:39 +00:00
|
|
|
* The new `jj git remote rename` command allows git remotes to be renamed
|
|
|
|
|
in-place.
|
|
|
|
|
|
2022-10-30 08:23:45 +00:00
|
|
|
* The new `jj resolve` command allows resolving simple conflicts with
|
|
|
|
|
an external 3-way-merge tool.
|
|
|
|
|
|
2022-10-20 21:18:34 +00:00
|
|
|
* `jj git push` will search `@-` for branches to push if `@` has none.
|
|
|
|
|
|
2022-11-01 08:11:22 +00:00
|
|
|
* The new revset function `file(pattern..)` finds commits modifying the
|
|
|
|
|
paths specified by the `pattern..`.
|
2022-10-23 04:14:00 +00:00
|
|
|
|
2022-11-15 08:12:37 +00:00
|
|
|
* The new revset function `empty()` finds commits modifying no files.
|
|
|
|
|
|
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>`.
|
2022-11-25 10:27:13 +00:00
|
|
|
|
2022-11-07 21:35:34 +00:00
|
|
|
* It is now possible to specify configuration options on the command line
|
2022-11-14 17:26:04 +00:00
|
|
|
with the new `--config-toml` global option.
|
2022-10-31 01:29:26 +00:00
|
|
|
|
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)
|
2022-11-06 18:15:44 +00:00
|
|
|
|
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)
|
2022-11-04 16:39:46 +00:00
|
|
|
|
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.
|
|
|
|
|
|
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`.
|
|
|
|
|
|
2022-11-20 00:13:39 +00:00
|
|
|
* `jj git` subcommands now support credential helpers.
|
|
|
|
|
|
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.
|
|
|
|
|
|
2022-11-20 03:38:25 +00:00
|
|
|
* The new global flag `-v/--verbose` will turn on debug logging to give
|
2023-01-12 10:01:35 +00:00
|
|
|
some additional insight into what is happening behind the scenes.
|
2022-11-20 03:38:25 +00:00
|
|
|
Note: This is not comprehensively supported by all operations yet.
|
|
|
|
|
|
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.
|
|
|
|
|
|
2022-10-20 23:33:14 +00:00
|
|
|
### Fixed bugs
|
|
|
|
|
|
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)
|
2023-01-12 10:01:35 +00:00
|
|
|
|
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
|
2022-12-03 08:02:15 +00:00
|
|
|
instead.
|
2022-12-03 17:44:21 +00:00
|
|
|
[#493](https://github.com/martinvonz/jj/issues/493)
|
2022-12-03 08:02:15 +00:00
|
|
|
|
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.
|
|
|
|
|
|
2022-10-20 23:33:14 +00:00
|
|
|
* `jj edit root` now fails gracefully.
|
|
|
|
|
|
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.
|
|
|
|
|
|
2022-10-28 23:18:56 +00:00
|
|
|
* `jj git import` no longer crashes when all Git refs are removed.
|
|
|
|
|
|
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.
|
|
|
|
|
|
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)
|
|
|
|
|
|
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.
|
|
|
|
|
|
2022-11-28 07:38:17 +00:00
|
|
|
### Contributors
|
|
|
|
|
|
|
|
|
|
Thanks to the people who made this release happen!
|
|
|
|
|
|
|
|
|
|
* Martin von Zweigbergk (@martinvonz)
|
|
|
|
|
* Benjamin Saunders (@Ralith)
|
|
|
|
|
* Yuya Nishihara (@yuja)
|
|
|
|
|
* Glen Choo (@chooglen)
|
|
|
|
|
* Ilya Grigoriev (@ilyagr)
|
|
|
|
|
* Ruben Slabbert (@rslabbert)
|
|
|
|
|
* Waleed Khan (@arxanas)
|
2022-11-30 16:43:13 +00:00
|
|
|
* Sean E. Russell (@xxxserxxx)
|
2022-11-23 19:34:38 +00:00
|
|
|
* Pranay Sashank (@pranaysashank)
|
2022-12-05 00:30:32 +00:00
|
|
|
* Luke Granger-Brown (@lukegb)
|
2022-11-28 07:38:17 +00:00
|
|
|
|
|
|
|
|
|
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).
|
|
|
|
|
|
2022-10-17 20:41:46 +00:00
|
|
|
## [0.5.0] - 2022-10-17
|
|
|
|
|
|
2022-04-24 19:31:54 +00:00
|
|
|
### Breaking changes
|
|
|
|
|
|
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.
|
|
|
|
|
|
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`).
|
|
|
|
|
|
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.
|
|
|
|
|
|
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
|
2022-05-14 15:55:46 +00:00
|
|
|
[here](https://github.com/martinvonz/jj/blob/main/docs/revsets.md).
|
2022-12-03 17:44:21 +00:00
|
|
|
[#250](https://github.com/martinvonz/jj/issues/250)
|
2022-05-14 15:55:46 +00:00
|
|
|
|
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 `@`).
|
|
|
|
|
|
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.
|
|
|
|
|
|
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).
|
|
|
|
|
|
2022-12-03 17:44:21 +00:00
|
|
|
* `jj branch` now uses subcommands like `jj branch create` and
|
2022-06-06 03:23:01 +00:00
|
|
|
`jj branch forget` instead of options like `jj branch --forget`.
|
2022-12-03 17:44:21 +00:00
|
|
|
[#330](https://github.com/martinvonz/jj/issues/330)
|
2022-06-06 03:23:01 +00:00
|
|
|
|
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.
|
|
|
|
|
|
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.
|
2022-06-19 03:22:54 +00:00
|
|
|
|
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).
|
|
|
|
|
|
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.
|
|
|
|
|
|
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`.
|
|
|
|
|
|
2022-04-06 18:00:27 +00:00
|
|
|
### New features
|
|
|
|
|
|
2022-08-30 18:47:38 +00:00
|
|
|
* The new `jj interdiff` command compares the changes in commits, ignoring
|
|
|
|
|
changes from intervening commits.
|
|
|
|
|
|
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
|
2022-04-14 06:53:35 +00:00
|
|
|
whole branch, relative to the destination. The default mode has changed from
|
|
|
|
|
`-r @` to `-b @`.
|
2022-04-13 17:53:50 +00:00
|
|
|
|
2022-04-06 18:00:27 +00:00
|
|
|
* The new `jj print` command prints the contents of a file in a revision.
|
|
|
|
|
|
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)
|
2022-04-25 20:34:13 +00:00
|
|
|
|
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.
|
2022-04-09 16:58:33 +00:00
|
|
|
|
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.
|
|
|
|
|
|
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.
|
|
|
|
|
|
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
|
2022-05-02 19:58:32 +00:00
|
|
|
the paths included in the sparse checkout.
|
2022-02-06 23:10:50 +00:00
|
|
|
|
2022-05-08 06:54:51 +00:00
|
|
|
* Configuration is now also read from `~/.jjconfig.toml`.
|
|
|
|
|
|
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.
|
|
|
|
|
|
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.
|
2022-04-10 05:42:27 +00:00
|
|
|
|
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.
|
|
|
|
|
|
2022-04-14 04:26:21 +00:00
|
|
|
* The new revset function `connected(x)` is the same as `x:x`.
|
|
|
|
|
|
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.
|
|
|
|
|
|
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.
|
|
|
|
|
|
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.
|
|
|
|
|
|
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
|
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.
|
2022-04-29 03:58:41 +00:00
|
|
|
|
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.
|
|
|
|
|
|
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"]
|
|
|
|
|
|
2022-05-02 19:58:32 +00:00
|
|
|
* `jj branch` can accept any number of branches to update, rather than just one.
|
|
|
|
|
|
2022-05-01 15:54:35 +00:00
|
|
|
* Aliases can now call other aliases.
|
|
|
|
|
|
2022-05-09 17:38:23 +00:00
|
|
|
* `jj log` now accepts a `--reversed` option, which will show older commits
|
|
|
|
|
first.
|
|
|
|
|
|
2022-09-13 07:26:23 +00:00
|
|
|
* `jj log` now accepts file paths.
|
|
|
|
|
|
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.
|
|
|
|
|
|
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.
|
|
|
|
|
|
2022-06-09 04:16:34 +00:00
|
|
|
* Color setting can now be overridden by `--color=always|never|auto` option.
|
|
|
|
|
|
2022-08-27 05:03:51 +00:00
|
|
|
* `jj checkout` now lets you specify a description with `--message/-m`.
|
|
|
|
|
|
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.
|
|
|
|
|
|
2022-04-07 06:25:01 +00:00
|
|
|
### Fixed bugs
|
|
|
|
|
|
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).
|
|
|
|
|
|
2022-04-07 06:25:01 +00:00
|
|
|
* Errors are now printed to stderr (they used to be printed to stdout).
|
|
|
|
|
|
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
|
2022-05-02 19:58:32 +00:00
|
|
|
fixed.
|
2022-04-15 06:03:08 +00:00
|
|
|
|
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.
|
|
|
|
|
|
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.
|
|
|
|
|
|
2022-04-09 16:20:00 +00:00
|
|
|
* `jj untrack` now requires at least one path (allowing no arguments was a UX
|
|
|
|
|
bug).
|
|
|
|
|
|
2022-04-11 17:40:56 +00:00
|
|
|
* `jj rebase` now requires at least one destination (allowing no arguments was a
|
|
|
|
|
UX bug).
|
|
|
|
|
|
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).
|
|
|
|
|
|
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.
|
|
|
|
|
|
2022-05-01 15:54:35 +00:00
|
|
|
* Global arguments, such as `--at-op=<operation>`, can now be passed before
|
|
|
|
|
an alias.
|
|
|
|
|
|
2022-04-20 05:15:38 +00:00
|
|
|
* Fixed relative path to the current directory in output to be `.` instead of
|
|
|
|
|
empty string.
|
|
|
|
|
|
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.
|
|
|
|
|
|
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.
|
|
|
|
|
|
2022-07-15 18:09:11 +00:00
|
|
|
* All commands now consistently snapshot the working copy (it was missing from
|
2023-01-12 10:01:35 +00:00
|
|
|
e.g. `jj undo` and `jj merge` before).
|
2022-07-15 18:09:11 +00:00
|
|
|
|
2022-04-03 05:56:59 +00:00
|
|
|
## [0.4.0] - 2022-04-02
|
|
|
|
|
|
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.
|
|
|
|
|
|
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.
|
|
|
|
|
|
2022-03-19 17:00:13 +00:00
|
|
|
* The [standard `$NO_COLOR` environment variable](https://no-color.org/) is now
|
|
|
|
|
respected.
|
|
|
|
|
|
2022-03-26 21:02:04 +00:00
|
|
|
* `jj new` now lets you specify a description with `--message/-m`.
|
|
|
|
|
|
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.
|
|
|
|
|
|
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
|
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.
|
2022-12-03 17:44:21 +00:00
|
|
|
[#111](https://github.com/martinvonz/jj/issues/111)
|
2022-03-17 03:58:04 +00:00
|
|
|
|
2022-03-28 09:12:08 +00:00
|
|
|
* `jj log` now accepts `-p`/`--patch` option.
|
|
|
|
|
|
2022-03-29 06:03:37 +00:00
|
|
|
### Fixed bugs
|
|
|
|
|
|
2022-03-28 13:46:21 +00:00
|
|
|
* Fixed crash on `jj init --git-repo=.` (it almost always crashed).
|
|
|
|
|
|
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.
|
|
|
|
|
|
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.
|
|
|
|
|
|
2022-03-14 04:51:21 +00:00
|
|
|
## [0.3.1] - 2022-03-13
|
|
|
|
|
|
2022-03-13 15:14:01 +00:00
|
|
|
### Fixed bugs
|
|
|
|
|
|
2022-12-03 17:44:21 +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)
|
2022-03-13 15:14:01 +00:00
|
|
|
|
2022-03-12 18:48:51 +00:00
|
|
|
## [0.3.0] - 2022-03-12
|
|
|
|
|
|
|
|
|
|
Last release before this changelog started.
|
