Code

History

Commits on CacheMyWorkingCopy to lib/src/refs.rs35+
  1. lib refs.rs: rename `TrackingRefPair` to `LocalAndRemoteRef`Ilya Grigoriev committed 2 years ago12c3be7
  2. object_id: make ObjectId constructors non-trait methodsYuya Nishihara committed 2 years ago95d83cb
  3. object_id: extract ObjectId trait and macros to separate moduleYuya Nishihara committed 2 years agofa5e407
  4. merge: add Merge constructor that accepts interleaved valuesYuya Nishihara committed 3 years agodd26b7b
  5. refs: run non-trivial merge of ref targets without destructuring Merge objectYuya Nishihara committed 3 years ago92dfe59
  6. refs: use swap_remove() in non-trivial merge of ref targetsYuya Nishihara committed 3 years ago9360154
  7. refs: merge tracking state of remote branchesYuya Nishihara committed 3 years ago5543f7a
  8. refs: add function to diff RemoteRef pairsYuya Nishihara committed 3 years ago3d45540
  9. refs: rename diff_named_refs() to diff_named_ref_targets()Yuya Nishihara committed 3 years ago6450194
  10. refs: add helper function to iterate local/remote ref pairsYuya Nishihara committed 3 years ago59eb03e
  11. refs: error out push if non-tracking remote branches existYuya Nishihara committed 3 years ago9e0b9e6
  12. refs: classify push action based on tracking targetYuya Nishihara committed 3 years ago089503a
  13. view: make local/remote branches iterator yield RemoteRef instead of RefTargetYuya Nishihara committed 3 years ago30fb799
  14. view: migrate in-memory structure to per-remote branches mapYuya Nishihara committed 3 years agob7c7b19
  15. refs: migrate classify_branch_push_action() to local/remote targets pairYuya Nishihara committed 3 years ago69a30b4
  16. view: add method to iterate local/remote pairs of certain remoteYuya Nishihara committed 3 years ago420bf79
  17. repo: rewrite diffing of named refs to compare each targets pairYuya Nishihara committed 3 years ago679a591
  18. refs: rename RefTarget::as_conflict() to as_merge()Yuya Nishihara committed 3 years ago2619200
  19. conflicts: move `Merge<T>` to `merge` moduleMartin von Zweigbergk committed 3 years agoef5f97f
  20. conflicts: rename `Conflict<T>` to `Merge<T>`Martin von Zweigbergk committed 3 years agoecc0308
  21. simple_op_store: serialize RefTarget in new format (breaks downgrades)Yuya Nishihara committed 3 years ago4834d12
  22. refs: rename RefTarget::is_conflict() to has_conflict()Yuya Nishihara committed 3 years ago2bbaa43
  23. refs: leverage Conflict::is_resolved()Yuya Nishihara committed 3 years ago961bb49
  24. refs: reimplement RefTarget as Conflict<Option<CommitId>> wrapperYuya Nishihara committed 3 years ago4da8483
  25. refs: pass &Option<RefTarget> into merge_ref_targets()Yuya Nishihara committed 3 years agob6967a1
  26. view: store Option<RefTarget> in maps, add extension trait to flatten OptionYuya Nishihara committed 3 years ago443391b
  27. view: add wrapper that will exclude absent RefTarget entries from ContentHashYuya Nishihara committed 3 years ago7461370
  28. refs: add stub constructors for absent RefTarget, replace None with itYuya Nishihara committed 3 years ago0461a85
  29. refs: turn RefTarget::adds()/removes() into iterator, rename accordinglyYuya Nishihara committed 3 years ago4cfe259
  30. refs: rewrite classify_branch_push_action() without using pattern matchingYuya Nishihara committed 3 years ago5d87f37
  31. refs: add constructor of Some(RefTarget::Conflict { .. })Yuya Nishihara committed 3 years agoa1e9256
  32. refs: add constructor of Some(RefTarget::Normal(id))Yuya Nishihara committed 3 years agoe55c533
  33. refs: stick to Option<CommitId> type while merging ref targetsYuya Nishihara committed 3 years agoab2fa35
  34. refs: leverage Conflict::flatten() and simplify() to premerge ref targetsYuya Nishihara committed 3 years ago424786d
  35. docs: warn about missing docs for `jj-lib` crateWaleed Khan committed 3 years ago54dba51