Summary

Add support for Jujutsu.

Review Request #14336 — Created Feb. 7, 2025 and updated Feb. 18, 2025, 7:21 a.m.

Information

Owner

david

Repository

RBTools

Branch

master

Bugs

Depends On

Reviewers

Groups

rbtools

People

Description

Testing Done:
- Ran unit tests.
- Posted a variety of changes with various revision ranges.
- Posted changes that included binary files.
- Tested rbt stamp with both the head and non-head changes.
- Tested rbt land with both merge and squash modes, and --push.
- Tested rbt patch with a variety of changes, including both
per-commit and squash modes.
- Built docs and looked at the updated/added pages.

Testing Done


Ran unit tests.
Posted a variety of changes with various revision ranges.
Posted changes that included binary files.
Tested rbt stamp with both the head and non-head changes.
Tested rbt land with both merge and squash modes, and --push.
Tested rbt patch with a variety of changes, including both

  per-commit and squash modes.
Built docs and looked at the updated/added pages.

Commits

Summary	ID
Add support for Jujutsu. Jujutsu is a new version control system which is rapidly gaining momentum. It works with Git remotes (and wraps Git internally for object storage, at least for now). This change adds an RBTools client for Jujutsu. Testing Done: - Ran unit tests. - Posted a variety of changes with various revision ranges. - Posted changes that included binary files. - Tested `rbt stamp` with both the head and non-head changes. - Tested `rbt land` with both merge and squash modes, and `--push`. - Tested `rbt patch` with a variety of changes, including both per-commit and squash modes. - Built docs and looked at the updated/added pages.	7f1b92804e2c2d8950fa0c06c7436e9cb0bac4af

Summary

Add support for Jujutsu.

Jujutsu is a new version control system which is rapidly gaining momentum. It works with Git remotes (and wraps Git internally for object storage, at least for now). This change adds an RBTools client for Jujutsu. Testing Done: - Ran unit tests. - Posted a variety of changes with various revision ranges. - Posted changes that included binary files. - Tested `rbt stamp` with both the head and non-head changes. - Tested `rbt land` with both merge and squash modes, and `--push`. - Tested `rbt patch` with a variety of changes, including both per-commit and squash modes. - Built docs and looked at the updated/added pages.

7f1b92804e2c2d8950fa0c06c7436e9cb0bac4af

Issues

Description	From	Last Updated
	maubin	Feb. 12, 2025, 9:30 a.m.
