Mercurial > evolve
changeset 3096:c458c0856ee5 stable
topic-mode: add missing end line in topic-mode warning
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Fri, 20 Oct 2017 21:43:13 +0200 |
| parents | 7a5941d91fc0 |
| children | f06c86fd2ffd |
| files | hgext3rd/topic/__init__.py tests/test-topic-mode.t |
| diffstat | 2 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext3rd/topic/__init__.py Fri Oct 20 20:58:35 2017 +0200 +++ b/hgext3rd/topic/__init__.py Fri Oct 20 21:43:13 2017 +0200 @@ -1010,7 +1010,7 @@ elif notopic and maywarn: ui.warn(_("warning: new draft commit without topic\n")) if not ui.quiet: - ui.warn(("(%s)") % hint) + ui.warn(("(%s)\n") % hint) elif notopic and mayrandom: with repo.vfs.open('topic', 'w') as f: f.write(randomname.randomtopicname(ui))
--- a/tests/test-topic-mode.t Fri Oct 20 20:58:35 2017 +0200 +++ b/tests/test-topic-mode.t Fri Oct 20 21:43:13 2017 +0200 @@ -52,13 +52,13 @@ $ hg add a $ hg ci -m "Added a" warning: new draft commit without topic - (see 'hg help -e topic.topic-mode' for details) (no-eol) + (see 'hg help -e topic.topic-mode' for details) (same test, checking we abort before the editor) $ EDITOR=cat hg ci --amend -m "Added a" --edit warning: new draft commit without topic - (see 'hg help -e topic.topic-mode' for details) (no-eol) + (see 'hg help -e topic.topic-mode' for details) $ hg ci --amend -m "added a'" --config experimental.topic-mode=ignore $ hg log changeset: 2:2e862d8b5eff @@ -103,7 +103,7 @@ (branch merge, don't forget to commit) $ hg commit -m "merge mytopic" warning: new draft commit without topic - (see 'hg help -e topic.topic-mode' for details) (no-eol) + (see 'hg help -e topic.topic-mode' for details) $ hg log -G @ changeset: 3:676a445d1c09