Rev 1578: Progress bar shows overall progress in /home/pqm/archives/thelove/bzr/+trunk/

Canonical.com Patch Queue Manager pqm at pqm.ubuntu.com
Thu Mar 9 21:05:02 GMT 2006


------------------------------------------------------------
revno: 1578
revision-id: pqm at pqm.ubuntu.com-20060309210459-a48571e310db5c23
parent: pqm at pqm.ubuntu.com-20060309085048-37f21fd146dabe93
parent: abentley at panoramicfeedback.com-20060309165336-f459a54797d6b6a3
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2006-03-09 21:04:59 +0000
message:
  Progress bar shows overall progress
added:
  bzrlib/tests/test_progress.py  test_progress.py-20060308160359-978c397bc79b7fda
modified:
  bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
  bzrlib/merge.py                merge.py-20050513021216-953b65a438527106
  bzrlib/progress.py             progress.py-20050610070202-df9faaab791964c0
  bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
  bzrlib/tests/test_merge.py     testmerge.py-20050905070950-c1b5aa49ff911024
  bzrlib/transform.py            transform.py-20060105172343-dd99e54394d91687
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20060309165336-f459a54797d6b6a3
    parent: abentley at panoramicfeedback.com-20060309164306-490b787135febb2c
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: Aaron's small fixes
    timestamp: Thu 2006-03-09 11:53:36 -0500
    message:
      Refactored the revert phases
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20060309164306-490b787135febb2c
    parent: abentley at panoramicfeedback.com-20060309163549-f638fe6c4cd1539d
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: Aaron's small fixes
    timestamp: Thu 2006-03-09 11:43:06 -0500
    message:
      Hide ETA, show spinner by default
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20060309163549-f638fe6c4cd1539d
    parent: abentley at panoramicfeedback.com-20060308222902-11c7991dded15b48
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: Aaron's small fixes
    timestamp: Thu 2006-03-09 11:35:49 -0500
    message:
      Handle progress phases more nicely in merge
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20060308222902-11c7991dded15b48
    parent: abentley at panoramicfeedback.com-20060308215300-4330cf9b81b09f58
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: Aaron's small fixes
    timestamp: Wed 2006-03-08 17:29:02 -0500
    message:
      Got merge and revert using nested pbs
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20060308215300-4330cf9b81b09f58
    parent: abentley at panoramicfeedback.com-20060308195144-af28fd357daa8cd0
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: Aaron's small fixes
    timestamp: Wed 2006-03-08 16:53:00 -0500
    message:
      Bugfixes to progress stuff
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20060308195144-af28fd357daa8cd0
    parent: abentley at panoramicfeedback.com-20060308190258-79b6a64b17fb8cf3
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: Aaron's small fixes
    timestamp: Wed 2006-03-08 14:51:44 -0500
    message:
      Got stack handling under test
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20060308190258-79b6a64b17fb8cf3
    parent: abentley at panoramicfeedback.com-20060308163450-d73ed3ce02da6513
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: Aaron's small fixes
    timestamp: Wed 2006-03-08 14:02:58 -0500
    message:
      Ensure all ProgressBar implementations can be used as parents
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20060308163450-d73ed3ce02da6513
    parent: abentley at panoramicfeedback.com-20060308155549-d4bba9fc7c8c824e
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: Aaron's small fixes
    timestamp: Wed 2006-03-08 11:34:50 -0500
    message:
      Got propogation under test
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20060308155549-d4bba9fc7c8c824e
    parent: aaron.bentley at utoronto.ca-20060308060843-7284a9b71ec43c21
    parent: abentley at panoramicfeedback.com-20060307194639-68365add92c0bad3
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: Aaron's small fixes
    timestamp: Wed 2006-03-08 10:55:49 -0500
    message:
      Restored somewhat looser tests
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20060307194639-68365add92c0bad3
    parent: abentley at panoramicfeedback.com-20060307164144-fcfe88c27f7c1384
    parent: abentley at panoramicfeedback.com-20060307184118-b18cf90f2bf4e6d8
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: Aaron's small fixes
    timestamp: Tue 2006-03-07 14:46:39 -0500
    message:
      Merge from bzr.ab.integration
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20060307164144-fcfe88c27f7c1384
    parent: abentley at panoramicfeedback.com-20060306174748-6a009f0b725d8bdd
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: Aaron's small fixes
    timestamp: Tue 2006-03-07 11:41:44 -0500
    message:
      Workaround for silly _get_log behaviour in test



More information about the bazaar-commits mailing list