[MERGE REVIEW] Progress bars interact nicely with warning/note

[Aaron Bentley]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

David Allouche noticed this oddity in the diff output:

@@ -92,6 +92,12 @@
~     def top(self):
~         if len(self._stack) != 0:
~             return self._stack[-1]
+        else:
+            return None
+
+    def bottom(self):
+        if len(self._stack) != 0:
+            return self._stack[0]
~         else:
~             return None

He wondered whether another diff algorithm would do better.  It turns
out Patience diff does behave better here:

@@ -95,6 +95,12 @@
~         else:
~             return None

+    def bottom(self):
+        if len(self._stack) != 0:
+            return self._stack[0]
+        else:
+            return None
+
~     def get_nested(self):
~         """Return a nested progress bar."""
~         if len(self._stack) == 0:
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org

iD8DBQFEEzA/0F+nu1YWqI0RAieQAJ9sW5hv/0N2IiDBob/KAYz7V7iTeACfUNuZ
VleCMsp14S8IqdPF9any4QY=
=i5Fe
-----END PGP SIGNATURE-----