D2069: revlog: resolve lfs rawtext to vanilla rawtext before applying delta

2018-03-06 Thread quark (Jun Wu)
This revision was automatically updated to reflect the committed changes. Closed by commit rHG369aadf7a326: revlog: resolve lfs rawtext to vanilla rawtext before applying delta (authored by quark, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.o

D2069: revlog: resolve lfs rawtext to vanilla rawtext before applying delta

2018-03-06 Thread indygreg (Gregory Szorc)
indygreg accepted this revision. indygreg added a comment. This revision is now accepted and ready to land. This change is a bit difficult to reason about. But I think it is fine. Essentially, we're ensuring that the delta stored in the revlog is applied on top of the fulltext after flag

D2069: revlog: resolve lfs rawtext to vanilla rawtext before applying delta

2018-03-03 Thread quark (Jun Wu)
quark updated this revision to Diff 6471. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D2069?vs=5652&id=6471 REVISION DETAIL https://phab.mercurial-scm.org/D2069 AFFECTED FILES mercurial/revlog.py tests/test-lfs-bundle.t CHANGE DETAILS diff --git

D2069: revlog: resolve lfs rawtext to vanilla rawtext before applying delta

2018-02-13 Thread quark (Jun Wu)
quark updated this revision to Diff 5652. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D2069?vs=5271&id=5652 REVISION DETAIL https://phab.mercurial-scm.org/D2069 AFFECTED FILES mercurial/revlog.py tests/test-lfs-bundle.t CHANGE DETAILS diff --git

D2069: revlog: resolve lfs rawtext to vanilla rawtext before applying delta

2018-02-07 Thread indygreg (Gregory Szorc)
indygreg requested changes to this revision. indygreg added a comment. This revision now requires changes to proceed. I'd like to see the next versions of hte previous 2 patches before looking at this because this patch will likely get some minor rework as well. REPOSITORY rHG Mercurial RE

D2069: revlog: resolve lfs rawtext to vanilla rawtext before applying delta

2018-02-06 Thread quark (Jun Wu)
quark updated this revision to Diff 5271. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D2069?vs=5267&id=5271 REVISION DETAIL https://phab.mercurial-scm.org/D2069 AFFECTED FILES mercurial/revlog.py tests/test-lfs-bundle.t CHANGE DETAILS diff --git

D2069: revlog: resolve lfs rawtext to vanilla rawtext before applying delta

2018-02-06 Thread quark (Jun Wu)
quark updated this revision to Diff 5267. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D2069?vs=5266&id=5267 REVISION DETAIL https://phab.mercurial-scm.org/D2069 AFFECTED FILES mercurial/revlog.py tests/test-lfs-bundle.t CHANGE DETAILS diff --git

D2069: revlog: resolve lfs rawtext to vanilla rawtext before applying delta

2018-02-06 Thread quark (Jun Wu)
quark created this revision. Herald added a reviewer: indygreg. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY This happens when a LFS delta base gets a non-LFS delta from another client. In that case, the LFS delta base needs to be converte