jj: finish package update

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: jj: finish package update
From: Thomas Klausner (via pkgsrc-wip) <commit-notify%pkgsrc.org@localhost>
Date: Sun, 9 Feb 2025 21:19:30 +0000
Module Name:	pkgsrc-wip
Committed By:	Thomas Klausner <wiz%NetBSD.org@localhost>
Pushed By:	wiz
Date:		Sun Feb 9 22:19:12 2025 +0100
Changeset:	a1780640ca5f5df84612a77d0c54463d5a7a121c

Modified Files:
	jj/distinfo
Added Files:
	jj/COMMIT_MSG
	jj/patches/patch-.._vendor_mac_address-1.1.7_Cargo.toml
Removed Files:
	jj/TODO

Log Message:
jj: finish package update

Following a hint from pin@, thanks!

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=a1780640ca5f5df84612a77d0c54463d5a7a121c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 jj/COMMIT_MSG                                      | 176 +++++++++++++++++++++
 jj/TODO                                            |  32 ----
 jj/distinfo                                        |   1 +
 .../patch-.._vendor_mac_address-1.1.7_Cargo.toml   |  16 ++
 4 files changed, 193 insertions(+), 32 deletions(-)

diffs:
diff --git a/jj/COMMIT_MSG b/jj/COMMIT_MSG
new file mode 100644
index 0000000000..12e14dfef9
--- /dev/null
+++ b/jj/COMMIT_MSG
@@ -0,0 +1,176 @@
+## [0.26.0] - 2025-02-05
+
+### Release highlights
+
+* Improved Git push/fetch compatibility by spawning an external `git` process.
+  This can be enabled by the `git.subprocess=true` config knob, and will be the
+  default in a future release.
+
+* `jj log` can now show cryptographic commit signatures. The output can be
+  controlled by the `ui.show-cryptographic-signatures=true` config knob.
+
+### Breaking changes
+
+* `jj abandon` now deletes bookmarks pointing to the revisions to be abandoned.
+  Use `--retain-bookmarks` to move bookmarks backwards. If deleted bookmarks
+  were tracking remote bookmarks, the associated bookmarks (or branches) will be
+  deleted from the remote on `jj git push --all`.
+  [#3505](https://github.com/jj-vcs/jj/issues/3505)
+
+* `jj init --git` and `jj init --git-repo` have been removed. They were
+  deprecated in early 2024. Use `jj git init` instead.
+
+* The following deprecated commands have been removed:
+  - `jj cat` is replaced by `jj file show`.
+  - `jj chmod` is replaced by `jj file chmod`.
+  - `jj files` is replaced by `jj file list`.
+
+* The deprecated `-l` short alias for `--limit` in `jj log`, `jj op log`
+  and `jj obslog` has been removed. The `-n` short alias can be used instead.
+
+* The deprecated `--siblings` options for `jj split` has been removed.
+  `jj split --parallel` can be used instead.
+
+* The deprecated `fix.tool-command` config option has been removed.
+
+* In colocated repos, the Git index now contains the changes from all parents
+  of the working copy instead of just the first parent (`HEAD`). 2-sided
+  conflicts from the merged parents are now added to the Git index as conflicts
+  as well.
+
+* The following change introduced in 0.25.0 is reverted:
+  - `jj config list` now prints inline tables `{ key = value, .. }` literally.
+    Inner items of inline tables are no longer merged across configuration
+    files.
+
+* `jj resolve` will now attempt to resolve all conflicted files instead of
+  resolving the first conflicted file. To resolve a single file, pass a file
+  path to `jj resolve`.
+
+* `jj util mangen` is replaced with `jj util install-man-pages`, which can
+  install man pages for all `jj` subcommands to a given path.
+
+* In `jj config list` template, `value` is now typed as `ConfigValue`, not as
+  `String` serialized in TOML syntax.
+
+* `jj git remote add`/`set-url` now converts relative Git remote path to
+  absolute path.
+
+* `jj log`/`op log` now applies `-n`/`--limit` *before* the items are reversed.
+  Rationale: It's more useful to see the N most recent commits/operations, and
+  is more performant. The old behavior can be achieved by `jj log .. | head`.
+  [#5403](https://github.com/jj-vcs/jj/issues/5403)
+
+* Upgraded `scm-record` from v0.4.0 to v0.5.0. See release notes at
+  <https://github.com/arxanas/scm-record/releases/tag/v0.5.0>.
+
+* The builtin pager is switched to
+  [streampager](https://github.com/markbt/streampager/). It can handle large
+  inputs better and can be configured.
+
+* Conflicts materialized in the working copy before `jj 0.19.0` may no longer
+  be parsed correctly. If you are using version 0.18.0 or earlier, check out a
+  non-conflicted commit before upgrading to prevent issues.
+
+### Deprecations
+
+### New features
+
+* `jj git {push,clone,fetch}` can now spawn an external `git` subprocess, via
+   the `git.subprocess = true` config knob. This provides an alternative that,
+   when turned on, fixes SSH bugs when interacting with Git remotes due to
+   `libgit2`s limitations [#4979](https://github.com/jj-vcs/jj/issues/4979).
+
+* `jj describe` now accepts `--edit`.
+
+* `jj evolog` and `jj op log` now accept `--reversed`.
+
+* `jj restore` now supports `-i`/`--interactive` selection.
+
+* `jj file list` now supports templating.
+
+* There is a new `builtin_op_log_oneline` template alias you can pass to `jj op
+  log -T` for a more compact output. You can use `format_operation_oneline` and
+  `format_snapshot_operation_oneline` to customize parts of it.
+
+* New template function `config(name)` to access to configuration variable from
+  template.
+
+* New template function `pad_centered()` to center content within a minimum
+  width.
+
+* Templater now supports `list.filter(|x| ..)` method.
+
+* The `diff` commit template keyword now supports custom formatting via
+  `diff.files()`. For example, `diff.files().map(|e| e.path().display())` prints
+  changed file paths.
+
+* The `diff.stat()` template method now provides methods to get summary values.
+
+* `jj log` can now show cryptographic commit signatures. The output can be
+  controlled by the `ui.show-cryptographic-signatures=true` config knob. The
+  signature template can be customized using
+  `format_detailed_cryptographic_signature(signature)` and
+  `format_short_cryptographic_signature(signature)`.
+
+* New `git.sign-on-push` config option to automatically sign commits which are
+  being pushed to a Git remote.
+
+* New `git.push-new-bookmarks` config option to push new bookmarks without
+  `--allow-new`.
+
+* `jj status` now shows untracked files when they reside directly under a
+  tracked directory. There's still an issue that files under untracked
+  directories aren't listed. [#5389](https://github.com/jj-vcs/jj/issues/5389)
+
+* New `merge-tools.<TOOL>.diff-expected-exit-codes` config option to suppress
+  warnings from tools exiting with non-zero exit codes.
+
+* New `fix.tools.TOOL.enabled` config option to enable/disable tools. This is
+  useful for defining disabled tools in user configuration that can be enabled
+  in individual repositories with one config setting.
+
+* Added `--into` flag to `jj restore`, similarly to `jj squash` and `jj
+  absorb`. It is equivalent to `--to`, but `--into` is the recommended name.
+
+* Italic text is now supported. You can set e.g. `color.error = { fg = "red",
+  italic = true }` in your config.
+
+* New `author_name`/`author_email`/`committer_name`/`committer_email(pattern)`
+  revset functions to match either name or email field explicitly.
+
+* New `subject(pattern)` revset function that matches first line of commit
+  descriptions.
+
+* Conditional configuration now supports `--when.commands` to change
+  configuration based on subcommand.
+
+* The Jujutsu documentation site now publishes a schema for the official
+  configuration file, which can be integrated into your editor for autocomplete,
+  inline errors, and more.
+  Please [see the documentation](/docs/config.md#json-schema-support) for more
+  on this.
+
+### Fixed bugs
+
+* `jj git fetch` with multiple remotes will now fetch from all remotes before
+  importing refs into the jj repo. This fixes a race condition where the
+  treatment of a commit that is found in multiple fetch remotes depended on the
+  order the remotes were specified.
+
+* Fixed diff selection by external tools with `jj split`/`commit -i FILESETS`.
+  [#5252](https://github.com/jj-vcs/jj/issues/5252)
+
+* Conditional configuration now applies when initializing new repository.
+  [#5144](https://github.com/jj-vcs/jj/issues/5144)
+
+* `[diff.<format>]` configuration now applies to `.diff().<format>()` commit
+  template methods.
+
+* Conflicts at the end of files which don't end with a newline character are
+  now materialized in a way that can be parsed correctly.
+  [#3968](https://github.com/jj-vcs/jj/issues/3968)
+
+* Bookmark and remote names written by `jj git clone` to
+  `revset-aliases.'trunk()'` are now escaped if necessary.
+  [#5359](https://github.com/jj-vcs/jj/issues/5359)
diff --git a/jj/TODO b/jj/TODO
deleted file mode 100644
index 43a27758ff..0000000000
--- a/jj/TODO
+++ /dev/null
@@ -1,32 +0,0 @@
-Fails to build:
-
-   Compiling pest_derive v2.7.15
-error[E0432]: unresolved import `internal`
-  --> /scratch/devel/jj/work/vendor/mac_address-1.1.7/src/iter/mod.rs:16:9
-   |
-16 | pub use internal::MacAddressIterator;
-   |         ^^^^^^^^ use of undeclared crate or module `internal`
-
-error[E0433]: failed to resolve: use of undeclared crate or module `os`
-   --> /scratch/devel/jj/work/vendor/mac_address-1.1.7/src/lib.rs:120:17
-    |
-120 |     let bytes = os::get_mac(None)?;
-    |                 ^^ use of undeclared crate or module `os`
-
-error[E0433]: failed to resolve: use of undeclared crate or module `os`
-   --> /scratch/devel/jj/work/vendor/mac_address-1.1.7/src/lib.rs:129:17
-    |
-129 |     let bytes = os::get_mac(Some(name))?;
-    |                 ^^ use of undeclared crate or module `os`
-
-error[E0433]: failed to resolve: use of undeclared crate or module `os`
-   --> /scratch/devel/jj/work/vendor/mac_address-1.1.7/src/lib.rs:136:5
-    |
-136 |     os::get_ifname(&mac.bytes)
-    |     ^^ use of undeclared crate or module `os`
-
-Some errors have detailed explanations: E0432, E0433.
-For more information about an error, try `rustc --explain E0432`.
-error: could not compile `mac_address` (lib) due to 4 previous errors
-warning: build failed, waiting for other jobs to finish...
-*** Error code 101
diff --git a/jj/distinfo b/jj/distinfo
index 1ffd3d0f6a..0a832d0f35 100644
--- a/jj/distinfo
+++ b/jj/distinfo
@@ -1407,6 +1407,7 @@ Size (zerovec-0.10.4.crate) = 126398 bytes
 BLAKE2s (zerovec-derive-0.10.3.crate) = 39169b3f694a23e151216d25802a49f00889bfe0e5c6e744cc26792325703db2
 SHA512 (zerovec-derive-0.10.3.crate) = caefbffeb35265db9f74933bf07109d57f0da48156cafd4f330af78a5c7eb9ab0831a80789ad4fb119875ebc6cfd7e3de68c9984b77dca5151f9be41f1ae6e09
 Size (zerovec-derive-0.10.3.crate) = 19438 bytes
+SHA1 (patch-.._vendor_mac_address-1.1.7_Cargo.toml) = e5fd437733ac003c14bb26a2f6fa29469ce67884
 SHA1 (patch-.._vendor_mac_address-1.1.7_examples_lookup.rs) = ec2b43ba896b7c8f2345e25995b573bdd8a30242
 SHA1 (patch-.._vendor_mac_address-1.1.7_src_iter_mod.rs) = e38104ebf2d668c29bf4db8ffb09913e0acbe74f
 SHA1 (patch-.._vendor_mac_address-1.1.7_src_lib.rs) = 0e460b3f603878e9c13fdf1506dc528acd9da249
diff --git a/jj/patches/patch-.._vendor_mac_address-1.1.7_Cargo.toml b/jj/patches/patch-.._vendor_mac_address-1.1.7_Cargo.toml
new file mode 100644
index 0000000000..ecd45e83b5
--- /dev/null
+++ b/jj/patches/patch-.._vendor_mac_address-1.1.7_Cargo.toml
@@ -0,0 +1,16 @@
+$NetBSD$
+
+Add NetBSD support.
+https://github.com/repnop/mac_address/pull/50
+
+--- ../vendor/mac_address-1.1.7/Cargo.toml.orig	2025-02-09 21:12:42.494785006 +0000
++++ ../vendor/mac_address-1.1.7/Cargo.toml
+@@ -37,7 +37,7 @@ version = "1.0.59"
+ [dev-dependencies.serde_test]
+ version = "1.0.117"
+ 
+-[target."cfg(any(target_os = \"linux\", target_os = \"macos\", target_os = \"freebsd\", target_os = \"openbsd\", target_os = \"android\", target_os = \"illumos\"))".dependencies.nix]
++[target."cfg(any(target_os = \"linux\", target_os = \"macos\", target_os = \"freebsd\", target_os = \"netbsd\", target_os = \"openbsd\", target_os = \"android\", target_os = \"illumos\"))".dependencies.nix]
+ version = "0.28"
+ features = ["net"]
+
Prev by Date: gst-plugins1-gl: make this package
Next by Date: jj: remove, used for updating pkgsrc
Previous by Thread: gst-plugins1-gl: make this package
Next by Thread: jj: remove, used for updating pkgsrc
Indexes:
Home | Main Index | Thread Index | Old Index