Code

History

Commits on ig/vimdiffwarn to lib/src/refs.rs35+
  1. view: rename RemoteRefState::Tracking to TrackedYuya Nishihara committed 1 year agof87db58
  2. ref_name: move RemoteRefSymbol types from refs moduleYuya Nishihara committed 1 year agocc8a80c
  3. lib: new `diff_named_commit_ids` helperIlya Grigoriev committed 1 year ago270924d
  4. refs: add RemoteRefSymbol { name, remote } typesYuya Nishihara committed 1 year ago201603f
  5. merge: make `trivial_merge()` take a single slice of interleaved termsMartin von Zweigbergk committed 1 year ago7149429
  6. bookmarks: update some leftover uses of the word "branch"Martin von Zweigbergk committed 2 years ago1aa2aec
  7. everything: Rename `branches` to `bookmarks`Philip Metzger committed 2 years agod9c68e0
  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. lib refs.rs: rename `TrackingRefPair` to `LocalAndRemoteRef`Ilya Grigoriev committed 2 years ago12c3be7
  11. object_id: make ObjectId constructors non-trait methodsYuya Nishihara committed 2 years ago95d83cb
  12. object_id: extract ObjectId trait and macros to separate moduleYuya Nishihara committed 2 years agofa5e407
  13. merge: add Merge constructor that accepts interleaved valuesYuya Nishihara committed 3 years agodd26b7b
  14. refs: run non-trivial merge of ref targets without destructuring Merge objectYuya Nishihara committed 3 years ago92dfe59
  15. refs: use swap_remove() in non-trivial merge of ref targetsYuya Nishihara committed 3 years ago9360154
  16. refs: merge tracking state of remote branchesYuya Nishihara committed 3 years ago5543f7a
  17. refs: add function to diff RemoteRef pairsYuya Nishihara committed 3 years ago3d45540
  18. refs: rename diff_named_refs() to diff_named_ref_targets()Yuya Nishihara committed 3 years ago6450194
  19. refs: add helper function to iterate local/remote ref pairsYuya Nishihara committed 3 years ago59eb03e
  20. refs: error out push if non-tracking remote branches existYuya Nishihara committed 3 years ago9e0b9e6
  21. refs: classify push action based on tracking targetYuya Nishihara committed 3 years ago089503a
  22. view: make local/remote branches iterator yield RemoteRef instead of RefTargetYuya Nishihara committed 3 years ago30fb799
  23. view: migrate in-memory structure to per-remote branches mapYuya Nishihara committed 3 years agob7c7b19
  24. refs: migrate classify_branch_push_action() to local/remote targets pairYuya Nishihara committed 3 years ago69a30b4
  25. view: add method to iterate local/remote pairs of certain remoteYuya Nishihara committed 3 years ago420bf79
  26. repo: rewrite diffing of named refs to compare each targets pairYuya Nishihara committed 3 years ago679a591
  27. refs: rename RefTarget::as_conflict() to as_merge()Yuya Nishihara committed 3 years ago2619200
  28. conflicts: move `Merge<T>` to `merge` moduleMartin von Zweigbergk committed 3 years agoef5f97f
  29. conflicts: rename `Conflict<T>` to `Merge<T>`Martin von Zweigbergk committed 3 years agoecc0308
  30. simple_op_store: serialize RefTarget in new format (breaks downgrades)Yuya Nishihara committed 3 years ago4834d12
  31. refs: rename RefTarget::is_conflict() to has_conflict()Yuya Nishihara committed 3 years ago2bbaa43
  32. refs: leverage Conflict::is_resolved()Yuya Nishihara committed 3 years ago961bb49
  33. refs: reimplement RefTarget as Conflict<Option<CommitId>> wrapperYuya Nishihara committed 3 years ago4da8483
  34. refs: pass &Option<RefTarget> into merge_ref_targets()Yuya Nishihara committed 3 years agob6967a1
  35. view: store Option<RefTarget> in maps, add extension trait to flatten OptionYuya Nishihara committed 3 years ago443391b