missing files from hg log -v

[Thomas Arendsen Hein]

* TK Soh <teekaysoh at yahoo.com> [20050831 03:31]:
> I noticed something a bit strange with this changeset on crew, where hgweb.py
> doesn't show up on 'files:' of 'hg log -v', but 'hg log --debug' seemed okay.

This is intentional, though I must admit the output of --debug and
the patch may be confusing, because of conflicting definitions.

> [tksoh at mylinux crew]$ hg log -r 1164 -v
> changeset:   1164:cf8185cf2a70abec4168afbdc15f9ced8e70c913
> parent:      1158:4650ec7ef690b61420583da749130fbba067f372
> parent:      1163:dacd3463ee3fed90d7cd0e099a0481df63716c3a
> files:

This was a simple merge, no file was modified in both parents, so no
file needed to be merged directly. So no file was changed because of
the merging. This behaviour was changed after 0.6c, before that any
file that was modified in any parent branch was displayed here.

> [tksoh at mylinux crew]$ hg log -r 1164 --debug
> manifest:    1164:ef6d8d764c4602a7d1fe52063de79546ba428fb5
> changeset:   1164:cf8185cf2a70abec4168afbdc15f9ced8e70c913
> parent:      1158:4650ec7ef690b61420583da749130fbba067f372
> parent:      1163:dacd3463ee3fed90d7cd0e099a0481df63716c3a
> user:        Thomas Arendsen Hein <thomas at intevation.de>
> files:       mercurial/hgweb.py

The file list printed on --debug is internally nothing else than
looking at the corresponding patch, that's why it is so slow.

> [tksoh at mylinux crew]$ hg log -r 1164 -v -p | diffstat
>  hgweb.py |  222
> +++++++++++++++++++++++++++++++++------------------------------
>  1 files changed, 117 insertions(+), 105 deletions(-)

The displayed patch is _always_ only against parent1, even if there
are two parents. This way you have the option of walking back in the
history of the file without branching your brain :-)

  1. hg log -rNODE -p
  2. look at the patch
  3. continue at parent1

Thomas

-- 
Email: thomas at intevation.de
http://intevation.de/~thomas/