Rev 5889: (vila) Do not show exception to user on pointless commit error. (Jonathan in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 5889 [merge]
revision-id: pqm at pqm.ubuntu.com-20110518100231-sow1yki9r9mghg61
parent: pqm at pqm.ubuntu.com-20110518091137-0b8tbe13tfw14ogn
parent: jriddell at canonical.com-20110518080224-xh74r2b2d5fyz21p
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2011-05-18 10:02:31 +0000
message:
  (vila) Do not show exception to user on pointless commit error. (Jonathan
   Riddell)
modified:
  bzrlib/commit.py               commit.py-20050511101309-79ec1a0168e0e825
  bzrlib/tests/blackbox/test_commit.py test_commit.py-20060212094538-ae88fc861d969db0
  doc/en/release-notes/bzr-2.4.txt bzr2.4.txt-20110114053217-k7ym9jfz243fddjm-1
=== modified file 'bzrlib/commit.py'
--- a/bzrlib/commit.py	2011-05-14 21:02:06 +0000
+++ b/bzrlib/commit.py	2011-05-17 14:27:30 +0000
@@ -443,7 +443,6 @@
         except Exception, e:
             mutter("aborting commit write group because of exception:")
             trace.log_exception_quietly()
-            note("aborting commit write group: %r" % (e,))
             self.builder.abort()
             raise
 

=== modified file 'bzrlib/tests/blackbox/test_commit.py'
--- a/bzrlib/tests/blackbox/test_commit.py	2011-04-18 03:15:03 +0000
+++ b/bzrlib/tests/blackbox/test_commit.py	2011-05-17 14:27:30 +0000
@@ -57,7 +57,6 @@
             err,
             DocTestMatches("""\
 Committing to: ...
-aborting commit write group: PointlessCommit(No changes to commit)
 bzr: ERROR: No changes to commit.\
  Please 'bzr add' the files you want to commit,\
  or use --unchanged to force an empty commit.

=== modified file 'doc/en/release-notes/bzr-2.4.txt'
--- a/doc/en/release-notes/bzr-2.4.txt	2011-05-18 09:11:37 +0000
+++ b/doc/en/release-notes/bzr-2.4.txt	2011-05-18 10:02:31 +0000
@@ -89,6 +89,9 @@
   reporting subdirectories that were tree references (in formats that
   supported them). (John Arbash Meinel, #764677)
 
+* Do not show exception to user on pointless commit error (Jonathan
+  Riddell #317357)
+
 * ``WT.update_basis_by_delta`` no longer requires that the deltas match
   the current WT state. This allows ``update_basis_by_delta`` to be used
   by more commands than just commit. Updating with a delta allows us to