[MERGE] bundle commandline cleanup

[John Arbash Meinel]

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

Aaron Bentley wrote:
> John Arbash Meinel wrote:
> 
>>> Looking back, I think you are right. Just hard to tell from the diff.
>>> So the only thing is the url_for_display stuff. And +1 from me.
> 
> I've experimented, and I'm satisfied that StreamHandler expects unicode
> input, and so note expects unicode input.  It unconditionally writes
> utf-8, even though my locale here is latin-1.  So the safe thing to do
> is to provide only ASCII to note.
> 
> Aaron


One small thing, note (like mutter) already formats strings. So do this
instead:

             elif not base_specified:
- -                note('Using saved location: %s' % base)
+                note(('Using saved location: %s' % \
+                      urlutils.unescape_for_display(base, 'ascii')))
             base_branch = Branch.open(base)


# FIXME:
# note() doesn't pay attention to terminal_encoding() so
# we must format with 'ascii' to be safe
note('Using saved location: %s',
	urlutils.unescape_for_display(base, 'ascii'))

Otherwise go ahead and submit. We'll deal with note() later. :)

John
=:->
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (Cygwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFEo/xRJdeBCYSNAAMRAsynAKCqwH2yZvv9A8djjy3lzDl3+poAmgCgolNc
cFHy10avdFZB8fp4egKeEtw=
=8uWT
-----END PGP SIGNATURE-----