[MERGE] Shelf 5 / 5 for reals

[John Arbash Meinel]

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



...

>> We should probably be consistent with how we quote the filenames we
>> display.
> 
> Okay, I've quoted that.
> 
>> I'll also note that you don't test the display of the filename
>> as part of the 'diff' code, though perhaps that is tested elsewhere.
> 
> If it's not tested in test_diff, that would definitely be a hole in
> testing, but I don't see how it's relevant here.
> 
>> Do we want to be raising SystemExit, rather than a more bzr-specific
>> exit exception?
> 
> Well, it's very direct, and this is commmand-level functionality, so it
> felt okay to me.  But I've switched that to raise UserAbort.
> 
> Diff attached.
> 
> Aaron

Most commands that decide they need to stop raise BzrCommandError. I
realize this isn't an error as much as "user-requested we stop".

I know the existing shelf aborts with a strange:

bzr: ERROR: nothing to shelve

When there is
a) No changes
and
b) User hits cancel

So I don't suggest that we mimic that behavior exactly.

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

iEYEARECAAYFAkkPdJkACgkQJdeBCYSNAAOwdACgvYS19IIqdjQhMKhlgkXwMbsK
9z8AoMDaho5JD6Ikd1z8jT9keXKD5D3S
=bMlc
-----END PGP SIGNATURE-----