Rev 2955: merge bzr.dev at 3903 in file:///net/bigmamac/Volumes/home/vila/src/bzr/experimental/https/

Vincent Ladeuil v.ladeuil+lp at free.fr
Fri Dec 12 14:33:37 GMT 2008


At file:///net/bigmamac/Volumes/home/vila/src/bzr/experimental/https/

------------------------------------------------------------
revno: 2955
revision-id: v.ladeuil+lp at free.fr-20081212143313-xttculpjnshz8rvl
parent: v.ladeuil+lp at free.fr-20081211124909-txt4rbv3gfzsxibc
parent: pqm at pqm.ubuntu.com-20081212134729-rphmydb7slbgqmeu
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: https
timestamp: Fri 2008-12-12 15:33:13 +0100
message:
  merge bzr.dev at 3903
added:
  bzrlib/_chunks_to_lines_py.py  _chunks_to_lines_py.-20081211024848-6uc3mtuje8j14l60-1
  bzrlib/_chunks_to_lines_pyx.pyx _chunks_to_lines_pyx-20081211021736-op7n8vrxgrd8snfi-1
  bzrlib/fifo_cache.py           fifo_cache.py-20081209212307-31ffjwvteyvmydnf-1
  bzrlib/tests/blackbox/test_shelve.py test_ls_shelf.py-20081202053526-thlo8yt0pi1cgor1-1
  bzrlib/tests/per_repository/test_add_inventory_by_delta.py test_add_inventory_d-20081013002626-rut81igtlqb4590z-1
  bzrlib/tests/test__chunks_to_lines.py test__chunks_to_line-20081211024848-6uc3mtuje8j14l60-2
  bzrlib/tests/test_fifo_cache.py test_fifo_cache.py-20081209212307-31ffjwvteyvmydnf-2
