Rev 3272: (bialix) Significantly reducing execution time and network traffic in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

Canonical.com Patch Queue Manager pqm at pqm.ubuntu.com
Thu Mar 13 08:29:49 GMT 2008


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

------------------------------------------------------------
revno: 3272
revision-id:pqm at pqm.ubuntu.com-20080313082937-sc9ovcwq3r10sjqd
parent: pqm at pqm.ubuntu.com-20080313021257-1l2g9qfezux7fboc
parent: bialix at ukr.net-20080313065238-93qf56i7j4leqo5s
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2008-03-13 08:29:37 +0000
message:
  (bialix) Significantly reducing execution time and network traffic
   for trivial case of `bzr missing`.
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/missing.py              missing.py-20050812153334-097f7097e2a8bcd1
    ------------------------------------------------------------
    revno: 3267.1.2
    revision-id:bialix at ukr.net-20080313065238-93qf56i7j4leqo5s
    parent: bialix at ukr.net-20080312210746-39xx932qcb92g3lj
    parent: pqm at pqm.ubuntu.com-20080313021257-1l2g9qfezux7fboc
    committer: Alexander Belchenko <bialix at ukr.net>
    branch nick: fast-missing
    timestamp: Thu 2008-03-13 08:52:38 +0200
    message:
      merge bzr.dev
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
      bzrlib/log.py                  log.py-20050505065812-c40ce11702fe5fb1
      bzrlib/plugins/launchpad/lp_registration.py lp_registration.py-20060315190948-daa617eafe3a8d48
      bzrlib/tests/blackbox/test_push.py test_push.py-20060329002750-929af230d5d22663
      setup.py                       setup.py-20050314065409-02f8a0a6e3f9bc70
    ------------------------------------------------------------
    revno: 3267.1.1
    revision-id:bialix at ukr.net-20080312210746-39xx932qcb92g3lj
    parent: pqm at pqm.ubuntu.com-20080312073810-r3a7ot93mw7hmk1m
    committer: Alexander Belchenko <bialix at ukr.net>
    branch nick: fast-missing
    timestamp: Wed 2008-03-12 23:07:46 +0200
    message:
      Significantly reducing execution time and network traffic for trivial case of `bzr missing`
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      bzrlib/missing.py              missing.py-20050812153334-097f7097e2a8bcd1
=== modified file 'NEWS'
--- a/NEWS	2008-03-13 02:12:57 +0000
+++ b/NEWS	2008-03-13 06:52:38 +0000
@@ -52,6 +52,10 @@
    * ``push`` has a ``--revision`` option, to specify what revision to push up
      to.  (Daniel Watkins)
 
+   * Significantly reducing execution time and network traffic for trivial 
+     case of running ``bzr missing`` command for two identical branches.
+     (Alexander Belchenko)
+
   BUGFIXES:
 
     * Disable plink's interactive prompt for password.

=== modified file 'bzrlib/missing.py'
--- a/bzrlib/missing.py	2007-06-21 03:29:39 +0000
+++ b/bzrlib/missing.py	2008-03-12 21:07:46 +0000
@@ -59,6 +59,10 @@
     try:
         remote_branch.lock_read()
         try:
+            # check for special case: both branches are equivalent
+            if (local_branch.last_revision_info() ==
+                remote_branch.last_revision_info()):
+                return [], []
             local_rev_history, local_rev_history_map = \
                 _get_history(local_branch, progress, "local", 0)
             remote_rev_history, remote_rev_history_map = \




More information about the bazaar-commits mailing list