D6613: commit: improve the files field of changelog for merges (RFC)

JordiGH added inline comments. INLINE COMMENTS > valentin.gatienbaron wrote in localrepo.py:2658 > It'd be trivial to change the code to check both parents, but I find what you > say surprising. Aren't there plenty of places in hg that do checks similar to > this one: > > https://www.mercurial

D6613: commit: improve the files field of changelog for merges (RFC)

valentin.gatienbaron added inline comments. INLINE COMMENTS > JordiGH wrote in localrepo.py:2658 > Not all merges can be detected by checking for p2 being non-null; p1 being > null but p2 being non-null is perfectly acceptable everywhere else, although > normally hg won't produce commits like t

D6613: commit: improve the files field of changelog for merges (RFC)

valentin.gatienbaron added a comment. In D6613#96908 , @mharbison72 wrote: > In D6613#96822 , @valentin.gatienbaron wrote: > >> Ok. Maybe it would be simpler or more robust to do the direct thing:

D6613: commit: improve the files field of changelog for merges (RFC)

JordiGH added inline comments. INLINE COMMENTS > localrepo.py:2658 > del m[f] > +if p2.rev() != nullrev: > +@util.cachefunc Not all merges can be detected by checking for p2 being non-null; p1 being null but p2 being non-null is perfectly

D6613: commit: improve the files field of changelog for merges (RFC)

mharbison72 added a comment. mharbison72 added a subscriber: yuja. In D6613#96822 , @valentin.gatienbaron wrote: > Ok. Maybe it would be simpler or more robust to do the direct thing: optionally treat the files list in the input commit as input

D6613: commit: improve the files field of changelog for merges (RFC)

valentin.gatienbaron added a comment. Ok. Maybe it would be simpler or more robust to do the direct thing: optionally treat the files list in the input commit as input and reuse them blindly in the resulting commit, when doing a hg->hg conversion without filemap. (btw, a tweak to test-merge

D6613: commit: improve the files field of changelog for merges (RFC)

mharbison72 added a comment. In D6613#96749 , @valentin.gatienbaron wrote: > In D6613#96743 , @mharbison72 wrote: > >> If this goes forward, can this be gated by a config option (even if it is on

D6613: commit: improve the files field of changelog for merges (RFC)

valentin.gatienbaron added a comment. In D6613#96743 , @mharbison72 wrote: > If this goes forward, can this be gated by a config option (even if it is on by default)? IIUC, this will change the hash for merges, and then cascade. That seems p

D6613: commit: improve the files field of changelog for merges (RFC)

This revision now requires changes to proceed. mharbison72 added a comment. mharbison72 requested changes to this revision. If this goes forward, can this be gated by a config option (even if it is on by default)? IIUC, this will change the hash for merges, and then cascade. That seems prob

D6613: commit: improve the files field of changelog for merges (RFC)

valentin.gatienbaron edited the summary of this revision. valentin.gatienbaron updated this revision to Diff 15830. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6613?vs=15789&id=15830 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6613/new/

D6613: commit: improve the files field of changelog for merges (RFC)

valentin.gatienbaron added a comment. I hadn't seen the bug you linked to, or your recent change, though I saw ctx.filesadded() and friends (when writing this) and suspected they were written the way they are to work nicely on merges. I didn't have one single goal when writing this. Hg's

D6613: commit: improve the files field of changelog for merges (RFC)

martinvonz added a comment. See some thoughts from me and others on https://bz.mercurial-scm.org/show_bug.cgi?id=4292. Is your goal to shrink the changelog? Or that you feel that the current behavior is incorrect? Or something else? REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION ht

D6613: commit: improve the files field of changelog for merges (RFC)

valentin.gatienbaron created this revision. Herald added subscribers: mercurial-devel, mjpieters. Herald added a reviewer: hg-reviewers. REVISION SUMMARY The main reason for the RFC tag is: the output of hg log -T {files} is stored in the changelog, despite it being a cache. So any fix to that