modified:
  .bzrignore                     bzrignore-20050311232317-81f7b71efa2db11a
  Makefile                       Makefile-20050805140406-d96e3498bb61c5bb
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/__init__.py             __init__.py-20050309040759-33e65acf91bbcd5d
  bzrlib/_dirstate_helpers_c.h   _dirstate_helpers_c.-20070802205935-hqo9yzuzjix271dd-1
  bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
  bzrlib/bzrdir.py               bzrdir.py-20060131065624-156dfea39c4387cb
  bzrlib/commit.py               commit.py-20050511101309-79ec1a0168e0e825
  bzrlib/delta.py                delta.py-20050729221636-54cf14ef94783d0a
  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/log.py                  log.py-20050505065812-c40ce11702fe5fb1
  bzrlib/lru_cache.py            lru_cache.py-20070119165515-tlw203kuwh0id5gv-1
  bzrlib/merge.py                merge.py-20050513021216-953b65a438527106
  bzrlib/osutils.py              osutils.py-20050309040759-eeaff12fbf77ac86
  bzrlib/push.py                 push.py-20080606021927-5fe39050e8xne9un-1
  bzrlib/remote.py               remote.py-20060720103555-yeeg2x51vn0rbtdp-1
  bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
  bzrlib/shelf.py                prepare_shelf.py-20081005181341-n74qe6gu1e65ad4v-1
  bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
  bzrlib/tests/blackbox/__init__.py __init__.py-20051128053524-eba30d8255e08dc3
  bzrlib/tests/blackbox/test_log.py test_log.py-20060112090212-78f6ea560c868e24
  bzrlib/tests/blackbox/test_ls.py test_ls.py-20060712232047-0jraqpecwngee12y-1
  bzrlib/tests/blackbox/test_pull.py test_pull.py-20051201144907-64959364f629947f
  bzrlib/tests/blackbox/test_push.py test_push.py-20060329002750-929af230d5d22663
  bzrlib/tests/blackbox/test_revision_info.py test_revision_info.py-20050917162600-21dab3877aa348d7
  bzrlib/tests/interrepository_implementations/__init__.py __init__.py-20060220054744-baf49a1f88f17b1a
  bzrlib/tests/per_repository/__init__.py __init__.py-20060131092037-9564957a7d4a841b
  bzrlib/tests/per_repository/test_add_fallback_repository.py test_add_fallback_re-20080215040003-8w9n4ck9uqdxj18m-1
  bzrlib/tests/per_repository/test_commit_builder.py test_commit_builder.py-20060606110838-76e3ra5slucqus81-1
  bzrlib/tests/per_repository/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
  bzrlib/tests/test_bzrdir.py    test_bzrdir.py-20060131065654-deba40eef51cf220
  bzrlib/tests/test_graph.py     test_graph_walker.py-20070525030405-enq4r60hhi9xrujc-1
  bzrlib/tests/test_http.py      testhttp.py-20051018020158-b2eef6e867c514d9
  bzrlib/tests/test_lru_cache.py test_lru_cache.py-20070119165535-hph6rk4h9rzy4180-1
  bzrlib/tests/test_osutils.py   test_osutils.py-20051201224856-e48ee24c12182989
  bzrlib/tests/test_remote.py    test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
  bzrlib/tests/test_revisionspec.py testrevisionnamespaces.py-20050711050225-8b4af89e6b1efe84
  bzrlib/tests/test_shelf.py     test_prepare_shelf.p-20081005181341-n74qe6gu1e65ad4v-2
  bzrlib/tests/test_smart_transport.py test_ssh_transport.py-20060608202016-c25gvf1ob7ypbus6-2
  bzrlib/tests/test_versionedfile.py test_versionedfile.py-20060222045249-db45c9ed14a1c2e5
  bzrlib/transform.py            transform.py-20060105172343-dd99e54394d91687
  bzrlib/transport/__init__.py   transport.py-20050711165921-4978aa7ce1285ad5
  bzrlib/transport/decorator.py  decorator.py-20060402223305-e913a0f25319ab42
  bzrlib/transport/http/__init__.py http_transport.py-20050711212304-506c5fd1059ace96
  bzrlib/transport/http/_pycurl.py pycurlhttp.py-20060110060940-4e2a705911af77a6
  bzrlib/transport/http/_urllib.py _urlgrabber.py-20060113083826-0bbf7d992fbf090c
  bzrlib/transport/remote.py     ssh.py-20060608202016-c25gvf1ob7ypbus6-1
  bzrlib/versionedfile.py        versionedfile.py-20060222045106-5039c71ee3b65490
  bzrlib/weave.py                knit.py-20050627021749-759c29984154256b
  doc/developers/HACKING.txt     HACKING-20050805200004-2a5dc975d870f78c
  setup.py                       setup.py-20050314065409-02f8a0a6e3f9bc70
    ------------------------------------------------------------
    revno: 2929.1.974
    revision-id: pqm at pqm.ubuntu.com-20081212134729-rphmydb7slbgqmeu
    parent: pqm at pqm.ubuntu.com-20081212125032-wboskm0umuvt44ft
    parent: v.ladeuil+lp at free.fr-20081212130926-ov09evfb53npj0z0
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Fri 2008-12-12 13:47:29 +0000
    message:
      (vila) Fix redirection related bugs: #245964, #265070,
      	#270863 and #303959
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      bzrlib/bzrdir.py               bzrdir.py-20060131065624-156dfea39c4387cb
      bzrlib/errors.py               errors.py-20050309040759-20512168c4e14fbd
      bzrlib/push.py                 push.py-20080606021927-5fe39050e8xne9un-1
      bzrlib/tests/blackbox/test_push.py test_push.py-20060329002750-929af230d5d22663
      bzrlib/tests/test_bzrdir.py    test_bzrdir.py-20060131065654-deba40eef51cf220
      bzrlib/tests/test_http.py      testhttp.py-20051018020158-b2eef6e867c514d9
      bzrlib/tests/test_smart_transport.py test_ssh_transport.py-20060608202016-c25gvf1ob7ypbus6-2
      bzrlib/transport/__init__.py   transport.py-20050711165921-4978aa7ce1285ad5
      bzrlib/transport/decorator.py  decorator.py-20060402223305-e913a0f25319ab42
      bzrlib/transport/http/__init__.py http_transport.py-20050711212304-506c5fd1059ace96
      bzrlib/transport/http/_pycurl.py pycurlhttp.py-20060110060940-4e2a705911af77a6
      bzrlib/transport/http/_urllib.py _urlgrabber.py-20060113083826-0bbf7d992fbf090c
      bzrlib/transport/remote.py     ssh.py-20060608202016-c25gvf1ob7ypbus6-1
        ------------------------------------------------------------
        revno: 2929.1191.1
        revision-id: v.ladeuil+lp at free.fr-20081212130926-ov09evfb53npj0z0
        parent: pqm at pqm.ubuntu.com-20081212125032-wboskm0umuvt44ft
        parent: v.ladeuil+lp at free.fr-20081212122548-cd4vs5pp3k2i9e25
        committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
        branch nick: bzr.integration
        timestamp: Fri 2008-12-12 14:09:26 +0100
        message:
          Fix redirection related bugs: #245964, #265070, #270863 and #303959
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/bzrdir.py               bzrdir.py-20060131065624-156dfea39c4387cb
          bzrlib/errors.py               errors.py-20050309040759-20512168c4e14fbd
          bzrlib/push.py                 push.py-20080606021927-5fe39050e8xne9un-1
          bzrlib/tests/blackbox/test_push.py test_push.py-20060329002750-929af230d5d22663
          bzrlib/tests/test_bzrdir.py    test_bzrdir.py-20060131065654-deba40eef51cf220
          bzrlib/tests/test_http.py      testhttp.py-20051018020158-b2eef6e867c514d9
          bzrlib/tests/test_smart_transport.py test_ssh_transport.py-20060608202016-c25gvf1ob7ypbus6-2
          bzrlib/transport/__init__.py   transport.py-20050711165921-4978aa7ce1285ad5
          bzrlib/transport/decorator.py  decorator.py-20060402223305-e913a0f25319ab42
          bzrlib/transport/http/__init__.py http_transport.py-20050711212304-506c5fd1059ace96
          bzrlib/transport/http/_pycurl.py pycurlhttp.py-20060110060940-4e2a705911af77a6
          bzrlib/transport/http/_urllib.py _urlgrabber.py-20060113083826-0bbf7d992fbf090c
          bzrlib/transport/remote.py     ssh.py-20060608202016-c25gvf1ob7ypbus6-1
        ------------------------------------------------------------
        revno: 2929.1190.7
        revision-id: v.ladeuil+lp at free.fr-20081212122548-cd4vs5pp3k2i9e25
        parent: v.ladeuil+lp at free.fr-20081204171246-p28b3u0e2alz53iv
        committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
        branch nick: 303959-redirection
        timestamp: Fri 2008-12-12 13:25:48 +0100
        message:
          Fixed as per Robert's review.
          
          * bzrlib/transport/http/__init__.py:
          (HttpTransportBase._redirected_to): Better comment.
        modified:
          bzrlib/transport/http/__init__.py http_transport.py-20050711212304-506c5fd1059ace96
        ------------------------------------------------------------
        revno: 2929.1190.6
        revision-id: v.ladeuil+lp at free.fr-20081204171246-p28b3u0e2alz53iv
        parent: v.ladeuil+lp at free.fr-20081204160251-37f920alwn9t0i4p
        committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
        branch nick: 303959-redirection
        timestamp: Thu 2008-12-04 18:12:46 +0100
        message:
          Fix bug #270863 by preserving 'bzr+http[s]' decorator.
          
          * bzrlib/transport/remote.py:
          (RemoteHTTPTransport._redirected_to): Specific implementation to
          handle the redirections.
          
          * bzrlib/transport/http/_urllib.py:
          (HttpTransport_urllib.__init__): Fix parameter order.
          
          * bzrlib/transport/http/_pycurl.py:
          (PyCurlTransport.__init__): Fix parameter order.
          
          * bzrlib/transport/http/__init__.py:
          (HttpTransportBase.external_url): Semi drive-by fix, external_url
          shouldn't expose the implementation qualifier (it's private to bzr
          not externally usable).
          
          * bzrlib/transport/decorator.py:
          (TransportDecorator._redirected_to): Cleanup.
          
          * bzrlib/tests/test_smart_transport.py:
          (RemoteHTTPTransportTestCase): Add specific tests for
          _redirected_to.
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/tests/test_smart_transport.py test_ssh_transport.py-20060608202016-c25gvf1ob7ypbus6-2
          bzrlib/transport/decorator.py  decorator.py-20060402223305-e913a0f25319ab42
          bzrlib/transport/http/__init__.py http_transport.py-20050711212304-506c5fd1059ace96
          bzrlib/transport/http/_pycurl.py pycurlhttp.py-20060110060940-4e2a705911af77a6
          bzrlib/transport/http/_urllib.py _urlgrabber.py-20060113083826-0bbf7d992fbf090c
          bzrlib/transport/remote.py     ssh.py-20060608202016-c25gvf1ob7ypbus6-1
        ------------------------------------------------------------
        revno: 2929.1190.5
        revision-id: v.ladeuil+lp at free.fr-20081204160251-37f920alwn9t0i4p
        parent: v.ladeuil+lp at free.fr-20081204155340-atj2k9w0cbcuob2k
        committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
        branch nick: 303959-redirection
        timestamp: Thu 2008-12-04 17:02:51 +0100
        message:
          Don't use the exception as a parameter for _redirected_to.
          
          * bzrlib/transport/http/__init__.py:
          (HttpTransportBase._redirected_to): Update prototype.
          
          * bzrlib/transport/decorator.py:
          (TransportDecorator._redirected_to): Update prototype.
          
          * bzrlib/tests/blackbox/test_push.py:
          (RedirectingMemoryTransport): Update prototype.
        modified:
          bzrlib/bzrdir.py               bzrdir.py-20060131065624-156dfea39c4387cb
          bzrlib/push.py                 push.py-20080606021927-5fe39050e8xne9un-1
          bzrlib/tests/blackbox/test_push.py test_push.py-20060329002750-929af230d5d22663
          bzrlib/tests/test_http.py      testhttp.py-20051018020158-b2eef6e867c514d9
          bzrlib/transport/__init__.py   transport.py-20050711165921-4978aa7ce1285ad5
          bzrlib/transport/decorator.py  decorator.py-20060402223305-e913a0f25319ab42
          bzrlib/transport/http/__init__.py http_transport.py-20050711212304-506c5fd1059ace96
        ------------------------------------------------------------
        revno: 2929.1190.4
        revision-id: v.ladeuil+lp at free.fr-20081204155340-atj2k9w0cbcuob2k
        parent: v.ladeuil+lp at free.fr-20081204115030-4dytul8qv82viscm
        committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
        branch nick: 303959-redirection
        timestamp: Thu 2008-12-04 16:53:40 +0100
        message:
          Cleanup.
          
          * bzrlib/transport/http/_urllib.py:
          (HttpTransport_urllib._perform): Update RedirectRequested creation.
          
          * bzrlib/transport/http/_pycurl.py:
          (PyCurlTransport._curl_perform): Update RedirectRequested creation.
          
          * bzrlib/tests/blackbox/test_push.py:
          (RedirectingMemoryTransport.mkdir): RedirectRequested wants urls
          not paths. Be more precise with the paths used too.
          (TestPushRedirect.test_push_redirects_on_mkdir,
          TestPushRedirect.test_push_gracefully_handles_too_many_redirects):
          Use '-d' instead of chdir().
          
          * bzrlib/push.py:
          (_show_push_branch.redirected): Updated and note() added (why
          wasn't it there in the first place ?).
          
          * bzrlib/errors.py:
          (RedirectRequested): Simplified now that the redirection stuff is
          handled by the transport itself.
        modified:
          bzrlib/errors.py               errors.py-20050309040759-20512168c4e14fbd
          bzrlib/push.py                 push.py-20080606021927-5fe39050e8xne9un-1
          bzrlib/tests/blackbox/test_push.py test_push.py-20060329002750-929af230d5d22663
          bzrlib/tests/test_http.py      testhttp.py-20051018020158-b2eef6e867c514d9
          bzrlib/transport/http/_pycurl.py pycurlhttp.py-20060110060940-4e2a705911af77a6
          bzrlib/transport/http/_urllib.py _urlgrabber.py-20060113083826-0bbf7d992fbf090c
        ------------------------------------------------------------
        revno: 2929.1190.3
        revision-id: v.ladeuil+lp at free.fr-20081204115030-4dytul8qv82viscm
        parent: v.ladeuil+lp at free.fr-20081204112556-g3i9tf396wygm1b7
        committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
        branch nick: 303959-redirection
        timestamp: Thu 2008-12-04 12:50:30 +0100
        message:
          Fix bug #303959 by returning a transport based on the same url
          when redirected to an url with a slash appened.
          
          * bzrlib/tests/test_http.py:
          (Test_redirected_to.test_redirected_to_self_with_slash): Reproduce
          bug #303959.
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/tests/test_http.py      testhttp.py-20051018020158-b2eef6e867c514d9
        ------------------------------------------------------------
        revno: 2929.1190.2
        revision-id: v.ladeuil+lp at free.fr-20081204112556-g3i9tf396wygm1b7
        parent: v.ladeuil+lp at free.fr-20081203164038-5ghthsgdei3ank1j
        committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
        branch nick: 303959-redirection
        timestamp: Thu 2008-12-04 12:25:56 +0100
        message:
          Fix bug #265070 by providing a finer sieve for accepted redirections.
          
          * bzrlib/transport/http/_urllib.py:
          (HttpTransport_urllib.__init__): Provides the implementation name.
          
          * bzrlib/transport/http/_pycurl.py:
          (PyCurlTransport.__init__): Provides the implementation name.
          
          * bzrlib/transport/http/__init__.py:
          (HttpTransportBase.__init__): Make the implementation a mandatory
          parameter.
          (HttpTransportBase._redirected_to.relpath): We need a dedicated
          relpath method to be able to cope with slight differences between
          the url sent and the url received from the server.
          (HttpTransportBase._redirected_to): Fix bug #265070 by accepting
          more redirection kinds and handling them: http <-> https and user
          specified in the url.
          
          * bzrlib/tests/test_http.py:
          (Test_redirected_to): More complete tests for _redirected_to().
        modified:
          bzrlib/tests/test_http.py      testhttp.py-20051018020158-b2eef6e867c514d9
          bzrlib/transport/http/__init__.py http_transport.py-20050711212304-506c5fd1059ace96
          bzrlib/transport/http/_pycurl.py pycurlhttp.py-20060110060940-4e2a705911af77a6
          bzrlib/transport/http/_urllib.py _urlgrabber.py-20060113083826-0bbf7d992fbf090c
        ------------------------------------------------------------
        revno: 2929.1190.1
        revision-id: v.ladeuil+lp at free.fr-20081203164038-5ghthsgdei3ank1j
        parent: pqm at pqm.ubuntu.com-20081202015700-3mc9dola31w7h5h4
        committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
        branch nick: 303959-redirection
        timestamp: Wed 2008-12-03 17:40:38 +0100
        message:
          Fix bug #245964 by preserving decorators during redirections (when
          appropriate).
          
          * bzrlib/transport/decorator.py:
          (TransportDecorator._redirected_to): Generic implementation
          delegating to the _decorated transport.
          
          * bzrlib/transport/http/__init__.py:
          (HttpTransportBase.clone): Drive-by fix, deleted, base
          implementation was strictly identical.
          (HttpTransportBase._redirected_to): Narrow the possible
          redirections to those where both urls have the same ending
          relpath (to cope with known usages that doesn't respect the 'base'
          paradigm (i.e. using '.bzr/smart' instead of 'smart' on a cloned
          transport for example). Preserve qualifiers when creating the
          redirected transport. Also preserve user if used against the same
          host:port (further authentication can invalidate the user if it's
          wrong, but if it's required, we'd better propagate it).
          
          * bzrlib/transport/decorator.py:
          (TransportDecorator.__init__): Drive-by fix, the url is indeed not
          decorated anymore, name the variable accordingly.
          
          * bzrlib/transport/__init__.py:
          (Transport._redirected_to): Default do nothing implementation.
          
          * bzrlib/tests/test_bzrdir.py:
          (TestHTTPRedirections.test_qualifier_preserved): Ensures that
          qualifiers are preserved across redirections.
          
          * bzrlib/bzrdir.py:
          (BzrDir.open_from_transport.redirected): Delegate redirection
          handling to the transport.
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/bzrdir.py               bzrdir.py-20060131065624-156dfea39c4387cb
          bzrlib/tests/test_bzrdir.py    test_bzrdir.py-20060131065654-deba40eef51cf220
          bzrlib/tests/test_http.py      testhttp.py-20051018020158-b2eef6e867c514d9
          bzrlib/transport/__init__.py   transport.py-20050711165921-4978aa7ce1285ad5
          bzrlib/transport/decorator.py  decorator.py-20060402223305-e913a0f25319ab42
          bzrlib/transport/http/__init__.py http_transport.py-20050711212304-506c5fd1059ace96
    ------------------------------------------------------------
    revno: 2929.1.973
    revision-id: pqm at pqm.ubuntu.com-20081212125032-wboskm0umuvt44ft
    parent: pqm at pqm.ubuntu.com-20081212070030-93xnzs7f14962hti
    parent: v.ladeuil+lp at free.fr-20081212121401-fx3zk2ixgjz843k0
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Fri 2008-12-12 12:50:32 +0000
    message:
      (vila) Use the short status format when the short format is used for
      	log
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
      bzrlib/delta.py                delta.py-20050729221636-54cf14ef94783d0a
      bzrlib/log.py                  log.py-20050505065812-c40ce11702fe5fb1
      bzrlib/tests/blackbox/test_log.py test_log.py-20060112090212-78f6ea560c868e24
        ------------------------------------------------------------
        revno: 2929.1189.1
        revision-id: v.ladeuil+lp at free.fr-20081212121401-fx3zk2ixgjz843k0
        parent: pqm at pqm.ubuntu.com-20081212070030-93xnzs7f14962hti
        parent: v.ladeuil+lp at free.fr-20081212120801-p1up3amo9ff3rghy
        committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
        branch nick: bzr.integration
        timestamp: Fri 2008-12-12 13:14:01 +0100
        message:
          (vila) Use the short status format when the short format is used for log
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
          bzrlib/delta.py                delta.py-20050729221636-54cf14ef94783d0a
          bzrlib/log.py                  log.py-20050505065812-c40ce11702fe5fb1
          bzrlib/tests/blackbox/test_log.py test_log.py-20060112090212-78f6ea560c868e24
        ------------------------------------------------------------
        revno: 2929.1187.8
        revision-id: v.ladeuil+lp at free.fr-20081212120801-p1up3amo9ff3rghy
        parent: v.ladeuil+lp at free.fr-20081211071228-21705lekcnoam79u
        committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
        branch nick: log-s-v
        timestamp: Fri 2008-12-12 13:08:01 +0100
        message:
          Fixed as ber Robert's review.
          
          * bzrlib/tests/blackbox/test_log.py:
          (TestLogVerbose): Refactor 'lob -v' delta format tests.
        modified:
          bzrlib/tests/blackbox/test_log.py test_log.py-20060112090212-78f6ea560c868e24
        ------------------------------------------------------------
        revno: 2929.1187.7
        revision-id: v.ladeuil+lp at free.fr-20081211071228-21705lekcnoam79u
        parent: v.ladeuil+lp at free.fr-20081210172141-tcdhvd9o14ingf1n
        committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
        branch nick: log-s-v
        timestamp: Thu 2008-12-11 08:12:28 +0100
        message:
          Restrict '-v' change to log --short only.
          
          * bzrlib/tests/blackbox/test_log.py:
          (TestLog.test_log_long_verbose,
          TestLog.test_log_long_verbose_verbose): Update tests to reflect
          --long ignoring verbosity level.
          
          * bzrlib/log.py:
          (LongLogFormatter.log_revision): Ignore verbosity level to
          preserve compatibility.
        modified:
          bzrlib/log.py                  log.py-20050505065812-c40ce11702fe5fb1
          bzrlib/tests/blackbox/test_log.py test_log.py-20060112090212-78f6ea560c868e24
        ------------------------------------------------------------
        revno: 2929.1187.6
        revision-id: v.ladeuil+lp at free.fr-20081210172141-tcdhvd9o14ingf1n
        parent: v.ladeuil+lp at free.fr-20081209085733-x9ubc9uj33tddlhp
        parent: v.ladeuil+lp at free.fr-20081210172011-hqo0uup8a7aq785f
        committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
        branch nick: log-s-v
        timestamp: Wed 2008-12-10 18:21:41 +0100
        message:
          merge bzr.dev at 3890
        added:
          bzrlib/fifo_cache.py           fifo_cache.py-20081209212307-31ffjwvteyvmydnf-1
          bzrlib/tests/per_repository/test_add_inventory_by_delta.py test_add_inventory_d-20081013002626-rut81igtlqb4590z-1
          bzrlib/tests/test_fifo_cache.py test_fifo_cache.py-20081209212307-31ffjwvteyvmydnf-2
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/__init__.py             __init__.py-20050309040759-33e65acf91bbcd5d
          bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
          bzrlib/commit.py               commit.py-20050511101309-79ec1a0168e0e825
          bzrlib/inventory.py            inventory.py-20050309040759-6648b84ca2005b37
          bzrlib/lru_cache.py            lru_cache.py-20070119165515-tlw203kuwh0id5gv-1
          bzrlib/remote.py               remote.py-20060720103555-yeeg2x51vn0rbtdp-1
          bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
          bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
          bzrlib/tests/blackbox/test_ls.py test_ls.py-20060712232047-0jraqpecwngee12y-1
          bzrlib/tests/blackbox/test_pull.py test_pull.py-20051201144907-64959364f629947f
          bzrlib/tests/blackbox/test_revision_info.py test_revision_info.py-20050917162600-21dab3877aa348d7
          bzrlib/tests/interrepository_implementations/__init__.py __init__.py-20060220054744-baf49a1f88f17b1a
          bzrlib/tests/per_repository/__init__.py __init__.py-20060131092037-9564957a7d4a841b
          bzrlib/tests/per_repository/test_commit_builder.py test_commit_builder.py-20060606110838-76e3ra5slucqus81-1
          bzrlib/tests/per_repository/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
          bzrlib/tests/test_lru_cache.py test_lru_cache.py-20070119165535-hph6rk4h9rzy4180-1
          bzrlib/transport/__init__.py   transport.py-20050711165921-4978aa7ce1285ad5
          doc/developers/HACKING.txt     HACKING-20050805200004-2a5dc975d870f78c
            ------------------------------------------------------------
            revno: 2929.1188.5
            revision-id: v.ladeuil+lp at free.fr-20081210172011-hqo0uup8a7aq785f
            parent: v.ladeuil+lp at free.fr-20081209085621-l1qyr2psspm72519
            parent: pqm at pqm.ubuntu.com-20081210082822-li6ku9s3k63kjrpr
            committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
            branch nick: cleanups
            timestamp: Wed 2008-12-10 18:20:11 +0100
            message:
              Merge bzr.dev into cleanups
            added:
              bzrlib/fifo_cache.py           fifo_cache.py-20081209212307-31ffjwvteyvmydnf-1
              bzrlib/tests/per_repository/test_add_inventory_by_delta.py test_add_inventory_d-20081013002626-rut81igtlqb4590z-1
              bzrlib/tests/test_fifo_cache.py test_fifo_cache.py-20081209212307-31ffjwvteyvmydnf-2
            modified:
              NEWS                           NEWS-20050323055033-4e00b5db738777ff
              bzrlib/__init__.py             __init__.py-20050309040759-33e65acf91bbcd5d
              bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
              bzrlib/commit.py               commit.py-20050511101309-79ec1a0168e0e825
              bzrlib/inventory.py            inventory.py-20050309040759-6648b84ca2005b37
              bzrlib/lru_cache.py            lru_cache.py-20070119165515-tlw203kuwh0id5gv-1
              bzrlib/remote.py               remote.py-20060720103555-yeeg2x51vn0rbtdp-1
              bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
              bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
              bzrlib/tests/blackbox/test_ls.py test_ls.py-20060712232047-0jraqpecwngee12y-1
              bzrlib/tests/blackbox/test_pull.py test_pull.py-20051201144907-64959364f629947f
              bzrlib/tests/blackbox/test_revision_info.py test_revision_info.py-20050917162600-21dab3877aa348d7
              bzrlib/tests/interrepository_implementations/__init__.py __init__.py-20060220054744-baf49a1f88f17b1a
              bzrlib/tests/per_repository/__init__.py __init__.py-20060131092037-9564957a7d4a841b
              bzrlib/tests/per_repository/test_commit_builder.py test_commit_builder.py-20060606110838-76e3ra5slucqus81-1
              bzrlib/tests/per_repository/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
              bzrlib/tests/test_lru_cache.py test_lru_cache.py-20070119165535-hph6rk4h9rzy4180-1
              bzrlib/transport/__init__.py   transport.py-20050711165921-4978aa7ce1285ad5
              doc/developers/HACKING.txt     HACKING-20050805200004-2a5dc975d870f78c
        ------------------------------------------------------------
        revno: 2929.1187.5
        revision-id: v.ladeuil+lp at free.fr-20081209085733-x9ubc9uj33tddlhp
        parent: v.ladeuil+lp at free.fr-20081205123515-q8d82ivuv6x36y7w
        parent: v.ladeuil+lp at free.fr-20081209085621-l1qyr2psspm72519
        committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
        branch nick: log-s-v
        timestamp: Tue 2008-12-09 09:57:33 +0100
        message:
          merge cleanups fixing conflicts
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/branch.py               branch.py-20050309040759-e4baf4e0d046576e
          bzrlib/bzrdir.py               bzrdir.py-20060131065624-156dfea39c4387cb
          bzrlib/fetch.py                fetch.py-20050818234941-26fea6105696365d
          bzrlib/knit.py                 knit.py-20051212171256-f056ac8f0fbe1bd9
          bzrlib/log.py                  log.py-20050505065812-c40ce11702fe5fb1
          bzrlib/registry.py             lazy_factory.py-20060809213415-2gfvqadtvdn0phtg-1
          bzrlib/remote.py               remote.py-20060720103555-yeeg2x51vn0rbtdp-1
          bzrlib/repofmt/pack_repo.py    pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
          bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
          bzrlib/revisionspec.py         revisionspec.py-20050907152633-17567659fd5c0ddb
          bzrlib/tests/blackbox/test_diff.py test_diff.py-20060110203741-aa99ac93e633d971
          bzrlib/tests/branch_implementations/__init__.py __init__.py-20060123013057-b12a52c3f361daf4
          bzrlib/tests/branch_implementations/test_branch.py testbranch.py-20050711070244-121d632bc37d7253
          bzrlib/tests/branch_implementations/test_sprout.py test_sprout.py-20070521151739-b8t8p7axw1h966ws-1
          bzrlib/tests/branch_implementations/test_stacking.py test_stacking.py-20080214020755-msjlkb7urobwly0f-1
          bzrlib/tests/bzrdir_implementations/test_bzrdir.py test_bzrdir.py-20060131065642-0ebeca5e30e30866
          bzrlib/tests/per_repository/test_add_fallback_repository.py test_add_fallback_re-20080215040003-8w9n4ck9uqdxj18m-1
          bzrlib/tests/per_repository/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
          bzrlib/tests/test_fetch.py     testfetch.py-20050825090644-f73e07e7dfb1765a
          bzrlib/tests/test_knit.py      test_knit.py-20051212171302-95d4c00dd5f11f2b
          bzrlib/tests/test_transport.py testtransport.py-20050718175618-e5cdb99f4555ddce
          bzrlib/tests/test_versionedfile.py test_versionedfile.py-20060222045249-db45c9ed14a1c2e5
          bzrlib/transport/__init__.py   transport.py-20050711165921-4978aa7ce1285ad5
          bzrlib/transport/remote.py     ssh.py-20060608202016-c25gvf1ob7ypbus6-1
          bzrlib/upgrade.py              history2weaves.py-20050818063535-e7d319791c19a8b2
          bzrlib/versionedfile.py        versionedfile.py-20060222045106-5039c71ee3b65490
            ------------------------------------------------------------
            revno: 2929.1188.4
            revision-id: v.ladeuil+lp at free.fr-20081209085621-l1qyr2psspm72519
            parent: v.ladeuil+lp at free.fr-20081209085526-jvh9bayou0bcoo5l
            committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
            branch nick: cleanups
            timestamp: Tue 2008-12-09 09:56:21 +0100
            message:
              Fix too long lines.
            modified:
              bzrlib/log.py                  log.py-20050505065812-c40ce11702fe5fb1
            ------------------------------------------------------------
            revno: 2929.1188.3
            revision-id: v.ladeuil+lp at free.fr-20081209085526-jvh9bayou0bcoo5l
            parent: v.ladeuil+lp at free.fr-20081205095113-u39p9ormkmt1w4v1
            parent: pqm at pqm.ubuntu.com-20081209023452-12dbzcwzxrt1xee3
            committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
            branch nick: cleanups
            timestamp: Tue 2008-12-09 09:55:26 +0100
            message:
              merge bzr.dev at 3883
            modified:
              NEWS                           NEWS-20050323055033-4e00b5db738777ff
              bzrlib/branch.py               branch.py-20050309040759-e4baf4e0d046576e
              bzrlib/bzrdir.py               bzrdir.py-20060131065624-156dfea39c4387cb
              bzrlib/fetch.py                fetch.py-20050818234941-26fea6105696365d
              bzrlib/knit.py                 knit.py-20051212171256-f056ac8f0fbe1bd9
              bzrlib/registry.py             lazy_factory.py-20060809213415-2gfvqadtvdn0phtg-1
              bzrlib/remote.py               remote.py-20060720103555-yeeg2x51vn0rbtdp-1
              bzrlib/repofmt/pack_repo.py    pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
              bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
              bzrlib/revisionspec.py         revisionspec.py-20050907152633-17567659fd5c0ddb
              bzrlib/tests/blackbox/test_diff.py test_diff.py-20060110203741-aa99ac93e633d971
              bzrlib/tests/branch_implementations/__init__.py __init__.py-20060123013057-b12a52c3f361daf4
              bzrlib/tests/branch_implementations/test_branch.py testbranch.py-20050711070244-121d632bc37d7253
              bzrlib/tests/branch_implementations/test_sprout.py test_sprout.py-20070521151739-b8t8p7axw1h966ws-1
              bzrlib/tests/branch_implementations/test_stacking.py test_stacking.py-20080214020755-msjlkb7urobwly0f-1
              bzrlib/tests/bzrdir_implementations/test_bzrdir.py test_bzrdir.py-20060131065642-0ebeca5e30e30866
              bzrlib/tests/per_repository/test_add_fallback_repository.py test_add_fallback_re-20080215040003-8w9n4ck9uqdxj18m-1
              bzrlib/tests/per_repository/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
              bzrlib/tests/test_fetch.py     testfetch.py-20050825090644-f73e07e7dfb1765a
              bzrlib/tests/test_knit.py      test_knit.py-20051212171302-95d4c00dd5f11f2b
              bzrlib/tests/test_transport.py testtransport.py-20050718175618-e5cdb99f4555ddce
              bzrlib/tests/test_versionedfile.py test_versionedfile.py-20060222045249-db45c9ed14a1c2e5
              bzrlib/transport/__init__.py   transport.py-20050711165921-4978aa7ce1285ad5
              bzrlib/transport/remote.py     ssh.py-20060608202016-c25gvf1ob7ypbus6-1
              bzrlib/upgrade.py              history2weaves.py-20050818063535-e7d319791c19a8b2
              bzrlib/versionedfile.py        versionedfile.py-20060222045106-5039c71ee3b65490
        ------------------------------------------------------------
        revno: 2929.1187.4
        revision-id: v.ladeuil+lp at free.fr-20081205123515-q8d82ivuv6x36y7w
        parent: v.ladeuil+lp at free.fr-20081205095210-um1v5wvo0pib6mmj
        committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
        branch nick: log-s-v
        timestamp: Fri 2008-12-05 13:35:15 +0100
        message:
          Fixed as per Aarons' comment.
          
          * bzrlib/tests/blackbox/test_log.py:
          (TestLog): Add more tests for 'delta_format'.
          
          * bzrlib/log.py:
          (LogFormatter): Document the 'delta_format' attribute.
          (LogFormatter.__init__): Initialize 'delta_format' respecting
          bzckward compatibility.
          (LongLogFormatter.log_revision): Takes 'delta_format' into account.
          (ShortLogFormatter.log_revision): Takes 'delta_format' into account.
          
          * bzrlib/builtins.py:
          (cmd_log.run): Use get_verbosity_level() to distinguish between -v
          and -vv.
        modified:
          bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
          bzrlib/log.py                  log.py-20050505065812-c40ce11702fe5fb1
          bzrlib/tests/blackbox/test_log.py test_log.py-20060112090212-78f6ea560c868e24
        ------------------------------------------------------------
        revno: 2929.1187.3
        revision-id: v.ladeuil+lp at free.fr-20081205095210-um1v5wvo0pib6mmj
        parent: v.ladeuil+lp at free.fr-20081201165324-w1go7lxnckpknk3k
        parent: v.ladeuil+lp at free.fr-20081205095113-u39p9ormkmt1w4v1
        committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
        branch nick: log-s-v
        timestamp: Fri 2008-12-05 10:52:10 +0100
        message:
          Merge cleanups into log-s-v
        modified:
          bzrlib/log.py                  log.py-20050505065812-c40ce11702fe5fb1
            ------------------------------------------------------------
            revno: 2929.1188.2
            revision-id: v.ladeuil+lp at free.fr-20081205095113-u39p9ormkmt1w4v1
            parent: v.ladeuil+lp at free.fr-20081201165155-awy16we83y95gahp
            committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
            branch nick: cleanups
            timestamp: Fri 2008-12-05 10:51:13 +0100
            message:
              Cleanup show_log doc string.
              
              * bzrlib/log.py:
              (show_log): Reformat doc string.
            modified:
              bzrlib/log.py                  log.py-20050505065812-c40ce11702fe5fb1
        ------------------------------------------------------------
        revno: 2929.1187.2
        revision-id: v.ladeuil+lp at free.fr-20081201165324-w1go7lxnckpknk3k
        parent: v.ladeuil+lp at free.fr-20081201154814-9ukqbu07oj70booe
        parent: v.ladeuil+lp at free.fr-20081201165155-awy16we83y95gahp
        committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
        branch nick: log-s-v
        timestamp: Mon 2008-12-01 17:53:24 +0100
        message:
          Merge cleanups into log-s-v
        modified:
          bzrlib/delta.py                delta.py-20050729221636-54cf14ef94783d0a
            ------------------------------------------------------------
            revno: 2929.1188.1
            revision-id: v.ladeuil+lp at free.fr-20081201165155-awy16we83y95gahp
            parent: pqm at pqm.ubuntu.com-20081201071425-al48chdg4wlkbm31
            committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
            branch nick: cleanups
            timestamp: Mon 2008-12-01 17:51:55 +0100
            message:
              Empty lines.
            modified:
              bzrlib/delta.py                delta.py-20050729221636-54cf14ef94783d0a
        ------------------------------------------------------------
        revno: 2929.1187.1
        revision-id: v.ladeuil+lp at free.fr-20081201154814-9ukqbu07oj70booe
        parent: pqm at pqm.ubuntu.com-20081201071425-al48chdg4wlkbm31
        committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
        branch nick: log-s-v
        timestamp: Mon 2008-12-01 16:48:14 +0100
        message:
          Fix #87179 by using the short status format when the short format is used for log.
          
          * bzrlib/tests/blackbox/test_log.py:
          (TestLog.test_log_short_verbose): Test that we use the right
          status format.
          
          * bzrlib/log.py:
          (ShortLogFormatter.log_revision): Set short_status to True.
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/log.py                  log.py-20050505065812-c40ce11702fe5fb1
          bzrlib/tests/blackbox/test_log.py test_log.py-20060112090212-78f6ea560c868e24
    ------------------------------------------------------------
    revno: 2929.1.972
    revision-id: pqm at pqm.ubuntu.com-20081212070030-93xnzs7f14962hti
    parent: pqm at pqm.ubuntu.com-20081212043027-n6zyyf2q7usjiyid
    parent: amanic at gmail.com-20081204195934-0jrq24ttncqpl9is
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Fri 2008-12-12 07:00:30 +0000
    message:
      Add more tests for dotted revnos. (Marius Kruger)
    modified:
      bzrlib/tests/blackbox/test_log.py test_log.py-20060112090212-78f6ea560c868e24
      bzrlib/tests/test_revisionspec.py testrevisionnamespaces.py-20050711050225-8b4af89e6b1efe84
        ------------------------------------------------------------
        revno: 2929.1186.3
        revision-id: amanic at gmail.com-20081204195934-0jrq24ttncqpl9is
        parent: amanic at gmail.com-20081204195329-bygs4wrol90ridjr
        committer: Marius Kruger <amanic at gmail.com>
        branch nick: bzr.diff_dotted_revno_exception
        timestamp: Thu 2008-12-04 21:59:34 +0200
        message:
          Add tests for log -r with non-exising revno's
          (the doted case now gives correct error message)
        modified:
          bzrlib/tests/blackbox/test_log.py test_log.py-20060112090212-78f6ea560c868e24
        ------------------------------------------------------------
        revno: 2929.1186.2
        revision-id: amanic at gmail.com-20081204195329-bygs4wrol90ridjr
        parent: amanic at gmail.com-20081204190952-9eed0xghn96koab1
        committer: Marius Kruger <amanic at gmail.com>
        branch nick: bzr.diff_dotted_revno_exception
        timestamp: Thu 2008-12-04 21:53:29 +0200
        message:
          Add tests for log -c with non-exising revno's
          (the doted case now gives correct error message)
        modified:
          bzrlib/tests/blackbox/test_log.py test_log.py-20060112090212-78f6ea560c868e24
        ------------------------------------------------------------
        revno: 2929.1186.1
        revision-id: amanic at gmail.com-20081204190952-9eed0xghn96koab1
        parent: pqm at pqm.ubuntu.com-20081202015700-3mc9dola31w7h5h4
        committer: Marius Kruger <amanic at gmail.com>
        branch nick: bzr.diff_dotted_revno_exception
        timestamp: Thu 2008-12-04 21:09:52 +0200
        message:
          Test invalid dotted revion number directly in TestRevisionSpec_revno
        modified:
          bzrlib/tests/test_revisionspec.py testrevisionnamespaces.py-20050711050225-8b4af89e6b1efe84
    ------------------------------------------------------------
    revno: 2929.1.971
    revision-id: pqm at pqm.ubuntu.com-20081212043027-n6zyyf2q7usjiyid
    parent: pqm at pqm.ubuntu.com-20081212025611-838ms79rnxjl7yr2
    parent: andrew.bennetts at canonical.com-20081212035356-uqcu89gy4nqf017x
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Fri 2008-12-12 04:30:27 +0000
    message:
      Fix compilation error in _dirstate_helpers_c on SunOS/Solaris. (Jari
      	Aalto)
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      bzrlib/_dirstate_helpers_c.h   _dirstate_helpers_c.-20070802205935-hqo9yzuzjix271dd-1
        ------------------------------------------------------------
        revno: 2929.1185.1
        revision-id: andrew.bennetts at canonical.com-20081212035356-uqcu89gy4nqf017x
        parent: pqm at pqm.ubuntu.com-20081212025611-838ms79rnxjl7yr2
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: solaris-ifdef
        timestamp: Fri 2008-12-12 14:53:56 +1100
        message:
          Fix compilation error in _dirstate_helpers_c on SunOS/Solaris. (Jari Aalto)
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/_dirstate_helpers_c.h   _dirstate_helpers_c.-20070802205935-hqo9yzuzjix271dd-1
    ------------------------------------------------------------
    revno: 2929.1.970
    revision-id: pqm at pqm.ubuntu.com-20081212025611-838ms79rnxjl7yr2
    parent: pqm at pqm.ubuntu.com-20081212015925-98alcrs1vpf9kjdu
    parent: andrew.bennetts at canonical.com-20081212014730-7mvzvi3vzvd1goj5
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Fri 2008-12-12 02:56:11 +0000
    message:
      Remove broken debug mutter in graph.py that was triggered by -Dhpss.
      	(Andrew Bennetts)
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      bzrlib/graph.py                graph_walker.py-20070525030359-y852guab65d4wtn0-1
      bzrlib/remote.py               remote.py-20060720103555-yeeg2x51vn0rbtdp-1
        ------------------------------------------------------------
        revno: 2929.1184.2
        revision-id: andrew.bennetts at canonical.com-20081212014730-7mvzvi3vzvd1goj5
        parent: andrew.bennetts at canonical.com-20081212011704-m5208objzpfsjar7
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: mutter-bug-307327
        timestamp: Fri 2008-12-12 12:47:30 +1100
        message:
          Mention in NEWS the removal of node_distances and select_farthest from bzrlib.graph.
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
        ------------------------------------------------------------
        revno: 2929.1184.1
        revision-id: andrew.bennetts at canonical.com-20081212011704-m5208objzpfsjar7
        parent: pqm at pqm.ubuntu.com-20081211215721-7er55v3goevwfz9w
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: mutter-bug-307327
        timestamp: Fri 2008-12-12 12:17:04 +1100
        message:
          Remove broken debugging cruft, and some unused imports.
        modified:
          bzrlib/graph.py                graph_walker.py-20070525030359-y852guab65d4wtn0-1
          bzrlib/remote.py               remote.py-20060720103555-yeeg2x51vn0rbtdp-1
    ------------------------------------------------------------
    revno: 2929.1.969
    revision-id: pqm at pqm.ubuntu.com-20081212015925-98alcrs1vpf9kjdu
    parent: pqm at pqm.ubuntu.com-20081212012450-3gw576prpztxziib
    parent: aaron at aaronbentley.com-20081212003726-331kkjc5050ofbag
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Fri 2008-12-12 01:59:25 +0000
    message:
      Add make check-nodocs target (abentley).
    modified:
      Makefile                       Makefile-20050805140406-d96e3498bb61c5bb
        ------------------------------------------------------------
        revno: 2929.1183.1
        revision-id: aaron at aaronbentley.com-20081212003726-331kkjc5050ofbag
        parent: pqm at pqm.ubuntu.com-20081211075753-m1ktaz1at8oxlp00
        committer: Aaron Bentley <aaron at aaronbentley.com>
        branch nick: check-nodocs
        timestamp: Thu 2008-12-11 16:37:26 -0800
        message:
          Add check-nodocs target
        modified:
          Makefile                       Makefile-20050805140406-d96e3498bb61c5bb
    ------------------------------------------------------------
    revno: 2929.1.968
    revision-id: pqm at pqm.ubuntu.com-20081212012450-3gw576prpztxziib
    parent: pqm at pqm.ubuntu.com-20081211215721-7er55v3goevwfz9w
    parent: mbp at sourcefrog.net-20081212004341-1s5soiy7itgnif7w
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Fri 2008-12-12 01:24:50 +0000
    message:
      (mbp) Developer documentation about when to add new exception classes
    modified:
      doc/developers/HACKING.txt     HACKING-20050805200004-2a5dc975d870f78c
        ------------------------------------------------------------
        revno: 2929.1182.2
        revision-id: mbp at sourcefrog.net-20081212004341-1s5soiy7itgnif7w
        parent: mbp at sourcefrog.net-20081212002306-oyljdsw9is6zkqf0
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: doc-hacking
        timestamp: Thu 2008-12-11 16:43:41 -0800
        message:
          Tweak documentation of exception classes
        modified:
          doc/developers/HACKING.txt     HACKING-20050805200004-2a5dc975d870f78c
        ------------------------------------------------------------
        revno: 2929.1182.1
        revision-id: mbp at sourcefrog.net-20081212002306-oyljdsw9is6zkqf0
        parent: pqm at pqm.ubuntu.com-20081205181554-ofrdnafloc43bxkh
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: doc-hacking
        timestamp: Thu 2008-12-11 16:23:06 -0800
        message:
          Developer documentation about when to add new exception classes
        modified:
          doc/developers/HACKING.txt     HACKING-20050805200004-2a5dc975d870f78c
    ------------------------------------------------------------
    revno: 2929.1.967
    revision-id: pqm at pqm.ubuntu.com-20081211215721-7er55v3goevwfz9w
    parent: pqm at pqm.ubuntu.com-20081211202300-6dz1vo3phfsc23pj
    parent: robertc at robertcollins.net-20081205154530-lvrdo30eslvvhxwl
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Thu 2008-12-11 21:57:21 +0000
    message:
      Remove dead code in Repository.iter_files_bytes. (Robert Collins)
    modified:
      bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
        ------------------------------------------------------------
        revno: 2929.1181.1
        revision-id: robertc at robertcollins.net-20081205154530-lvrdo30eslvvhxwl
        parent: pqm at pqm.ubuntu.com-20081202015700-3mc9dola31w7h5h4
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: iter_files_bytes
        timestamp: Sat 2008-12-06 02:45:30 +1100
        message:
          Remove dead code in Repository.iter_files_bytes.
        modified:
          bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
    ------------------------------------------------------------
    revno: 2929.1.966
    revision-id: pqm at pqm.ubuntu.com-20081211202300-6dz1vo3phfsc23pj
    parent: pqm at pqm.ubuntu.com-20081211174647-l45s6xsw669ovgsa
    parent: john at arbash-meinel.com-20081211193706-7qz4e5f9a8c5w4b1
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Thu 2008-12-11 20:23:00 +0000
    message:
      (jam) Add ContentFactory.get_bytes_as('chunked') and
      	osutils.chunks_to_lines()
    added:
      bzrlib/_chunks_to_lines_py.py  _chunks_to_lines_py.-20081211024848-6uc3mtuje8j14l60-1
      bzrlib/_chunks_to_lines_pyx.pyx _chunks_to_lines_pyx-20081211021736-op7n8vrxgrd8snfi-1
      bzrlib/tests/test__chunks_to_lines.py test__chunks_to_line-20081211024848-6uc3mtuje8j14l60-2
    modified:
      .bzrignore                     bzrignore-20050311232317-81f7b71efa2db11a
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      bzrlib/knit.py                 knit.py-20051212171256-f056ac8f0fbe1bd9
      bzrlib/merge.py                merge.py-20050513021216-953b65a438527106
      bzrlib/osutils.py              osutils.py-20050309040759-eeaff12fbf77ac86
      bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
      bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
      bzrlib/tests/test_osutils.py   test_osutils.py-20051201224856-e48ee24c12182989
      bzrlib/tests/test_versionedfile.py test_versionedfile.py-20060222045249-db45c9ed14a1c2e5
      bzrlib/transform.py            transform.py-20060105172343-dd99e54394d91687
      bzrlib/versionedfile.py        versionedfile.py-20060222045106-5039c71ee3b65490
      bzrlib/weave.py                knit.py-20050627021749-759c29984154256b
      setup.py                       setup.py-20050314065409-02f8a0a6e3f9bc70
        ------------------------------------------------------------
        revno: 2929.1180.18
        revision-id: john at arbash-meinel.com-20081211193706-7qz4e5f9a8c5w4b1
        parent: john at arbash-meinel.com-20081211193101-q0utq7jeh79vpmgr
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: get_record_stream_chunked
        timestamp: Thu 2008-12-11 13:37:06 -0600
        message:
          Implement osutils.split_lines() in terms of chunks_to_lines if possible.
          
          chunks_to_lines([fulltext]) is about 2x faster than the original split_lines implementation.
        modified:
          bzrlib/_chunks_to_lines_py.py  _chunks_to_lines_py.-20081211024848-6uc3mtuje8j14l60-1
          bzrlib/osutils.py              osutils.py-20050309040759-eeaff12fbf77ac86
        ------------------------------------------------------------
        revno: 2929.1180.17
        revision-id: john at arbash-meinel.com-20081211193101-q0utq7jeh79vpmgr
        parent: john at arbash-meinel.com-20081211182616-l9m9rjnea3bebaor
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: get_record_stream_chunked
        timestamp: Thu 2008-12-11 13:31:01 -0600
        message:
          Add a few more corner cases, some suggested by Robert.
        modified:
          bzrlib/tests/test__chunks_to_lines.py test__chunks_to_line-20081211024848-6uc3mtuje8j14l60-2
        ------------------------------------------------------------
        revno: 2929.1180.16
        revision-id: john at arbash-meinel.com-20081211182616-l9m9rjnea3bebaor
        parent: john at arbash-meinel.com-20081211182023-sr6hi6owbbzozhkn
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: get_record_stream_chunked
        timestamp: Thu 2008-12-11 12:26:16 -0600
        message:
          If we split into 2 loops, we get 440us for already lines, and the
          same time when it is not.
          The only downside is that it requires looping over the same data twice.
        modified:
          bzrlib/_chunks_to_lines_pyx.pyx _chunks_to_lines_pyx-20081211021736-op7n8vrxgrd8snfi-1
        ------------------------------------------------------------
        revno: 2929.1180.15
        revision-id: john at arbash-meinel.com-20081211182023-sr6hi6owbbzozhkn
        parent: john at arbash-meinel.com-20081211175903-gtuvyewwr1eehauq
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: get_record_stream_chunked
        timestamp: Thu 2008-12-11 12:20:23 -0600
        message:
          Update to do a single iteration over the chunks.
          
          This costs 600us versus 430us for the case where the object is
          already a list of lines. However it is only 1.2ms rather than 3ms
          when everything is in a single buffer.
          
          The biggest advantage is that 'chunks' *could* be an iterator,
          rather than requiring it to already have all the results.
        modified:
          bzrlib/_chunks_to_lines_pyx.pyx _chunks_to_lines_pyx-20081211021736-op7n8vrxgrd8snfi-1
          bzrlib/tests/test__chunks_to_lines.py test__chunks_to_line-20081211024848-6uc3mtuje8j14l60-2
        ------------------------------------------------------------
        revno: 2929.1180.14
        revision-id: john at arbash-meinel.com-20081211175903-gtuvyewwr1eehauq
        parent: john at arbash-meinel.com-20081211175431-s89ujzp4w4l51x34
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: get_record_stream_chunked
        timestamp: Thu 2008-12-11 11:59:03 -0600
        message:
          Restore correctness.
        modified:
          bzrlib/_chunks_to_lines_pyx.pyx _chunks_to_lines_pyx-20081211021736-op7n8vrxgrd8snfi-1
        ------------------------------------------------------------
        revno: 2929.1180.13
        revision-id: john at arbash-meinel.com-20081211175431-s89ujzp4w4l51x34
        parent: john at arbash-meinel.com-20081211174407-6sz5ooqz40m30xc2
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: get_record_stream_chunked
        timestamp: Thu 2008-12-11 11:54:31 -0600
        message:
          Add a NEWS entry.
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
        ------------------------------------------------------------
        revno: 2929.1180.12
        revision-id: john at arbash-meinel.com-20081211174407-6sz5ooqz40m30xc2
        parent: john at arbash-meinel.com-20081211174330-31to8tzq6k4ewii4
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: get_record_stream_chunked
        timestamp: Thu 2008-12-11 11:44:07 -0600
        message:
          Remove the extra comment, it probably isn't useful to most people.
        modified:
          bzrlib/_chunks_to_lines_pyx.pyx _chunks_to_lines_pyx-20081211021736-op7n8vrxgrd8snfi-1
        ------------------------------------------------------------
        revno: 2929.1180.11
        revision-id: john at arbash-meinel.com-20081211174330-31to8tzq6k4ewii4
        parent: john at arbash-meinel.com-20081211170336-70oi6rnsgkyh3z2o
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: get_record_stream_chunked
        timestamp: Thu 2008-12-11 11:43:30 -0600
        message:
          A bit more tweaking of the pyrex version. Shave off another 10% by
          using PyString_CheckExact.
        modified:
          bzrlib/_chunks_to_lines_pyx.pyx _chunks_to_lines_pyx-20081211021736-op7n8vrxgrd8snfi-1
          bzrlib/tests/test__chunks_to_lines.py test__chunks_to_line-20081211024848-6uc3mtuje8j14l60-2
        ------------------------------------------------------------
        revno: 2929.1180.10
        revision-id: john at arbash-meinel.com-20081211170336-70oi6rnsgkyh3z2o
        parent: john at arbash-meinel.com-20081211031852-cmjpdf2ufno0okui
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: get_record_stream_chunked
        timestamp: Thu 2008-12-11 11:03:36 -0600
        message:
          Change the python implementation to a friendlier implementation.
          
          It is only a little bit slower, because we still avoid function calls.
          Redo the Pyrex version for clarity as well. May need to revisit as it might be
          a little bit slower.
        modified:
          bzrlib/_chunks_to_lines_py.py  _chunks_to_lines_py.-20081211024848-6uc3mtuje8j14l60-1
          bzrlib/_chunks_to_lines_pyx.pyx _chunks_to_lines_pyx-20081211021736-op7n8vrxgrd8snfi-1
        ------------------------------------------------------------
        revno: 2929.1180.9
        revision-id: john at arbash-meinel.com-20081211031852-cmjpdf2ufno0okui
        parent: john at arbash-meinel.com-20081211030803-gctunob7zsten3qg
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: get_record_stream_chunked
        timestamp: Wed 2008-12-10 21:18:52 -0600
        message:
          Start using osutils.chunks_as_lines rather than osutils.split_lines.
        modified:
          bzrlib/knit.py                 knit.py-20051212171256-f056ac8f0fbe1bd9
          bzrlib/merge.py                merge.py-20050513021216-953b65a438527106
          bzrlib/transform.py            transform.py-20060105172343-dd99e54394d91687
          bzrlib/versionedfile.py        versionedfile.py-20060222045106-5039c71ee3b65490
          bzrlib/weave.py                knit.py-20050627021749-759c29984154256b
        ------------------------------------------------------------
        revno: 2929.1180.8
        revision-id: john at arbash-meinel.com-20081211030803-gctunob7zsten3qg
        parent: john at arbash-meinel.com-20081211021859-3ds8cwdqiq387t83
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: get_record_stream_chunked
        timestamp: Wed 2008-12-10 21:08:03 -0600
        message:
          Move everything into properly parameterized tests.
          
          Also add tests that we preserve the object when it is already lines.
          
          The compiled form takes 450us on a 7.6k line file (NEWS).
          So for common cases, we should have virtually no overhead.
        added:
          bzrlib/_chunks_to_lines_py.py  _chunks_to_lines_py.-20081211024848-6uc3mtuje8j14l60-1
          bzrlib/tests/test__chunks_to_lines.py test__chunks_to_line-20081211024848-6uc3mtuje8j14l60-2
        modified:
          bzrlib/_chunks_to_lines_pyx.pyx _chunks_to_lines_pyx-20081211021736-op7n8vrxgrd8snfi-1
          bzrlib/osutils.py              osutils.py-20050309040759-eeaff12fbf77ac86
          bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
          bzrlib/tests/test_osutils.py   test_osutils.py-20051201224856-e48ee24c12182989
        ------------------------------------------------------------
        revno: 2929.1180.7
        revision-id: john at arbash-meinel.com-20081211021859-3ds8cwdqiq387t83
        parent: john at arbash-meinel.com-20081211020207-rrgdcyqc344zo5q1
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: get_record_stream_chunked
        timestamp: Wed 2008-12-10 20:18:59 -0600
        message:
          A Pyrex extension is about 5x faster than the fastest python code I could write.
          
          Seems worth having after all.
        added:
          bzrlib/_chunks_to_lines_pyx.pyx _chunks_to_lines_pyx-20081211021736-op7n8vrxgrd8snfi-1
        modified:
          .bzrignore                     bzrignore-20050311232317-81f7b71efa2db11a
          bzrlib/osutils.py              osutils.py-20050309040759-eeaff12fbf77ac86
          setup.py                       setup.py-20050314065409-02f8a0a6e3f9bc70
        ------------------------------------------------------------
        revno: 2929.1180.6
        revision-id: john at arbash-meinel.com-20081211020207-rrgdcyqc344zo5q1
        parent: john at arbash-meinel.com-20081211011419-vqtdjgpa04woqvm4
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: get_record_stream_chunked
        timestamp: Wed 2008-12-10 20:02:07 -0600
        message:
          Change name to 'chunks_to_lines', and find an optimized form.
          
          It is a little bit ugly, but it is faster than join & split, and means
          we get to leave the strings untouched.
        modified:
          bzrlib/osutils.py              osutils.py-20050309040759-eeaff12fbf77ac86
          bzrlib/tests/test_osutils.py   test_osutils.py-20051201224856-e48ee24c12182989
        ------------------------------------------------------------
        revno: 2929.1180.5
        revision-id: john at arbash-meinel.com-20081211011419-vqtdjgpa04woqvm4
        parent: john at arbash-meinel.com-20081211011038-osioaxd7moquxxmy
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: get_record_stream_chunked
        timestamp: Wed 2008-12-10 19:14:19 -0600
        message:
          More tests for edge cases.
        modified:
          bzrlib/tests/test_osutils.py   test_osutils.py-20051201224856-e48ee24c12182989
        ------------------------------------------------------------
        revno: 2929.1180.4
        revision-id: john at arbash-meinel.com-20081211011038-osioaxd7moquxxmy
        parent: john at arbash-meinel.com-20081211010104-3tcii2strejk5252
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: get_record_stream_chunked
        timestamp: Wed 2008-12-10 19:10:38 -0600
        message:
          Add a new function that can convert 'chunks' format to a 'lines' format.
        modified:
          bzrlib/osutils.py              osutils.py-20050309040759-eeaff12fbf77ac86
          bzrlib/tests/test_osutils.py   test_osutils.py-20051201224856-e48ee24c12182989
        ------------------------------------------------------------
        revno: 2929.1180.3
        revision-id: john at arbash-meinel.com-20081211010104-3tcii2strejk5252
        parent: john at arbash-meinel.com-20081211005616-szoqqeabcyahy39u
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: get_record_stream_chunked
        timestamp: Wed 2008-12-10 19:01:04 -0600
        message:
          Use the 'chunked' interface to keep memory consumption minimal during revision_trees()
        modified:
          bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
        ------------------------------------------------------------
        revno: 2929.1180.2
        revision-id: john at arbash-meinel.com-20081211005616-szoqqeabcyahy39u
        parent: john at arbash-meinel.com-20081211005436-a8bn72zw43b1vd9r
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: get_record_stream_chunked
        timestamp: Wed 2008-12-10 18:56:16 -0600
        message:
          Change the signature to report the storage kind as 'chunked'
        modified:
          bzrlib/tests/test_versionedfile.py test_versionedfile.py-20060222045249-db45c9ed14a1c2e5
          bzrlib/versionedfile.py        versionedfile.py-20060222045106-5039c71ee3b65490
        ------------------------------------------------------------
        revno: 2929.1180.1
        revision-id: john at arbash-meinel.com-20081211005436-a8bn72zw43b1vd9r
        parent: pqm at pqm.ubuntu.com-20081210082822-li6ku9s3k63kjrpr
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: get_record_stream_chunked
        timestamp: Wed 2008-12-10 18:54:36 -0600
        message:
          Start working on a ChunkedContentFactory.
          
          This allows get_bytes_as('chunked') for both FulltextContentFactory,
          and for ChunkedContentFactory, as it is a trivial conversion to
          go between the two styles.
          We will also want to special case when converting 'chunked' into
          'lines'. But that is for future work.
        modified:
          bzrlib/knit.py                 knit.py-20051212171256-f056ac8f0fbe1bd9
          bzrlib/tests/test_versionedfile.py test_versionedfile.py-20060222045249-db45c9ed14a1c2e5
          bzrlib/versionedfile.py        versionedfile.py-20060222045106-5039c71ee3b65490
          bzrlib/weave.py                knit.py-20050627021749-759c29984154256b
    ------------------------------------------------------------
    revno: 2929.1.965
    revision-id: pqm at pqm.ubuntu.com-20081211174647-l45s6xsw669ovgsa
    parent: pqm at pqm.ubuntu.com-20081211075753-m1ktaz1at8oxlp00
    parent: aaron at aaronbentley.com-20081211162546-a1zte4t2ststz6th
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Thu 2008-12-11 17:46:47 +0000
    message:
      Raise if CachingParentsProvider.enable_cache used wrongly (abentley)
    modified:
      bzrlib/graph.py                graph_walker.py-20070525030359-y852guab65d4wtn0-1
      bzrlib/tests/test_graph.py     test_graph_walker.py-20070525030405-enq4r60hhi9xrujc-1
        ------------------------------------------------------------
        revno: 2929.1120.20
        revision-id: aaron at aaronbentley.com-20081211162546-a1zte4t2ststz6th
        parent: aaron at aaronbentley.com-20081211032844-m23vj0emra6btb6i
        committer: Aaron Bentley <aaron at aaronbentley.com>
        branch nick: remote-stacking-graph
        timestamp: Thu 2008-12-11 08:25:46 -0800
        message:
          Change custom error to an AssertionError.
        modified:
          bzrlib/errors.py               errors.py-20050309040759-20512168c4e14fbd
          bzrlib/graph.py                graph_walker.py-20070525030359-y852guab65d4wtn0-1
          bzrlib/tests/test_graph.py     test_graph_walker.py-20070525030405-enq4r60hhi9xrujc-1
        ------------------------------------------------------------
        revno: 2929.1120.19
        revision-id: aaron at aaronbentley.com-20081211032844-m23vj0emra6btb6i
        parent: aaron at aaronbentley.com-20081210203113-ooeh6z6uavoysoc9
        committer: Aaron Bentley <aaron at aaronbentley.com>
        branch nick: remote-stacking-graph
        timestamp: Wed 2008-12-10 19:28:44 -0800
        message:
          Raise exception when caching is enabled twice.
        modified:
          bzrlib/errors.py               errors.py-20050309040759-20512168c4e14fbd
          bzrlib/graph.py                graph_walker.py-20070525030359-y852guab65d4wtn0-1
          bzrlib/tests/test_graph.py     test_graph_walker.py-20070525030405-enq4r60hhi9xrujc-1
    ------------------------------------------------------------
    revno: 2929.1.964
    revision-id: pqm at pqm.ubuntu.com-20081211075753-m1ktaz1at8oxlp00
    parent: pqm at pqm.ubuntu.com-20081210210638-e569azc2bomqq5qx
    parent: aaron at aaronbentley.com-20081211060357-c03e8qj0oaiw3g6t
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Thu 2008-12-11 07:57:53 +0000
    message:
      Add --list option to shelve (abentley)
    added:
      bzrlib/tests/blackbox/test_shelve.py test_ls_shelf.py-20081202053526-thlo8yt0pi1cgor1-1
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
      bzrlib/shelf.py                prepare_shelf.py-20081005181341-n74qe6gu1e65ad4v-1
      bzrlib/tests/blackbox/__init__.py __init__.py-20051128053524-eba30d8255e08dc3
      bzrlib/tests/test_shelf.py     test_prepare_shelf.p-20081005181341-n74qe6gu1e65ad4v-2
        ------------------------------------------------------------
        revno: 0.16.119
        revision-id: aaron at aaronbentley.com-20081211060357-c03e8qj0oaiw3g6t
        parent: aaron at aaronbentley.com-20081211043815-txr61gyz174x41c1
        committer: Aaron Bentley <aaron at aaronbentley.com>
        branch nick: ls-shelf
        timestamp: Wed 2008-12-10 22:03:57 -0800
        message:
          Fix option help style.
        modified:
          bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
        ------------------------------------------------------------
        revno: 0.16.118
        revision-id: aaron at aaronbentley.com-20081211043815-txr61gyz174x41c1
        parent: aaron at aaronbentley.com-20081211042826-0zgon0hquuau0rse
        committer: Aaron Bentley <aaron at aaronbentley.com>
        branch nick: ls-shelf
        timestamp: Wed 2008-12-10 20:38:15 -0800
        message:
          Fix open_containing
        modified:
          bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
        ------------------------------------------------------------
        revno: 0.16.117
        revision-id: aaron at aaronbentley.com-20081211042826-0zgon0hquuau0rse
        parent: aaron at aaronbentley.com-20081211030727-1e95kx8mixx0spru
        committer: Aaron Bentley <aaron at aaronbentley.com>
        branch nick: ls-shelf
        timestamp: Wed 2008-12-10 20:28:26 -0800
        message:
          Remove references to ls-shelf
        modified:
          bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
        ------------------------------------------------------------
        revno: 0.16.116
        revision-id: aaron at aaronbentley.com-20081211030727-1e95kx8mixx0spru
        parent: aaron at aaronbentley.com-20081211030610-mw6v6v7dxwseyyhm
        committer: Aaron Bentley <aaron at aaronbentley.com>
        branch nick: ls-shelf
        timestamp: Wed 2008-12-10 19:07:27 -0800
        message:
          Update NEWS
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
        ------------------------------------------------------------
        revno: 0.16.115
        revision-id: aaron at aaronbentley.com-20081211030610-mw6v6v7dxwseyyhm
        parent: aaron at aaronbentley.com-20081211030500-sl63oogmfwy3tjd3
        parent: pqm at pqm.ubuntu.com-20081210210638-e569azc2bomqq5qx
        committer: Aaron Bentley <aaron at aaronbentley.com>
        branch nick: ls-shelf
        timestamp: Wed 2008-12-10 19:06:10 -0800
        message:
          Merge bzr.dev into shelf2
        added:
          bzrlib/fifo_cache.py           fifo_cache.py-20081209212307-31ffjwvteyvmydnf-1
          bzrlib/tests/per_repository/test_add_inventory_by_delta.py test_add_inventory_d-20081013002626-rut81igtlqb4590z-1
          bzrlib/tests/test_fifo_cache.py test_fifo_cache.py-20081209212307-31ffjwvteyvmydnf-2
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/__init__.py             __init__.py-20050309040759-33e65acf91bbcd5d
          bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
          bzrlib/bzrdir.py               bzrdir.py-20060131065624-156dfea39c4387cb
          bzrlib/commit.py               commit.py-20050511101309-79ec1a0168e0e825
          bzrlib/fetch.py                fetch.py-20050818234941-26fea6105696365d
          bzrlib/graph.py                graph_walker.py-20070525030359-y852guab65d4wtn0-1
          bzrlib/inventory.py            inventory.py-20050309040759-6648b84ca2005b37
          bzrlib/knit.py                 knit.py-20051212171256-f056ac8f0fbe1bd9
          bzrlib/lru_cache.py            lru_cache.py-20070119165515-tlw203kuwh0id5gv-1
          bzrlib/registry.py             lazy_factory.py-20060809213415-2gfvqadtvdn0phtg-1
          bzrlib/remote.py               remote.py-20060720103555-yeeg2x51vn0rbtdp-1
          bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
          bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
          bzrlib/tests/blackbox/test_ls.py test_ls.py-20060712232047-0jraqpecwngee12y-1
          bzrlib/tests/blackbox/test_pull.py test_pull.py-20051201144907-64959364f629947f
          bzrlib/tests/blackbox/test_revision_info.py test_revision_info.py-20050917162600-21dab3877aa348d7
          bzrlib/tests/bzrdir_implementations/test_bzrdir.py test_bzrdir.py-20060131065642-0ebeca5e30e30866
          bzrlib/tests/interrepository_implementations/__init__.py __init__.py-20060220054744-baf49a1f88f17b1a
          bzrlib/tests/per_repository/__init__.py __init__.py-20060131092037-9564957a7d4a841b
          bzrlib/tests/per_repository/test_add_fallback_repository.py test_add_fallback_re-20080215040003-8w9n4ck9uqdxj18m-1
          bzrlib/tests/per_repository/test_commit_builder.py test_commit_builder.py-20060606110838-76e3ra5slucqus81-1
          bzrlib/tests/per_repository/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
          bzrlib/tests/test_fetch.py     testfetch.py-20050825090644-f73e07e7dfb1765a
          bzrlib/tests/test_graph.py     test_graph_walker.py-20070525030405-enq4r60hhi9xrujc-1
          bzrlib/tests/test_knit.py      test_knit.py-20051212171302-95d4c00dd5f11f2b
          bzrlib/tests/test_lru_cache.py test_lru_cache.py-20070119165535-hph6rk4h9rzy4180-1
          bzrlib/tests/test_remote.py    test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
          bzrlib/tests/test_versionedfile.py test_versionedfile.py-20060222045249-db45c9ed14a1c2e5
          bzrlib/transport/__init__.py   transport.py-20050711165921-4978aa7ce1285ad5
          bzrlib/upgrade.py              history2weaves.py-20050818063535-e7d319791c19a8b2
          bzrlib/versionedfile.py        versionedfile.py-20060222045106-5039c71ee3b65490
          doc/developers/HACKING.txt     HACKING-20050805200004-2a5dc975d870f78c
        ------------------------------------------------------------
        revno: 0.16.114
        revision-id: aaron at aaronbentley.com-20081211030500-sl63oogmfwy3tjd3
        parent: aaron at aaronbentley.com-20081203053127-vozu5rmsixaadw0v
        committer: Aaron Bentley <aaron at aaronbentley.com>
        branch nick: ls-shelf
        timestamp: Wed 2008-12-10 19:05:00 -0800
        message:
          Use open_containing when listing shelves
        modified:
          bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
        ------------------------------------------------------------
        revno: 0.16.113
        revision-id: aaron at aaronbentley.com-20081203053127-vozu5rmsixaadw0v
        parent: aaron at aaronbentley.com-20081202055411-89w3mu0uu6wrstoh
        committer: Aaron Bentley <aaron at aaronbentley.com>
        branch nick: ls-shelf
        timestamp: Wed 2008-12-03 00:31:27 -0500
        message:
          Change ls-shelf to shelve --list
        renamed:
          bzrlib/tests/blackbox/test_ls_shelf.py => bzrlib/tests/blackbox/test_shelve.py test_ls_shelf.py-20081202053526-thlo8yt0pi1cgor1-1
        modified:
          bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
          bzrlib/tests/blackbox/__init__.py __init__.py-20051128053524-eba30d8255e08dc3
          bzrlib/tests/blackbox/test_shelve.py test_ls_shelf.py-20081202053526-thlo8yt0pi1cgor1-1
        ------------------------------------------------------------
        revno: 0.16.112
        revision-id: aaron at aaronbentley.com-20081202055411-89w3mu0uu6wrstoh
        parent: aaron at aaronbentley.com-20081202054417-24d9o48m6l55ln8w
        committer: Aaron Bentley <aaron at aaronbentley.com>
        branch nick: ls-shelf
        timestamp: Tue 2008-12-02 00:54:11 -0500
        message:
          Add tests
        modified:
          bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
          bzrlib/shelf.py                prepare_shelf.py-20081005181341-n74qe6gu1e65ad4v-1
          bzrlib/tests/test_shelf.py     test_prepare_shelf.p-20081005181341-n74qe6gu1e65ad4v-2
        ------------------------------------------------------------
        revno: 0.16.111
        revision-id: aaron at aaronbentley.com-20081202054417-24d9o48m6l55ln8w
        parent: aaron at aaronbentley.com-20081202053551-1f8ifkqem116sudi
        committer: Aaron Bentley <aaron at aaronbentley.com>
        branch nick: ls-shelf
        timestamp: Tue 2008-12-02 00:44:17 -0500
        message:
          Return metadata as a dict.
        modified:
          bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
          bzrlib/shelf.py                prepare_shelf.py-20081005181341-n74qe6gu1e65ad4v-1
        ------------------------------------------------------------
        revno: 0.16.110
        revision-id: aaron at aaronbentley.com-20081202053551-1f8ifkqem116sudi
        parent: aaron at aaronbentley.com-20081202042459-y0y1n73u7jwqpgeq
        committer: Aaron Bentley <aaron at aaronbentley.com>
        branch nick: ls-shelf
        timestamp: Tue 2008-12-02 00:35:51 -0500
        message:
          Implement ls-shelf command
        added:
          bzrlib/tests/blackbox/test_ls_shelf.py test_ls_shelf.py-20081202053526-thlo8yt0pi1cgor1-1
        modified:
          bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
          bzrlib/shelf.py                prepare_shelf.py-20081005181341-n74qe6gu1e65ad4v-1
          bzrlib/tests/blackbox/__init__.py __init__.py-20051128053524-eba30d8255e08dc3
        ------------------------------------------------------------
        revno: 0.16.109
        revision-id: aaron at aaronbentley.com-20081202042459-y0y1n73u7jwqpgeq
        parent: aaron at aaronbentley.com-20081115203736-6ikutv274y59s0jo
        parent: pqm at pqm.ubuntu.com-20081202015700-3mc9dola31w7h5h4
        committer: Aaron Bentley <aaron at aaronbentley.com>
        branch nick: ls-shelf
        timestamp: Mon 2008-12-01 23:24:59 -0500
        message:
          Merge bzr.dev into ls-shelf
        added:
          bzrlib/foreign.py              foreign.py-20081112170002-olsxmandkk8qyfuq-1
          bzrlib/tests/test_foreign.py   test_foreign.py-20081125004048-ywb901edgp9lluxo-1
          contrib/convert_to_1.9.py      convert_to_dev2.py-20081014130524-z1ydl3mq9b4ehlvv-1
          tools/win32/build_release.py   build_release.py-20081105204355-2ghh5cv01v1x4rzz-1
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzr                            bzr.py-20050313053754-5485f144c7006fa6
          bzrlib/__init__.py             __init__.py-20050309040759-33e65acf91bbcd5d
          bzrlib/_patiencediff_c.c       _patiencediff_c.c-20070721205602-q3imkipwlgagp3cy-1
          bzrlib/_readdir_pyx.pyx        readdir.pyx-20060609152855-rm6v321vuaqyh9tu-1
          bzrlib/branch.py               branch.py-20050309040759-e4baf4e0d046576e
          bzrlib/btree_index.py          index.py-20080624222253-p0x5f92uyh5hw734-7
          bzrlib/bugtracker.py           bugtracker.py-20070410073305-vu1vu1qosjurg8kb-1
          bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
          bzrlib/bzrdir.py               bzrdir.py-20060131065624-156dfea39c4387cb
          bzrlib/commit.py               commit.py-20050511101309-79ec1a0168e0e825
          bzrlib/config.py               config.py-20051011043216-070c74f4e9e338e8
          bzrlib/errors.py               errors.py-20050309040759-20512168c4e14fbd
          bzrlib/fetch.py                fetch.py-20050818234941-26fea6105696365d
          bzrlib/help_topics/__init__.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
          bzrlib/index.py                index.py-20070712131115-lolkarso50vjr64s-1
          bzrlib/knit.py                 knit.py-20051212171256-f056ac8f0fbe1bd9
          bzrlib/lockable_files.py       control_files.py-20051111201905-bb88546e799d669f
          bzrlib/log.py                  log.py-20050505065812-c40ce11702fe5fb1
          bzrlib/mutabletree.py          mutabletree.py-20060906023413-4wlkalbdpsxi2r4y-2
          bzrlib/plugin.py               plugin.py-20050622060424-829b654519533d69
          bzrlib/python-compat.h         pythoncompat.h-20080924041409-9kvi0fgtuuqp743j-1
          bzrlib/remote.py               remote.py-20060720103555-yeeg2x51vn0rbtdp-1
          bzrlib/repofmt/pack_repo.py    pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
          bzrlib/repofmt/weaverepo.py    presplitout.py-20070125045333-wfav3tsh73oxu3zk-1
          bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
          bzrlib/revisionspec.py         revisionspec.py-20050907152633-17567659fd5c0ddb
          bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
          bzrlib/tests/blackbox/test_diff.py test_diff.py-20060110203741-aa99ac93e633d971
          bzrlib/tests/blackbox/test_log.py test_log.py-20060112090212-78f6ea560c868e24
          bzrlib/tests/branch_implementations/__init__.py __init__.py-20060123013057-b12a52c3f361daf4
          bzrlib/tests/branch_implementations/test_branch.py testbranch.py-20050711070244-121d632bc37d7253
          bzrlib/tests/branch_implementations/test_sprout.py test_sprout.py-20070521151739-b8t8p7axw1h966ws-1
          bzrlib/tests/branch_implementations/test_stacking.py test_stacking.py-20080214020755-msjlkb7urobwly0f-1
          bzrlib/tests/commands/test_commit.py test_commit.py-20070913161801-ydrx2k5gmv7k7eiu-1
          bzrlib/tests/interrepository_implementations/test_fetch.py test_fetch.py-20080425213627-j60cjh782ufm83ry-1
          bzrlib/tests/per_repository/test_commit_builder.py test_commit_builder.py-20060606110838-76e3ra5slucqus81-1
          bzrlib/tests/per_repository/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
          bzrlib/tests/per_repository/test_revision.py testrevprops.py-20051013073044-92bc3c68302ce1bf
          bzrlib/tests/test_fetch.py     testfetch.py-20050825090644-f73e07e7dfb1765a
          bzrlib/tests/test_knit.py      test_knit.py-20051212171302-95d4c00dd5f11f2b
          bzrlib/tests/test_log.py       testlog.py-20050728115707-1a514809d7d49309
          bzrlib/tests/test_pack_repository.py test_pack_repository-20080801043947-eaw0e6h2gu75kwmy-1
          bzrlib/tests/test_permissions.py test_permissions.py-20051215004520-ccf475789c80e80c
          bzrlib/tests/test_plugins.py   plugins.py-20050622075746-32002b55e5e943e9
          bzrlib/tests/test_remote.py    test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
          bzrlib/tests/test_repository.py test_repository.py-20060131075918-65c555b881612f4d
          bzrlib/tests/test_revision.py  testrevision.py-20050804210559-46f5e1eb67b01289
          bzrlib/tests/test_sftp_transport.py testsftp.py-20051027032739-247570325fec7e7e
          bzrlib/tests/test_transport.py testtransport.py-20050718175618-e5cdb99f4555ddce
          bzrlib/tests/workingtree_implementations/test_parents.py test_set_parents.py-20060807231740-yicmnlci1mj8smu1-1
          bzrlib/transport/__init__.py   transport.py-20050711165921-4978aa7ce1285ad5
          bzrlib/transport/remote.py     ssh.py-20060608202016-c25gvf1ob7ypbus6-1
          bzrlib/versionedfile.py        versionedfile.py-20060222045106-5039c71ee3b65490
          bzrlib/workingtree.py          workingtree.py-20050511021032-29b6ec0a681e02e3
          bzrlib/workingtree_4.py        workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
          doc/developers/ppa.txt         ppa.txt-20080722055539-606u7t2z32t3ae4w-1
    ------------------------------------------------------------
    revno: 2929.1.963
    revision-id: pqm at pqm.ubuntu.com-20081210210638-e569azc2bomqq5qx
    parent: pqm at pqm.ubuntu.com-20081210180716-sg0oipqppsgmn15t
    parent: aaron at aaronbentley.com-20081210203113-ooeh6z6uavoysoc9
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Wed 2008-12-10 21:06:38 +0000
    message:
      (abentley) Move RemoteRepository caching to CachingParentsProvider
    modified:
      bzrlib/graph.py                graph_walker.py-20070525030359-y852guab65d4wtn0-1
      bzrlib/remote.py               remote.py-20060720103555-yeeg2x51vn0rbtdp-1
      bzrlib/tests/per_repository/test_add_fallback_repository.py test_add_fallback_re-20080215040003-8w9n4ck9uqdxj18m-1
      bzrlib/tests/test_graph.py     test_graph_walker.py-20070525030405-enq4r60hhi9xrujc-1
      bzrlib/tests/test_remote.py    test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
        ------------------------------------------------------------
        revno: 2929.1120.18
        revision-id: aaron at aaronbentley.com-20081210203113-ooeh6z6uavoysoc9
        parent: aaron at aaronbentley.com-20081210195642-3y1d2azpt2tccgsh
        parent: pqm at pqm.ubuntu.com-20081210180716-sg0oipqppsgmn15t
        committer: Aaron Bentley <aaron at aaronbentley.com>
        branch nick: remote-stacking-graph
        timestamp: Wed 2008-12-10 12:31:13 -0800
        message:
          Merge with trunk
        added:
          bzrlib/fifo_cache.py           fifo_cache.py-20081209212307-31ffjwvteyvmydnf-1
          bzrlib/tests/per_repository/test_add_inventory_by_delta.py test_add_inventory_d-20081013002626-rut81igtlqb4590z-1
          bzrlib/tests/test_fifo_cache.py test_fifo_cache.py-20081209212307-31ffjwvteyvmydnf-2
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/__init__.py             __init__.py-20050309040759-33e65acf91bbcd5d
          bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
          bzrlib/bzrdir.py               bzrdir.py-20060131065624-156dfea39c4387cb
          bzrlib/commit.py               commit.py-20050511101309-79ec1a0168e0e825
          bzrlib/fetch.py                fetch.py-20050818234941-26fea6105696365d
          bzrlib/inventory.py            inventory.py-20050309040759-6648b84ca2005b37
          bzrlib/knit.py                 knit.py-20051212171256-f056ac8f0fbe1bd9
          bzrlib/lru_cache.py            lru_cache.py-20070119165515-tlw203kuwh0id5gv-1
          bzrlib/registry.py             lazy_factory.py-20060809213415-2gfvqadtvdn0phtg-1
          bzrlib/remote.py               remote.py-20060720103555-yeeg2x51vn0rbtdp-1
          bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
          bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
          bzrlib/tests/blackbox/test_ls.py test_ls.py-20060712232047-0jraqpecwngee12y-1
          bzrlib/tests/blackbox/test_pull.py test_pull.py-20051201144907-64959364f629947f
          bzrlib/tests/blackbox/test_revision_info.py test_revision_info.py-20050917162600-21dab3877aa348d7
          bzrlib/tests/bzrdir_implementations/test_bzrdir.py test_bzrdir.py-20060131065642-0ebeca5e30e30866
          bzrlib/tests/interrepository_implementations/__init__.py __init__.py-20060220054744-baf49a1f88f17b1a
          bzrlib/tests/per_repository/__init__.py __init__.py-20060131092037-9564957a7d4a841b
          bzrlib/tests/per_repository/test_add_fallback_repository.py test_add_fallback_re-20080215040003-8w9n4ck9uqdxj18m-1
          bzrlib/tests/per_repository/test_commit_builder.py test_commit_builder.py-20060606110838-76e3ra5slucqus81-1
          bzrlib/tests/per_repository/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
          bzrlib/tests/test_fetch.py     testfetch.py-20050825090644-f73e07e7dfb1765a
          bzrlib/tests/test_knit.py      test_knit.py-20051212171302-95d4c00dd5f11f2b
          bzrlib/tests/test_lru_cache.py test_lru_cache.py-20070119165535-hph6rk4h9rzy4180-1
          bzrlib/tests/test_versionedfile.py test_versionedfile.py-20060222045249-db45c9ed14a1c2e5
          bzrlib/transport/__init__.py   transport.py-20050711165921-4978aa7ce1285ad5
          bzrlib/upgrade.py              history2weaves.py-20050818063535-e7d319791c19a8b2
          bzrlib/versionedfile.py        versionedfile.py-20060222045106-5039c71ee3b65490
          doc/developers/HACKING.txt     HACKING-20050805200004-2a5dc975d870f78c
        ------------------------------------------------------------
        revno: 2929.1120.17
        revision-id: aaron at aaronbentley.com-20081210195642-3y1d2azpt2tccgsh
        parent: aaron at aaronbentley.com-20081210194042-3x07buw2h4g8x9hs
        committer: Aaron Bentley <aaron at aaronbentley.com>
        branch nick: remote-stacking-graph
        timestamp: Wed 2008-12-10 11:56:42 -0800
        message:
          Fix stacking bug
        modified:
          bzrlib/remote.py               remote.py-20060720103555-yeeg2x51vn0rbtdp-1
          bzrlib/tests/per_repository/test_add_fallback_repository.py test_add_fallback_re-20080215040003-8w9n4ck9uqdxj18m-1
        ------------------------------------------------------------
        revno: 2929.1120.16
        revision-id: aaron at aaronbentley.com-20081210194042-3x07buw2h4g8x9hs
        parent: aaron at aaronbentley.com-20081203050944-biuf61wbttr0wrzv
        committer: Aaron Bentley <aaron at aaronbentley.com>
        branch nick: remote-stacking-graph
        timestamp: Wed 2008-12-10 11:40:42 -0800
        message:
          Updates from review
        modified:
          bzrlib/graph.py                graph_walker.py-20070525030359-y852guab65d4wtn0-1
          bzrlib/tests/test_graph.py     test_graph_walker.py-20070525030405-enq4r60hhi9xrujc-1
        ------------------------------------------------------------
        revno: 2929.1120.15
        revision-id: aaron at aaronbentley.com-20081203050944-biuf61wbttr0wrzv
        parent: aaron at aaronbentley.com-20081203042321-kr5k4mdhmdvl3553
        committer: Aaron Bentley <aaron at aaronbentley.com>
        branch nick: remote-stacking-graph
        timestamp: Wed 2008-12-03 00:09:44 -0500
        message:
          Allow miss caching to be disabled.
        modified:
          bzrlib/graph.py                graph_walker.py-20070525030359-y852guab65d4wtn0-1
          bzrlib/remote.py               remote.py-20060720103555-yeeg2x51vn0rbtdp-1
          bzrlib/tests/test_graph.py     test_graph_walker.py-20070525030405-enq4r60hhi9xrujc-1
          bzrlib/tests/test_remote.py    test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
        ------------------------------------------------------------
        revno: 2929.1120.14
        revision-id: aaron at aaronbentley.com-20081203042321-kr5k4mdhmdvl3553
        parent: aaron at aaronbentley.com-20081123163839-ew27m17130fz85v6
        parent: pqm at pqm.ubuntu.com-20081202015700-3mc9dola31w7h5h4
        committer: Aaron Bentley <aaron at aaronbentley.com>
        branch nick: remote-stacking-graph
        timestamp: Tue 2008-12-02 23:23:21 -0500
        message:
          Merge with trunk
        added:
          bzrlib/foreign.py              foreign.py-20081112170002-olsxmandkk8qyfuq-1
          bzrlib/tests/test_foreign.py   test_foreign.py-20081125004048-ywb901edgp9lluxo-1
          contrib/convert_to_1.9.py      convert_to_dev2.py-20081014130524-z1ydl3mq9b4ehlvv-1
          tools/win32/build_release.py   build_release.py-20081105204355-2ghh5cv01v1x4rzz-1
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzr                            bzr.py-20050313053754-5485f144c7006fa6
          bzrlib/__init__.py             __init__.py-20050309040759-33e65acf91bbcd5d
          bzrlib/_patiencediff_c.c       _patiencediff_c.c-20070721205602-q3imkipwlgagp3cy-1
          bzrlib/_readdir_pyx.pyx        readdir.pyx-20060609152855-rm6v321vuaqyh9tu-1
          bzrlib/branch.py               branch.py-20050309040759-e4baf4e0d046576e
          bzrlib/btree_index.py          index.py-20080624222253-p0x5f92uyh5hw734-7
          bzrlib/bugtracker.py           bugtracker.py-20070410073305-vu1vu1qosjurg8kb-1
          bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
          bzrlib/bzrdir.py               bzrdir.py-20060131065624-156dfea39c4387cb
          bzrlib/commit.py               commit.py-20050511101309-79ec1a0168e0e825
          bzrlib/config.py               config.py-20051011043216-070c74f4e9e338e8
          bzrlib/errors.py               errors.py-20050309040759-20512168c4e14fbd
          bzrlib/fetch.py                fetch.py-20050818234941-26fea6105696365d
          bzrlib/help_topics/__init__.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
          bzrlib/index.py                index.py-20070712131115-lolkarso50vjr64s-1
          bzrlib/knit.py                 knit.py-20051212171256-f056ac8f0fbe1bd9
          bzrlib/lockable_files.py       control_files.py-20051111201905-bb88546e799d669f
          bzrlib/log.py                  log.py-20050505065812-c40ce11702fe5fb1
          bzrlib/mutabletree.py          mutabletree.py-20060906023413-4wlkalbdpsxi2r4y-2
          bzrlib/plugin.py               plugin.py-20050622060424-829b654519533d69
          bzrlib/python-compat.h         pythoncompat.h-20080924041409-9kvi0fgtuuqp743j-1
          bzrlib/remote.py               remote.py-20060720103555-yeeg2x51vn0rbtdp-1
          bzrlib/repofmt/pack_repo.py    pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
          bzrlib/repofmt/weaverepo.py    presplitout.py-20070125045333-wfav3tsh73oxu3zk-1
          bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
          bzrlib/revisionspec.py         revisionspec.py-20050907152633-17567659fd5c0ddb
          bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
          bzrlib/tests/blackbox/test_diff.py test_diff.py-20060110203741-aa99ac93e633d971
          bzrlib/tests/blackbox/test_log.py test_log.py-20060112090212-78f6ea560c868e24
          bzrlib/tests/branch_implementations/__init__.py __init__.py-20060123013057-b12a52c3f361daf4
          bzrlib/tests/branch_implementations/test_branch.py testbranch.py-20050711070244-121d632bc37d7253
          bzrlib/tests/branch_implementations/test_sprout.py test_sprout.py-20070521151739-b8t8p7axw1h966ws-1
          bzrlib/tests/branch_implementations/test_stacking.py test_stacking.py-20080214020755-msjlkb7urobwly0f-1
          bzrlib/tests/commands/test_commit.py test_commit.py-20070913161801-ydrx2k5gmv7k7eiu-1
          bzrlib/tests/interrepository_implementations/test_fetch.py test_fetch.py-20080425213627-j60cjh782ufm83ry-1
          bzrlib/tests/per_repository/test_commit_builder.py test_commit_builder.py-20060606110838-76e3ra5slucqus81-1
          bzrlib/tests/per_repository/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
          bzrlib/tests/per_repository/test_revision.py testrevprops.py-20051013073044-92bc3c68302ce1bf
          bzrlib/tests/test_fetch.py     testfetch.py-20050825090644-f73e07e7dfb1765a
          bzrlib/tests/test_knit.py      test_knit.py-20051212171302-95d4c00dd5f11f2b
          bzrlib/tests/test_log.py       testlog.py-20050728115707-1a514809d7d49309
          bzrlib/tests/test_pack_repository.py test_pack_repository-20080801043947-eaw0e6h2gu75kwmy-1
          bzrlib/tests/test_permissions.py test_permissions.py-20051215004520-ccf475789c80e80c
          bzrlib/tests/test_plugins.py   plugins.py-20050622075746-32002b55e5e943e9
          bzrlib/tests/test_remote.py    test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
          bzrlib/tests/test_repository.py test_repository.py-20060131075918-65c555b881612f4d
          bzrlib/tests/test_revision.py  testrevision.py-20050804210559-46f5e1eb67b01289
          bzrlib/tests/test_sftp_transport.py testsftp.py-20051027032739-247570325fec7e7e
          bzrlib/tests/test_transport.py testtransport.py-20050718175618-e5cdb99f4555ddce
          bzrlib/tests/workingtree_implementations/test_parents.py test_set_parents.py-20060807231740-yicmnlci1mj8smu1-1
          bzrlib/transport/__init__.py   transport.py-20050711165921-4978aa7ce1285ad5
          bzrlib/transport/remote.py     ssh.py-20060608202016-c25gvf1ob7ypbus6-1
          bzrlib/versionedfile.py        versionedfile.py-20060222045106-5039c71ee3b65490
          bzrlib/workingtree.py          workingtree.py-20050511021032-29b6ec0a681e02e3
          bzrlib/workingtree_4.py        workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
          doc/developers/ppa.txt         ppa.txt-20080722055539-606u7t2z32t3ae4w-1
        ------------------------------------------------------------
        revno: 2929.1120.13
        revision-id: aaron at aaronbentley.com-20081123163839-ew27m17130fz85v6
        parent: aaron at aaronbentley.com-20081123162708-17093o7m3obv7czs
        committer: Aaron Bentley <aaron at aaronbentley.com>
        branch nick: remote-stacking-graph
        timestamp: Sun 2008-11-23 11:38:39 -0500
        message:
          Update documentation
        modified:
          bzrlib/graph.py                graph_walker.py-20070525030359-y852guab65d4wtn0-1
        ------------------------------------------------------------
        revno: 2929.1120.12
        revision-id: aaron at aaronbentley.com-20081123162708-17093o7m3obv7czs
        parent: aaron at aaronbentley.com-20081122162637-p21ab628pasd3ruf
        committer: Aaron Bentley <aaron at aaronbentley.com>
        branch nick: remote-stacking-graph
        timestamp: Sun 2008-11-23 11:27:08 -0500
        message:
          Unify CachingExtraParentsProvider and CachingParentsProvider.
        modified:
          bzrlib/graph.py                graph_walker.py-20070525030359-y852guab65d4wtn0-1
          bzrlib/remote.py               remote.py-20060720103555-yeeg2x51vn0rbtdp-1
          bzrlib/tests/test_graph.py     test_graph_walker.py-20070525030405-enq4r60hhi9xrujc-1
        ------------------------------------------------------------
        revno: 2929.1120.11
        revision-id: aaron at aaronbentley.com-20081122162637-p21ab628pasd3ruf
        parent: aaron at aaronbentley.com-20081122162428-o9vik1937s3p8fmy
        committer: Aaron Bentley <aaron at aaronbentley.com>
        branch nick: remote-stacking-graph
        timestamp: Sat 2008-11-22 11:26:37 -0500
        message:
          Rename FakeParentsProvider to ExtraParentsProvider
        modified:
          bzrlib/tests/test_graph.py     test_graph_walker.py-20070525030405-enq4r60hhi9xrujc-1
        ------------------------------------------------------------
        revno: 2929.1120.10
        revision-id: aaron at aaronbentley.com-20081122162428-o9vik1937s3p8fmy
        parent: aaron at aaronbentley.com-20081122053311-lyn8yvy36i89smyg
        committer: Aaron Bentley <aaron at aaronbentley.com>
        branch nick: remote-stacking-graph
        timestamp: Sat 2008-11-22 11:24:28 -0500
        message:
          Move CachingExtraParentsProvider to Graph
        modified:
          bzrlib/graph.py                graph_walker.py-20070525030359-y852guab65d4wtn0-1
          bzrlib/remote.py               remote.py-20060720103555-yeeg2x51vn0rbtdp-1
          bzrlib/tests/test_graph.py     test_graph_walker.py-20070525030405-enq4r60hhi9xrujc-1
          bzrlib/tests/test_remote.py    test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
        ------------------------------------------------------------
        revno: 2929.1120.9
        revision-id: aaron at aaronbentley.com-20081122053311-lyn8yvy36i89smyg
        parent: aaron at aaronbentley.com-20081122052057-id7ffzq9lyl9c4fk
        committer: Aaron Bentley <aaron at aaronbentley.com>
        branch nick: remote-stacking-graph
        timestamp: Sat 2008-11-22 00:33:11 -0500
        message:
          Handle _requested_parents, take a callable
        modified:
          bzrlib/remote.py               remote.py-20060720103555-yeeg2x51vn0rbtdp-1
          bzrlib/tests/test_remote.py    test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
        ------------------------------------------------------------
        revno: 2929.1120.8
        revision-id: aaron at aaronbentley.com-20081122052057-id7ffzq9lyl9c4fk
        parent: aaron at aaronbentley.com-20081118214336-53wku2p6og6kvl5r
        committer: Aaron Bentley <aaron at aaronbentley.com>
        branch nick: remote-stacking-graph
        timestamp: Sat 2008-11-22 00:20:57 -0500
        message:
          Make UnstackedParentsProvider manage the cache
        modified:
          bzrlib/remote.py               remote.py-20060720103555-yeeg2x51vn0rbtdp-1
          bzrlib/tests/test_remote.py    test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
    ------------------------------------------------------------
    revno: 2929.1.962
    revision-id: pqm at pqm.ubuntu.com-20081210180716-sg0oipqppsgmn15t
    parent: pqm at pqm.ubuntu.com-20081210082822-li6ku9s3k63kjrpr
    parent: john at arbash-meinel.com-20081210172640-064zf1x91jgrarbj
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Wed 2008-12-10 18:07:16 +0000
    message:
      Update an old NEWS entry to reference bug #106117
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
        ------------------------------------------------------------
        revno: 2929.1179.1
        revision-id: john at arbash-meinel.com-20081210172640-064zf1x91jgrarbj
        parent: pqm at pqm.ubuntu.com-20081210082822-li6ku9s3k63kjrpr
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: jam-integration
        timestamp: Wed 2008-12-10 11:26:40 -0600
        message:
          Update an old NEWS entry to discuss bug #106117
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
    ------------------------------------------------------------
    revno: 2929.1.961
    revision-id: pqm at pqm.ubuntu.com-20081210082822-li6ku9s3k63kjrpr
    parent: pqm at pqm.ubuntu.com-20081210051250-2czm9b99a7e7y0xi
    parent: ian.clatworthy at canonical.com-20081210064720-33gd8jy3l6p45xgc
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Wed 2008-12-10 08:28:22 +0000
    message:
      support -d in revision-info (Michael Hudson)
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
      bzrlib/tests/blackbox/test_revision_info.py test_revision_info.py-20050917162600-21dab3877aa348d7
        ------------------------------------------------------------
        revno: 2929.1178.1
        revision-id: ian.clatworthy at canonical.com-20081210064720-33gd8jy3l6p45xgc
        parent: pqm at pqm.ubuntu.com-20081210051250-2czm9b99a7e7y0xi
        parent: michael.hudson at canonical.com-20081210020530-7lrsz78ln4d08m8l
        committer: Ian Clatworthy <ian.clatworthy at canonical.com>
        branch nick: ianc-integration
        timestamp: Wed 2008-12-10 16:47:20 +1000
        message:
          support -d in revision-info (Michael Hudson)
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
          bzrlib/tests/blackbox/test_revision_info.py test_revision_info.py-20050917162600-21dab3877aa348d7
        ------------------------------------------------------------
        revno: 2929.1177.1
        revision-id: michael.hudson at canonical.com-20081210020530-7lrsz78ln4d08m8l
        parent: pqm at pqm.ubuntu.com-20081209205258-uop2lclksyc9whj8
        committer: Michael Hudson <michael.hudson at canonical.com>
        branch nick: revision-info-takes--d
        timestamp: Wed 2008-12-10 15:05:30 +1300
        message:
          support -d in the revision-info command
        modified:
          bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
          bzrlib/tests/blackbox/test_revision_info.py test_revision_info.py-20050917162600-21dab3877aa348d7
    ------------------------------------------------------------
    revno: 2929.1.960
    revision-id: pqm at pqm.ubuntu.com-20081210051250-2czm9b99a7e7y0xi
    parent: pqm at pqm.ubuntu.com-20081210011933-axdrxiq306imj2ty
    parent: john at arbash-meinel.com-20081210043421-2uaz4mfuzw3ca5jz
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Wed 2008-12-10 05:12:50 +0000
    message:
      (robertc, jam) Add Repository.add_inventory_by_delta,
      	and use it in the InterDifferingSerializer code.
    added:
      bzrlib/tests/per_repository/test_add_inventory_by_delta.py test_add_inventory_d-20081013002626-rut81igtlqb4590z-1
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      bzrlib/__init__.py             __init__.py-20050309040759-33e65acf91bbcd5d
      bzrlib/commit.py               commit.py-20050511101309-79ec1a0168e0e825
      bzrlib/inventory.py            inventory.py-20050309040759-6648b84ca2005b37
      bzrlib/remote.py               remote.py-20060720103555-yeeg2x51vn0rbtdp-1
      bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
      bzrlib/tests/interrepository_implementations/__init__.py __init__.py-20060220054744-baf49a1f88f17b1a
      bzrlib/tests/per_repository/__init__.py __init__.py-20060131092037-9564957a7d4a841b
      bzrlib/tests/per_repository/test_commit_builder.py test_commit_builder.py-20060606110838-76e3ra5slucqus81-1
      bzrlib/tests/per_repository/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
        ------------------------------------------------------------
        revno: 2929.1175.13
        revision-id: john at arbash-meinel.com-20081210043421-2uaz4mfuzw3ca5jz
        parent: john at arbash-meinel.com-20081210032133-2mxcpa2p81kbpi5c
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: differ_serializer
        timestamp: Tue 2008-12-09 22:34:21 -0600
        message:
          There was a test that asserted we called pb.update() with the last revision.
        modified:
          bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
        ------------------------------------------------------------
        revno: 2929.1175.12
        revision-id: john at arbash-meinel.com-20081210032133-2mxcpa2p81kbpi5c
        parent: john at arbash-meinel.com-20081210001000-xsgsn2kt5ce6dfl2
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: differ_serializer
        timestamp: Tue 2008-12-09 21:21:33 -0600
        message:
          Missed an add_inventory_delta => add_inventory_by_delta.
        modified:
          bzrlib/tests/per_repository/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
        ------------------------------------------------------------
        revno: 2929.1175.11
        revision-id: john at arbash-meinel.com-20081210001000-xsgsn2kt5ce6dfl2
        parent: john at arbash-meinel.com-20081207173303-ydamo2rxs3ngjhw0
        parent: pqm at pqm.ubuntu.com-20081209163533-fj6hx9l65sretbai
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: differ_serializer
        timestamp: Tue 2008-12-09 18:10:00 -0600
        message:
          Merge bzr.dev, resolve NEWS
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
          bzrlib/bzrdir.py               bzrdir.py-20060131065624-156dfea39c4387cb
          bzrlib/fetch.py                fetch.py-20050818234941-26fea6105696365d
          bzrlib/knit.py                 knit.py-20051212171256-f056ac8f0fbe1bd9
          bzrlib/registry.py             lazy_factory.py-20060809213415-2gfvqadtvdn0phtg-1
          bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
          bzrlib/tests/blackbox/test_pull.py test_pull.py-20051201144907-64959364f629947f
          bzrlib/tests/bzrdir_implementations/test_bzrdir.py test_bzrdir.py-20060131065642-0ebeca5e30e30866
          bzrlib/tests/per_repository/test_add_fallback_repository.py test_add_fallback_re-20080215040003-8w9n4ck9uqdxj18m-1
          bzrlib/tests/test_fetch.py     testfetch.py-20050825090644-f73e07e7dfb1765a
          bzrlib/tests/test_versionedfile.py test_versionedfile.py-20060222045249-db45c9ed14a1c2e5
          bzrlib/transport/__init__.py   transport.py-20050711165921-4978aa7ce1285ad5
          bzrlib/upgrade.py              history2weaves.py-20050818063535-e7d319791c19a8b2
          bzrlib/versionedfile.py        versionedfile.py-20060222045106-5039c71ee3b65490
        ------------------------------------------------------------
        revno: 2929.1175.10
        revision-id: john at arbash-meinel.com-20081207173303-ydamo2rxs3ngjhw0
        parent: john at arbash-meinel.com-20081205222549-lri0j1a3wv37wtax
        parent: john at arbash-meinel.com-20081207172622-r3hrmb872nwmezeu
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: differ_serializer
        timestamp: Sun 2008-12-07 11:33:03 -0600
        message:
          Merge in the new add_inventory_by_delta and handle the new return values.
        modified:
          bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
          bzrlib/tests/per_repository/test_add_inventory_by_delta.py test_add_inventory_d-20081013002626-rut81igtlqb4590z-1
            ------------------------------------------------------------
            revno: 2929.1176.1
            revision-id: john at arbash-meinel.com-20081207172622-r3hrmb872nwmezeu
            parent: john at arbash-meinel.com-20081205172501-a0g7ho4sl29q6dz9
            committer: John Arbash Meinel <john at arbash-meinel.com>
            branch nick: add_inventory_by_delta
            timestamp: Sun 2008-12-07 11:26:22 -0600
            message:
              Change the return of add_inventory_by_delta to also return the Inventory.
            modified:
              bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
        ------------------------------------------------------------
        revno: 2929.1175.9
        revision-id: john at arbash-meinel.com-20081205222549-lri0j1a3wv37wtax
        parent: john at arbash-meinel.com-20081205221928-kzstz04ngqrxpb12
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: differ_serializer
        timestamp: Fri 2008-12-05 16:25:49 -0600
        message:
          Use a last-modified-revision test.
          
          This avoids copying the same text revisions multiple times.
        modified:
          bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
        ------------------------------------------------------------
        revno: 2929.1175.8
        revision-id: john at arbash-meinel.com-20081205221928-kzstz04ngqrxpb12
        parent: john at arbash-meinel.com-20081205221847-hs9mh3yuinxq7w29
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: differ_serializer
        timestamp: Fri 2008-12-05 16:19:28 -0600
        message:
          Bring in the CHK inter-differing-serializer fetch code.
          
          Refactor it into several helper functions which makes the flow a bit
          clearer and reduces the indentation.
        modified:
          bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
        ------------------------------------------------------------
        revno: 2929.1175.7
        revision-id: john at arbash-meinel.com-20081205221847-hs9mh3yuinxq7w29
        parent: john at arbash-meinel.com-20081205221809-d3c4cz1jyv9p1y1h
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: differ_serializer
        timestamp: Fri 2008-12-05 16:18:47 -0600
        message:
          Add an Inter test that actually uses InterDifferingSerializer
        modified:
          bzrlib/tests/interrepository_implementations/__init__.py __init__.py-20060220054744-baf49a1f88f17b1a
        ------------------------------------------------------------
        revno: 2929.1175.6
        revision-id: john at arbash-meinel.com-20081205221809-d3c4cz1jyv9p1y1h
        parent: john at arbash-meinel.com-20081205172501-a0g7ho4sl29q6dz9
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: differ_serializer
        timestamp: Fri 2008-12-05 16:18:09 -0600
        message:
          Bring in Inventory._make_delta
        modified:
          bzrlib/inventory.py            inventory.py-20050309040759-6648b84ca2005b37
        ------------------------------------------------------------
        revno: 2929.1175.5
        revision-id: john at arbash-meinel.com-20081205172501-a0g7ho4sl29q6dz9
        parent: john at arbash-meinel.com-20081205164010-05sx88jxi50q819a
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: add_inventory_by_delta
        timestamp: Fri 2008-12-05 11:25:01 -0600
        message:
          Change record_delete() to return the delta.
          
          Add direct tests for CB.get_basis_delta(), to ensure that it returns a
          valid delta, and that it errors if the client hasn't called will_record_deletes.
        modified:
          bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
          bzrlib/tests/per_repository/test_commit_builder.py test_commit_builder.py-20060606110838-76e3ra5slucqus81-1
        ------------------------------------------------------------
        revno: 2929.1175.4
        revision-id: john at arbash-meinel.com-20081205164010-05sx88jxi50q819a
        parent: john at arbash-meinel.com-20081205162905-12c9k3esfetyes4a
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: add_inventory_by_delta
        timestamp: Fri 2008-12-05 10:40:10 -0600
        message:
          This didn't land in 1.9 or 1.10, so make the minimum version 1.11
        modified:
          bzrlib/__init__.py             __init__.py-20050309040759-33e65acf91bbcd5d
        ------------------------------------------------------------
        revno: 2929.1175.3
        revision-id: john at arbash-meinel.com-20081205162905-12c9k3esfetyes4a
        parent: john at arbash-meinel.com-20081205160704-ti2a80z9tvqehwws
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: differ_serializer
        timestamp: Fri 2008-12-05 10:29:05 -0600
        message:
          Hide the .basis_delta variable, and require callers to use .get_basis_delta()
          This allows us to check that the callers were sure they would be
          generating a proper delta, by using CommitBuilder.record_delete() correctly.
        modified:
          bzrlib/commit.py               commit.py-20050511101309-79ec1a0168e0e825
          bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
        ------------------------------------------------------------
        revno: 2929.1175.2
        revision-id: john at arbash-meinel.com-20081205160704-ti2a80z9tvqehwws
        parent: john at arbash-meinel.com-20081205160233-f4c61by1u3kf5sqj
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: differ_serializer
        timestamp: Fri 2008-12-05 10:07:04 -0600
        message:
          Rename add_inventory_delta to add_inventory_by_delta.
        renamed:
          bzrlib/tests/per_repository/test_add_inventory_delta.py => bzrlib/tests/per_repository/test_add_inventory_by_delta.py test_add_inventory_d-20081013002626-rut81igtlqb4590z-1
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/remote.py               remote.py-20060720103555-yeeg2x51vn0rbtdp-1
          bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
          bzrlib/tests/per_repository/__init__.py __init__.py-20060131092037-9564957a7d4a841b
          bzrlib/tests/per_repository/test_add_inventory_by_delta.py test_add_inventory_d-20081013002626-rut81igtlqb4590z-1
        ------------------------------------------------------------
        revno: 2929.1175.1
        revision-id: john at arbash-meinel.com-20081205160233-f4c61by1u3kf5sqj
        parent: pqm at pqm.ubuntu.com-20081205135154-uwqcpl3lruah9fo3
        parent: robertc at robertcollins.net-20081013044331-ibghe8j4no7uhb55
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: differ_serializer
        timestamp: Fri 2008-12-05 10:02:33 -0600
        message:
          Merge in the add_inventory_delta code.
        added:
          bzrlib/tests/per_repository/test_add_inventory_delta.py test_add_inventory_d-20081013002626-rut81igtlqb4590z-1
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/__init__.py             __init__.py-20050309040759-33e65acf91bbcd5d
          bzrlib/commit.py               commit.py-20050511101309-79ec1a0168e0e825
          bzrlib/remote.py               remote.py-20060720103555-yeeg2x51vn0rbtdp-1
          bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
          bzrlib/tests/per_repository/__init__.py __init__.py-20060131092037-9564957a7d4a841b
          bzrlib/tests/per_repository/test_commit_builder.py test_commit_builder.py-20060606110838-76e3ra5slucqus81-1
          bzrlib/tests/per_repository/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
        ------------------------------------------------------------
        revno: 2929.1174.3
        revision-id: robertc at robertcollins.net-20081013044331-ibghe8j4no7uhb55
        parent: robertc at robertcollins.net-20081013043229-dn4s7hfg6h6zcobm
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: commit-delta
        timestamp: Mon 2008-10-13 15:43:31 +1100
        message:
          Delegate basis inventory calculation during commit to the CommitBuilder object.
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/__init__.py             __init__.py-20050309040759-33e65acf91bbcd5d
          bzrlib/commit.py               commit.py-20050511101309-79ec1a0168e0e825
        ------------------------------------------------------------
        revno: 2929.1174.2
        revision-id: robertc at robertcollins.net-20081013043229-dn4s7hfg6h6zcobm
        parent: robertc at robertcollins.net-20081013002817-xxxsr37afvuhbzdx
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: commit-delta
        timestamp: Mon 2008-10-13 15:32:29 +1100
        message:
          Teach CommitBuilder to accumulate inventory deltas.
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
          bzrlib/tests/per_repository/test_commit_builder.py test_commit_builder.py-20060606110838-76e3ra5slucqus81-1
        ------------------------------------------------------------
        revno: 2929.1174.1
        revision-id: robertc at robertcollins.net-20081013002817-xxxsr37afvuhbzdx
        parent: pqm at pqm.ubuntu.com-20081012204951-j2dgh06nuzrak1ri
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: commit-delta
        timestamp: Mon 2008-10-13 11:28:17 +1100
        message:
          Create bzrlib.repository.Repository.add_inventory_delta for adding inventories via deltas.
        added:
          bzrlib/tests/per_repository/test_add_inventory_delta.py test_add_inventory_d-20081013002626-rut81igtlqb4590z-1
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/remote.py               remote.py-20060720103555-yeeg2x51vn0rbtdp-1
          bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
          bzrlib/tests/per_repository/__init__.py __init__.py-20060131092037-9564957a7d4a841b
          bzrlib/tests/per_repository/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
    ------------------------------------------------------------
    revno: 2929.1.959
    revision-id: pqm at pqm.ubuntu.com-20081210011933-axdrxiq306imj2ty
    parent: pqm at pqm.ubuntu.com-20081210004116-qqips4wfg800p4ku
    parent: john at arbash-meinel.com-20081210000733-5h1j6enwe37ymnuj
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Wed 2008-12-10 01:19:33 +0000
    message:
      (jam) Add a FIFOCache class, to allow max-size with less overhead,
      	though lower hit rate.
    added:
      bzrlib/fifo_cache.py           fifo_cache.py-20081209212307-31ffjwvteyvmydnf-1
      bzrlib/tests/test_fifo_cache.py test_fifo_cache.py-20081209212307-31ffjwvteyvmydnf-2
    modified:
      bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
        ------------------------------------------------------------
        revno: 2929.1173.8
        revision-id: john at arbash-meinel.com-20081210000733-5h1j6enwe37ymnuj
        parent: john at arbash-meinel.com-20081209222640-u3iece2ixcd0q7lj
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: fifo_cache
        timestamp: Tue 2008-12-09 18:07:33 -0600
        message:
          Handle that Python2.4 doesn't have collections.deque.remove
        modified:
          bzrlib/fifo_cache.py           fifo_cache.py-20081209212307-31ffjwvteyvmydnf-1
        ------------------------------------------------------------
        revno: 2929.1173.7
        revision-id: john at arbash-meinel.com-20081209222640-u3iece2ixcd0q7lj
        parent: john at arbash-meinel.com-20081209220341-9d70gll0szipelao
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: fifo_cache
        timestamp: Tue 2008-12-09 16:26:40 -0600
        message:
          Add a FIFOSizeCache which is constrained based on the size of the values.
        modified:
          bzrlib/fifo_cache.py           fifo_cache.py-20081209212307-31ffjwvteyvmydnf-1
          bzrlib/tests/test_fifo_cache.py test_fifo_cache.py-20081209212307-31ffjwvteyvmydnf-2
        ------------------------------------------------------------
        revno: 2929.1173.6
        revision-id: john at arbash-meinel.com-20081209220341-9d70gll0szipelao
        parent: john at arbash-meinel.com-20081209220003-05o6ymacid6io8mn
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: fifo_cache
        timestamp: Tue 2008-12-09 16:03:41 -0600
        message:
          Test that del x[foo] also triggers a cleanup.
        modified:
          bzrlib/tests/test_fifo_cache.py test_fifo_cache.py-20081209212307-31ffjwvteyvmydnf-2
        ------------------------------------------------------------
        revno: 2929.1173.5
        revision-id: john at arbash-meinel.com-20081209220003-05o6ymacid6io8mn
        parent: john at arbash-meinel.com-20081209215736-6rvlqtzobqbwqn2m
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: fifo_cache
        timestamp: Tue 2008-12-09 16:00:03 -0600
        message:
          Add tests that *adding* an entry also triggers the cleanup code.
        modified:
          bzrlib/tests/test_fifo_cache.py test_fifo_cache.py-20081209212307-31ffjwvteyvmydnf-2
        ------------------------------------------------------------
        revno: 2929.1173.4
        revision-id: john at arbash-meinel.com-20081209215736-6rvlqtzobqbwqn2m
        parent: john at arbash-meinel.com-20081209215038-uevgqhtrnlgnkecj
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: fifo_cache
        timestamp: Tue 2008-12-09 15:57:36 -0600
        message:
          Implement setdefault.
        modified:
          bzrlib/fifo_cache.py           fifo_cache.py-20081209212307-31ffjwvteyvmydnf-1
          bzrlib/tests/test_fifo_cache.py test_fifo_cache.py-20081209212307-31ffjwvteyvmydnf-2
        ------------------------------------------------------------
        revno: 2929.1173.3
        revision-id: john at arbash-meinel.com-20081209215038-uevgqhtrnlgnkecj
        parent: john at arbash-meinel.com-20081209213917-c5ko2gvw831txpt8
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: fifo_cache
        timestamp: Tue 2008-12-09 15:50:38 -0600
        message:
          Implement update
        modified:
          bzrlib/fifo_cache.py           fifo_cache.py-20081209212307-31ffjwvteyvmydnf-1
          bzrlib/tests/test_fifo_cache.py test_fifo_cache.py-20081209212307-31ffjwvteyvmydnf-2
        ------------------------------------------------------------
        revno: 2929.1173.2
        revision-id: john at arbash-meinel.com-20081209213917-c5ko2gvw831txpt8
        parent: john at arbash-meinel.com-20081209213549-yc1mqv3l5gun9c63
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: fifo_cache
        timestamp: Tue 2008-12-09 15:39:17 -0600
        message:
          Add a test which fails because we don't call cleanup funcs during deconstruction.
        modified:
          bzrlib/tests/test_fifo_cache.py test_fifo_cache.py-20081209212307-31ffjwvteyvmydnf-2
        ------------------------------------------------------------
        revno: 2929.1173.1
        revision-id: john at arbash-meinel.com-20081209213549-yc1mqv3l5gun9c63
        parent: pqm at pqm.ubuntu.com-20081209163533-fj6hx9l65sretbai
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: fifo_cache
        timestamp: Tue 2008-12-09 15:35:49 -0600
        message:
          Start working on a FIFOCache.
          
          This is designed to have less runtime cost than the LRUCache.
          Mostly because we don't have to do any recording work on *access*
          only on update or delete.
          As such, we subclass dict directly, because experiments show that
          it performed the best. Unfortunately, even though we don't have
          a custom __getitem__ implementation, it is still approx 2x slower
          than using a raw dict.
        added:
          bzrlib/fifo_cache.py           fifo_cache.py-20081209212307-31ffjwvteyvmydnf-1
          bzrlib/tests/test_fifo_cache.py test_fifo_cache.py-20081209212307-31ffjwvteyvmydnf-2
        modified:
          bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
    ------------------------------------------------------------
    revno: 2929.1.958
    revision-id: pqm at pqm.ubuntu.com-20081210004116-qqips4wfg800p4ku
    parent: pqm at pqm.ubuntu.com-20081209205258-uop2lclksyc9whj8
    parent: john at arbash-meinel.com-20081209223156-8usxe0ihbbg4cpjq
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Wed 2008-12-10 00:41:16 +0000
    message:
      (jam) Tweaks to the LRUCache code, butter memory use,
      	mostly code cleanup.
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      bzrlib/lru_cache.py            lru_cache.py-20070119165515-tlw203kuwh0id5gv-1
      bzrlib/tests/test_lru_cache.py test_lru_cache.py-20070119165535-hph6rk4h9rzy4180-1
        ------------------------------------------------------------
        revno: 2929.1172.2
        revision-id: john at arbash-meinel.com-20081209223156-8usxe0ihbbg4cpjq
        parent: john at arbash-meinel.com-20081208182300-u1qmnxafwt2rr5dz
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: lru_cache
        timestamp: Tue 2008-12-09 16:31:56 -0600
        message:
          Only cache cleanup functions if they aren't None.
        modified:
          bzrlib/lru_cache.py            lru_cache.py-20070119165515-tlw203kuwh0id5gv-1
        ------------------------------------------------------------
        revno: 2929.1172.1
        revision-id: john at arbash-meinel.com-20081208182300-u1qmnxafwt2rr5dz
        parent: pqm at pqm.ubuntu.com-20081205181554-ofrdnafloc43bxkh
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: lru_cache
        timestamp: Mon 2008-12-08 12:23:00 -0600
        message:
          Add LRUCache.resize(), and change the init arguments for LRUCache.
          
          The old name was a bit confusing, and caused LRUSizeCache to re-use variables in
          a confusing way with LRUCache.
          
          
          Also, this changes the default cleanup size to be 80% of max_size. This should
          be better, as it means we get a little bit of room when adding keys,
          rather than having to cleanup after every add, we can instead do it in
          batches.
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/lru_cache.py            lru_cache.py-20070119165515-tlw203kuwh0id5gv-1
          bzrlib/tests/test_lru_cache.py test_lru_cache.py-20070119165535-hph6rk4h9rzy4180-1
    ------------------------------------------------------------
    revno: 2929.1.957
    revision-id: pqm at pqm.ubuntu.com-20081209205258-uop2lclksyc9whj8
    parent: pqm at pqm.ubuntu.com-20081209163533-fj6hx9l65sretbai
    parent: gphemsley at gmail.com-20081209194959-qk6a4ho0v6qbcvrs
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Tue 2008-12-09 20:52:58 +0000
    message:
      (Gordon P. Hemsley) Add a trailing slash to directories for 'bzr ls'
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
      bzrlib/tests/blackbox/test_ls.py test_ls.py-20060712232047-0jraqpecwngee12y-1
      doc/developers/HACKING.txt     HACKING-20050805200004-2a5dc975d870f78c
        ------------------------------------------------------------
        revno: 2929.1171.6
        revision-id: gphemsley at gmail.com-20081209194959-qk6a4ho0v6qbcvrs
        parent: gphemsley at gmail.com-20081209092211-t41qyggtpohyxz3p
        committer: Gordon P. Hemsley <gphemsley at gmail.com>
        branch nick: bug-306424-ls-trailing-slash
        timestamp: Tue 2008-12-09 14:49:59 -0500
        message:
          Revert added slash for null-separated output of 'bzr ls'.
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
          bzrlib/tests/blackbox/test_ls.py test_ls.py-20060712232047-0jraqpecwngee12y-1
        ------------------------------------------------------------
        revno: 2929.1171.5
        revision-id: gphemsley at gmail.com-20081209092211-t41qyggtpohyxz3p
        parent: gphemsley at gmail.com-20081209091818-03c3z0cyty2jn2gv
        committer: Gordon P. Hemsley <gphemsley at gmail.com>
        branch nick: bug-306424-ls-trailing-slash
        timestamp: Tue 2008-12-09 04:22:11 -0500
        message:
          Fixed I-before-E typo in passing.
        modified:
          doc/developers/HACKING.txt     HACKING-20050805200004-2a5dc975d870f78c
        ------------------------------------------------------------
        revno: 2929.1171.4
        revision-id: gphemsley at gmail.com-20081209091818-03c3z0cyty2jn2gv
        parent: gphemsley at gmail.com-20081209091359-t9j2isw8vhrpxk85
        committer: Gordon P. Hemsley <gphemsley at gmail.com>
        branch nick: bug-306424-ls-trailing-slash
        timestamp: Tue 2008-12-09 04:18:18 -0500
        message:
          Add note to NEWS.
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
        ------------------------------------------------------------
        revno: 2929.1171.3
        revision-id: gphemsley at gmail.com-20081209091359-t9j2isw8vhrpxk85
        parent: gphemsley at gmail.com-20081209090945-dj6nxd0vdsqlc2bh
        committer: Gordon P. Hemsley <gphemsley at gmail.com>
        branch nick: bug-306424-ls-trailing-slash
        timestamp: Tue 2008-12-09 04:13:59 -0500
        message:
          Small optimization.
        modified:
          bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
        ------------------------------------------------------------
        revno: 2929.1171.2
        revision-id: gphemsley at gmail.com-20081209090945-dj6nxd0vdsqlc2bh
        parent: gphemsley at gmail.com-20081209090003-jp2tf9268mfum2j3
        committer: Gordon P. Hemsley <gphemsley at gmail.com>
        branch nick: bug-306424-ls-trailing-slash
        timestamp: Tue 2008-12-09 04:09:45 -0500
        message:
          Change unittests to conform to new output.
        modified:
          bzrlib/tests/blackbox/test_ls.py test_ls.py-20060712232047-0jraqpecwngee12y-1
        ------------------------------------------------------------
        revno: 2929.1171.1
        revision-id: gphemsley at gmail.com-20081209090003-jp2tf9268mfum2j3
        parent: pqm at pqm.ubuntu.com-20081209023452-12dbzcwzxrt1xee3
        committer: Gordon P. Hemsley <gphemsley at gmail.com>
        branch nick: bug-306424-ls-trailing-slash
        timestamp: Tue 2008-12-09 04:00:03 -0500
        message:
          Add trailing slash after directories.
        modified:
          bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
    ------------------------------------------------------------
    revno: 2929.1.956
    revision-id: pqm at pqm.ubuntu.com-20081209163533-fj6hx9l65sretbai
    parent: pqm at pqm.ubuntu.com-20081209155126-st6whj38jx3nl0ft
    parent: john at arbash-meinel.com-20081208194402-v50vbmybtyiojlk5
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Tue 2008-12-09 16:35:33 +0000
    message:
      (jam) Default to urllib for http and pycurl for https
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      bzrlib/transport/__init__.py   transport.py-20050711165921-4978aa7ce1285ad5
        ------------------------------------------------------------
        revno: 2929.1170.1
        revision-id: john at arbash-meinel.com-20081208194402-v50vbmybtyiojlk5
        parent: pqm at pqm.ubuntu.com-20081205181554-ofrdnafloc43bxkh
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: default_urllib
        timestamp: Mon 2008-12-08 13:44:02 -0600
        message:
          Use urllib for http connections, pycurl for https connections.
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/transport/__init__.py   transport.py-20050711165921-4978aa7ce1285ad5
    ------------------------------------------------------------
    revno: 2929.1.955
    revision-id: pqm at pqm.ubuntu.com-20081209155126-st6whj38jx3nl0ft
    parent: pqm at pqm.ubuntu.com-20081209023452-12dbzcwzxrt1xee3
    parent: aaron at aaronbentley.com-20081209151508-nd1jb1vv2z22llwm
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Tue 2008-12-09 15:51:26 +0000
    message:
      Pull -v respects log_format config var (abentley)
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
      bzrlib/tests/blackbox/test_pull.py test_pull.py-20051201144907-64959364f629947f
    ------------------------------------------------------------
    revno: 2929.1169.5
    revision-id: aaron at aaronbentley.com-20081209151508-nd1jb1vv2z22llwm
    parent: aaron at aaronbentley.com-20081209033614-3zjvk6v47u039uzd
    committer: Aaron Bentley <aaron at aaronbentley.com>
    branch nick: pull-log
    timestamp: Tue 2008-12-09 07:15:08 -0800
    message:
      Updates from review
    modified:
      bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
      bzrlib/tests/blackbox/test_pull.py test_pull.py-20051201144907-64959364f629947f
    ------------------------------------------------------------
    revno: 2929.1169.4
    revision-id: aaron at aaronbentley.com-20081209033614-3zjvk6v47u039uzd
    parent: aaron at aaronbentley.com-20081209033407-zrrszq9wddwln1y2
    committer: Aaron Bentley <aaron at aaronbentley.com>
    branch nick: pull-log
    timestamp: Mon 2008-12-08 19:36:14 -0800
    message:
      Add NEWS entry
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
    ------------------------------------------------------------
    revno: 2929.1169.3
    revision-id: aaron at aaronbentley.com-20081209033407-zrrszq9wddwln1y2
    parent: aaron at aaronbentley.com-20081209014107-w3v6jg9302mewvd0
    parent: pqm at pqm.ubuntu.com-20081209023452-12dbzcwzxrt1xee3
    committer: Aaron Bentley <aaron at aaronbentley.com>
    branch nick: pull-log
    timestamp: Mon 2008-12-08 19:34:07 -0800
    message:
      Merge bzr.dev into pull-log.
    added:
      bzrlib/foreign.py              foreign.py-20081112170002-olsxmandkk8qyfuq-1
      bzrlib/tests/test_foreign.py   test_foreign.py-20081125004048-ywb901edgp9lluxo-1
      contrib/convert_to_1.9.py      convert_to_dev2.py-20081014130524-z1ydl3mq9b4ehlvv-1
      tools/win32/build_release.py   build_release.py-20081105204355-2ghh5cv01v1x4rzz-1
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      bzr                            bzr.py-20050313053754-5485f144c7006fa6
      bzrlib/__init__.py             __init__.py-20050309040759-33e65acf91bbcd5d
      bzrlib/_patiencediff_c.c       _patiencediff_c.c-20070721205602-q3imkipwlgagp3cy-1
      bzrlib/branch.py               branch.py-20050309040759-e4baf4e0d046576e
      bzrlib/btree_index.py          index.py-20080624222253-p0x5f92uyh5hw734-7
      bzrlib/bugtracker.py           bugtracker.py-20070410073305-vu1vu1qosjurg8kb-1
      bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
      bzrlib/bzrdir.py               bzrdir.py-20060131065624-156dfea39c4387cb
      bzrlib/config.py               config.py-20051011043216-070c74f4e9e338e8
      bzrlib/errors.py               errors.py-20050309040759-20512168c4e14fbd
      bzrlib/fetch.py                fetch.py-20050818234941-26fea6105696365d
      bzrlib/help_topics/__init__.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
      bzrlib/knit.py                 knit.py-20051212171256-f056ac8f0fbe1bd9
      bzrlib/log.py                  log.py-20050505065812-c40ce11702fe5fb1
      bzrlib/mutabletree.py          mutabletree.py-20060906023413-4wlkalbdpsxi2r4y-2
      bzrlib/registry.py             lazy_factory.py-20060809213415-2gfvqadtvdn0phtg-1
      bzrlib/remote.py               remote.py-20060720103555-yeeg2x51vn0rbtdp-1
      bzrlib/repofmt/pack_repo.py    pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
      bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
      bzrlib/revisionspec.py         revisionspec.py-20050907152633-17567659fd5c0ddb
      bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
      bzrlib/tests/blackbox/test_diff.py test_diff.py-20060110203741-aa99ac93e633d971
      bzrlib/tests/blackbox/test_log.py test_log.py-20060112090212-78f6ea560c868e24
      bzrlib/tests/branch_implementations/__init__.py __init__.py-20060123013057-b12a52c3f361daf4
      bzrlib/tests/branch_implementations/test_branch.py testbranch.py-20050711070244-121d632bc37d7253
      bzrlib/tests/branch_implementations/test_sprout.py test_sprout.py-20070521151739-b8t8p7axw1h966ws-1
      bzrlib/tests/branch_implementations/test_stacking.py test_stacking.py-20080214020755-msjlkb7urobwly0f-1
      bzrlib/tests/bzrdir_implementations/test_bzrdir.py test_bzrdir.py-20060131065642-0ebeca5e30e30866
      bzrlib/tests/commands/test_commit.py test_commit.py-20070913161801-ydrx2k5gmv7k7eiu-1
      bzrlib/tests/per_repository/test_add_fallback_repository.py test_add_fallback_re-20080215040003-8w9n4ck9uqdxj18m-1
      bzrlib/tests/per_repository/test_commit_builder.py test_commit_builder.py-20060606110838-76e3ra5slucqus81-1
      bzrlib/tests/per_repository/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
      bzrlib/tests/per_repository/test_revision.py testrevprops.py-20051013073044-92bc3c68302ce1bf
      bzrlib/tests/test_fetch.py     testfetch.py-20050825090644-f73e07e7dfb1765a
      bzrlib/tests/test_knit.py      test_knit.py-20051212171302-95d4c00dd5f11f2b
      bzrlib/tests/test_log.py       testlog.py-20050728115707-1a514809d7d49309
      bzrlib/tests/test_pack_repository.py test_pack_repository-20080801043947-eaw0e6h2gu75kwmy-1
      bzrlib/tests/test_remote.py    test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
      bzrlib/tests/test_repository.py test_repository.py-20060131075918-65c555b881612f4d
      bzrlib/tests/test_sftp_transport.py testsftp.py-20051027032739-247570325fec7e7e
      bzrlib/tests/test_transport.py testtransport.py-20050718175618-e5cdb99f4555ddce
      bzrlib/tests/test_versionedfile.py test_versionedfile.py-20060222045249-db45c9ed14a1c2e5
      bzrlib/tests/workingtree_implementations/test_parents.py test_set_parents.py-20060807231740-yicmnlci1mj8smu1-1
      bzrlib/transport/__init__.py   transport.py-20050711165921-4978aa7ce1285ad5
      bzrlib/transport/remote.py     ssh.py-20060608202016-c25gvf1ob7ypbus6-1
      bzrlib/upgrade.py              history2weaves.py-20050818063535-e7d319791c19a8b2
      bzrlib/versionedfile.py        versionedfile.py-20060222045106-5039c71ee3b65490
      doc/developers/ppa.txt         ppa.txt-20080722055539-606u7t2z32t3ae4w-1
    ------------------------------------------------------------
    revno: 2929.1169.2
    revision-id: aaron at aaronbentley.com-20081209014107-w3v6jg9302mewvd0
    parent: aaron at aaronbentley.com-20081209013728-43v0yz6mo2jfexqv
    committer: Aaron Bentley <aaron at aaronbentley.com>
    branch nick: pull-log
    timestamp: Mon 2008-12-08 17:41:07 -0800
    message:
      Make test stricter
    modified:
      bzrlib/tests/blackbox/test_pull.py test_pull.py-20051201144907-64959364f629947f
    ------------------------------------------------------------
    revno: 2929.1169.1
    revision-id: aaron at aaronbentley.com-20081209013728-43v0yz6mo2jfexqv
    parent: pqm at pqm.ubuntu.com-20081125021810-2dhu9lqkn6nh5bhn
    committer: Aaron Bentley <aaron at aaronbentley.com>
    branch nick: pull-log
    timestamp: Mon 2008-12-08 17:37:28 -0800
    message:
      Use default log format in pull -v
    modified:
      bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
      bzrlib/tests/blackbox/test_pull.py test_pull.py-20051201144907-64959364f629947f
-------------- next part --------------

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


More information about the bazaar-commits mailing list