too many blank lines (2) Column: 5 Error code: E303	reviewbot	Feb. 7, 2025, 8 a.m.
continuation line over-indented for visual indent Column: 30 Error code: E127	reviewbot	Feb. 7, 2025, 8 a.m.
continuation line over-indented for visual indent Column: 30 Error code: E127	reviewbot	Feb. 7, 2025, 8 a.m.
multiple spaces before operator Column: 13 Error code: E221	reviewbot	Feb. 7, 2025, 8 a.m.
line too long (89 > 79 characters) Column: 80 Error code: E501	reviewbot	Feb. 7, 2025, 8 a.m.
line too long (88 > 79 characters) Column: 80 Error code: E501	reviewbot	Feb. 7, 2025, 8 a.m.
line too long (86 > 79 characters) Column: 80 Error code: E501	reviewbot	Feb. 7, 2025, 8 a.m.
line too long (85 > 79 characters) Column: 80 Error code: E501	reviewbot	Feb. 7, 2025, 8 a.m.
whitespace after '{' Column: 36 Error code: E201	reviewbot	Feb. 7, 2025, 8 a.m.
whitespace before '}' Column: 62 Error code: E202	reviewbot	Feb. 7, 2025, 8 a.m.
whitespace before '}' Column: 62 Error code: E202	reviewbot	Feb. 7, 2025, 8 a.m.
whitespace after '{' Column: 36 Error code: E201	reviewbot	Feb. 7, 2025, 8 a.m.
whitespace after '{' Column: 36 Error code: E201	reviewbot	Feb. 7, 2025, 8 a.m.
whitespace before '}' Column: 45 Error code: E202	reviewbot	Feb. 7, 2025, 8 a.m.
whitespace after '{' Column: 36 Error code: E201	reviewbot	Feb. 7, 2025, 8 a.m.
whitespace before '}' Column: 45 Error code: E202	reviewbot	Feb. 7, 2025, 8 a.m.
line too long (80 > 79 characters) Column: 80 Error code: E501	reviewbot	Feb. 7, 2025, 8 a.m.
Would be good to say "You can create a personal configuration file (e.g. in :file:$HOME/.reviewboardrc) with the following ...) That …	maubin	Feb. 12, 2025, 9:44 a.m.
Typo: thtrough	maubin	Feb. 12, 2025, 9:44 a.m.
I think there's an extra : here?	maubin	Feb. 12, 2025, 9:45 a.m.
This reads kinda weird, the "... working about branches ..." part. Might also benefit from splitting it up into two …	maubin	Feb. 12, 2025, 9:45 a.m.
Does rbt land support the --push option with jujutsu? If so we should mention that here too.	maubin	Feb. 12, 2025, 9:47 a.m.
I think its worth it to link to the per-user config page here https://www.reviewboard.org/docs/rbtools/latest/rbt/configuration/users/. You can use "personal configuration" as …	maubin	Feb. 14, 2025, 3:56 p.m.
The type needs to be updated here as well (get rid of Optional)	maubin	Feb. 13, 2025, 11:24 a.m.
This method doesn't seem to ever return None, we always return 1 if p is None.	maubin	Feb. 12, 2025, 9:47 a.m.
You can consolidate this to return super()...	maubin	Feb. 12, 2025, 9:48 a.m.
Missing the Raises section in the docstring.	maubin	Feb. 12, 2025, 9:49 a.m.
Missing the Raises section in the docstring.	maubin	Feb. 12, 2025, 9:49 a.m.
We should wrap this in a try/except and raise an SCMError if we encounter a RunProcessError, like we do with …	maubin	Feb. 12, 2025, 9:50 a.m.
This docstring should have a Raises section for the possible rbtools.utils.process.RunProcessError	maubin	Feb. 12, 2025, 9:50 a.m.
Add , optional	maubin	Feb. 12, 2025, 9:50 a.m.
Missing a Raises section in the docstring.	maubin	Feb. 12, 2025, 9:51 a.m.
Add , optional	maubin	Feb. 12, 2025, 9:52 a.m.
This docstring should have a Raises section for the possible rbtools.utils.process.RunProcessError	maubin	Feb. 12, 2025, 9:51 a.m.
Here too.	maubin	Feb. 12, 2025, 9:52 a.m.
Here too. And its missing Args and Returns.	maubin	Feb. 12, 2025, 9:54 a.m.
'sys.stdout' imported but unused Column: 1 Error code: F401	reviewbot	Feb. 12, 2025, 10:24 a.m.

flake8 failed.

JSHint passed.

flake8

rbtools/clients/jujutsu.py (Diff revision 1)
The issue has been dropped. Show all issues
```
too many blank lines (2)

Column: 5
Error code: E303
```

rbtools/clients/jujutsu.py (Diff revision 1)

The issue has been dropped. Show all issues

continuation line over-indented for visual indent

Column: 30
Error code: E127

rbtools/clients/jujutsu.py (Diff revision 1)

The issue has been dropped. Show all issues

continuation line over-indented for visual indent

Column: 30
Error code: E127

