[PATCH 4 of 4 V2] annotate: simplify annotate parent function

[Matt Mackall]

On Thu, 2013-06-06 at 17:58 +0000, Durham Goode wrote:
> On 6/5/13 1:47 PM, "Matt Mackall" <mpm at selenic.com> wrote:
> 
> >On Tue, 2013-06-04 at 12:59 -0700, Durham Goode wrote:
> >> # HG changeset patch
> >> # User Durham Goode <durham at fb.com>
> >> # Date 1369967343 25200
> >> #      Thu May 30 19:29:03 2013 -0700
> >> # Node ID d0a0580f790466ff5566682bb7b29d8623acb1da
> >> # Parent  a1a98fba2858dab9aa58431f4e4991f3d91649ab
> >> annotate: simplify annotate parent function
> >
> >These are queued for default, thanks.
> >
> 
> After pulling, a few of my patches don't seem to have been applied. I
> don't see these:
> 
> filelog: switch 'not len(filerevlog)' to 'not filerevlog'
> filectx: remove dependencies on filerev
> merge: use nullid instead of null rev
> 
> The final 'annotate: simplify annotate parent function' patch is applied,
> which makes me think these three were missed.  Or perhaps they weren't
> queued to begin with and I misunderstood.

Hmm, let's ask blackbox:


2013/06/05 15:37:37 mpm> qimport /home/mpm/patches/v2-filelog-switch-not-len-filerevlog-to-not.patch
2013/06/05 15:37:37 mpm> qimport /home/mpm/patches/v2-filelog-switch-not-len-filerevlog-to-not.patch exit
ed 0 after 0.04 seconds
2013/06/05 15:37:37 mpm> qpush
2013/06/05 15:37:37 mpm> qpush exited -1 after 0.11 seconds
2013/06/05 15:37:46 mpm> revert -a
2013/06/05 15:37:46 mpm> revert -a exited 0 after 0.14 seconds
2013/06/05 15:37:47 mpm> qa
2013/06/05 15:37:47 mpm> qa exited 0 after 0.03 seconds
2013/06/05 15:37:54 mpm> export
2013/06/05 15:37:55 mpm> export exited 0 after 0.11 seconds
2013/06/05 15:38:07 mpm> qpop
2013/06/05 15:38:08 mpm> qpop exited 0 after 0.17 seconds
2013/06/05 15:45:44 mpm> qimport /home/mpm/patches/v2-log-move-log-file-walk-to-its-own-function.patch
2013/06/05 15:45:44 mpm> qimport /home/mpm/patches/v2-log-move-log-file-walk-to-its-own-function.patch ex
ited 0 after 0.04 seconds
2013/06/05 15:45:44 mpm> qpush
2013/06/05 15:45:44 mpm> qpush exited 0 after 0.14 seconds
2013/06/05 15:46:11 mpm> qimport /home/mpm/patches/v2-changegroup-move-changegroup-file-adding-to-a.patch
2013/06/05 15:46:11 mpm> qimport /home/mpm/patches/v2-changegroup-move-changegroup-file-adding-to-a.patch
 exited 0 after 0.05 seconds
2013/06/05 15:46:11 mpm> qpush
2013/06/05 15:46:11 mpm> qpush exited 0 after 0.15 seconds
2013/06/05 15:46:45 mpm> qimport /home/mpm/patches/v2-annotate-simplify-annotate-parent-function.patch
2013/06/05 15:46:45 mpm> qimport /home/mpm/patches/v2-annotate-simplify-annotate-parent-function.patch ex
ited 0 after 0.05 seconds
2013/06/05 15:46:45 mpm> qpush

Looks like I ran into trouble queueing the first of four that I acked,
and failed to qpush it again. Will fix. I don't think I acked the other
two from your previous series.

-- 
Mathematics is the supreme nostalgia of our time.