902445 - hg.mozilla.org web interface doesn't show the right file listing for some changes

Status: RESOLVED INVALID

(Developer Services :: Mercurial: hg.mozilla.org, defect)

Description

[Kartikaya Gupta (email:[e-mail])]

Not sure if this is the right component; please move as necessary.

Go to http://hg.mozilla.org/mozilla-central/rev/8fd10790fdf1 (as an example; I've seen this on other changesets as well). Note how the file listing section at the top lists 15 files that were modified, but the diff below has way more.

Comment 1

[Benjamin Smedberg]

This is a merge commit. It appears that the file list is relative to one side of the commit and the patch is relative to the other side?

I don't think we've altered hg in this, so this is probably either 1) not a bug or 2) a mercurial bug that needs to be filed upstream.

Comment 2

[John O'Duinn [:joduinn] (please use "needinfo?" flag)]

(In reply to Benjamin Smedberg  [:bsmedberg] PTO 8-Aug until 18-Aug, workweek high latency 19-Aug through 23-Aug from comment #1)
> This is a merge commit. It appears that the file list is relative to one
> side of the commit and the patch is relative to the other side?
> 
> I don't think we've altered hg in this, so this is probably either 1) not a
> bug or 2) a mercurial bug that needs to be filed upstream.

Not sure if this is pushlog/hgweb change (need-info laura) or an upstream mercurial server change (need-info jake). Bug can sit here until we three figure out next steps.

Comment 3

[(not currently active) Ted Mielczarek]

This is not pushlog code. This is straight upstream Mercurial code. As bsmedberg said, this is either a Mercurial bug (which should be filed upstream with Mercurial) or just unintuitive expected behavior.

Comment 4

[Kendall Libby [:fubar] (he/him)]

Unintuitive, but expected behavior; "only files different from BOTH parents will appear in files:" (and {files} is the piece generating the list of filenames).