rbtools/clients/tests/test_jujutsu.py (Diff revision 1)
The issue has been dropped. Show all issues
```
multiple spaces before operator

Column: 13
Error code: E221
```
rbtools/clients/tests/test_jujutsu.py (Diff revision 1)
The issue has been dropped. Show all issues
```
line too long (89 > 79 characters)

Column: 80
Error code: E501
```
rbtools/clients/tests/test_jujutsu.py (Diff revision 1)
The issue has been dropped. Show all issues
```
line too long (88 > 79 characters)

Column: 80
Error code: E501
```
rbtools/clients/tests/test_jujutsu.py (Diff revision 1)
The issue has been dropped. Show all issues
```
line too long (86 > 79 characters)

Column: 80
Error code: E501
```
rbtools/clients/tests/test_jujutsu.py (Diff revision 1)
The issue has been dropped. Show all issues
```
line too long (85 > 79 characters)

Column: 80
Error code: E501
```
rbtools/clients/tests/test_jujutsu.py (Diff revision 1)
The issue has been dropped. Show all issues
```
whitespace after '{'

Column: 36
Error code: E201
```
rbtools/clients/tests/test_jujutsu.py (Diff revision 1)
The issue has been dropped. Show all issues
```
whitespace before '}'

Column: 62
Error code: E202
```
rbtools/clients/tests/test_jujutsu.py (Diff revision 1)
The issue has been dropped. Show all issues
```
whitespace before '}'

Column: 62
Error code: E202
```
rbtools/clients/tests/test_jujutsu.py (Diff revision 1)
The issue has been dropped. Show all issues
```
whitespace after '{'

Column: 36
Error code: E201
```
rbtools/clients/tests/test_jujutsu.py (Diff revision 1)
The issue has been dropped. Show all issues
```
whitespace after '{'

Column: 36
Error code: E201
```
rbtools/clients/tests/test_jujutsu.py (Diff revision 1)
The issue has been dropped. Show all issues
```
whitespace before '}'

Column: 45
Error code: E202
```
rbtools/clients/tests/test_jujutsu.py (Diff revision 1)
The issue has been dropped. Show all issues
```
whitespace after '{'

Column: 36
Error code: E201
```
rbtools/clients/tests/test_jujutsu.py (Diff revision 1)
The issue has been dropped. Show all issues
```
whitespace before '}'

Column: 45
Error code: E202
```
rbtools/clients/tests/test_jujutsu.py (Diff revision 1)
The issue has been dropped. Show all issues
```
line too long (80 > 79 characters)

Column: 80
Error code: E501
```

Commits:

	Summary	ID
	Add support for Jujutsu. Jujutsu is a new version control system which is rapidly gaining momentum. It works with Git remotes (and wraps Git internally for object storage, at least for now). This change adds an RBTools client for Jujutsu. Testing Done: - Ran unit tests. - Posted a variety of changes with various revision ranges. - Posted changes that included binary files. - Tested `rbt stamp` with both the head and non-head changes. - Tested `rbt land` with both merge and squash modes, and `--push`. - Tested `rbt patch` with a variety of changes, including both per-commit and squash modes. - Built docs and looked at the updated/added pages.	0939f49a7c6d46d68eec8e02437c2d2016db6a24
	Add support for Jujutsu. Jujutsu is a new version control system which is rapidly gaining momentum. It works with Git remotes (and wraps Git internally for object storage, at least for now). This change adds an RBTools client for Jujutsu. Testing Done: - Ran unit tests. - Posted a variety of changes with various revision ranges. - Posted changes that included binary files. - Tested `rbt stamp` with both the head and non-head changes. - Tested `rbt land` with both merge and squash modes, and `--push`. - Tested `rbt patch` with a variety of changes, including both per-commit and squash modes. - Built docs and looked at the updated/added pages.	750f6cc355529283ec08e12d500094f97cd0ea8d

Diff:

Revision 2 (+7038 -24)

Show changes

	docs/rbtools/index.rst
	docs/rbtools/rbt/commands/post.rst
	docs/rbtools/rbt/configuration/repositories.rst
	docs/rbtools/workflows/index.rst
	docs/rbtools/workflows/jujutsu.rst
	rbtools/clients/jujutsu.py
	rbtools/clients/base/registry.py
	rbtools/clients/tests/test_jujutsu.py
	1 more

Checks run (2 succeeded)

flake8 passed.

JSHint passed.

Change Summary:

Wrap errors in gettext.

Commits:

	Summary	ID
	Add support for Jujutsu. Jujutsu is a new version control system which is rapidly gaining momentum. It works with Git remotes (and wraps Git internally for object storage, at least for now). This change adds an RBTools client for Jujutsu. Testing Done: - Ran unit tests. - Posted a variety of changes with various revision ranges. - Posted changes that included binary files. - Tested `rbt stamp` with both the head and non-head changes. - Tested `rbt land` with both merge and squash modes, and `--push`. - Tested `rbt patch` with a variety of changes, including both per-commit and squash modes. - Built docs and looked at the updated/added pages.	750f6cc355529283ec08e12d500094f97cd0ea8d
	Add support for Jujutsu. Jujutsu is a new version control system which is rapidly gaining momentum. It works with Git remotes (and wraps Git internally for object storage, at least for now). This change adds an RBTools client for Jujutsu. Testing Done: - Ran unit tests. - Posted a variety of changes with various revision ranges. - Posted changes that included binary files. - Tested `rbt stamp` with both the head and non-head changes. - Tested `rbt land` with both merge and squash modes, and `--push`. - Tested `rbt patch` with a variety of changes, including both per-commit and squash modes. - Built docs and looked at the updated/added pages.	2df63bf280cd6605bacb43054215af3dc50eaec7

