mirror of
https://github.com/facebook/sapling.git
synced 2024-10-11 01:07:15 +03:00
b7817ffbd8
Summary: Renamed xdiff functions to avoid linking issues when using both libgit2-sys and xdiff. When using repo_import tool (https://fburl.com/diffusion/8p6fhjt2) we have libgit2-sys dependency for importing git repos. However, when we derive blame data types, we need to use xdiff functionalities (from_no_parents: https://fburl.com/diffusion/pitukmyo -> diff_hunks: https://fburl.com/diffusion/9f8caan9 -> xdl_diff: https://fburl.com/diffusion/260x66hf). Both libgit2 and eden/scm have vendored versions of xdiff library. Therefore, libgit2-sys and eden/scm share functions with the same signatures, but have different behaviours and when we tried to derive blame, it used libgit2-sys's xdl_diff instead of eden's. This resulted in getting segfaults (https://fburl.com/paste/04gwalpo). Note: repo_import is the first tool that has tried to import both and the first to run into this issue. Reviewed By: StanislavGlebik Differential Revision: D22432330 fbshipit-source-id: f2b965f3926a2dc45de1bf20e41dad70ca09cdfd |
||
|---|---|---|
| .. | ||
| mman-win32 | ||
| rust | ||
| sha1dc | ||
| xdiff | ||