Rev 2863: Merge bzr.dev. in http://people.ubuntu.com/~robertc/baz2.0/repository

Robert Collins robertc at robertcollins.net
Tue Oct 30 20:41:00 GMT 2007


At http://people.ubuntu.com/~robertc/baz2.0/repository

------------------------------------------------------------
revno: 2863
revision-id:robertc at robertcollins.net-20071030204056-i1pugmzelp3uu0by
parent: robertc at robertcollins.net-20071030180532-9deflvcm5z1m93yq
parent: pqm at pqm.ubuntu.com-20071030203434-6ffpvdncd12ncx3d
committer: Robert Collins <robertc at robertcollins.net>
branch nick: repository
timestamp: Wed 2007-10-31 07:40:56 +1100
message:
  Merge bzr.dev.
modified:
  bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
    ------------------------------------------------------------
    revno: 2592.1.25.2.7.1.28.1.6.1.3.1.9.2.1.3.74.1.31.3.18.1.9.1.2.1.12.1.8.1.46.1.18.1.1.2.21.2.10.3.8.2.9.1.9.2.2.1.1
    revision-id:pqm at pqm.ubuntu.com-20071030203434-6ffpvdncd12ncx3d
    parent: pqm at pqm.ubuntu.com-20071029221703-zy7q7a0ehfvpybtn
    parent: robertc at robertcollins.net-20071030194231-07hv0tjz76xzfoom
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Tue 2007-10-30 20:34:34 +0000
    message:
      (robertc) Stop reading all history during fetch operations on packs. (Robert Collins, #88319)
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      bzrlib/errors.py               errors.py-20050309040759-20512168c4e14fbd
      bzrlib/repofmt/knitrepo.py     knitrepo.py-20070206081537-pyy4a00xdas0j4pf-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/tests/interrepository_implementations/__init__.py __init__.py-20060220054744-baf49a1f88f17b1a
      bzrlib/tests/interrepository_implementations/test_interrepository.py test_interrepository.py-20060220061411-1ec13fa99e5e3eee
      bzrlib/tests/test_repository.py test_repository.py-20060131075918-65c555b881612f4d
    ------------------------------------------------------------
    revno: 2592.1.25.2.7.1.28.1.6.1.3.1.9.2.1.3.74.1.31.3.18.1.9.1.2.1.12.1.8.1.46.1.18.1.1.2.21.2.10.3.8.2.9.1.9.2.6
    revision-id:robertc at robertcollins.net-20071030194231-07hv0tjz76xzfoom
    parent: robertc at robertcollins.net-20071030183733-cygr23zc5sycopbg
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: fetch
    timestamp: Wed 2007-10-31 06:42:31 +1100
    message:
      Use a list comprehension not a generator.
    modified:
      bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
    ------------------------------------------------------------
    revno: 2592.1.25.2.7.1.28.1.6.1.3.1.9.2.1.3.74.1.31.3.18.1.9.1.2.1.12.1.8.1.46.1.18.1.1.2.21.2.10.3.8.2.9.1.9.2.5
    revision-id:robertc at robertcollins.net-20071030183733-cygr23zc5sycopbg
    parent: robertc at robertcollins.net-20071030173911-ams9jk9pw8uein0j
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: fetch
    timestamp: Wed 2007-10-31 05:37:33 +1100
    message:
      Review feedback.
    modified:
      bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
=== modified file 'bzrlib/repository.py'
--- a/bzrlib/repository.py	2007-10-30 17:39:11 +0000
+++ b/bzrlib/repository.py	2007-10-30 19:42:31 +0000
@@ -2391,8 +2391,9 @@
                 except StopIteration:
                     break
                 next_revs.difference_update(null_set)
-                target_keys =list ((key,) for key in next_revs)
-                have_revs = frozenset(node[1][0] for node in target_index.iter_entries(target_keys))
+                target_keys = [(key,) for key in next_revs]
+                have_revs = frozenset(node[1][0] for node in
+                    target_index.iter_entries(target_keys))
                 missing_revs.update(next_revs - have_revs)
                 searcher.stop_searching_any(have_revs)
             return missing_revs



More information about the bazaar-commits mailing list