Diff:

Revision 3 (+7042 -24)

Show changes

	docs/rbtools/index.rst
	docs/rbtools/rbt/commands/post.rst
	docs/rbtools/rbt/configuration/repositories.rst
	docs/rbtools/workflows/index.rst
	docs/rbtools/workflows/jujutsu.rst
	rbtools/clients/jujutsu.py
	rbtools/clients/base/registry.py
	rbtools/clients/tests/test_jujutsu.py
	1 more

Checks run (2 succeeded)

flake8 passed.

JSHint passed.

```
Excited to try this out.
```
The issue has been dropped. Show all issues

docs/rbtools/workflows/jujutsu.rst (Diff revision 2)

The issue has been resolved. Show all issues

Would be good to say "You can create a personal configuration file (e.g. in :file:$HOME/.reviewboardrc) with the following ...)

That helps if the reader is not familiar with our per-user config and they can easily find more info about it if needed. Especially for Windows users who don't have a home directory.

docs/rbtools/workflows/jujutsu.rst (Diff revision 2)
The issue has been resolved. Show all issues
```
Typo: thtrough
```
docs/rbtools/workflows/jujutsu.rst (Diff revision 2)
The issue has been dropped. Show all issues
```
I think there's an extra : here?
```
1. david Feb. 12, 2025, 10:14 a.m.
  In rst that indicates that the following indented stuff is a code block.

docs/rbtools/workflows/jujutsu.rst (Diff revision 2)

The issue has been resolved. Show all issues

This reads kinda weird, the "... working about branches ..." part.

Might also benefit from splitting it up into two sentences: .. merge commits is ugly. When we're working ..."

docs/rbtools/workflows/jujutsu.rst (Diff revision 2)

The issue has been dropped. Show all issues

Does rbt land support the --push option with jujutsu? If so we should mention that here too.

david Feb. 12, 2025, 10:14 a.m.

That is mentioned above in the "Land your change" section. For this example I think I'd like to keep each step separate.

rbtools/clients/jujutsu.py (Diff revision 3)

The issue has been resolved. Show all issues

This method doesn't seem to ever return None, we always return 1 if p is None.

rbtools/clients/jujutsu.py (Diff revision 3)

The issue has been resolved. Show all issues

You can consolidate this to return super()...

david Feb. 12, 2025, 10:14 a.m.

Actually this whole thing can go away now. This did other stuff when I was busy trying to figure out how best to manage creation of commits/changes during the patch process.

rbtools/clients/jujutsu.py (Diff revision 3)
The issue has been resolved. Show all issues
```
Missing the Raises section in the docstring.
```
rbtools/clients/jujutsu.py (Diff revision 3)
The issue has been resolved. Show all issues
```
Missing the Raises section in the docstring.
```

rbtools/clients/jujutsu.py (Diff revision 3)

The issue has been resolved. Show all issues

We should wrap this in a try/except and raise an SCMError if we encounter a RunProcessError, like we do with the other methods that use run_process

rbtools/clients/jujutsu.py (Diff revision 3)

The issue has been resolved. Show all issues

This docstring should have a Raises section for the possible rbtools.utils.process.RunProcessError

rbtools/clients/jujutsu.py (Diff revision 3)
The issue has been resolved. Show all issues
```
Add , optional
```
rbtools/clients/jujutsu.py (Diff revision 3)
The issue has been resolved. Show all issues
```
Missing a Raises section in the docstring.
```
rbtools/clients/jujutsu.py (Diff revision 3)
The issue has been resolved. Show all issues
```
Add , optional
```

rbtools/clients/jujutsu.py (Diff revision 3)

The issue has been resolved. Show all issues

This docstring should have a Raises section for the possible rbtools.utils.process.RunProcessError

rbtools/clients/jujutsu.py (Diff revision 3)
The issue has been resolved. Show all issues
```
Here too.
```
rbtools/clients/jujutsu.py (Diff revision 3)
The issue has been resolved. Show all issues
```
Here too. And its missing Args and Returns.
```

