# HG changeset patch
# User mpm@selenic.com
# Date 1120373675 28800
# Node ID eb46971fc57f3752c00f61f4f9c747e3f6ed2f53
# Parent  38d106db75bc5b267463482d5720020367dd2b85
options: kill -d for debug

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

options: kill -d for debug

You must now use --debug.
This is a preparatory step for changing the option parsing from:

hg [global-opts] <command> [command-opts]

to

hg [global-opts] <command> [global or command opts]


manifest hash: ec5ecc687340baa109a98b742f1cd8d1f4aadeed
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)

iD8DBQFCx4urywK+sNU5EO8RAl90AJ0fwKU/GwHpJvlTFl5naeJbkceWewCgh4jK
kaTSSodACgPzgbFiid5RL4Y=
=siEe
-----END PGP SIGNATURE-----


diff --git a/mercurial/commands.py b/mercurial/commands.py
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
@@ -893,7 +893,7 @@ table = {
                   [('t', 'text', "", 'commit text'),
                    ('A', 'addremove', None, 'run add/remove during commit'),
                    ('l', 'logfile', "", 'commit text file'),
-                   ('d', 'date', "", 'data'),
+                   ('d', 'date', "", 'date code'),
                    ('u', 'user', "", 'user')],
                   'hg commit [files]'),
     "copy": (copy, [], 'hg copy <source> <dest>'),
