Rev 1609: Fixed pb.note interaction with nested progress bars in /home/pqm/archives/thelove/bzr/+trunk/

[Canonical.com Patch Queue Manager]

------------------------------------------------------------
revno: 1609
revision-id: pqm at pqm.ubuntu.com-20060403225420-b86ea31effcd8e72
parent: pqm at pqm.ubuntu.com-20060403073057-a38ba31abe6849e5
parent: abentley at panoramicfeedback.com-20060403142927-3702d2c4aa57fe1d
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2006-04-03 23:54:20 +0100
message:
  Fixed pb.note interaction with nested progress bars
modified:
  bzrlib/progress.py             progress.py-20050610070202-df9faaab791964c0
  bzrlib/tests/test_ui.py        test_ui.py-20051130162854-458e667a7414af09
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20060403142927-3702d2c4aa57fe1d
    parent: aaron.bentley at utoronto.ca-20060331063745-14027470af52bd3a
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: bzr.progress
    timestamp: Mon 2006-04-03 10:29:27 -0400
    message:
      Fixed test case for pb.note
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20060331063745-14027470af52bd3a
    parent: aaron.bentley at utoronto.ca-20060331023909-957277c1233c6aff
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    branch nick: bzr.progress
    timestamp: Fri 2006-03-31 01:37:45 -0500
    message:
      Use ui_factory.clear_term in pb.note
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20060331023909-957277c1233c6aff
    parent: aaron.bentley at utoronto.ca-20060318210222-8a49d67ada6f8638
    parent: aaron.bentley at utoronto.ca-20060331020235-369b764c5e0478f7
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    branch nick: bzr.progress
    timestamp: Thu 2006-03-30 21:39:09 -0500
    message:
      Merge from bzr.ab.integration
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20060331020235-369b764c5e0478f7
    parent: aaron.bentley at utoronto.ca-20060330055417-130d43d9978feff2
    parent: pqm at pqm.ubuntu.com-20060331004321-2171d32febcbfe4d
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    branch nick: bzr.ab.integration
    timestamp: Thu 2006-03-30 21:02:35 -0500
    message:
      Merge from bzr.dev
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20060330055417-130d43d9978feff2
    parent: aaron.bentley at utoronto.ca-20060330040520-b85604fce5e59326
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    branch nick: bzr.ab.integration
    timestamp: Thu 2006-03-30 00:54:17 -0500
    message:
      Bad change.  (broke tests).  Reverted.
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20060330040520-b85604fce5e59326
    parent: abentley at panoramicfeedback.com-20060329182708-32f2728cd6a2a4ca
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    branch nick: bzr.ab.integration
    timestamp: Wed 2006-03-29 23:05:20 -0500
    message:
      Fixed ProgressBar.note by just calling note
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20060329182708-32f2728cd6a2a4ca
    parent: abentley at panoramicfeedback.com-20060329150734-13b14a84e6962cf1
    parent: pqm at pqm.ubuntu.com-20060329154814-a5e1b3e2b9685db3
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: Aaron's integration
    timestamp: Wed 2006-03-29 13:27:08 -0500
    message:
      Merge bzr.dev