Code

History

Commits on ig/vimdiffwarn to cli/tests/test_concurrent_operations.rs32
  1. cli: Print @ and @- in status and print_updated_working_copy_statsRobin Stocker committed 1 year ago0456701
  2. tests: port test_concurrent_operations.rs to TestWorkDir APIYuya Nishihara committed 1 year agodd00489
  3. tests: resolve directory path to run_jj_in() relative to env_rootYuya Nishihara committed 1 year ago7fa8420
  4. tests: migrate non-snapshot users of jj_cmd_ok() to run_jj_in().success()Yuya Nishihara committed 1 year ago804d175
  5. tests: migrate snapshot users of jj_cmd_ok() to run_jj_in()Yuya Nishihara committed 1 year ago3193513
  6. tests: migrate snapshot users of jj_cmd_success() to run_jj_in()Yuya Nishihara committed 1 year agocdcc777
  7. tests: migrate unusual users of jj_cmd_success() to run_jj_in/with()Yuya Nishihara committed 1 year ago3179938
  8. tests: migrate callers of jj_cmd_failure() to run_jj_in()Yuya Nishihara committed 1 year agod19e58f
  9. tests: migrate some jj_cmd_ok() output wrappers to run_jj_in()Yuya Nishihara committed 1 year ago679a5c5
  10. tests: add [EOF] marker to command output when displayingYuya Nishihara committed 1 year ago630036e
  11. tests: add CommandOutputString wrapperYuya Nishihara committed 1 year agoa541652
  12. log: emit working-copy branch first if included in the revsetYuya Nishihara committed 2 years ago1973c71
  13. repo: teach OpStore about the root commit idYuya Nishihara committed 2 years agoae62b5b
  14. op log: change "resolve concurrent" to "reconcile divergent"Martin von Zweigbergk committed 2 years agocc15ecf
  15. cli: merge op heads and snapshot working copy by "op log" by defaultYuya Nishihara committed 2 years ago9ec6175
  16. cli: do not attempt to merge op heads if --at-op=@ is specifiedYuya Nishihara committed 2 years ago2008991
  17. Enable the new graph nodes by default.Anton Älgmyr committed 2 years agoc7eac90
  18. diff: fix typo in Git diff "index old..new" headerYuya Nishihara committed 2 years ago07a6a80
  19. commit_builder: reset author timestamp on discardable commitsScott Taylor committed 2 years ago1eebbe5
  20. tests: avoid deprecated `jj init --git/--git-repo`Martin von Zweigbergk committed 2 years agofe9daac
  21. op_store: add metadata flag for ops representing working-copy snapshotMartin von Zweigbergk committed 2 years ago11c67cf
  22. Fix the ContentHash implementations for std::Option, MergedTreeId, and RemoteRefStateEvan Mesterhazy committed 2 years agoe1fd402
  23. compile integration tests as a single binaryjyn committed 2 years agod66fcf2
  24. cli: give root operation special treatment in template (like root commit)Martin von Zweigbergk committed 2 years ago41db64e
  25. op_store: add a virtual root operation, similar to root commitMartin von Zweigbergk committed 2 years ago6e302bb
  26. view: drop tracking of public headsMartin von Zweigbergk committed 2 years agoc9af8bf
  27. cli: run "op log" without loading repo or merging concurrent opsYuya Nishihara committed 2 years ago543036c
  28. merge: simply generate content hash from interleaved valuesYuya Nishihara committed 3 years agob07b370
  29. view: migrate in-memory structure to per-remote branches mapYuya Nishihara committed 3 years agob7c7b19
  30. cli: send status messages to stderr, specify stdout/stderr explicitlyYuya Nishihara committed 3 years ago7a3e724
  31. tests: replace jj_cmd_success() involving mutation to allow stderr outputYuya Nishihara committed 3 years ago58acc1d
  32. tests: move `tests/` under `cli/` so they're run againMartin von Zweigbergk committed 3 years ago0075174