@@ -925,7 +925,7 @@ table = {
     "push": (push, [], 'hg push <destination>'),
     "rawcommit": (rawcommit,
                   [('p', 'parent', [], 'parent'),
-                   ('d', 'date', "", 'data'),
+                   ('d', 'date', "", 'date code'),
                    ('u', 'user', "", 'user'),
                    ('F', 'files', "", 'file list'),
                    ('t', 'text', "", 'commit text'),
@@ -945,7 +945,7 @@ table = {
               "hg serve [options]"),
     "status": (status, [], 'hg status'),
     "tag": (tag,  [('t', 'text', "", 'commit text'),
-                   ('d', 'date', "", 'date'),
+                   ('d', 'date', "", 'date code'),
                    ('u', 'user', "", 'user')],
             'hg tag [options] <name> [rev]'),
     "tags": (tags, [], 'hg tags'),
@@ -980,7 +980,7 @@ def run():
 def dispatch(args):
     options = {}
     opts = [('v', 'verbose', None, 'verbose'),
-            ('d', 'debug', None, 'debug'),
+            ('', 'debug', None, 'debug'),
             ('q', 'quiet', None, 'quiet'),
             ('', 'profile', None, 'profile'),
             ('R', 'repository', "", 'repository root directory'),
diff --git a/tests/test-conflict b/tests/test-conflict
--- a/tests/test-conflict
+++ b/tests/test-conflict
@@ -11,7 +11,7 @@ hg co 0
 echo "something else" > a
 hg commit -t branch2 -u test -d "0 0"
 export HGMERGE=merge
-hg -d up -m 1
+hg up -m 1
 hg id
 grep -Ev ">>>|<<<" a
 hg status
diff --git a/tests/test-conflict.out b/tests/test-conflict.out
--- a/tests/test-conflict.out
+++ b/tests/test-conflict.out
@@ -9,15 +9,9 @@
 + hg commit -t branch2 -u test -d '0 0'
 + export HGMERGE=merge
 + HGMERGE=merge
-+ hg -d up -m 1
++ hg up -m 1
 merge: warning: conflicts during merge
-resolving manifests
- ancestor 1c6e5a129854 local 35fedfab3325 remote a58017859bdc
- a versions differ, resolve
-working dir created .out, keeping
 merging a
-resolving a
-file a: other d7250518cb1b ancestor 68ba9db7a9e4
 merging a failed!
 + hg id
 32e80765d7fe+75234512624c+ tip
diff --git a/tests/test-copy b/tests/test-copy
--- a/tests/test-copy
+++ b/tests/test-copy
@@ -9,7 +9,7 @@ hg status
 cp a b
 hg copy a b
 hg status
-hg -d commit -t "2" -u test -d "0 0"
+hg --debug commit -t "2" -u test -d "0 0"
 hg history
 hg log a
 hexdump -C .hg/data/b.d
diff --git a/tests/test-copy.out b/tests/test-copy.out
--- a/tests/test-copy.out
+++ b/tests/test-copy.out
@@ -9,7 +9,7 @@
 + hg status
 A b
 ? .out
-+ hg -d commit -t 2 -u test -d '0 0'
++ hg --debug commit -t 2 -u test -d '0 0'
 b
  b: copy a:b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3
 + hg history
diff --git a/tests/test-flags b/tests/test-flags
--- a/tests/test-flags
+++ b/tests/test-flags
@@ -27,7 +27,7 @@ hg pull ../test2
 hg heads
 hg history
 
-hg -dv co -m
+hg -v co -m
 
 ls -l ../test[12]/a > foo
 cut -b 0-10 < foo
diff --git a/tests/test-flags.out b/tests/test-flags.out
--- a/tests/test-flags.out
+++ b/tests/test-flags.out
@@ -62,13 +62,10 @@ user:        test
 date:        Thu Jan  1 00:00:00 1970
 summary:     added a b
 
-+ hg -dv co -m
++ hg -v co -m
 resolving manifests
- ancestor f328b97f7c11 local e7f06daf1cdb remote 629f0b785e0e
- a versions differ, resolve
 merging a
 resolving a
-file a: other 37c42bd6cc03 ancestor b80de5d13875
 + ls -l ../test1/a ../test2/a
 + cut -b 0-10
 -rwxr-x---
diff --git a/tests/test-pull.out b/tests/test-pull.out
--- a/tests/test-pull.out
+++ b/tests/test-pull.out
@@ -18,4 +18,3 @@ 2ed2a3912a0b24502043eae84ee4b279c18b90dd
 pulling from http://localhost:20059/
 searching for changes
 no changes found
-killed!
diff --git a/tests/test-rawcommit1 b/tests/test-rawcommit1
--- a/tests/test-rawcommit1
+++ b/tests/test-rawcommit1
@@ -1,33 +1,33 @@
 #!/bin/sh -x
-hg -d init
+hg --debug init
 echo this is a1 > a
-hg -d add a
-hg -d commit -t0 -d "0 0" -u user
+hg add a
+hg commit -t0 -d "0 0" -u user
 echo this is b1 > b
-hg -d add b
-hg -d commit -t1 -d "0 0" -u user
-hg -d manifest 1
+hg add b
+hg commit -t1 -d "0 0" -u user
+hg manifest 1
 echo this is c1 > c
-hg -d rawcommit -p 1 -d "0 0" -u user -t2 c
-hg -d manifest 2
-hg -d parents
+hg rawcommit -p 1 -d "0 0" -u user -t2 c
+hg manifest 2
+hg parents
 rm b
-hg -d rawcommit -p 2 -d "0 0" -u user -t3 b
-hg -d manifest 3
-hg -d parents
+hg rawcommit -p 2 -d "0 0" -u user -t3 b
+hg manifest 3
+hg parents
 echo this is a22 > a
-hg -d rawcommit -p 3 -d "0 0" -u user -t4 a
-hg -d manifest 4
-hg -d parents
+hg rawcommit -p 3 -d "0 0" -u user -t4 a
+hg manifest 4
+hg parents
 echo this is c22 > c
-hg -d rawcommit -p 1 -d "0 0" -u user -t5 c
-hg -d manifest 5
-hg -d parents
+hg rawcommit -p 1 -d "0 0" -u user -t5 c
+hg manifest 5
+hg parents
 # merge, but no files changed
-hg -d rawcommit -p 4 -p 5 -d "0 0" -u user -t6
-hg -d manifest 6
-hg -d parents
+hg rawcommit -p 4 -p 5 -d "0 0" -u user -t6
+hg manifest 6
+hg parents
 # no changes what-so-ever
-hg -d rawcommit -p 6 -d "0 0" -u user -t7
-hg -d manifest 7
-hg -d parents
+hg rawcommit -p 6 -d "0 0" -u user -t7
+hg manifest 7
+hg parents
diff --git a/tests/test-rawcommit1.out b/tests/test-rawcommit1.out
--- a/tests/test-rawcommit1.out
+++ b/tests/test-rawcommit1.out
@@ -1,117 +1,83 @@
-+ hg -d init
++ hg --debug init
 + echo this is a1
-+ hg -d add a
-+ hg -d commit -t0 -d '0 0' -u user
-a
++ hg add a
++ hg commit -t0 -d '0 0' -u user
 + echo this is b1
-+ hg -d add b
-+ hg -d commit -t1 -d '0 0' -u user
-b
-+ hg -d manifest 1
++ hg add b
++ hg commit -t1 -d '0 0' -u user
++ hg manifest 1
 05f9e54f4c9b86b09099803d8b49a50edcb4eaab 644 a
 54837d97f2932a8194e69745a280a2c11e61ff9c 644 b
 + echo this is c1
-+ hg -d rawcommit -p 1 -d '0 0' -u user -t2 c
-+ hg -d manifest 2
++ hg rawcommit -p 1 -d '0 0' -u user -t2 c
++ hg manifest 2
 05f9e54f4c9b86b09099803d8b49a50edcb4eaab 644 a
 54837d97f2932a8194e69745a280a2c11e61ff9c 644 b
 76d5e637cbec1bcc04a5a3fa4bcc7d13f6847c00 644 c
-+ hg -d parents
++ hg parents
 changeset:   2:c4ef0ef0554dff3ceade68d75539e4f208a2be0a
 tag:         tip
-parent:      1:3cefbe5cc27b3a068b7a6899ddff22a9874a7e69
-parent:      -1:0000000000000000000000000000000000000000
-manifest:    2:f5d7a10be55c91e08fbd4f527ab313aff2761fc6
 user:        user
 date:        Thu Jan  1 00:00:00 1970
-files+:      c
-description:
-2
-
+summary:     2
 
 + rm b
-+ hg -d rawcommit -p 2 -d '0 0' -u user -t3 b
-+ hg -d manifest 3
++ hg rawcommit -p 2 -d '0 0' -u user -t3 b
++ hg manifest 3
 05f9e54f4c9b86b09099803d8b49a50edcb4eaab 644 a
 76d5e637cbec1bcc04a5a3fa4bcc7d13f6847c00 644 c
-+ hg -d parents
++ hg parents
 changeset:   3:923669243607c26c4c8f0c11f48c1182ce1a7aff
 tag:         tip
-parent:      2:c4ef0ef0554dff3ceade68d75539e4f208a2be0a
-parent:      -1:0000000000000000000000000000000000000000
-manifest:    3:1102cb6dde652ec2ba8cc2777e464853afa67cef
 user:        user
 date:        Thu Jan  1 00:00:00 1970
-files-:      b
-description:
-3
-
+summary:     3
 
 + echo this is a22
-+ hg -d rawcommit -p 3 -d '0 0' -u user -t4 a
-+ hg -d manifest 4
++ hg rawcommit -p 3 -d '0 0' -u user -t4 a
++ hg manifest 4
 d6e3c4976c13feb1728cd3ac851abaf7256a5c23 644 a
 76d5e637cbec1bcc04a5a3fa4bcc7d13f6847c00 644 c
-+ hg -d parents
++ hg parents
 changeset:   4:2361ec7b1da5142bce1285c50f3bb2960706263d
 tag:         tip
-parent:      3:923669243607c26c4c8f0c11f48c1182ce1a7aff
-parent:      -1:0000000000000000000000000000000000000000
-manifest:    4:cf4021621d6357e928385ffeee996f87c0bf991d
 user:        user
 date:        Thu Jan  1 00:00:00 1970
-files:       a
-description:
-4
-
+summary:     4
 
 + echo this is c22
-+ hg -d rawcommit -p 1 -d '0 0' -u user -t5 c
-+ hg -d manifest 5
++ hg rawcommit -p 1 -d '0 0' -u user -t5 c
++ hg manifest 5
 05f9e54f4c9b86b09099803d8b49a50edcb4eaab 644 a
 54837d97f2932a8194e69745a280a2c11e61ff9c 644 b
 3570202ceac2b52517df64ebd0a062cb0d8fe33a 644 c
-+ hg -d parents
++ hg parents
 changeset:   4:2361ec7b1da5142bce1285c50f3bb2960706263d
-parent:      3:923669243607c26c4c8f0c11f48c1182ce1a7aff
-parent:      -1:0000000000000000000000000000000000000000
-manifest:    4:cf4021621d6357e928385ffeee996f87c0bf991d
 user:        user
 date:        Thu Jan  1 00:00:00 1970
-files:       a
-description:
-4
+summary:     4
 
-
-+ hg -d rawcommit -p 4 -p 5 -d '0 0' -u user -t6
-+ hg -d manifest 6
++ hg rawcommit -p 4 -p 5 -d '0 0' -u user -t6
++ hg manifest 6
 d6e3c4976c13feb1728cd3ac851abaf7256a5c23 644 a
 76d5e637cbec1bcc04a5a3fa4bcc7d13f6847c00 644 c
-+ hg -d parents
++ hg parents
 changeset:   6:aaf55aee7b6249fd7d4ba295d98c4492ec2740d7
 tag:         tip
 parent:      4:2361ec7b1da5142bce1285c50f3bb2960706263d
 parent:      5:f8292b00383d88b470efcb2ea9c71409832ec9d6
-manifest:    6:71c4262e09a89666ee12a92fefa12085aad53243
 user:        user
 date:        Thu Jan  1 00:00:00 1970
-description:
-6
+summary:     6
 
-
-+ hg -d rawcommit -p 6 -d '0 0' -u user -t7
-+ hg -d manifest 7
++ hg rawcommit -p 6 -d '0 0' -u user -t7
++ hg manifest 7
 d6e3c4976c13feb1728cd3ac851abaf7256a5c23 644 a
 76d5e637cbec1bcc04a5a3fa4bcc7d13f6847c00 644 c
-+ hg -d parents
++ hg parents
 changeset:   7:836ff890ac9ecb8c4b7c209b3e8b93f8805ca5f0
 tag:         tip
-parent:      6:aaf55aee7b6249fd7d4ba295d98c4492ec2740d7
-parent:      -1:0000000000000000000000000000000000000000
-manifest:    7:c15305fbac9dd3f49bffcc17d659b2d06d10b9a2
 user:        user
 date:        Thu Jan  1 00:00:00 1970
-description:
-7
+summary:     7
 
-
diff --git a/tests/test-up-local-change b/tests/test-up-local-change
--- a/tests/test-up-local-change
+++ b/tests/test-up-local-change
@@ -26,8 +26,8 @@ hg commit -t "2" -u test -d "0 0"
 cd ../r2
 hg -q pull ../r1
 hg status
-hg -d up
-hg -d up -m
+hg --debug up
+hg --debug up -m
 hg parents
 hg -v history
 hg diff > ../d
diff --git a/tests/test-up-local-change.out b/tests/test-up-local-change.out
--- a/tests/test-up-local-change.out
+++ b/tests/test-up-local-change.out
@@ -25,7 +25,7 @@ diff -r c19d34741b0a a
 + hg -q pull ../r1
 + hg status
 C a
-+ hg -d up
++ hg --debug up
 resolving manifests
  ancestor a0c8bcbbb45c local a0c8bcbbb45c remote 1165e8bd193e
  a versions differ, resolve
@@ -34,7 +34,7 @@ getting b
 merging a
 resolving a
 file a: other d730145abbf9 ancestor b789fdd96dc2
-+ hg -d up -m
++ hg --debug up -m
 resolving manifests
  ancestor 1165e8bd193e local 1165e8bd193e remote 1165e8bd193e
 + hg parents