Code

History

Commits on git-sync to cli/tests/test_status_command.rs35+
  1. logging: Add trailing periods in log messagesJoseph Lou committed 4 months agod6c4fa8
  2. status: don't suggest `jj git fetch` when using non-Git backendMartin von Zweigbergk committed 6 months agod52755b
  3. status: don't report clean working copy with filtered-out untracked pathsFederico G. Schwindt committed 6 months ago252a65b
  4. status: suppress empty working-copy changes headerFederico G. Schwindt committed 6 months ago6bb2eb7
  5. status: filter untracked paths by filesetFederico G. Schwindt committed 7 months ago53e5ea6
  6. tests: run `cargo insta test --force-update-snapshots`Ilya Grigoriev committed 8 months ago3a9e56d
  7. git_backend: use first tree as base tree for conflictsScott Taylor committed 1 year agoc1ecf8a
  8. merged_tree: migrate more callers to `MergedTree::conflicts_matching`Scott Taylor committed 10 months ago1e521f5
  9. templates: add "divergent" label to log for divergent changesScott Taylor committed 11 months ago33ad38b
  10. rewrite: add conflict labels when merging commit treesScott Taylor committed 1 year ago04a9121
  11. templates: show change offsets for divergent and hidden commitsScott Taylor committed 1 year ago0dffb6f
  12. tests: update cargo insta snapshotsTheo Buehler committed 11 months agocfb6509
  13. tests: exercise status without working copyDavid Higgs committed 11 months agoa60ed77
  14. docs: jj-vcs.github.io -> jj-vcs.devSteve Klabnik committed 11 months ago5b3aa51
  15. cli: `jj status` warns when fileset doesn't existTejas Sanap committed 1 year ago731d75b
  16. tests: exercise status with conflicting bookmarksDavid Higgs committed 1 year agof524ba4
  17. cli, lib: move to Rust 2024 language editionAustin Seipp committed 1 year agoba24140
  18. status: collapse entirely untracked directoriesHubert Głuchowski committed 1 year ago8ec0196
  19. cli: allow "large" revsets by defaultYuya Nishihara committed 1 year ago6c8f6e9
  20. cli: use more precise wording in conflict resolution hintVincent Ging Ho Yim committed 1 year agof176518
  21. git: write change-id header by defaultMartin von Zweigbergk committed 1 year agoacd8242
  22. tests: port test_status_command.rs to TestWorkDir APIYuya Nishihara committed 1 year ago16c788a
  23. cli: Print @ and @- in status and print_updated_working_copy_statsRobin Stocker committed 1 year ago0456701
  24. tests: pass &TestWorkDir to create_commit*() helperYuya Nishihara committed 1 year ago61a4495
  25. cli tests: move `create_commit()` tests helpers to common/Martin von Zweigbergk committed 1 year ago0055cd4
  26. config: Allow hiding the 'how to resolve conflicts' hintJonathan Gilchrist committed 1 year ago742bc8a
  27. tests: resolve directory path to run_jj_in() relative to env_rootYuya Nishihara committed 1 year ago7fa8420
  28. tests: migrate non-snapshot users of jj_cmd_ok() to run_jj_in().success()Yuya Nishihara committed 1 year ago804d175
  29. tests: migrate non-snapshot users of jj_cmd_success() to run_jj_in().success()Yuya Nishihara committed 1 year agoc83abc9
  30. tests: migrate snapshot users of jj_cmd_success() to run_jj_in()Yuya Nishihara committed 1 year agocdcc777
  31. tests: migrate some helper functions that uses jj_cmd_*() to run_jj_in()Yuya Nishihara committed 1 year ago18ea718
  32. cli: add "Hint: " prefix to conflict hintsYuya Nishihara committed 1 year ago48b0222
  33. cli: render "conflicts" message as warningYuya Nishihara committed 1 year agoa2a9a99
  34. cli: status: do not label message lines as "conflict"Yuya Nishihara committed 1 year ago1fa4e5a
  35. cli: status: reorder conflict message to match checkout statsYuya Nishihara committed 1 year ago067e2eb