Rev 2543: Merge bzr.dev. in sftp://rookery/~/public_html/baz2.0/roadmap

Robert Collins robertc at robertcollins.net
Thu Jun 28 03:43:57 BST 2007


At sftp://rookery/~/public_html/baz2.0/roadmap

------------------------------------------------------------
revno: 2543
revision-id: robertc at robertcollins.net-20070628024350-z8bdm0y6yz2uyf4o
parent: robertc at robertcollins.net-20070621064107-82v51aa0gpquytwb
parent: pqm at pqm.ubuntu.com-20070626191000-flte155pupv54bcs
committer: Robert Collins <robertc at robertcollins.net>
branch nick: roadmap
timestamp: Thu 2007-06-28 12:43:50 +1000
message:
  Merge bzr.dev.
added:
  bzrlib/smtp_connection.py      smtp_connection.py-20070618204456-nu6wag1ste4biuk2-1
  bzrlib/tests/blackbox/test_lsprof.py test_lsprof.py-20070622025641-nbsm2svy8anvj9df-1
  bzrlib/tests/test_smtp_connection.py test_smtp_connection-20070618204509-wuyxc0r0ztrecv7e-1
  doc/developers/bundles.txt     bundles.txt-20070621030528-qkjnugd7iyud6ow3-1
  doc/developers/dirstate.txt    dirstate.txt-20070618020404-cdhv0ecgrukomemg-2
  doc/developers/scratch.txt     scratch.txt-20070618020404-cdhv0ecgrukomemg-3
  doc/developers/uncommit.txt    uncommit.txt-20070621042721-4clw8ucb9u9yda2h-1
