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

valentin.gatienbaron (Valentin Gatien-Baron) phabricator at mercurial-scm.org
Wed Jul 10 21:45:40 EDT 2019


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 this in most circumstances.

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-scm.org/repo/hg-committed/file/3bc400ccbf99/mercurial/context.py#l443
https://www.mercurial-scm.org/repo/hg-committed/file/3bc400ccbf99/mercurial/context.py#l2414
https://www.mercurial-scm.org/repo/hg-committed/file/3bc400ccbf99/mercurial/localrepo.py#l2407

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D6613/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D6613

To: valentin.gatienbaron, #hg-reviewers, mharbison72
Cc: JordiGH, yuja, mharbison72, martinvonz, mjpieters, mercurial-devel


More information about the Mercurial-devel mailing list