Patchwork [2,of,8] mq: add missing \n in warning

login
register
mail settings
Submitter Mads Kiilerich
Date Oct. 15, 2014, 3:09 a.m.
Message ID <11a264fc876af9214c91.1413342549@localhost.localdomain>
Download mbox | patch
Permalink /patch/6267/
State Accepted
Headers show

Comments

Mads Kiilerich - Oct. 15, 2014, 3:09 a.m.
# HG changeset patch
# User Mads Kiilerich <madski@unity3d.com>
# Date 1413339147 -7200
#      Wed Oct 15 04:12:27 2014 +0200
# Node ID 11a264fc876af9214c911d17e99f3ba8d08c171a
# Parent  6475983d4ed263172d1b54b1bc487fc857e4f7fb
mq: add missing \n in warning
Matt Mackall - Oct. 15, 2014, 4:44 p.m.
On Wed, 2014-10-15 at 05:09 +0200, Mads Kiilerich wrote:
> # HG changeset patch
> # User Mads Kiilerich <madski@unity3d.com>
> # Date 1413339147 -7200
> #      Wed Oct 15 04:12:27 2014 +0200
> # Node ID 11a264fc876af9214c911d17e99f3ba8d08c171a
> # Parent  6475983d4ed263172d1b54b1bc487fc857e4f7fb
> mq: add missing \n in warning

> -  cleaning up working directory...done
> +  cleaning up working directory...
> +  done

I think the original output was as intended.

Patch

diff --git a/hgext/mq.py b/hgext/mq.py
--- a/hgext/mq.py
+++ b/hgext/mq.py
@@ -1375,7 +1375,7 @@  class queue(object):
                     ret = self.apply(repo, s, list, all_files=all_files,
                                      tobackup=tobackup, keepchanges=keepchanges)
             except: # re-raises
-                self.ui.warn(_('cleaning up working directory...'))
+                self.ui.warn(_('cleaning up working directory...\n'))
                 node = repo.dirstate.p1()
                 hg.revert(repo, node, None)
                 # only remove unknown files that we know we touched or
diff --git a/tests/test-mq-qpush-fail.t b/tests/test-mq-qpush-fail.t
--- a/tests/test-mq-qpush-fail.t
+++ b/tests/test-mq-qpush-fail.t
@@ -40,7 +40,8 @@  test qpush on empty series
   applying bad-patch
   transaction abort!
   rollback completed
-  cleaning up working directory...done
+  cleaning up working directory...
+  done
   abort: decoding near '\xe9': 'ascii' codec can't decode byte 0xe9 in position 0: ordinal not in range(128)! (esc)
   [255]
   $ hg parents