57 Commits

Author	SHA1	Message	Date
Ilya Grigoriev	6aef4bb52e	cli rebase: do not allow -r --skip-empty ... This follows up on 3967f63 (see that commit's description for more motivation) and e79c8b6. In a discussion linked below, it was decided that forbidding `-r --skip-empty` entirely is preferable to the mixed behavior introduced in 3967f63. 3967f637dc (commitcomment-133539911)	2023-11-27 10:16:36 -08:00
Ilya Grigoriev	8bc3f5fd67	cli rebase: Allow jj rebase -r to rebase a commit onto a descendant ... #1188 There are some additional test changes because children and descendants are now rebased before the commit itself.	2023-10-30 10:56:27 -07:00
Yuya Nishihara	7a3e72415c	cli: send status messages to stderr, specify stdout/stderr explicitly ... Many of &mut UI can be changed to immutable borrows, but I'm not gonna update them in this patch.	2023-10-11 19:24:01 +09:00
Yuya Nishihara	58acc1d111	tests: replace jj_cmd_success() involving mutation to allow stderr output	2023-10-11 19:24:01 +09:00
Yuya Nishihara	e3c85d6ecc	revset: convert root symbol to function ... The idea is that we can fully eliminate special symbols that would otherwise shadow user branches, tags, or change ID prefixes. Closes #2095	2023-09-04 10:36:30 +09:00
Ilya Grigoriev	6fa8a25839	cli templates: include branches in short commit description ... They are shown next to the change and commit id, since they are other names the commit can be referred by. The description is separated from the branches by a ` | ` when there are branches, so that one can tell the branches from the description without color. The result looks like this: 	2023-08-10 20:58:40 -07:00
Martin von Zweigbergk	0075174308	tests: move tests/ under cli/ so they're run again ... Thanks to @ilyagr for noticing that they should be moved.	2023-08-05 06:18:59 +00:00