Rev 4498: Merge post-review fixes in file:///home/vila/src/bzr/experimental/cleanup-strict/

[Vincent Ladeuil]

At file:///home/vila/src/bzr/experimental/cleanup-strict/

------------------------------------------------------------
revno: 4498 [merge]
revision-id: v.ladeuil+lp at free.fr-20090630081555-jq9devz6h8rsd856
parent: v.ladeuil+lp at free.fr-20090629180209-a3xjmjo21qf6uw3r
parent: v.ladeuil+lp at free.fr-20090630080635-w9gmlrpta383usl1
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: cleanup-strict
timestamp: Tue 2009-06-30 10:15:55 +0200
message:
  Merge post-review fixes
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/errors.py               errors.py-20050309040759-20512168c4e14fbd
-------------- next part --------------
=== modified file 'NEWS'
--- a/NEWS	2009-06-29 11:07:16 +0000
+++ b/NEWS	2009-06-30 08:15:55 +0000
@@ -23,8 +23,8 @@
 
 * ``bzr push`` now aborts if uncommitted changes (including pending merges)
   are present in the working tree (if one is present) and no revision is
-  speficied. The ``push_strict`` option can be declared in a configuration
-  file.  option is used.  (Vincent Ladeuil, #284038, #322808, #65286)
+  speified. The configuration option ``push_strict`` can be used to set the
+  default for this behavior.  (Vincent Ladeuil, #284038, #322808, #65286)
 
 * ``bzr send`` now aborts if uncommitted changes (including pending merges)
   are present in the working tree and no revision is speficied. The

=== modified file 'bzrlib/errors.py'
--- a/bzrlib/errors.py	2009-06-19 00:33:36 +0000
+++ b/bzrlib/errors.py	2009-06-30 08:06:35 +0000
@@ -2778,7 +2778,8 @@
 
 class UncommittedChanges(BzrError):
 
-    _fmt = 'Working tree "%(display_url)s" has uncommitted changes.'
+    _fmt = ('Working tree "%(display_url)s" has uncommitted changes'
+            ' (See bzr status).')
 
     def __init__(self, tree):
         import bzrlib.urlutils as urlutils