Code

History

Commits on ig/commit-debug to lib/tests/test_refs.rs35
  1. tests: remove CommitGraphBuilderMartin von Zweigbergk committed 1 year ago28562f1
  2. cleanup: enable `unused_trait_names` clippy lint and run `clippy --fix`Ilya Grigoriev committed 1 year agoacaedc3
  3. tests: add convenient method to initialize TestWorkspace with test settingsYuya Nishihara committed 2 years agob865398
  4. repo: remove &UserSettings argument from new/rewrite_commit(), use self.settingsYuya Nishihara committed 1 year agocff7384
  5. repo: remove &UserSettings argument from start_transaction(), use self.settingsYuya Nishihara committed 1 year ago14b5220
  6. transaction: propagate errors from `commit()`Martin von Zweigbergk committed 1 year agode6da1a
  7. transaction: rename `mut_repo()` to idiomatic `repo_mut()`Martin von Zweigbergk committed 2 years ago8d09062
  8. refs: retry trivial resolution after merging targetsYuya Nishihara committed 2 years ago11b9888
  9. formatting only: switch to Item level import ganularityMatt Kulukundis committed 2 years ago8ead72e
  10. jj git push: safety checks in push negotiation, "force-with-lease"Ilya Grigoriev committed 2 years ago8d3dd17
  11. transaction: take description at end instead of startMartin von Zweigbergk committed 2 years ago60fae31
  12. merge: add Merge constructor that accepts interleaved valuesYuya Nishihara committed 3 years agodd26b7b
  13. refs: use swap_remove() in non-trivial merge of ref targetsYuya Nishihara committed 3 years ago9360154
  14. tests: wherever we test with only one backend, use the test backendMartin von Zweigbergk committed 3 years ago0f7054e
  15. testutils: delete bool-typed `init()` in favor of enum-typed versionMartin von Zweigbergk committed 3 years ago9c30d75
  16. conflicts: move `Merge<T>` to `merge` moduleMartin von Zweigbergk committed 3 years agoef5f97f
  17. conflicts: rename `Conflict<T>` to `Merge<T>`Martin von Zweigbergk committed 3 years agoecc0308
  18. refs: reimplement RefTarget as Conflict<Option<CommitId>> wrapperYuya Nishihara committed 3 years ago4da8483
  19. refs: pass &Option<RefTarget> into merge_ref_targets()Yuya Nishihara committed 3 years agob6967a1
  20. refs: add stub constructors for absent RefTarget, replace None with itYuya Nishihara committed 3 years ago0461a85
  21. refs: add constructor of Some(RefTarget::Conflict { .. })Yuya Nishihara committed 3 years agoa1e9256
  22. refs: add constructor of Some(RefTarget::Normal(id))Yuya Nishihara committed 3 years agoe55c533
  23. refs: leverage Conflict::flatten() and simplify() to premerge ref targetsYuya Nishihara committed 3 years ago424786d
  24. cargo: rename crates from `jujutsu`/`jujutsu-lib` to `jj-cli`/`jj-lib`Martin von Zweigbergk committed 3 years agoaac5b7a
  25. repo: extract a `Repo` trait for `Arc<ReadonlyRepo>` and `MutableRepo`Martin von Zweigbergk committed 3 years agof6a4cb5
  26. repo: make `ReadonlyRepo::index()` return a `&dyn Index`Martin von Zweigbergk committed 3 years ago8a06728
  27. index: delete IndexRef, use Index traitMartin von Zweigbergk committed 3 years ago2d8aa2d
  28. copyright: change from "Google LLC" to "The Jujutsu Authors"Martin von Zweigbergk committed 3 years agod8feed9
  29. operations: make hostname and username configurableMartin von Zweigbergk committed 4 years ago9502d84
  30. tests: move `testutils` module into separate crateMartin von Zweigbergk committed 4 years ago3c7c4e9
  31. tests: move `init_{repo,workspace}` functions onto typesMartin von Zweigbergk committed 4 years ago4cf04f3
  32. tests: rename `init_repo()` to `init_workspace()`Martin von Zweigbergk committed 4 years agoabedeea
  33. testutils: make init_repo return a struct, including a WorkspaceMartin von Zweigbergk committed 4 years agoce094f6
  34. tests: use CommitGraphBuilder in test_refs.rsMartin von Zweigbergk committed 5 years agoe99e86e
  35. view: add support for merging git ref targetsMartin von Zweigbergk committed 5 years ago6b1ccd4