Rev 2658: (robertc) Update bzrlib.index to support composite keys. (Robert Collins) in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 2658
revision-id: pqm at pqm.ubuntu.com-20070728030946-tfjmxwe9y2eq1gzo
parent: pqm at pqm.ubuntu.com-20070728013305-u91kdx3px9ytdyok
parent: robertc at robertcollins.net-20070728013353-qk7394wehmg2iiph
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Sat 2007-07-28 04:09:46 +0100
message:
  (robertc) Update bzrlib.index to support composite keys. (Robert Collins)
modified:
  bzrlib/index.py                index.py-20070712131115-lolkarso50vjr64s-1
  bzrlib/knit.py                 knit.py-20051212171256-f056ac8f0fbe1bd9
  bzrlib/tests/test_index.py     test_index.py-20070712131115-lolkarso50vjr64s-2
  bzrlib/tests/test_knit.py      test_knit.py-20051212171302-95d4c00dd5f11f2b
    ------------------------------------------------------------
    revno: 2624.2.11
    merged: robertc at robertcollins.net-20070728013353-qk7394wehmg2iiph
    parent: robertc at robertcollins.net-20070727141454-q70m5m38oyp0el4c
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: index
    timestamp: Sat 2007-07-28 11:33:53 +1000
    message:
      Review comments.
    ------------------------------------------------------------
    revno: 2624.2.10
    merged: robertc at robertcollins.net-20070727141454-q70m5m38oyp0el4c
    parent: robertc at robertcollins.net-20070727122746-99wyymjtkwcu51k6
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: index
    timestamp: Sat 2007-07-28 00:14:54 +1000
    message:
      Also add iter_key_prefix support to InMemoryGraphIndex.
    ------------------------------------------------------------
    revno: 2624.2.9
    merged: robertc at robertcollins.net-20070727122746-99wyymjtkwcu51k6
    parent: robertc at robertcollins.net-20070727074259-47dvq2n20vf0c79e
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: index
    timestamp: Fri 2007-07-27 22:27:46 +1000
    message:
      Introduce multiple component keys, which is what is needed to combine multiple knit indices into one.
    ------------------------------------------------------------
    revno: 2624.2.8
    merged: robertc at robertcollins.net-20070727074259-47dvq2n20vf0c79e
    parent: robertc at robertcollins.net-20070727061700-bo6g7qfrhjb2uofj
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: index
    timestamp: Fri 2007-07-27 17:42:59 +1000
    message:
      Explicitly mark the number of keys elements in use in GraphIndex files.
    ------------------------------------------------------------
    revno: 2624.2.7
    merged: robertc at robertcollins.net-20070727061700-bo6g7qfrhjb2uofj
    parent: robertc at robertcollins.net-20070727055546-yx9oibzlvdz733yf
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: index
    timestamp: Fri 2007-07-27 16:17:00 +1000
    message:
      Merge back the removal of difference_update from my repository branch.
    ------------------------------------------------------------
    revno: 2624.2.6
    merged: robertc at robertcollins.net-20070727055546-yx9oibzlvdz733yf
    parent: robertc at robertcollins.net-20070727054646-muk3ote4u3l91dea
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: index
    timestamp: Fri 2007-07-27 15:55:46 +1000
    message:
      Remove performance overhead of set intersection against dicts in index iteraction.
    ------------------------------------------------------------
    revno: 2624.2.5
    merged: robertc at robertcollins.net-20070727054646-muk3ote4u3l91dea
    parent: robertc at robertcollins.net-20070726234827-6kstsjyi2p5kvtfk
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: index
    timestamp: Fri 2007-07-27 15:46:46 +1000
    message:
      Change bzrlib.index.Index keys to be 1-tuples, not strings.
    ------------------------------------------------------------
    revno: 2624.2.4
    merged: robertc at robertcollins.net-20070726234827-6kstsjyi2p5kvtfk
    parent: robertc at robertcollins.net-20070718061559-36wb5mc52pp26qqq
    parent: pqm at pqm.ubuntu.com-20070725024725-x592w4y7gdqxv81x
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: index
    timestamp: Fri 2007-07-27 09:48:27 +1000
    message:
      Merge bzr.dev.
    ------------------------------------------------------------
    revno: 2624.2.3
    merged: robertc at robertcollins.net-20070718061559-36wb5mc52pp26qqq
    parent: robertc at robertcollins.net-20070718060649-k1c0mh6bmra497n2
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: index
    timestamp: Wed 2007-07-18 16:15:59 +1000
    message:
      Make GraphIndex.iter_entries do hash lookups rather than table scans.
    ------------------------------------------------------------
    revno: 2624.2.2
    merged: robertc at robertcollins.net-20070718060649-k1c0mh6bmra497n2
    parent: robertc at robertcollins.net-20070718044624-kb7pmne2pd96ekum
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: index
    timestamp: Wed 2007-07-18 16:06:49 +1000
    message:
      Temporary performance hack for GraphIndex : load the entire index once and only once into ram.
    ------------------------------------------------------------
    revno: 2624.2.1
    merged: robertc at robertcollins.net-20070718044624-kb7pmne2pd96ekum
    parent: pqm at pqm.ubuntu.com-20070717110203-zzmtp28nunhsoz12
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: index
    timestamp: Wed 2007-07-18 14:46:24 +1000
    message:
      InMemoryGraphIndex.add_nodes was inconsistent with other metods for non-node-reference indices.

Diff too large for email (1674 lines, the limit is 1000).