Code

History

Commits on ig/commit-debug to lib/src/refs.rs35+
  1. cleanup: replace clippy allow() exemptions by expect()Martin von Zweigbergk committed 1 year ago8aa9d1d
  2. files, tree: make same-change conflict resolution configurableYuya Nishihara committed 1 year agoaf4fe21
  3. merge: parameterize same-change rule of trivial_merge()Yuya Nishihara committed 1 year ago949fd2a
  4. cli, lib: move to Rust 2024 language editionAustin Seipp committed 1 year agoba24140
  5. view: rename RemoteRefState::Tracking to TrackedYuya Nishihara committed 1 year agof87db58
  6. ref_name: move RemoteRefSymbol types from refs moduleYuya Nishihara committed 1 year agocc8a80c
  7. lib: new `diff_named_commit_ids` helperIlya Grigoriev committed 1 year ago270924d
  8. refs: add RemoteRefSymbol { name, remote } typesYuya Nishihara committed 1 year ago201603f
  9. merge: make `trivial_merge()` take a single slice of interleaved termsMartin von Zweigbergk committed 1 year ago7149429
  10. bookmarks: update some leftover uses of the word "branch"Martin von Zweigbergk committed 2 years ago1aa2aec
  11. everything: Rename `branches` to `bookmarks`Philip Metzger committed 2 years agod9c68e0
  12. refs: retry trivial resolution after merging targetsYuya Nishihara committed 2 years ago11b9888
  13. formatting only: switch to Item level import ganularityMatt Kulukundis committed 2 years ago8ead72e
  14. lib refs.rs: rename `TrackingRefPair` to `LocalAndRemoteRef`Ilya Grigoriev committed 2 years ago12c3be7
  15. object_id: make ObjectId constructors non-trait methodsYuya Nishihara committed 2 years ago95d83cb
  16. object_id: extract ObjectId trait and macros to separate moduleYuya Nishihara committed 2 years agofa5e407
  17. merge: add Merge constructor that accepts interleaved valuesYuya Nishihara committed 3 years agodd26b7b
  18. refs: run non-trivial merge of ref targets without destructuring Merge objectYuya Nishihara committed 3 years ago92dfe59
  19. refs: use swap_remove() in non-trivial merge of ref targetsYuya Nishihara committed 3 years ago9360154
  20. refs: merge tracking state of remote branchesYuya Nishihara committed 3 years ago5543f7a
  21. refs: add function to diff RemoteRef pairsYuya Nishihara committed 3 years ago3d45540
  22. refs: rename diff_named_refs() to diff_named_ref_targets()Yuya Nishihara committed 3 years ago6450194
  23. refs: add helper function to iterate local/remote ref pairsYuya Nishihara committed 3 years ago59eb03e
  24. refs: error out push if non-tracking remote branches existYuya Nishihara committed 3 years ago9e0b9e6
  25. refs: classify push action based on tracking targetYuya Nishihara committed 3 years ago089503a
  26. view: make local/remote branches iterator yield RemoteRef instead of RefTargetYuya Nishihara committed 3 years ago30fb799
  27. view: migrate in-memory structure to per-remote branches mapYuya Nishihara committed 3 years agob7c7b19
  28. refs: migrate classify_branch_push_action() to local/remote targets pairYuya Nishihara committed 3 years ago69a30b4
  29. view: add method to iterate local/remote pairs of certain remoteYuya Nishihara committed 3 years ago420bf79
  30. repo: rewrite diffing of named refs to compare each targets pairYuya Nishihara committed 3 years ago679a591
  31. refs: rename RefTarget::as_conflict() to as_merge()Yuya Nishihara committed 3 years ago2619200
  32. conflicts: move `Merge<T>` to `merge` moduleMartin von Zweigbergk committed 3 years agoef5f97f
  33. conflicts: rename `Conflict<T>` to `Merge<T>`Martin von Zweigbergk committed 3 years agoecc0308
  34. simple_op_store: serialize RefTarget in new format (breaks downgrades)Yuya Nishihara committed 3 years ago4834d12
  35. refs: rename RefTarget::is_conflict() to has_conflict()Yuya Nishihara committed 3 years ago2bbaa43