##// END OF EJS Templates
remove the deprecated --text (t) option to rawcommit and tag
Benoit Boissinot -
r1496:3cf287a0 default
parent child Browse files
Show More
@@ -1705,10 +1705,7 b' def rawcommit(ui, repo, *flist, **rc):'
1705 1705 This command is not intended to be used by normal users, as it is
1706 1706 primarily useful for importing from other SCMs.
1707 1707 """
1708 if rc['text']:
1709 ui.warn(_("Warning: -t and --text is deprecated,"
1710 " please use -m or --message instead.\n"))
1711 message = rc['message'] or rc['text']
1708 message = rc['message']
1712 1709 if not message and rc['logfile']:
1713 1710 try:
1714 1711 message = open(rc['logfile']).read()
@@ -1980,9 +1977,6 b' def tag(ui, repo, name, rev=None, **opts'
1980 1977 similarly to other project files and can be hand-edited if
1981 1978 necessary.
1982 1979 """
1983 if opts['text']:
1984 ui.warn(_("Warning: -t and --text is deprecated,"
1985 " please use -m or --message instead.\n"))
1986 1980 if name == "tip":
1987 1981 raise util.Abort(_("the name 'tip' is reserved"))
1988 1982 if rev:
@@ -2007,7 +2001,7 b' def tag(ui, repo, name, rev=None, **opts'
2007 2001 if repo.dirstate.state(".hgtags") == '?':
2008 2002 repo.add([".hgtags"])
2009 2003
2010 message = (opts['message'] or opts['text'] or
2004 message = (opts['message'] or
2011 2005 _("Added tag %s for changeset %s") % (name, r))
2012 2006 try:
2013 2007 repo.commit([".hgtags"], message, opts['user'], opts['date'])
@@ -2291,7 +2285,6 b' table = {'
2291 2285 ('u', 'user', "", _('user')),
2292 2286 ('F', 'files', "", _('file list')),
2293 2287 ('m', 'message', "", _('commit message')),
2294 ('t', 'text', "", _('commit message (deprecated: use -m)')),
2295 2288 ('l', 'logfile', "", _('commit message file'))],
2296 2289 _('hg rawcommit [OPTION]... [FILE]...')),
2297 2290 "recover": (recover, [], _("hg recover")),
@@ -2339,7 +2332,6 b' table = {'
2339 2332 (tag,
2340 2333 [('l', 'local', None, _('make the tag local')),
2341 2334 ('m', 'message', "", _('message for tag commit log entry')),
2342 ('t', 'text', "", _('commit message (deprecated: use -m)')),
2343 2335 ('d', 'date', "", _('record datecode as commit date')),
2344 2336 ('u', 'user', "", _('record user as commiter'))],
2345 2337 _('hg tag [OPTION]... NAME [REV]')),
General Comments 0
You need to be logged in to leave comments. Login now