Commits:

	Summary	ID
	Add support for Jujutsu. Jujutsu is a new version control system which is rapidly gaining momentum. It works with Git remotes (and wraps Git internally for object storage, at least for now). This change adds an RBTools client for Jujutsu. Testing Done: - Ran unit tests. - Posted a variety of changes with various revision ranges. - Posted changes that included binary files. - Tested `rbt stamp` with both the head and non-head changes. - Tested `rbt land` with both merge and squash modes, and `--push`. - Tested `rbt patch` with a variety of changes, including both per-commit and squash modes. - Built docs and looked at the updated/added pages.	2df63bf280cd6605bacb43054215af3dc50eaec7
	Add support for Jujutsu. Jujutsu is a new version control system which is rapidly gaining momentum. It works with Git remotes (and wraps Git internally for object storage, at least for now). This change adds an RBTools client for Jujutsu. Testing Done: - Ran unit tests. - Posted a variety of changes with various revision ranges. - Posted changes that included binary files. - Tested `rbt stamp` with both the head and non-head changes. - Tested `rbt land` with both merge and squash modes, and `--push`. - Tested `rbt patch` with a variety of changes, including both per-commit and squash modes. - Built docs and looked at the updated/added pages.	358ff590b72b5bcea498924763a89d337819161f

Diff:

Revision 4 (+7086 -24)

Show changes

	docs/rbtools/index.rst
	docs/rbtools/rbt/commands/post.rst
	docs/rbtools/rbt/configuration/repositories.rst
	docs/rbtools/workflows/index.rst
	docs/rbtools/workflows/jujutsu.rst
	rbtools/clients/jujutsu.py
	rbtools/clients/base/registry.py
	rbtools/clients/tests/test_jujutsu.py
	1 more

Checks run (1 failed, 1 succeeded)

flake8 failed.

JSHint passed.

flake8

rbtools/clients/jujutsu.py (Diff revision 4)
The issue has been dropped. Show all issues
```
'sys.stdout' imported but unused

Column: 1
Error code: F401
```

Commits:

	Summary	ID
	Add support for Jujutsu. Jujutsu is a new version control system which is rapidly gaining momentum. It works with Git remotes (and wraps Git internally for object storage, at least for now). This change adds an RBTools client for Jujutsu. Testing Done: - Ran unit tests. - Posted a variety of changes with various revision ranges. - Posted changes that included binary files. - Tested `rbt stamp` with both the head and non-head changes. - Tested `rbt land` with both merge and squash modes, and `--push`. - Tested `rbt patch` with a variety of changes, including both per-commit and squash modes. - Built docs and looked at the updated/added pages.	358ff590b72b5bcea498924763a89d337819161f
	Add support for Jujutsu. Jujutsu is a new version control system which is rapidly gaining momentum. It works with Git remotes (and wraps Git internally for object storage, at least for now). This change adds an RBTools client for Jujutsu. Testing Done: - Ran unit tests. - Posted a variety of changes with various revision ranges. - Posted changes that included binary files. - Tested `rbt stamp` with both the head and non-head changes. - Tested `rbt land` with both merge and squash modes, and `--push`. - Tested `rbt patch` with a variety of changes, including both per-commit and squash modes. - Built docs and looked at the updated/added pages.	f6f6e348a9cefd87be214b52ae2b276d28977c8c

Diff:

Revision 5 (+7084 -24)

Show changes

	docs/rbtools/index.rst
	docs/rbtools/rbt/commands/post.rst
	docs/rbtools/rbt/configuration/repositories.rst
	docs/rbtools/workflows/index.rst
	docs/rbtools/workflows/jujutsu.rst
	rbtools/clients/jujutsu.py
	rbtools/clients/base/registry.py
	rbtools/clients/tests/test_jujutsu.py
	1 more

Checks run (2 succeeded)

flake8 passed.

JSHint passed.

docs/rbtools/workflows/jujutsu.rst (Diff revisions 3 - 5)

The issue has been resolved. Show all issues

I think its worth it to link to the per-user config page here https://www.reviewboard.org/docs/rbtools/latest/rbt/configuration/users/. You can use "personal configuration" as the link text.

