Merge lp:~jeroen-hoekx/bzr-push-and-update/note into lp:bzr-push-and-update

[Jelmer Vernooij]

The "this does not update the working tree" message uses warning() rather than note() now.

[Martin Pool (mbp)]

It would be nice to do this in a cleaner way, but this is fine.

review: Approve

[John A Meinel (jameinel)]

Fine w me.
Merge: approve

=:->
On Jun 28, 2011 4:28 PM, "Jelmer Vernooij" <email address hidden> wrote:
> Jelmer Vernooij has proposed merging
lp:~jeroen-hoekx/bzr-push-and-update/note into lp:bzr-push-and-update.
>
> Requested reviews:
> Bazaar Developers (bzr)
> Related bugs:
> Bug #360521 in Plugin to Update Remote Trees: "Warning about working trees
not updating not suppressed"
> https://bugs.launchpad.net/bzr-push-and-update/+bug/360521
>
> For more details, see:
>
https://code.launchpad.net/~jeroen-hoekx/bzr-push-and-update/note/+merge/66168
>
> The "this does not update the working tree" message uses warning() rather
than note() now.
> --
>
https://code.launchpad.net/~jeroen-hoekx/bzr-push-and-update/note/+merge/66168
> Your team Bazaar Developers is requested to review the proposed merge of
lp:~jeroen-hoekx/bzr-push-and-update/note into lp:bzr-push-and-update.

=== modified file '__init__.py'
--- __init__.py	2008-05-01 19:59:02 +0000
+++ __init__.py	2011-06-28 15:28:10 +0000
@@ -62,19 +62,19 @@
         # remote working trees suppressed, since our post-push hook will
         # actually update them.
         import re
-        orig_warning = builtins.warning
-        def wrapped_warning(msg):
-            if re.match('^This transport does not update.*(ssh://|sftp://)',
+        orig_note = trace.note
+        def wrapped_note(msg):
+            if re.match('^This transport does not update.*(ssh://|sftp://|bzr+ssh://)',
                         msg):
                 # Suppress warnings about not updating bzr+ssh and sftp working
                 # trees
                 return
-            orig_warning(msg)
-        builtins.warning = wrapped_warning
+            orig_note(msg)
+        trace.note = wrapped_note
         try:
             return builtins.cmd_push.run(self, *args, **kwargs)
         finally:
-            builtins.warning = orig_warning
+            trace.note = orig_note
 
 commands.register_command(cmd_push)