martinvonz/jj
1
1
Fork 0
mirror of https://github.com/martinvonz/jj.git synced 2024-11-11 13:46:02 +03:00
Code Issues Packages Projects Releases Wiki Activity
a9d1b16937
jj/CHANGELOG.md

67 lines
2.3 KiB
Markdown
Raw Normal View History

release: add a changelog
2022-03-12 21:48:51 +03: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]
config: drop support for `~/.jjconfig` I'm a little hesitant to do this because most tools I'm familiar with have the config file directly in `~/`. It's also easier to describe where to put the file if it doesn't vary across platforms. But we're still early in the project, so let's try it and see if we get any complaints.
2022-03-19 20:17:30 +03:00
### Breaking changes
* Dropped support for config in `~/.jjconfig`. Your configuration is now read
from `<config dir>/jj/config.toml`, where `<config dir>` is
`${XDG_CONFIG_HOME}` or `~/.config/` on Linux,
`~/Library/Application Support/` on macOS, and `~\AppData\Roaming\` on
Windows.
config: add support for a `$JJ_CONFIG` environment variable It's useful for tests, scripts, and debugging to be able to use specific config instead of the user's config. That's especially true for our automated tests because they didn't have a place to read config from on Windows before this patch (they read their config from `{FOLDERID_RoamingAppData}`, which I don't think we can override in tests).
2022-03-19 20:37:13 +03:00
### New features
* You can now set an environment variable called `$JJ_CONFIG` to a path to a
config file. That will then be read instead of your regular config file. This
is mostly intended for testing and scripts.
cli: respect `$NO_COLOR` environment variable
2022-03-19 20:00:13 +03:00
* The [standard `$NO_COLOR` environment variable](https://no-color.org/) is now
respected.
cli: teach `jj new` to set initial description with `-m` I rarely use `jj new`, so this feature is mostly for use in tests.
2022-03-27 00:02:04 +03:00
* `jj new` now lets you specify a description with `--message/-m`.
repo: don't abandon empty commit if it has descendants It's unusual for the current commit to have descendants, but it can happen. In particular, it can easily happen when you run `jj new`. You probably don't want to abandon it in those cases.
2022-03-27 00:53:51 +03: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.
repo: when merging in removed head, rebase descendants (#111)
2022-03-17 06:58:04 +03:00
* (#111) 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
operation rebased A as A', then B would be automatically rebased on top of
A'). See #111 for more examples.
log: add -p/--patch option to show diff along with commit meta data "log -p | less" is the option I often use with hg/git to find interesting bits from the changelog, and I think it's also valid with jj. Unlike "hg log -p --stat", "jj log -p --summary" does not show both diff summary and patch to reflect the internal structure. This behavoir is arguable and may be changed later. The logic of show_patch() is extracted from cmd_show().
2022-03-28 12:12:08 +03:00
* `jj log` now accepts `-p`/`--patch` option.
cli: fix git-colocated working copy on Windows This patch adds a very simple e2e test of having a working copy shared with Git. The test initially failed on Windows. The symptom was that the "master" branch did not get updated when we create a commit using `jj`. That suggested that we didn't correctly detect that the working copy was shared. After a lot of troubleshooting, I think I mostly understand what we going on here (thanks to @arxanas for suggesting https://github.com/mxschmitt/action-tmate). The path we get from `git2::Repository::workdir()` seems to not be canonicalized in the same way as `std::fs::canonicalize()` canonicalizes. Specifically, it does not have the "\\?\" prefix we get from that function. I suppose that's because libgit2 is a C library and canonicalizes the path using some other system call.
2022-03-29 09:03:37 +03:00
### Fixed bugs
* When sharing the working copy with a Git repo, the automatic importing and
exporting (sometimes?) didn't happen on Windows.
release: include the two recent no-op releases in the changelog I keep forgetting to update things while doing a release...
2022-03-17 09:01:42 +03:00
## [0.3.3] - 2022-03-16
No changes, only trying to get the automated build to work.
## [0.3.2] - 2022-03-16
No changes, only trying to get the automated build to work.
release: update release notes for 0.3.1 I forgot to do this when I bumped the version number.
2022-03-14 07:51:21 +03:00
## [0.3.1] - 2022-03-13
cli: expand `~` in `core.excludesFile`, don't crash when missing I thought that `std::fs::canonicalize()` expanded "~", but it doesn't seem to do that, which caused #131. Git seems to do the expansion itself, so we probably also should. More importantly `std::fs::canonicalize()` crashes when the file doesn't exist. The manual expansion we do now does not. Closes #131.
2022-03-13 18:14:01 +03:00
### Fixed bugs
- (#131) Fixed crash when `core.excludesFile` pointed to non-existent file, and
made leading `~/` in that config expand to `$HOME/`
release: add a changelog
2022-03-12 21:48:51 +03:00
## [0.3.0] - 2022-03-12
Last release before this changelog started.
Reference in New Issue Copy Permalink