Code

History

Commits on ig/diff-multiples-warning to cli/tests/test_status_command.rs35+
  1. tests: run `cargo insta test --force-update-snapshots`Ilya Grigoriev committed 9 months ago3a9e56d
  2. git_backend: use first tree as base tree for conflictsScott Taylor committed 1 year agoc1ecf8a
  3. merged_tree: migrate more callers to `MergedTree::conflicts_matching`Scott Taylor committed 10 months ago1e521f5
  4. templates: add "divergent" label to log for divergent changesScott Taylor committed 11 months ago33ad38b
  5. rewrite: add conflict labels when merging commit treesScott Taylor committed 1 year ago04a9121
  6. templates: show change offsets for divergent and hidden commitsScott Taylor committed 1 year ago0dffb6f
  7. tests: update cargo insta snapshotsTheo Buehler committed 11 months agocfb6509
  8. tests: exercise status without working copyDavid Higgs committed 11 months agoa60ed77
  9. docs: jj-vcs.github.io -> jj-vcs.devSteve Klabnik committed 11 months ago5b3aa51
  10. cli: `jj status` warns when fileset doesn't existTejas Sanap committed 1 year ago731d75b
  11. tests: exercise status with conflicting bookmarksDavid Higgs committed 1 year agof524ba4
  12. cli, lib: move to Rust 2024 language editionAustin Seipp committed 1 year agoba24140
  13. status: collapse entirely untracked directoriesHubert Głuchowski committed 1 year ago8ec0196
  14. cli: allow "large" revsets by defaultYuya Nishihara committed 1 year ago6c8f6e9
  15. cli: use more precise wording in conflict resolution hintVincent Ging Ho Yim committed 1 year agof176518
  16. git: write change-id header by defaultMartin von Zweigbergk committed 1 year agoacd8242
  17. tests: port test_status_command.rs to TestWorkDir APIYuya Nishihara committed 1 year ago16c788a
  18. cli: Print @ and @- in status and print_updated_working_copy_statsRobin Stocker committed 1 year ago0456701
  19. tests: pass &TestWorkDir to create_commit*() helperYuya Nishihara committed 1 year ago61a4495
  20. cli tests: move `create_commit()` tests helpers to common/Martin von Zweigbergk committed 1 year ago0055cd4
  21. config: Allow hiding the 'how to resolve conflicts' hintJonathan Gilchrist committed 1 year ago742bc8a
  22. tests: resolve directory path to run_jj_in() relative to env_rootYuya Nishihara committed 1 year ago7fa8420
  23. tests: migrate non-snapshot users of jj_cmd_ok() to run_jj_in().success()Yuya Nishihara committed 1 year ago804d175
  24. tests: migrate non-snapshot users of jj_cmd_success() to run_jj_in().success()Yuya Nishihara committed 1 year agoc83abc9
  25. tests: migrate snapshot users of jj_cmd_success() to run_jj_in()Yuya Nishihara committed 1 year agocdcc777
  26. tests: migrate some helper functions that uses jj_cmd_*() to run_jj_in()Yuya Nishihara committed 1 year ago18ea718
  27. cli: add "Hint: " prefix to conflict hintsYuya Nishihara committed 1 year ago48b0222
  28. cli: render "conflicts" message as warningYuya Nishihara committed 1 year agoa2a9a99
  29. cli: status: do not label message lines as "conflict"Yuya Nishihara committed 1 year ago1fa4e5a
  30. cli: status: reorder conflict message to match checkout statsYuya Nishihara committed 1 year ago067e2eb
  31. tests: add [EOF] marker to command output when displayingYuya Nishihara committed 1 year ago630036e
  32. tests: add CommandOutputString wrapperYuya Nishihara committed 1 year agoa541652
  33. bookmarks: First step to make target revision a required argument to bookmark create/move/set.David Rieber committed 1 year agodd73b5a
  34. cli: status: replace "is clean" by "has no changes"Martin von Zweigbergk committed 1 year ago1e25101
  35. local_working_copy: scan directory entries excluded by auto-track patternYuya Nishihara committed 1 year ago6574f12