changeset 761:0fb498458905

Change all references to -t --text commit message to -m and --message.
author Andrew Thompson <andrewkt@aktzero.com>
date Fri, 22 Jul 2005 15:59:13 +0100
parents 73540173e14c
children 312b4a10d862
files doc/hg.1.txt mercurial/commands.py tests/README tests/test-basic tests/test-basic.out
diffstat 5 files changed, 8 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/doc/hg.1.txt
+++ b/doc/hg.1.txt
@@ -112,7 +112,7 @@ commit [-A -t -l <file> -m <text> -u <us
     Options:
 
     -A, --addremove       run addremove during commit
-    -m, --text <text>     use <text> as commit message
+    -m, --message <text>  use <text> as commit message
     -l, --logfile <file>  show the commit message for the given file
     -d, --date <datecode> record datecode as commit date
     -u, --user <user>     record user as commiter
@@ -358,7 +358,7 @@ tag [-l -m <text> -d <datecode> -u <user
 
     options:
     -l, --local           make the tag local
-    -m, --text <text>     message for tag commit log entry
+    -m, --message <text>  message for tag commit log entry
     -d, --date <datecode> datecode for commit
     -u, --user <user>     user for commit
 
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
@@ -460,7 +460,7 @@ def clone(ui, source, dest=None, **opts)
 
 def commit(ui, repo, *files, **opts):
     """commit the specified files or all outstanding changes"""
-    text = opts['text']
+    text = opts['message'] or opts['text']
     logfile = opts['logfile']
     if not text and logfile:
         try:
@@ -1101,7 +1101,7 @@ table = {
     "^commit|ci":
         (commit,
          [('A', 'addremove', None, 'run add/remove during commit'),
-          ('m', 'text', "", 'commit message'),
+          ('m', 'message', "", 'commit message'),
           ('t', 'text', "", 'commit message (deprecated: use -m)'),
           ('l', 'logfile', "", 'commit text file'),
           ('d', 'date', "", 'date code'),
--- a/tests/README
+++ b/tests/README
@@ -18,13 +18,13 @@ writing tests:
 
 - hg commit and hg up -m want user interaction
 
-  for commit use -t "text"
+  for commit use -m "text"
   for hg up -m, set HGMERGE to something noninteractive (like true or merge)
 
 - changeset hashes will change based on user and date which make
   things like hg history output change
 
-  use commit -t "test" -u test -d "0 0"
+  use commit -m "test" -u test -d "0 0"
 
 - diff will show the current time
 
--- a/tests/test-basic
+++ b/tests/test-basic
@@ -6,7 +6,7 @@ cd t
 hg init
 echo a > a
 hg add a
-hg commit -t test -d "0 0"
+hg commit -m test -d "0 0"
 hg history
 hg manifest
 hg cat a
--- a/tests/test-basic.out
+++ b/tests/test-basic.out
@@ -3,7 +3,7 @@
 + hg init
 + echo a
 + hg add a
-+ hg commit -t test -d '0 0'
++ hg commit -m test -d '0 0'
 + hg history
 changeset:   0:acb14030fe0a21b60322c440ad2d20cf7685a376
 tag:         tip