Martin von Zweigbergk
5c703aeb03
cli: replace o
as graph node by ●
when using unicode graph
...
@joyously found `o` confusing because it's a valid change id prefix. I
don't have much preference, but `●` seems fine. The "ascii",
"ascii-large", and "legacy" graph styles still use "o".
I didn't change `@` since it seems useful to have that match the
symbol used on the CLI. I don't think we want to have users do
something like `jj co ◎-`.
2023-03-12 23:21:05 -07:00
Samuel Tardieu
5ecdeed606
git: only consider references matching globs when fetching
2023-03-02 10:09:08 +01:00
Yuya Nishihara
66458a097e
templater: require infix ++ operator to concatenate expressions
...
This eliminates ambiguous parsing between "func()" and "expr ()".
I chose "++" as template concatenation operator in case we want to add
bit-wise negate operator. It's also easier to find/replace than "~".
2023-03-01 16:39:23 +09:00
Yuya Nishihara
6bbf4c6fcf
tests: extract log template function/variable for code readability
...
Also rewrites some lengthy templates. That's why the test output slightly
changed.
2023-03-01 16:39:23 +09:00
Samuel Tardieu
c5e41a99c3
git remote rename: rename git refs as well
2023-02-26 15:22:18 +01:00
Samuel Tardieu
b515d14f18
git_fetch: when removing a remote branch, remove git ref as well
2023-02-26 15:22:18 +01:00
Samuel Tardieu
1056cfa41a
test_git_fetch: make different remotes in test contain different commits
...
Using the same commits (and thus the same commit id) in multiple remotes
makes it harder to see what comes from where.
2023-02-24 20:29:03 +01:00
Ilya Grigoriev
30d03a66e6
cmd: --branch
option for git fetch
.
...
Thanks to @samueltardieu for noticing a subtle bug in the refspecs, providing
the fix, as well as the two `conflicting_branches` tests.
2023-02-21 18:33:40 -08:00
Ilya Grigoriev
cd8a18daf8
test_git_fetch.rs: Move some helper methods
2023-02-21 18:33:40 -08:00
Samuel Tardieu
c0c3f87574
git fetch: prune old branch names before adding new ones
2023-02-12 02:10:17 +01:00
Samuel Tardieu
b7b3314afe
git fetch: exhibit bug due to fetching references before pruning
2023-02-12 02:10:17 +01:00
Samuel Tardieu
af9471e65c
git fetch: accept several remotes
...
The "--remote" option can be repeated, and the "git.fetch" key
is now a list.
2023-02-03 16:04:37 +01:00
Samuel Tardieu
4550b9c481
git fetch: add tests
2023-02-03 16:04:37 +01:00