[PATCH 2 of 2 STABLE v2] transplant: fix emptied changeset message

[Patrick Mezard]

# HG changeset patch
# User Patrick Mezard <patrick at mezard.eu>
# Date 1343822899 -7200
# Branch stable
# Node ID 938d3c7ebfd1da41ee37c9facf1118ec18fd664d
# Parent  3fc1bd37e77731208359259575ac6ed06726189b
transplant: fix emptied changeset message

- Append an EOL
- State the changeset is skipped

diff --git a/hgext/transplant.py b/hgext/transplant.py
--- a/hgext/transplant.py
+++ b/hgext/transplant.py
@@ -285,7 +285,7 @@
         n = repo.commit(message, user, date, extra=extra, match=m,
                         editor=self.editor)
         if not n:
-            self.ui.warn(_('%s: empty changeset') % revlog.hex(node))
+            self.ui.warn(_('skipping emptied changeset %s\n') % short(node))
             return None
         if not merge:
             self.transplants.set(n, node)
diff --git a/tests/test-transplant.t b/tests/test-transplant.t
--- a/tests/test-transplant.t
+++ b/tests/test-transplant.t
@@ -629,6 +629,6 @@
   $ hg transplant -s ../binarysource 2
   searching for changes
   applying 7a7d57e15850
-  7a7d57e158501e51588f5fd3288b491cac77e0d8: empty changeset (no-eol)
+  skipping emptied changeset 7a7d57e15850
   $ cd ..