renamed:
  doc/developers/performance-commit.txt => doc/developers/commit.txt performancecommit.tx-20070606061633-4y4rawskx5ejb99w-1
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  README                         README-20050309040720-8f368abf9f346b9d
  bzrlib/branch.py               branch.py-20050309040759-e4baf4e0d046576e
  bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
  bzrlib/bundle/serializer/__init__.py __init__.py-20051118175413-86b97db0b618feef
  bzrlib/commands.py             bzr.py-20050309040720-d10f4714595cf8c3
  bzrlib/commit.py               commit.py-20050511101309-79ec1a0168e0e825
  bzrlib/deprecated_graph.py     graph.py-20050905070950-b47dce53236c5e48
  bzrlib/errors.py               errors.py-20050309040759-20512168c4e14fbd
  bzrlib/graph.py                graph_walker.py-20070525030359-y852guab65d4wtn0-1
  bzrlib/inventory.py            inventory.py-20050309040759-6648b84ca2005b37
  bzrlib/knit.py                 knit.py-20051212171256-f056ac8f0fbe1bd9
  bzrlib/merge.py                merge.py-20050513021216-953b65a438527106
  bzrlib/missing.py              missing.py-20050812153334-097f7097e2a8bcd1
  bzrlib/remote.py               remote.py-20060720103555-yeeg2x51vn0rbtdp-1
  bzrlib/repofmt/knitrepo.py     knitrepo.py-20070206081537-pyy4a00xdas0j4pf-1
  bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
  bzrlib/revision.py             revision.py-20050309040759-e77802c08f3999d5
  bzrlib/status.py               status.py-20050505062338-431bfa63ec9b19e6
  bzrlib/tests/HTTPTestUtil.py   HTTPTestUtil.py-20050914180604-247d3aafb7a43343
  bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
  bzrlib/tests/blackbox/__init__.py __init__.py-20051128053524-eba30d8255e08dc3
  bzrlib/tests/blackbox/test_merge_directive.py test_merge_directive-20070302012039-zh7uhy39biairtn0-1
  bzrlib/tests/repository_implementations/__init__.py __init__.py-20060131092037-9564957a7d4a841b
  bzrlib/tests/repository_implementations/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
  bzrlib/tests/test_graph.py     test_graph_walker.py-20070525030405-enq4r60hhi9xrujc-1
  bzrlib/tests/test_http.py      testhttp.py-20051018020158-b2eef6e867c514d9
  bzrlib/tests/test_tsort.py     testtsort.py-20051025073946-27da871c394d5be4
  bzrlib/tests/test_versionedfile.py test_versionedfile.py-20060222045249-db45c9ed14a1c2e5
  bzrlib/transport/http/_urllib2_wrappers.py _urllib2_wrappers.py-20060913231729-ha9ugi48ktx481ao-1
  bzrlib/tsort.py                tsort.py-20051025073946-7808f6aaf7d07208
  bzrlib/versionedfile.py        versionedfile.py-20060222045106-5039c71ee3b65490
  bzrlib/weave.py                knit.py-20050627021749-759c29984154256b
  doc/configuration.txt          configuration.txt-20060314161707-868350809502af01
  doc/developers/index.txt       index.txt-20070508041241-qznziunkg0nffhiw-1
  doc/developers/performance-roadmap.txt performanceroadmap.t-20070507174912-mwv3xv517cs4sisd-2
  doc/developers/performance-use-case-analysis.txt performanceusecasean-20070508045640-zneiu1yzbci574c6-2
  doc/developers/profiling.txt   profiling.txt-20070531045713-j15mxufywgzwdeu8-1
  doc/developers/commit.txt      performancecommit.tx-20070606061633-4y4rawskx5ejb99w-1
    ------------------------------------------------------------
    revno: 2541.1.12
    revision-id: pqm at pqm.ubuntu.com-20070626191000-flte155pupv54bcs
    parent: pqm at pqm.ubuntu.com-20070626061722-8m49gdqd8cb8zc0c
    parent: john at arbash-meinel.com-20070626141056-zr6wslndfw8tkg5d
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Tue 2007-06-26 20:10:00 +0100
    message:
      (Adeodato Simó) fix bug #120591 by using exact encoding for merge directives.
        ------------------------------------------------------------
        revno: 2541.1.11.1.1
        revision-id: john at arbash-meinel.com-20070626141056-zr6wslndfw8tkg5d
        parent: pqm at pqm.ubuntu.com-20070626061722-8m49gdqd8cb8zc0c
        parent: dato at net.com.org.es-20070617161104-8mqczaz3oobfg0xy
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: jam-integration
        timestamp: Tue 2007-06-26 09:10:56 -0500
        message:
          (Adeodato Simó) fix bug #120591 by using exact encoding for merge directives.
        ------------------------------------------------------------
        revno: 2530.2.1
        revision-id: dato at net.com.org.es-20070617161104-8mqczaz3oobfg0xy
        parent: pqm at pqm.ubuntu.com-20070615082222-98j9j9nbl6p2dx0m
        committer: Adeodato Simó <dato at net.com.org.es>
        branch nick: bzr.merge_directive_exact_encoding
        timestamp: Sun 2007-06-17 17:11:04 +0100
        message:
          Add encoding_type = 'exact' to cmd_merge_directive. (LP #120591)
    ------------------------------------------------------------
    revno: 2541.1.11
    revision-id: pqm at pqm.ubuntu.com-20070626061722-8m49gdqd8cb8zc0c
    parent: pqm at pqm.ubuntu.com-20070626045533-qni2zzf3cv41c1t8
    parent: ian.clatworthy at internode.on.net-20070626043739-2ksn3hbnynt6zggj
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Tue 2007-06-26 07:17:22 +0100
    message:
      Refactor of commit to walk the working inventory less
        ------------------------------------------------------------
        revno: 2541.1.9.1.1
        revision-id: ian.clatworthy at internode.on.net-20070626043739-2ksn3hbnynt6zggj
        parent: pqm at pqm.ubuntu.com-20070625174647-pocypsjmp861qgv7
        parent: ian.clatworthy at internode.on.net-20070621001613-j04fg9qt7kh48llg
        committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
        branch nick: ianc-integration
        timestamp: Tue 2007-06-26 14:37:39 +1000
        message:
          Refactor of commit to walk the working inventory less
        ------------------------------------------------------------
        revno: 2541.2.1
        revision-id: ian.clatworthy at internode.on.net-20070621001613-j04fg9qt7kh48llg
        parent: pqm at pqm.ubuntu.com-20070620205507-uuolokc2e0eckrb7
        committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
        branch nick: bzr.fast-commit
        timestamp: Thu 2007-06-21 10:16:13 +1000
        message:
          Refactor commit.commit() to walk the working inventory once/less
    ------------------------------------------------------------
    revno: 2541.1.10
    revision-id: pqm at pqm.ubuntu.com-20070626045533-qni2zzf3cv41c1t8
    parent: pqm at pqm.ubuntu.com-20070625174647-pocypsjmp861qgv7
    parent: mbp at sourcefrog.net-20070626041504-sxdk4kjal60vnbxl
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Tue 2007-06-26 05:55:33 +0100
    message:
      (mbp) design notes for commit and uncommit
        ------------------------------------------------------------
        revno: 2513.1.7
        revision-id: mbp at sourcefrog.net-20070626041504-sxdk4kjal60vnbxl
        parent: mbp at sourcefrog.net-20070626032049-whv447fmgyj2lf19
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: doc
        timestamp: Tue 2007-06-26 14:15:04 +1000
        message:
          fix another broken doc link
        ------------------------------------------------------------
        revno: 2513.1.6
        revision-id: mbp at sourcefrog.net-20070626032049-whv447fmgyj2lf19
        parent: mbp at sourcefrog.net-20070621074424-ayfp2ycf98edc9ma
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: doc
        timestamp: Tue 2007-06-26 13:20:49 +1000
        message:
          Remove broken link to status design document
        ------------------------------------------------------------
        revno: 2513.1.5
        revision-id: mbp at sourcefrog.net-20070621074424-ayfp2ycf98edc9ma
        parent: mbp at sourcefrog.net-20070621054143-ut9cw6zbkt3vwdzc
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: doc
        timestamp: Thu 2007-06-21 17:44:24 +1000
        message:
          More analysis of commit
        ------------------------------------------------------------
        revno: 2513.1.4
        revision-id: mbp at sourcefrog.net-20070621054143-ut9cw6zbkt3vwdzc
        parent: mbp at sourcefrog.net-20070621042747-e3g0tdn8if750mv5
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: doc
        timestamp: Thu 2007-06-21 15:41:43 +1000
        message:
          More commit documentation
        ------------------------------------------------------------
        revno: 2513.1.3
        revision-id: mbp at sourcefrog.net-20070621042747-e3g0tdn8if750mv5
        parent: mbp at sourcefrog.net-20070618065424-awsn4t4tv2bi4okt
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: doc
        timestamp: Thu 2007-06-21 14:27:47 +1000
        message:
          More commit specs
        ------------------------------------------------------------
        revno: 2513.1.2
        revision-id: mbp at sourcefrog.net-20070618065424-awsn4t4tv2bi4okt
        parent: mbp at sourcefrog.net-20070618020420-3e205xzlugq682j9
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: doc
        timestamp: Mon 2007-06-18 16:54:24 +1000
        message:
          Remove duplicated commit use case documentation
        ------------------------------------------------------------
        revno: 2513.1.1
        revision-id: mbp at sourcefrog.net-20070618020420-3e205xzlugq682j9
        parent: pqm at pqm.ubuntu.com-20070606144200-rmsd3gyelimh8kal
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: doc
        timestamp: Mon 2007-06-18 12:04:20 +1000
        message:
          (in progress) analysis of commit
    ------------------------------------------------------------
    revno: 2541.1.9
    revision-id: pqm at pqm.ubuntu.com-20070625174647-pocypsjmp861qgv7
    parent: pqm at pqm.ubuntu.com-20070625151932-yshsnfirhwggx07b
    parent: john at arbash-meinel.com-20070625165906-rj1g8amflmksb95i
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Mon 2007-06-25 18:46:47 +0100
    message:
      (Vincent Ladeuil) Fix bug #121889 by working around urllib2 limitation.
        ------------------------------------------------------------
        revno: 2541.1.6.2.1
        revision-id: john at arbash-meinel.com-20070625165906-rj1g8amflmksb95i
        parent: pqm at pqm.ubuntu.com-20070625092303-yr8bqbke8snrmkig
        parent: v.ladeuil+lp at free.fr-20070624152356-2z0c3j94udya3mge
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: jam-integration
        timestamp: Mon 2007-06-25 11:59:06 -0500
        message:
          (Vincent Ladeuil) Fix bug #121889 by working around urllib2 limitation.
        ------------------------------------------------------------
        revno: 2541.1.4.2.2
        revision-id: v.ladeuil+lp at free.fr-20070624152356-2z0c3j94udya3mge
        parent: v.ladeuil+lp at free.fr-20070624151640-5tg62jb5g9tqvybd
        committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
        branch nick: 121889
        timestamp: Sun 2007-06-24 17:23:56 +0200
        message:
          Update NEWS.
        ------------------------------------------------------------
        revno: 2541.1.4.2.1
        revision-id: v.ladeuil+lp at free.fr-20070624151640-5tg62jb5g9tqvybd
        parent: pqm at pqm.ubuntu.com-20070622160825-17gv0lorkzbr3x76
        committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
        branch nick: 121889
        timestamp: Sun 2007-06-24 17:16:40 +0200
        message:
          Fix 121889 by working around urllib2 bug.
          
          * tests/HTTPTestUtil.py:
          (DigestAuthRequestHandler.send_header_auth_reqed): python-2.4.1
          fail to decode the header without the quotes. The RFC do not
          require them, python >= 2.4.4 handles them gracefully. Not a big
          deal.
          
          * tests/test_http.py:
          (TestAuth.setUp): Add a comment in hope I will not running around
          shouting: "Who takes my traces ? Gimme my traces !" when running
          the only tests who capture their own traces without showing them.
          
          * transport/http/_urllib2_wrappers.py (BasicAuthHandler,
          DigestAuthHandler): Not directly related to the bug, bug good to
          fix anyway, the digest auth should be preferred to the basic
          one. To do so, the digest handler should be tried before the basic
          one.
          
          * builtins.py:
          (cmd_selftest.run): Fix typo. Note to reviewers: No, it's not
          related to the bug. No there are no tests for that. No I don't
          intend to write some :) But I'll understand if you veto that
          because you want to take care of it :D
    ------------------------------------------------------------
    revno: 2541.1.8
    revision-id: pqm at pqm.ubuntu.com-20070625151932-yshsnfirhwggx07b
    parent: pqm at pqm.ubuntu.com-20070625134610-4y70duw4fcuj8txe
    parent: abentley at panoramicfeedback.com-20070625142708-m7i0qrtxi7k5y2o7
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Mon 2007-06-25 16:19:32 +0100
    message:
      Don't suppress pipe errors for non-display commaneds (Belchenko, #87178)
        ------------------------------------------------------------
        revno: 2541.1.7.1.1
        revision-id: abentley at panoramicfeedback.com-20070625142708-m7i0qrtxi7k5y2o7
        parent: pqm at pqm.ubuntu.com-20070625134610-4y70duw4fcuj8txe
        committer: Aaron Bentley <abentley at panoramicfeedback.com>
        branch nick: Aaron's integration
        timestamp: Mon 2007-06-25 10:27:08 -0400
        message:
          Don't suppress pipe errors for non-display commaneds (Belchenko, #87178)
    ------------------------------------------------------------
    revno: 2541.1.7
    revision-id: pqm at pqm.ubuntu.com-20070625134610-4y70duw4fcuj8txe
    parent: pqm at pqm.ubuntu.com-20070625092303-yr8bqbke8snrmkig
    parent: abentley at panoramicfeedback.com-20070625131732-8jp7229jrt5r7khp
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Mon 2007-06-25 14:46:10 +0100
    message:
      Add SMTPConnection class (Adeodato Simó)
        ------------------------------------------------------------
        revno: 2541.1.6.1.1
        revision-id: abentley at panoramicfeedback.com-20070625131732-8jp7229jrt5r7khp
        parent: pqm at pqm.ubuntu.com-20070625092303-yr8bqbke8snrmkig
        parent: dato at net.com.org.es-20070623011151-i21l3zr5igkphd53
        committer: Aaron Bentley <abentley at panoramicfeedback.com>
        branch nick: Aaron's integration
        timestamp: Mon 2007-06-25 09:17:32 -0400
        message:
          Add SMTPConnection class (Adeodato Simó)
        ------------------------------------------------------------
        revno: 2535.2.5
        revision-id: dato at net.com.org.es-20070623011151-i21l3zr5igkphd53
        parent: dato at net.com.org.es-20070620003933-cjj1lq1lqgav5gm6
        committer: Adeodato Simó <dato at net.com.org.es>
        branch nick: bzr.smtp_connection
        timestamp: Sat 2007-06-23 02:11:51 +0100
        message:
          Fix copyright statement not to contain "by".
        ------------------------------------------------------------
        revno: 2535.2.4
        revision-id: dato at net.com.org.es-20070620003933-cjj1lq1lqgav5gm6
        parent: dato at net.com.org.es-20070620002245-t4ugu7418qmkdtmv
        committer: Adeodato Simó <dato at net.com.org.es>
        branch nick: bzr.smtp_connection
        timestamp: Wed 2007-06-20 01:39:33 +0100
        message:
          Don't use BzrCommandError in non-UI code; create and use an SMTPError
          exception instead.
        ------------------------------------------------------------
        revno: 2535.2.3
        revision-id: dato at net.com.org.es-20070620002245-t4ugu7418qmkdtmv
        parent: dato at net.com.org.es-20070619201517-0v2w6kvc9ur7ybpg
        committer: Adeodato Simó <dato at net.com.org.es>
        branch nick: bzr.smtp_connection
        timestamp: Wed 2007-06-20 01:22:45 +0100
        message:
          Import full email.Utils module instead of individual functions, as per
          Aaron's review.
        ------------------------------------------------------------
        revno: 2535.2.2
        revision-id: dato at net.com.org.es-20070619201517-0v2w6kvc9ur7ybpg
        parent: dato at net.com.org.es-20070619161126-zwni0l40maepwyj5
        committer: Adeodato Simó <dato at net.com.org.es>
        branch nick: bzr.smtp_connection
        timestamp: Tue 2007-06-19 21:15:17 +0100
        message:
          Swap the order of internal_error and _fmt for consistency.
        ------------------------------------------------------------
        revno: 2535.2.1
        revision-id: dato at net.com.org.es-20070619161126-zwni0l40maepwyj5
        parent: pqm at pqm.ubuntu.com-20070619024533-oand7e7ns9eyis9x
        committer: Adeodato Simó <dato at net.com.org.es>
        branch nick: bzr.smtp_connection
        timestamp: Tue 2007-06-19 17:11:26 +0100
        message:
          New SMTPConnection class, a reduced version of that in bzr-email.
    ------------------------------------------------------------
    revno: 2541.1.6
    revision-id: pqm at pqm.ubuntu.com-20070625092303-yr8bqbke8snrmkig
    parent: pqm at pqm.ubuntu.com-20070625072710-uiiv39h32diq0al7
    parent: robertc at robertcollins.net-20070622050522-bi07tvlincf1h19m
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Mon 2007-06-25 10:23:03 +0100
    message:
      (robertc) Relocate TestCaseWithRepository to be more central.
        ------------------------------------------------------------
        revno: 2485.7.2
        revision-id: robertc at robertcollins.net-20070622050522-bi07tvlincf1h19m
        parent: robertc at robertcollins.net-20070510141122-91gp5mw7mmv88852
        parent: pqm at pqm.ubuntu.com-20070621070542-od3c9uxurv03i41p
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: per-repository-test-setup
        timestamp: Fri 2007-06-22 15:05:22 +1000
        message:
          Merge bzr.dev.
        ------------------------------------------------------------
        revno: 2485.7.1
        revision-id: robertc at robertcollins.net-20070510141122-91gp5mw7mmv88852
        parent: pqm at pqm.ubuntu.com-20070510055501-w262sk5hl33vmd19
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: per-repository-test-setup
        timestamp: Fri 2007-05-11 00:11:22 +1000
        message:
          Relocate TestCaseWithRepository to be more central.
    ------------------------------------------------------------
    revno: 2541.1.5
    revision-id: pqm at pqm.ubuntu.com-20070625072710-uiiv39h32diq0al7
    parent: pqm at pqm.ubuntu.com-20070622160825-17gv0lorkzbr3x76
    parent: mbp at sourcefrog.net-20070625062227-vr2f1nwzlfa4vxb7
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Mon 2007-06-25 08:27:10 +0100
    message:
      (trivial,mbp) doc updates
        ------------------------------------------------------------
        revno: 2541.1.4.1.2
        revision-id: mbp at sourcefrog.net-20070625062227-vr2f1nwzlfa4vxb7
        parent: mbp at sourcefrog.net-20070625051257-fpzcv067ye6a341c
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: doc
        timestamp: Mon 2007-06-25 16:22:27 +1000
        message:
          Explain where to get lsprof (John, Alexander)
        ------------------------------------------------------------
        revno: 2541.1.4.1.1
        revision-id: mbp at sourcefrog.net-20070625051257-fpzcv067ye6a341c
        parent: pqm at pqm.ubuntu.com-20070622160825-17gv0lorkzbr3x76
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: doc
        timestamp: Mon 2007-06-25 15:12:57 +1000
        message:
          Fix typo and remove version number from README
    ------------------------------------------------------------
    revno: 2541.1.4
    revision-id: pqm at pqm.ubuntu.com-20070622160825-17gv0lorkzbr3x76
    parent: pqm at pqm.ubuntu.com-20070621070542-od3c9uxurv03i41p
    parent: abentley at panoramicfeedback.com-20070622152719-b843debqfvuykj0y
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Fri 2007-06-22 17:08:25 +0100
    message:
      Note lsprof filename via trace.note, not stdout
        ------------------------------------------------------------
        revno: 1551.2.49.1.40.1.22.1.42.1.31.1.39.1.17.1.33
        revision-id: abentley at panoramicfeedback.com-20070622152719-b843debqfvuykj0y
        parent: abentley at panoramicfeedback.com-20070622152525-6uh2x3zz21s95t5q
        committer: Aaron Bentley <abentley at panoramicfeedback.com>
        branch nick: Aaron's mergeable stuff
        timestamp: Fri 2007-06-22 11:27:19 -0400
        message:
          Add NEWS entry
        ------------------------------------------------------------
        revno: 1551.2.49.1.40.1.22.1.42.1.31.1.39.1.17.1.32
        revision-id: abentley at panoramicfeedback.com-20070622152525-6uh2x3zz21s95t5q
        parent: abentley at panoramicfeedback.com-20070622152245-e5cewlvmqlj3q76w
        parent: pqm at pqm.ubuntu.com-20070621070542-od3c9uxurv03i41p
        committer: Aaron Bentley <abentley at panoramicfeedback.com>
        branch nick: Aaron's mergeable stuff
        timestamp: Fri 2007-06-22 11:25:25 -0400
        message:
          Merge bzr.dev
        ------------------------------------------------------------
        revno: 1551.2.49.1.40.1.22.1.42.1.31.1.39.1.17.1.31
        revision-id: abentley at panoramicfeedback.com-20070622152245-e5cewlvmqlj3q76w
        parent: aaron.bentley at utoronto.ca-20070622032823-2rsipnu2wmt1qoa3
        committer: Aaron Bentley <abentley at panoramicfeedback.com>
        branch nick: Aaron's mergeable stuff
        timestamp: Fri 2007-06-22 11:22:45 -0400
        message:
          Add check for LSProf
        ------------------------------------------------------------
        revno: 1551.2.49.1.40.1.22.1.42.1.31.1.39.1.17.1.30
        revision-id: aaron.bentley at utoronto.ca-20070622032823-2rsipnu2wmt1qoa3
        parent: aaron.bentley at utoronto.ca-20070619052015-y7r2d7i5sihpfadm
        committer: Aaron Bentley <aaron.bentley at utoronto.ca>
        branch nick: Aaron's mergeable stuff
        timestamp: Thu 2007-06-21 23:28:23 -0400
        message:
          Write lsprof file name to stderr, not stdout
    ------------------------------------------------------------
    revno: 2541.1.3
    revision-id: pqm at pqm.ubuntu.com-20070621070542-od3c9uxurv03i41p
    parent: pqm at pqm.ubuntu.com-20070621055651-p2zqigyl0rju375h
    parent: aaron.bentley at utoronto.ca-20070621063927-35dli0ujb998wku3
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Thu 2007-06-21 08:05:42 +0100
    message:
      Merge bzr.dev
        ------------------------------------------------------------
        revno: 2490.2.35
        revision-id: aaron.bentley at utoronto.ca-20070621063927-35dli0ujb998wku3
        parent: aaron.bentley at utoronto.ca-20070621063206-rjmdoolr3qu24y7q
        parent: pqm at pqm.ubuntu.com-20070621055651-p2zqigyl0rju375h
        committer: Aaron Bentley <aaron.bentley at utoronto.ca>
        branch nick: graphwalker
        timestamp: Thu 2007-06-21 02:39:27 -0400
        message:
          Merge bzr.dev
        ------------------------------------------------------------
        revno: 2490.2.34
        revision-id: aaron.bentley at utoronto.ca-20070621063206-rjmdoolr3qu24y7q
        parent: aaron.bentley at utoronto.ca-20070621032939-kcnl1dmxsixygskb
        committer: Aaron Bentley <aaron.bentley at utoronto.ca>
        branch nick: graphwalker
        timestamp: Thu 2007-06-21 02:32:06 -0400
        message:
          Update NEWS and change implementation to return an iterator
    ------------------------------------------------------------
    revno: 2541.1.2
    revision-id: pqm at pqm.ubuntu.com-20070621055651-p2zqigyl0rju375h
    parent: pqm at pqm.ubuntu.com-20070621052237-2phm1z5dg4arrwnk
    parent: robertc at robertcollins.net-20070621030632-u20tpto23hcj15td
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Thu 2007-06-21 06:56:51 +0100
    message:
      (robertc) Create a document describing bundles and their motivation.
        ------------------------------------------------------------
        revno: 2534.1.1
        revision-id: robertc at robertcollins.net-20070621030632-u20tpto23hcj15td
        parent: pqm at pqm.ubuntu.com-20070618210710-6y8wzcqiw2kvxdiy
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: bundle
        timestamp: Thu 2007-06-21 13:06:32 +1000
        message:
          Create a document describing bundles and their motivation.
    ------------------------------------------------------------
    revno: 2541.1.1
    revision-id: pqm at pqm.ubuntu.com-20070621052237-2phm1z5dg4arrwnk
    parent: pqm at pqm.ubuntu.com-20070620205507-uuolokc2e0eckrb7
    parent: aaron.bentley at utoronto.ca-20070621032939-kcnl1dmxsixygskb
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Thu 2007-06-21 06:22:37 +0100
    message:
      Avoid topological sorting in Repository.get_ancestry where possible
    ------------------------------------------------------------
    revno: 2490.2.33
    revision-id: aaron.bentley at utoronto.ca-20070621032939-kcnl1dmxsixygskb
    parent: aaron.bentley at utoronto.ca-20070621023343-3f3oy8iszatpjcui
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    branch nick: graphwalker
    timestamp: Wed 2007-06-20 23:29:39 -0400
    message:
      Disable topological sorting of get_ancestry where sensible
    ------------------------------------------------------------
    revno: 2490.2.32
    revision-id: aaron.bentley at utoronto.ca-20070621023343-3f3oy8iszatpjcui
    parent: aaron.bentley at utoronto.ca-20070621015829-b62l2d1ehuvgnr3x
    parent: aaron.bentley at utoronto.ca-20070617170704-z3xbz0t5nqddnyeo
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    branch nick: graphwalker
    timestamp: Wed 2007-06-20 22:33:43 -0400
    message:
      Merge of not-sorting-ancestry branch
        ------------------------------------------------------------
        revno: 2530.1.1
        revision-id: aaron.bentley at utoronto.ca-20070617170704-z3xbz0t5nqddnyeo
        parent: pqm at pqm.ubuntu.com-20070615082222-98j9j9nbl6p2dx0m
        committer: Aaron Bentley <aaron.bentley at utoronto.ca>
        branch nick: get_ancestry_no_topo
        timestamp: Sun 2007-06-17 13:07:04 -0400
        message:
          Make topological sorting optional for get_ancestry
    ------------------------------------------------------------
    revno: 2490.2.31
    revision-id: aaron.bentley at utoronto.ca-20070621015829-b62l2d1ehuvgnr3x
    parent: aaron.bentley at utoronto.ca-20070621011219-a967wm19vxxc8dx5
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    branch nick: graphwalker
    timestamp: Wed 2007-06-20 21:58:29 -0400
    message:
      Fix iter_topo_order to permit un-included parents
    ------------------------------------------------------------
    revno: 2490.2.30
    revision-id: aaron.bentley at utoronto.ca-20070621011219-a967wm19vxxc8dx5
    parent: abentley at panoramicfeedback.com-20070619145132-xc0rgyfzebvraxb0
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    branch nick: graphwalker
    timestamp: Wed 2007-06-20 21:12:19 -0400
    message:
      Add functionality for tsorting graphs

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



More information about the bazaar-commits mailing list