Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

FR: Pattern match the arguments for revset-aliases #2966

Closed
Zambito1 opened this issue Feb 6, 2024 · 1 comment
Closed

FR: Pattern match the arguments for revset-aliases #2966

Zambito1 opened this issue Feb 6, 2024 · 1 comment
Assignees
@yuja
Labels
enhancement New feature or request

Comments

@Zambito1
Copy link

Zambito1 commented Feb 6, 2024 •
edited
Loading

Is your feature request related to a problem? Please describe.
I want to be able to use revset aliases that can handle different numbers of arguments. I think pattern matching on the arguments is the most natural way to do this.

Describe the solution you'd like

[revset-aliases]
'review(x)' = '(::x | ::@) ~ ::trunk()'
'review(x, y)' = '(::x | ::@) ~ ::y'

The first alias defines a function that will show the intersection between the provided branch and your working branch, and only the commits of those that have not landed on the trunk() branch. This is useful for reviewing merge requests.

It may be useful to specify a target besides the trunk(), if that is not what the target branch is. Specifying an additional, optional argument would be a good way to do this.

Describe alternatives you've considered
This could be achieved by naming the second alias something different, but I think pattern matching on the arguments like this is a reasonable behavior to expect.
@PhilipMetzger PhilipMetzger added the enhancement New feature or request label Feb 6, 2024
@yuja
Copy link
Collaborator

yuja commented Feb 7, 2024

iirc, Sapling added support for overloading by arity. That's probably doable in jj.

@yuja yuja self-assigned this Jun 7, 2024
yuja added a commit to yuja/jj that referenced this issue Jun 13, 2024
@yuja
revset, templater: implement arity-based alias overloading
00fe082 
Still alias function shadows builtin function (of any arity) by name. This
allows to detect argument error as such, but might be a bit inconvenient if
user wants to overload heads() for example. If needed, maybe we can add some
config/revset syntax to import builtin function to alias namespace.

The functions table is keyed by name, not by (name, arity) pair. That's mainly
because std collections require keys to be Borrow, and a pair of borrowed
values is incompatible with owned pair. Another reason is it makes easy to look
up overloads by name.

Alias overloading could also be achieved by adding default parameters, but that
will complicate the implementation a bit more, and can't prevent shadowing of
0-ary immutable_heads().

Closes jj-vcs#2966
@yuja yuja mentioned this issue Jun 13, 2024
Merged
4 tasks
yuja added a commit to yuja/jj that referenced this issue Jun 14, 2024
@yuja
revset, templater: implement arity-based alias overloading
5f9d1f2 
Still alias function shadows builtin function (of any arity) by name. This
allows to detect argument error as such, but might be a bit inconvenient if
user wants to overload heads() for example. If needed, maybe we can add some
config/revset syntax to import builtin function to alias namespace.

The functions table is keyed by name, not by (name, arity) pair. That's mainly
because std collections require keys to be Borrow, and a pair of borrowed
values is incompatible with owned pair. Another reason is it makes easy to look
up overloads by name.

Alias overloading could also be achieved by adding default parameters, but that
will complicate the implementation a bit more, and can't prevent shadowing of
0-ary immutable_heads().

Closes jj-vcs#2966
@yuja yuja closed this as completed in a7bff04 Jun 14, 2024
@BrewTestBot BrewTestBot mentioned this issue Jul 5, 2024
Merged
netbsd-srcmastr pushed a commit to NetBSD/pkgsrc that referenced this issue Jul 7, 2024
@0-wiz-0
jj: update to 0.19.0.
b0c37bd 
## [0.19.0] - 2024-07-03

### Breaking changes

* In revset aliases, top-level `kind:pattern` expression is now parsed as
  modifier. Surround with parentheses if it should be parsed as string/file
  pattern.

* Dropped support for automatic upgrade of repo formats used by versions before
  0.12.0.

* `jj fix` now defaults to the broader revset `-s reachable(@, mutable())`
  instead of `-s @`.

* Dropped support for deprecated `jj branch delete`/`forget` `--glob` option.

* `jj branch set` now creates new branch if it doesn't exist. Use `jj branch
  move` to ensure that the target branch already exists.
  [#3584](jj-vcs/jj#3584)

### Deprecations

* Replacing `-l` shorthand for `--limit` with `-n` in `jj log`, `jj op log`
  and `jj obslog`.

* `jj split --siblings` is deprecated in favor of `jj split --parallel` (to
  match `jj parallelize`).

* A new `jj file` subcommand now replaces several existing uncategorized
  commands, which are deprecated.
  - `jj file show` replaces `jj cat`.
  - `jj file chmod` replaces `jj chmod`.
  - `jj file list` replaces `jj files`.

### New features

* Support background filesystem monitoring via watchman triggers enabled with
  the `core.watchman.register_snapshot_trigger = true` config.

* Show paths to config files when configuration errors occur.

* `jj fix` now supports configuring the default revset for `-s` using the
  `revsets.fix` config.

* The `descendants()` revset function now accepts an optional `depth` argument;
  like the `ancestors()` depth argument, it limits the depth of the set.

* Revset/template aliases now support function overloading.
  [#2966](jj-vcs/jj#2966)

* Conflicted files are individually simplified before being materialized.

* The `jj file` subcommand now contains several existing file utilities.
  - `jj file show`, replacing `jj cat`.
  - `jj file chmod` replacing `jj chmod`.
  - `jj file list` replacing `jj files`.

* New command `jj branch move` let you update branches by name pattern or source
  revision.

* New diff option `jj diff --name-only` allows for easier shell scripting.

* In color-words diffs, hunks are now highlighted with underline. See [diff
  colors and styles](docs/config.md#diff-colors-and-styles) for customization.

* `jj git push -c <arg>` can now accept revsets that resolve to multiple
  revisions. This means that `jj git push -c xyz -c abc` is now equivalent to
  `jj git push -c 'all:(xyz | abc)'`.

* `jj prev` and `jj next` have gained a `--conflict` flag which moves you
  to the next conflict in a child commit.

* New command `jj git remote set-url` that sets the url of a git remote.

* Author timestamp is now reset when rewriting discardable commits (empty
  commits with no description) if authored by the current user.
  [#2000](jj-vcs/jj#2000)

* `jj commit` now accepts `--reset-author` option to match `jj describe`.

* `jj squash` now accepts a `--keep-emptied` option to keep the source commit.

### Fixed bugs

* `jj git push` now ignores immutable commits when checking whether a
  to-be-pushed commit has conflicts, or has no description / committer / author
  set. [#3029](jj-vcs/jj#3029)

* `jj` will look for divergent changes outside the short prefix set even if it
  finds the change id inside the short prefix set.
  [#2476](jj-vcs/jj#2476)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees

@yuja yuja

Labels
enhancement New feature or request
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
3 participants
@yuja @Zambito1 @PhilipMetzger