assorted cleanup
R=r, iant
CC=go-dev
http://go/go-review/1025024
diff --git a/lib/codereview/codereview.py b/lib/codereview/codereview.py
index a8ba540..e5878e2 100644
--- a/lib/codereview/codereview.py
+++ b/lib/codereview/codereview.py
@@ -1078,7 +1078,15 @@
sync_changes(ui, repo)
def sync_note(msg):
- if msg == 'resolving manifests\n' or msg == 'searching for changes\n':
+ # we run sync (pull -u) in verbose mode to get the
+ # list of files being updated, but that drags along
+ # a bunch of messages we don't care about.
+ # omit them.
+ if msg == 'resolving manifests\n':
+ return
+ if msg == 'searching for changes\n':
+ return
+ if msg == "couldn't find merge tool hgmerge\n":
return
sys.stdout.write(msg)
