Rev 1580: Merge knit utf8 and reannotate-less support. in /home/pqm/archives/thelove/bzr/+trunk/

[Canonical.com Patch Queue Manager]

------------------------------------------------------------
revno: 1580
revision-id: pqm at pqm.ubuntu.com-20060309223311-9b952a772944e322
parent: pqm at pqm.ubuntu.com-20060309222250-8bc4180b1ba28f13
parent: robertc at robertcollins.net-20060309215559-ce35a155f135ffcc
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2006-03-09 22:33:11 +0000
message:
  Merge knit utf8 and reannotate-less support.
modified:
  BRANCH.TODO                    BRANCH.TODO-20060103052123-79ac4969351c03a9
  bzrlib/knit.py                 knit.py-20051212171256-f056ac8f0fbe1bd9
  bzrlib/tests/test_knit.py      test_knit.py-20051212171302-95d4c00dd5f11f2b
  bzrlib/tests/test_versionedfile.py test_versionedfile.py-20060222045249-db45c9ed14a1c2e5
  bzrlib/transport/http.py       http_transport.py-20050711212304-506c5fd1059ace96
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060309215559-ce35a155f135ffcc
    parent: pqm at pqm.ubuntu.com-20060309210459-a48571e310db5c23
    parent: robertc at robertcollins.net-20060309213249-300fd49ec4594da8
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: integration
    timestamp: Fri 2006-03-10 08:55:59 +1100
    message:
      Merge knit utf8 and reannotate-less support.
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060309213249-300fd49ec4594da8
    parent: robertc at robertcollins.net-20060309204610-042bfd97c773fe24
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: versioned-file-performance
    timestamp: Fri 2006-03-10 08:32:49 +1100
    message:
      Remove utf8 debugging code
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060309204610-042bfd97c773fe24
    parent: robertc at robertcollins.net-20060309203318-c67d28910f113bed
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: versioned-file-performance
    timestamp: Fri 2006-03-10 07:46:10 +1100
    message:
      Reviewer feedback on knit branches.
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060309203318-c67d28910f113bed
    parent: robertc at robertcollins.net-20060309123455-9a14c99c11e62537
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: versioned-file-performance
    timestamp: Fri 2006-03-10 07:33:18 +1100
    message:
      Utf8 safety in knit indexes.
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060309123455-9a14c99c11e62537
    parent: robertc at robertcollins.net-20060309112848-d2206b69f357ae57
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: versioned-file-performance
    timestamp: Thu 2006-03-09 23:34:55 +1100
    message:
      Join knits with the original gzipped data avoiding recompression.
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060309112848-d2206b69f357ae57
    parent: robertc at robertcollins.net-20060309061524-74c42a273f335e85
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: versioned-file-performance
    timestamp: Thu 2006-03-09 22:28:48 +1100
    message:
      Remove the requirement for reannotation in knit joins.