Commits

Branch selector

ort-misc

User selector

All users

Datepicker

All time

Commit history

Commits on Jul 23, 2021

• Revert "merge-ort: allow rename detection to be disabled"

  Show description for 2e7e8d7
  newren

  committed
  2e7e8d7View commit details

  Copy full SHA for 2e7e8d7

  Browse repository at this point

• merge-ort: allow rename detection to be disabled

  Show description for 5330a9d
  newren

  committed
  5330a9dView commit details

  Copy full SHA for 5330a9d

  Browse repository at this point

• diffcore-rename: enable limiting rename detection to relevant destinations

  Show description for c7540e8
  newren

  committed
  c7540e8View commit details

  Copy full SHA for c7540e8

  Browse repository at this point

• merge-ort: Important note for redo-after-renames and cached pairs

  Show description for e49a56e
  newren

  committed
  e49a56eView commit details

  Copy full SHA for e49a56e

  Browse repository at this point

Commits on Jul 22, 2021

• merge-ort: reuse path strings in pool_alloc_filespec

  Show description for 17aa0a7
  newren

  committed
  17aa0a7View commit details

  Copy full SHA for 17aa0a7

  Browse repository at this point

• merge-ort: store filepairs and filespecs in our mem_pool

  Show description for 629d042
  newren

  committed
  629d042View commit details

  Copy full SHA for 629d042

  Browse repository at this point

• diffcore-rename, merge-ort: add wrapper functions for filepair alloc/dealloc

  Show description for 2db932b
  newren

  committed
  2db932bView commit details

  Copy full SHA for 2db932b

  Browse repository at this point

• merge-ort: switch our strmaps over to using memory pools

  Show description for 8231c8e
  newren

  committed
  8231c8eView commit details

  Copy full SHA for 8231c8e

  Browse repository at this point

• merge-ort: add pool_alloc, pool_calloc, and pool_strndup wrappers

  Show description for e30b8c8
  newren

  committed
  e30b8c8View commit details

  Copy full SHA for e30b8c8

  Browse repository at this point

• merge-ort: set up a memory pool

  Show description for 77367a6
  newren

  committed
  77367a6View commit details

  Copy full SHA for 77367a6

  Browse repository at this point

• diffcore-rename: use a mem_pool for exact rename detection's hashmap

  Show description for 9f8ab62
  newren

  committed
  9f8ab62View commit details

  Copy full SHA for 9f8ab62

  Browse repository at this point

Commits on Jul 20, 2021

• merge-ort: restart merge with cached renames to reduce process entry cost

  Show description for c9ada83
  newren

  committed
  c9ada83View commit details

  Copy full SHA for c9ada83

  Browse repository at this point

• merge-ort: avoid recursing into directories when we don't need to

  Show description for 7b21127
  newren

  committed
  7b21127View commit details

  Copy full SHA for 7b21127

  Browse repository at this point

• merge-ort: defer recursing into directories when merge base is matched

  Show description for 5b01c11
  newren

  committed
  5b01c11View commit details

  Copy full SHA for 5b01c11

  Browse repository at this point

• merge-ort: add a handle_deferred_entries() helper function

  Show description for ff568a6
  newren

  committed
  ff568a6View commit details

  Copy full SHA for ff568a6

  Browse repository at this point

• merge-ort: add data structures for allowable trivial directory resolves

  Show description for d816574
  newren

  committed
  d816574View commit details

  Copy full SHA for d816574

  Browse repository at this point

• merge-ort: add some more explanations in collect_merge_info_callback()

  Show description for 7a0085f
  newren

  committed
  7a0085fView commit details

  Copy full SHA for 7a0085f

  Browse repository at this point

• merge-ort: resolve paths early when we have sufficient information

  Show description for 7fdfeb1
  newren

  committed
  7fdfeb1View commit details

  Copy full SHA for 7fdfeb1

  Browse repository at this point

Commits on Jun 22, 2021

• diffcore-rename: revert last three commits; they cause 33% slowdown

  Show description for 2eeee12
  newren

  committed
  2eeee12View commit details

  Copy full SHA for 2eeee12

  Browse repository at this point

• diffcore-rename: I think I got the exact count makes dir rename irrelevant exclusion working

  Show description for 2b30242
  newren

  committed
  2b30242View commit details

  Copy full SHA for 2b30242

  Browse repository at this point

• diffcore-rename: factor out bump_unknown_count() function

  Show description for b127fbe
  newren

  committed
  b127fbeView commit details

  Copy full SHA for b127fbe

  Browse repository at this point

• diffcore-rename: allow increment_count() to take an amount

  Show description for 45f461c
  newren

  committed
  45f461cView commit details

  Copy full SHA for 45f461c

  Browse repository at this point

• merge-ort: add prefetching for content merges

  Show description for 69011cf
  newren

  committed
  69011cfView commit details

  Copy full SHA for 69011cf

  Browse repository at this point

• diffcore-rename: use a different prefetch for basename comparisons

  Show description for c9b5524
  newren

  committed
  c9b5524View commit details

  Copy full SHA for c9b5524

  Browse repository at this point

• diffcore-rename: allow different missing_object_cb functions

  Show description for 7ed0162
  newren

  committed
  7ed0162View commit details

  Copy full SHA for 7ed0162

  Browse repository at this point

• t6421: add tests checking for excessive object downloads during merge

  Show description for 4796e09
  newren

  committed
  4796e09View commit details

  Copy full SHA for 4796e09

  Browse repository at this point

Commits on Jun 15, 2021

• promisor-remote: output trace2 statistics for number of objects fetched

  Show description for 04f5ebd
  newren

  committed
  04f5ebdView commit details

  Copy full SHA for 04f5ebd

  Browse repository at this point

Commits on Jun 8, 2021

• merge-ort: miscellaneous touch-ups

  Show description for 6de569e
  newren

  committed
  6de569eView commit details

  Copy full SHA for 6de569e

  Browse repository at this point

• Fix various issues found in comments

  Show description for 55c0f2c
  newren

  committed
  55c0f2cView commit details

  Copy full SHA for 55c0f2c

  Browse repository at this point

• diffcore-rename: avoid unnecessary strdup'ing in break_idx

  Show description for be858c4
  newren

  committed
  be858c4View commit details

  Copy full SHA for be858c4

  Browse repository at this point

• merge-ort: replace string_list_df_name_compare with faster alternative

  Show description for 140c1e8
  newren

  committed
  140c1e8View commit details

  Copy full SHA for 140c1e8

  Browse repository at this point

Commits on May 19, 2021

• merge-ort, diffcore-rename: employ cached renames when possible

  Show description for 76e2537
  newren

  committed
  76e2537View commit details

  Copy full SHA for 76e2537

  Browse repository at this point

• merge-ort: handle interactions of caching and rename/rename(1to1) cases

  Show description for 886a171
  newren

  committed
  886a171View commit details

  Copy full SHA for 886a171

  Browse repository at this point

• merge-ort: add helper functions for using cached renames

  Show description for 386fd24
  newren

  committed
  386fd24View commit details

  Copy full SHA for 386fd24

  Browse repository at this point

• merge-ort: preserve cached renames for the appropriate side

  Show description for 472a539
  newren

  committed
  472a539View commit details

  Copy full SHA for 472a539

  Browse repository at this point