Rev 2193: Add Tree.annotate_iter in /home/pqm/archives/thelove/bzr/+trunk/

[Canonical.com Patch Queue Manager]

------------------------------------------------------------
revno: 2193
revision-id: pqm at pqm.ubuntu.com-20061217195527-29196a8633600671
parent: pqm at pqm.ubuntu.com-20061216093635-ef3d14265a8a8b6b
parent: aaron.bentley at utoronto.ca-20061217194036-2x3z6tavblhqn522
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Sun 2006-12-17 19:55:27 +0000
message:
  Add Tree.annotate_iter
added:
  bzrlib/tests/tree_implementations/test_tree.py test_tree.py-20061215160206-usu7lwcj8aq2n3br-1
modified:
  bzrlib/annotate.py             annotate.py-20050922133147-7c60541d2614f022
  bzrlib/revision.py             revision.py-20050309040759-e77802c08f3999d5
  bzrlib/revisiontree.py         revisiontree.py-20060724012533-bg8xyryhxd0o0i0h-1
  bzrlib/tests/test_annotate.py  test_annotate.py-20061213215015-sttc9agsxomls7q0-1
  bzrlib/tests/tree_implementations/__init__.py __init__.py-20060717075546-420s7b0bj9hzeowi-2
  bzrlib/tree.py                 tree.py-20050309040759-9d5f2496be663e77
  bzrlib/workingtree.py          workingtree.py-20050511021032-29b6ec0a681e02e3
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20061217194036-2x3z6tavblhqn522
    parent: aaron.bentley at utoronto.ca-20061217191154-dpbv8dusbhapdhwb
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    branch nick: Aaron's mergeable stuff
    timestamp: Sun 2006-12-17 14:40:36 -0500
    message:
      Fix copyright statements
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20061217191154-dpbv8dusbhapdhwb
    parent: aaron.bentley at utoronto.ca-20061217185705-tfkfwl1lara0ydzu
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    branch nick: Aaron's mergeable stuff
    timestamp: Sun 2006-12-17 14:11:54 -0500
    message:
      Remove unrelated assertion
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20061217185705-tfkfwl1lara0ydzu
    parent: aaron.bentley at utoronto.ca-20061217174243-fv74f0aswfsa6tn9
    parent: pqm at pqm.ubuntu.com-20061216093635-ef3d14265a8a8b6b
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    branch nick: Aaron's mergeable stuff
    timestamp: Sun 2006-12-17 13:57:05 -0500
    message:
      Merge from bzr.dev
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20061217174243-fv74f0aswfsa6tn9
    parent: abentley at panoramicfeedback.com-20061215221916-xcnnqab6tw3rt6yr
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    branch nick: Aaron's mergeable stuff
    timestamp: Sun 2006-12-17 12:42:43 -0500
    message:
      Updates from review comments
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20061215221916-xcnnqab6tw3rt6yr
    parent: abentley at panoramicfeedback.com-20061215181634-pvdzlrgya7rszujv
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: Aaron's mergeable stuff
    timestamp: Fri 2006-12-15 17:19:16 -0500
    message:
      Annotate for working trees across all parents
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20061215181634-pvdzlrgya7rszujv
    parent: abentley at panoramicfeedback.com-20061214214718-dydr28yhnrea88w8
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: Aaron's mergeable stuff
    timestamp: Fri 2006-12-15 13:16:34 -0500
    message:
      Implement Tree.annotate_iter for RevisionTree and WorkingTree