[Python-apps-team] Bug#552542: hg log -fp ignores -p when -fing.

[Trent W. Buck]

Package: mercurial
Version: 1.3.1-1
Severity: normal

With hg log -fp, hg stops emitting the patch details (-p) when it
starts following after a move/copy (-f).  The transcript below
(hopefully) demonstrates the problem:

    $ with-temp-dir
    with-temp-dir: entering directory `/tmp/with-temp-dir.bA8urW'
    This directory will be deleted when you exit.
    $ hg init
    $ date >f
    $ hg add f
    $ hg ci -m f f
    $ date >f
    $ hg ci -m f f
    $ hg cp f g
    $ hg mv f h
    $ hg ci -m g g
    $ hg ci -m h h
    $ date >g
    $ date >h
    $ hg ci -m g2 g
    $ hg ci -m h2 h
    $ hg log --style default -fp h
    changeset:   5:900bfcc10696
    tag:         tip
    user:        Trent W. Buck <trentbuck at gmail.com>
    date:        Tue Oct 27 14:41:45 2009 +1100
    summary:     h2

    diff --git a/h b/h
    --- a/h
    +++ b/h
    @@ -1,1 +1,1 @@
    -Tue Oct 27 14:41:12 EST 2009
    +Tue Oct 27 14:41:39 EST 2009

    changeset:   3:1f688869ffc8
    user:        Trent W. Buck <trentbuck at gmail.com>
    date:        Tue Oct 27 14:41:35 2009 +1100
    summary:     h

    diff --git a/f b/h
    copy from f
    copy to h

    changeset:   1:8fe06b1bba17
    user:        Trent W. Buck <trentbuck at gmail.com>
    date:        Tue Oct 27 14:41:16 2009 +1100
    summary:     f


    changeset:   0:81a697f091cb
    user:        Trent W. Buck <trentbuck at gmail.com>
    date:        Tue Oct 27 14:41:07 2009 +1100
    summary:     f


    $ hg log --style default -fp g
    changeset:   4:20150d709e5f
    user:        Trent W. Buck <trentbuck at gmail.com>
    date:        Tue Oct 27 14:41:43 2009 +1100
    summary:     g2

    diff --git a/g b/g
    --- a/g
    +++ b/g
    @@ -1,1 +1,1 @@
    -Tue Oct 27 14:41:12 EST 2009
    +Tue Oct 27 14:41:38 EST 2009

    changeset:   2:e9083071b4b5
    user:        Trent W. Buck <trentbuck at gmail.com>
    date:        Tue Oct 27 14:41:30 2009 +1100
    summary:     g

    diff --git a/f b/g
    copy from f
    copy to g

    changeset:   1:8fe06b1bba17
    user:        Trent W. Buck <trentbuck at gmail.com>
    date:        Tue Oct 27 14:41:16 2009 +1100
    summary:     f


    changeset:   0:81a697f091cb
    user:        Trent W. Buck <trentbuck at gmail.com>
    date:        Tue Oct 27 14:41:07 2009 +1100
    summary:     f

-- System Information:
Debian Release: squeeze/sid
  APT prefers testing
  APT policy: (990, 'testing'), (500, 'unstable'), (500, 'stable'), (1, 'experimental')
Architecture: amd64 (x86_64)

Kernel: Linux 2.6.24-23-openvz (SMP w/4 CPU cores)
Locale: LANG=en_AU.utf8, LC_CTYPE=en_AU.utf8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash

Versions of packages mercurial depends on:
ii  libc6                         2.10.1-2   GNU C Library: Shared libraries
ii  mercurial-common              1.3.1-1    scalable distributed version contr
ii  python                        2.5.4-2    An interactive high-level object-o
ii  python-support                1.0.4      automated rebuilding support for P
ii  ucf                           3.0022     Update Configuration File: preserv

mercurial recommends no packages.

Versions of packages mercurial suggests:
ii  emacs                         23.1+1-4   The GNU Emacs editor (metapackage)
pn  kdiff3 | tkdiff | meld | xxdi <none>     (no description available)
pn  qct                           <none>     (no description available)
pn  wish                          <none>     (no description available)

-- no debconf information