david Feb. 12, 2025, 8:55 p.m.

I think that particular link might be confusing because the settings useful for TREES are actually "repository" settings, not the "user" settings (which are documented on https://www.reviewboard.org/docs/rbtools/latest/rbt/configuration/repositories/). Let me think on this for a bit.

rbtools/clients/jujutsu.py (Diff revisions 3 - 5)
The issue has been resolved. Show all issues
```
The type needs to be updated here as well (get rid of Optional)
```

Commits:

	Summary	ID
	Add support for Jujutsu. Jujutsu is a new version control system which is rapidly gaining momentum. It works with Git remotes (and wraps Git internally for object storage, at least for now). This change adds an RBTools client for Jujutsu. Testing Done: - Ran unit tests. - Posted a variety of changes with various revision ranges. - Posted changes that included binary files. - Tested `rbt stamp` with both the head and non-head changes. - Tested `rbt land` with both merge and squash modes, and `--push`. - Tested `rbt patch` with a variety of changes, including both per-commit and squash modes. - Built docs and looked at the updated/added pages.	f6f6e348a9cefd87be214b52ae2b276d28977c8c
	Add support for Jujutsu. Jujutsu is a new version control system which is rapidly gaining momentum. It works with Git remotes (and wraps Git internally for object storage, at least for now). This change adds an RBTools client for Jujutsu. Testing Done: - Ran unit tests. - Posted a variety of changes with various revision ranges. - Posted changes that included binary files. - Tested `rbt stamp` with both the head and non-head changes. - Tested `rbt land` with both merge and squash modes, and `--push`. - Tested `rbt patch` with a variety of changes, including both per-commit and squash modes. - Built docs and looked at the updated/added pages.	ea1649b88370704f8921bff176c8cfac444dce7c

Diff:

Revision 6 (+7086 -24)

Show changes

	docs/rbtools/index.rst
	docs/rbtools/rbt/commands/post.rst
	docs/rbtools/rbt/configuration/repositories.rst
	docs/rbtools/workflows/index.rst
	docs/rbtools/workflows/jujutsu.rst
	rbtools/clients/jujutsu.py
	rbtools/clients/base/registry.py
	rbtools/clients/tests/test_jujutsu.py
	1 more

Checks run (2 succeeded)

flake8 passed.

JSHint passed.

Change Summary:

Link to the new top-level reviewboardrc section for "personal configuration file"

Commits:

	Summary	ID
	Add support for Jujutsu. Jujutsu is a new version control system which is rapidly gaining momentum. It works with Git remotes (and wraps Git internally for object storage, at least for now). This change adds an RBTools client for Jujutsu. Testing Done: - Ran unit tests. - Posted a variety of changes with various revision ranges. - Posted changes that included binary files. - Tested `rbt stamp` with both the head and non-head changes. - Tested `rbt land` with both merge and squash modes, and `--push`. - Tested `rbt patch` with a variety of changes, including both per-commit and squash modes. - Built docs and looked at the updated/added pages.	ea1649b88370704f8921bff176c8cfac444dce7c
	Add support for Jujutsu. Jujutsu is a new version control system which is rapidly gaining momentum. It works with Git remotes (and wraps Git internally for object storage, at least for now). This change adds an RBTools client for Jujutsu. Testing Done: - Ran unit tests. - Posted a variety of changes with various revision ranges. - Posted changes that included binary files. - Tested `rbt stamp` with both the head and non-head changes. - Tested `rbt land` with both merge and squash modes, and `--push`. - Tested `rbt patch` with a variety of changes, including both per-commit and squash modes. - Built docs and looked at the updated/added pages.	7f1b92804e2c2d8950fa0c06c7436e9cb0bac4af

Diff:

Revision 7 (+7082 -24)

Show changes

	docs/rbtools/index.rst
	docs/rbtools/rbt/commands/post.rst
	docs/rbtools/rbt/configuration/repositories.rst
	docs/rbtools/workflows/index.rst
	docs/rbtools/workflows/jujutsu.rst
	rbtools/clients/jujutsu.py
	rbtools/clients/base/registry.py
	rbtools/clients/tests/test_jujutsu.py
	1 more

Checks run (2 succeeded)

flake8 passed.

JSHint passed.

Ship it!

```
Ship It!
```