# HG changeset patch # User Matt Mackall # Date 2014-12-09 18:39:23 # Node ID 2164226a5637bf7037be13c5913902a9e33fdcf1 # Parent 67045b5a903ae951dcc29cc812c28ebdd31e5775 graft: drop cset description from empty commit message This is either already redundant in the output or too verbose in quiet mode. diff --git a/mercurial/commands.py b/mercurial/commands.py --- a/mercurial/commands.py +++ b/mercurial/commands.py @@ -3498,8 +3498,9 @@ def graft(ui, repo, *revs, **opts): node = repo.commit(text=message, user=user, date=date, extra=extra, editor=editor) if node is None: - ui.warn(_('note: graft of %s created no changes to commit\n') % - desc) + ui.warn( + _('note: graft of %d:%s created no changes to commit\n') % + (ctx.rev(), ctx)) finally: wlock.release() diff --git a/tests/test-graft.t b/tests/test-graft.t --- a/tests/test-graft.t +++ b/tests/test-graft.t @@ -716,5 +716,6 @@ Empty graft $ hg up -qr 26 $ hg tag -f something $ hg graft -qr 27 - $ hg graft -qf 27 - note: graft of 27:3aaa8b6725f0 "28" created no changes to commit + $ hg graft -f 27 + grafting 27:3aaa8b6725f0 "28" + note: graft of 27:3aaa8b6725f0 created no changes to commit