# HG changeset patch # User Matt Mackall # Date 1130211740 25200 # Node ID 3a0b69ea5708355a99d3506f0ff485ea3ac2bad0 # Parent d32dbf86b88da2fa51df0d15e0497f7f9b3c82de Remove deprecated commit -t option diff --git a/mercurial/commands.py b/mercurial/commands.py --- a/mercurial/commands.py +++ b/mercurial/commands.py @@ -743,10 +743,7 @@ def commit(ui, repo, *pats, **opts): The HGEDITOR or EDITOR environment variables are used to start an editor to add a commit comment. """ - if opts['text']: - ui.warn(_("Warning: -t and --text is deprecated," - " please use -m or --message instead.\n")) - message = opts['message'] or opts['text'] + message = opts['message'] logfile = opts['logfile'] if message and logfile: @@ -2188,7 +2185,6 @@ table = { ('I', 'include', [], _('include names matching the given patterns')), ('X', 'exclude', [], _('exclude names matching the given patterns')), ('m', 'message', "", _('use as commit message')), - ('t', 'text', "", _('commit message (deprecated: use -m)')), ('l', 'logfile', "", _('read the commit message from ')), ('d', 'date', "", _('record datecode as commit date')), ('u', 'user', "", _('record user as commiter'))], diff --git a/tests/test-update-reverse b/tests/test-update-reverse --- a/tests/test-update-reverse +++ b/tests/test-update-reverse @@ -7,7 +7,7 @@ hg commit -m "Added a" -d "0 0" touch main hg add main -hg commit -t "Added main" -d "0 0" +hg commit -m "Added main" -d "0 0" hg checkout 0 echo Main should be gone diff --git a/tests/test-update-reverse.out b/tests/test-update-reverse.out --- a/tests/test-update-reverse.out +++ b/tests/test-update-reverse.out @@ -1,4 +1,3 @@ -Warning: -t and --text is deprecated, please use -m or --message instead. Main should be gone a changeset: 3:91ebc10ed028