Code

History

Commits on ig/vimdiffwarn to cli/tests/test_status_command.rs35+
  1. cli: Print @ and @- in status and print_updated_working_copy_statsRobin Stocker committed 1 year ago0456701
  2. tests: pass &TestWorkDir to create_commit*() helperYuya Nishihara committed 1 year ago61a4495
  3. cli tests: move `create_commit()` tests helpers to common/Martin von Zweigbergk committed 1 year ago0055cd4
  4. config: Allow hiding the 'how to resolve conflicts' hintJonathan Gilchrist committed 1 year ago742bc8a
  5. tests: resolve directory path to run_jj_in() relative to env_rootYuya Nishihara committed 1 year ago7fa8420
  6. tests: migrate non-snapshot users of jj_cmd_ok() to run_jj_in().success()Yuya Nishihara committed 1 year ago804d175
  7. tests: migrate non-snapshot users of jj_cmd_success() to run_jj_in().success()Yuya Nishihara committed 1 year agoc83abc9
  8. tests: migrate snapshot users of jj_cmd_success() to run_jj_in()Yuya Nishihara committed 1 year agocdcc777
  9. tests: migrate some helper functions that uses jj_cmd_*() to run_jj_in()Yuya Nishihara committed 1 year ago18ea718
  10. cli: add "Hint: " prefix to conflict hintsYuya Nishihara committed 1 year ago48b0222
  11. cli: render "conflicts" message as warningYuya Nishihara committed 1 year agoa2a9a99
  12. cli: status: do not label message lines as "conflict"Yuya Nishihara committed 1 year ago1fa4e5a
  13. cli: status: reorder conflict message to match checkout statsYuya Nishihara committed 1 year ago067e2eb
  14. tests: add [EOF] marker to command output when displayingYuya Nishihara committed 1 year ago630036e
  15. tests: add CommandOutputString wrapperYuya Nishihara committed 1 year agoa541652
  16. bookmarks: First step to make target revision a required argument to bookmark create/move/set.David Rieber committed 1 year agodd73b5a
  17. cli: status: replace "is clean" by "has no changes"Martin von Zweigbergk committed 1 year ago1e25101
  18. local_working_copy: scan directory entries excluded by auto-track patternYuya Nishihara committed 1 year ago6574f12
  19. status: show untracked filesChristian Stoitner committed 1 year agoae91f22
  20. docs/cli: update URLs to from martinvonz user to jj-vcs orgMartin von Zweigbergk committed 1 year agob836e0a
  21. conflicts: Highlight change ids in rebase adviceLukas Wirth committed 2 years agobccd821
  22. everything: Rename `branches` to `bookmarks`Philip Metzger committed 2 years agod9c68e0
  23. status: report copies and renamesMartin von Zweigbergk committed 2 years agob78c83e
  24. Change conflict hint depending on state of working commit.Essien Ita Essien committed 2 years ago7c4185c
  25. cli_util: add missing word in conflict resolution instructionsVincent Ging Ho Yim committed 2 years ago79b326d
  26. Enable the new graph nodes by default.Anton Älgmyr committed 2 years agoc7eac90
  27. commit_builder: reset author timestamp on discardable commitsScott Taylor committed 2 years ago1eebbe5
  28. print_conflicted_paths: simplify file conflicts before printingBenjamin Tan committed 2 years ago9d4ac81
  29. tests: add tests showing that individual file conflicts are not simplified/deduplicatedBenjamin Tan committed 2 years agof74991c
  30. tests: avoid deprecated `jj init --git/--git-repo`Martin von Zweigbergk committed 2 years agofe9daac
  31. cli: status: when current change has conflicts, display instructions to resolve themAlexis (Poliorcetics) Bourget committed 2 years ago52e494d
  32. cli: support filtering by paths in `status`Scott Olson committed 2 years agoe22370c
  33. compile integration tests as a single binaryjyn committed 2 years agod66fcf2
  34. tests: replace jj_cmd_success() involving mutation to allow stderr outputYuya Nishihara committed 3 years ago58acc1d
  35. Fix .gitignore handling of ignored directories - Ignore .gitignore files from untracked directories - Do not allow un-ignoring files within ignored directoriesPiotr Kufel committed 3 years ago2109a7b