log: File paths are missing from the log for merge commits

Thu Oct 8 02:49:55 UTC 2020

Hi, 

This is still an issue in version 5.5.2. Is no-one else seeing this issue? I find it odd that files missing from log output is not a high priority issue? Am I reporting this to the correct channel?

Thanks,
Dave Sparks

-----Original Message-----
From: Mercurial <mercurial-bounces at mercurial-scm.org> On Behalf Of Dave Sparks via Mercurial
Sent: Monday, 31 August 2020 22:03
To: mercurial at mercurial-scm.org
Subject: SPAM-LOW: RE: log: File paths are missing from the log for merge commits

Hi,

Is anyone looking into this issue? It appears to apply to all other built-in templates as well as xml? We use the output from the xml template to show the list of files in our CI server. If this is unreliable than we'll need look into rewriting our parser to read the output from --stat.

Thanks,
Dave Sparks

-----Original Message-----
From: Mercurial <mercurial-bounces at mercurial-scm.org> On Behalf Of Dave Sparks via Mercurial
Sent: Friday, 7 August 2020 15:02
To: mercurial at mercurial-scm.org; 'Pierre-Yves David' <pierre-yves.david at ens-lyon.org>
Subject: SPAM-LOW: RE: log: File paths are missing from the log for merge commits

Hi Pierre,

I've just tested with version 5.1 and the file is missing from the output there:

I:\FBAT_HG>hg --version
Mercurial Distributed SCM (version 5.1)
(see https://mercurial-scm.org for more information)

I:\FBAT_HG>hg log -l 1 -v --style=xml
<?xml version="1.0"?>
<log>
<logentry revision="6167" node="c1b3947b6a8cd2600f4a9babc1aaa6e94699b9db">
<branch>dev</branch>
<tag>tip</tag>
<parent revision="6165" node="58d0f685e8ea080604e4a5d7329dacbac4b66d89" /> <parent revision="6166" node="a6f960cd570082f1f20f894c62f53402c5f392b3" /> <author email="xxxxx at finalbuilder.com">Some Name</author> <date>2020-08-06T14:35:55+10:00</date>
<msg xml:space="preserve">Merge with f-flat-log-word-wrap</msg> <paths> </paths> </logentry> </log>

So the change happened between v5.0.2 and v5.1. There's no windows installer for v5.1rc0, so I can't narrow it down any further.

Note that the missing file was updated (differently) in both parent revisions, see below (v5.1):

I:\FBAT_HG>hg log -l 3 -v --style=xml --graph --stat <?xml version="1.0"?> <log>
o    <logentry revision="6167" node="c1b3947b6a8cd2600f4a9babc1aaa6e94699b9db">
|\   <branch>dev</branch>
| |  <tag>tip</tag>
| |  <parent revision="6165" 
| | node="58d0f685e8ea080604e4a5d7329dacbac4b66d89" />  <parent 
| | revision="6166" node="a6f960cd570082f1f20f894c62f53402c5f392b3" /> 
| | <author email="user1 at finalbuilder.com">User 1</author> 
| | <date>2020-08-06T14:35:55+10:00</date>
| |  <msg xml:space="preserve">Merge with f-flat-log-word-wrap</msg> 
| | <paths>  </paths>  </logentry>
| |   Src\StyleSheets\FB\ConvertLogToHTML.xsl |  105 +++++++++++++++----------
| |   1 files changed, 63 insertions(+), 42 deletions(-)
| |
| @  <logentry revision="6166" node="a6f960cd570082f1f20f894c62f53402c5f392b3">
|/   <branch>f-flat-log-word-wrap</branch>
|    <author email="user2 at finalbuilder.com">User 2</author>
|    <date>2020-08-06T13:06:24+10:00</date>
|    <msg xml:space="preserve">added word wrap to action message output, made word breaks less indiscriminate, aligned vertical alignment, and increased initial size of first column</msg>
|    <paths>
|    <path action="M">Src/StyleSheets/FB/ConvertLogToHTML.xsl</path>
|    </paths>
|    </logentry>
|     Src\StyleSheets\FB\ConvertLogToHTML.xsl |  105 +++++++++++++++----------
|     1 files changed, 63 insertions(+), 42 deletions(-)
|
o  <logentry revision="6165" node="58d0f685e8ea080604e4a5d7329dacbac4b66d89">
|  <branch>dev</branch>
~  <parent revision="6162" node="cd742ef0df02065c9baafc62b68fd2cfc94b92cf" />
   <author email="user1 at finalbuilder.com">User 1</author>
   <date>2020-08-06T10:47:25+10:00</date>
   <msg xml:space="preserve">Enhancement - Export Log Action - improved formatting of flat html style.</msg>
   <paths>
   <path action="M">Src/StyleSheets/FB/ConvertLogToHTML.xsl</path>
   </paths>
   </logentry>
    Src\StyleSheets\FB\ConvertLogToHTML.xsl |  382 ++++++++++++++++-----------
    1 files changed, 225 insertions(+), 157 deletions(-)

</log>

Thanks,
Dave Sparks

-----Original Message-----
From: Pierre-Yves David <pierre-yves.david at ens-lyon.org>
Sent: Friday, 7 August 2020 02:10
To: support at finalbuilder.com; Dave Sparks <dave.sparks at finalbuilder.com>; mercurial at mercurial-scm.org
Subject: Re: log: File paths are missing from the log for merge commits

<snip>

The change you are pointing at is not related to your behavior changes. 
The change in 5.1 is about storing less data in the changeset at commit time which (unfortunately) affect the hash. In your case, the very same changeset (same hash) result in a different output. Can you try other Mercurial version to pinpoint that point where the behavior changed better?

--
Pierre-Yves David

_______________________________________________
Mercurial mailing list
Mercurial at mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial

_______________________________________________
Mercurial mailing list
Mercurial at mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial