{"thread":{"id":"405","subject":"[PATCH] Rename usage and error message strings + rpull/rpush commands","startedAt":"2005-04-30T01:49:24Z","lastAt":"2005-04-30T01:49:24Z","messageCount":1,"participants":["Jonas Fonseca"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"2228","messageId":"20050430014924.GA11210@diku.dk","threadId":"405","inReplyTo":null,"subject":"[PATCH] Rename usage and error message strings + rpull/rpush commands","fromName":"Jonas Fonseca","fromEmail":"fonseca@diku.dk","sentAt":"2005-04-30T01:49:24Z","receivedAt":"2005-04-30T01:49:24Z","isPatch":true,"sender":{"key":"fonseca@diku.dk","avatar":"https://gravatar.com/avatar/f82f3ad698717c51873b020c750a92438c820a24056dc39fe4d07baa10a92264?d=mp&s=160"},"body":"[ Sorry for the resend. Forgot to sign off and CC the ML. ]\n\nDon't know if renaming the program identification strings are desirable.\nHowever, the remote command used by rpull/rpush should probably be\nchanged.\n\n cat-file.c         |   10 +++++-----\n commit-tree.c      |    2 +-\n convert-cache.c    |    2 +-\n diff-cache.c       |    2 +-\n diff-files.c       |    2 +-\n diff-tree-helper.c |    2 +-\n diff-tree.c        |    4 ++--\n fsck-cache.c       |    4 ++--\n http-pull.c        |    2 +-\n ls-tree.c          |    2 +-\n merge-base.c       |    2 +-\n merge-cache.c      |    8 ++++----\n read-tree.c        |    2 +-\n rev-list.c         |    2 +-\n rev-tree.c         |    4 ++--\n rpull.c            |    4 ++--\n rpush.c            |    4 ++--\n show-files.c       |    2 +-\n tar-tree.c         |   10 +++++-----\n unpack-file.c      |    2 +-\n 20 files changed, 36 insertions(+), 36 deletions(-)\n\nIndex: cat-file.c\n===================================================================\n--- c1546808797f6a3c4e6ae82069cee3dc316fbf24/cat-file.c  (mode:100644 sha1:3c47d79a16305d326a65768fe9f37ee25928510b)\n+++ uncommitted/cat-file.c  (mode:100644)\n@@ -13,17 +13,17 @@\n \tunsigned long size;\n \n \tif (argc != 3 || get_sha1_hex(argv[2], sha1))\n-\t\tusage(\"cat-file [-t | tagname] <sha1>\");\n+\t\tusage(\"git-cat-file [-t | tagname] <sha1>\");\n \tbuf = read_sha1_file(sha1, type, &size);\n \tif (!buf)\n-\t\tdie(\"cat-file %s: bad file\", argv[2]);\n+\t\tdie(\"git-cat-file %s: bad file\", argv[2]);\n \tif (!strcmp(\"-t\", argv[1])) {\n \t\tbuf = type;\n \t\tsize = strlen(type);\n \t\ttype[size] = '\\n';\n \t\tsize++;\n \t} else if (strcmp(type, argv[1])) {\n-\t\tdie(\"cat-file %s: bad tag\", argv[2]);\n+\t\tdie(\"git-cat-file %s: bad tag\", argv[2]);\n \t}\n \n \twhile (size > 0) {\n@@ -34,9 +34,9 @@\n \t\t\t/* Ignore epipe */\n \t\t\tif (errno == EPIPE)\n \t\t\t\tbreak;\n-\t\t\tdie(\"cat-file: %s\", strerror(errno));\n+\t\t\tdie(\"git-cat-file: %s\", strerror(errno));\n \t\t} else if (!ret) {\n-\t\t\tdie(\"cat-file: disk full?\");\n+\t\t\tdie(\"git-cat-file: disk full?\");\n \t\t}\n \t\tsize -= ret;\n \t\tbuf += ret;\nIndex: commit-tree.c\n===================================================================\n--- c1546808797f6a3c4e6ae82069cee3dc316fbf24/commit-tree.c  (mode:100644 sha1:23de13361944ad7ba7c5320cf7cdd04e81842c60)\n+++ uncommitted/commit-tree.c  (mode:100644)\n@@ -240,7 +240,7 @@\n  */\n #define MAXPARENT (16)\n \n-static char *commit_tree_usage = \"commit-tree <sha1> [-p <sha1>]* < changelog\";\n+static char *commit_tree_usage = \"git-commit-tree <sha1> [-p <sha1>]* < changelog\";\n \n int main(int argc, char **argv)\n {\nIndex: convert-cache.c\n===================================================================\n--- c1546808797f6a3c4e6ae82069cee3dc316fbf24/convert-cache.c  (mode:100644 sha1:631d1aa910e7328c99642495f93908c749074f91)\n+++ uncommitted/convert-cache.c  (mode:100644)\n@@ -304,7 +304,7 @@\n \tstruct entry *entry;\n \n \tif (argc != 2 || get_sha1_hex(argv[1], sha1))\n-\t\tusage(\"convert-cache <sha1>\");\n+\t\tusage(\"git-convert-cache <sha1>\");\n \n \tentry = convert_entry(sha1);\n \tprintf(\"new sha1: %s\\n\", sha1_to_hex(entry->new_sha1));\nIndex: diff-cache.c\n===================================================================\n--- c1546808797f6a3c4e6ae82069cee3dc316fbf24/diff-cache.c  (mode:100644 sha1:899e37361e5d34a38e4746b3cd290d9b96a6c8f8)\n+++ uncommitted/diff-cache.c  (mode:100644)\n@@ -143,7 +143,7 @@\n }\n \n static char *diff_cache_usage =\n-\"diff-cache [-r] [-z] [-p] [--cached] <tree sha1>\";\n+\"git-diff-cache [-r] [-z] [-p] [--cached] <tree sha1>\";\n \n int main(int argc, char **argv)\n {\nIndex: diff-files.c\n===================================================================\n--- c1546808797f6a3c4e6ae82069cee3dc316fbf24/diff-files.c  (mode:100644 sha1:fdd7dd4b0cc8c92a18ddaf0bcf8c9675fcab303b)\n+++ uncommitted/diff-files.c  (mode:100644)\n@@ -7,7 +7,7 @@\n #include \"diff.h\"\n \n static const char *show_diff_usage =\n-\"show-diff [-p] [-q] [-r] [-z] [paths...]\";\n+\"git-show-diff [-p] [-q] [-r] [-z] [paths...]\";\n \n static int generate_patch = 0;\n static int line_termination = '\\n';\nIndex: diff-tree-helper.c\n===================================================================\n--- c1546808797f6a3c4e6ae82069cee3dc316fbf24/diff-tree-helper.c  (mode:100644 sha1:282b649f318cf3fa19c7f01da94ba590126f5443)\n+++ uncommitted/diff-tree-helper.c  (mode:100644)\n@@ -104,7 +104,7 @@\n }\n \n static const char *diff_tree_helper_usage =\n-\"diff-tree-helper [-R] [-z] paths...\";\n+\"git-diff-tree-helper [-R] [-z] paths...\";\n \n int main(int ac, const char **av) {\n \tstruct strbuf sb;\nIndex: diff-tree.c\n===================================================================\n--- c1546808797f6a3c4e6ae82069cee3dc316fbf24/diff-tree.c  (mode:100644 sha1:e7a5b7cc76f5d80e602184f1ef12f502d53a552b)\n+++ uncommitted/diff-tree.c  (mode:100644)\n@@ -227,7 +227,7 @@\n \t\t\tupdate_tree_entry(&tree2, &size2);\n \t\t\tcontinue;\n \t\t}\n-\t\tdie(\"diff-tree: internal error\");\n+\t\tdie(\"git-diff-tree: internal error\");\n \t}\n \treturn 0;\n }\n@@ -250,7 +250,7 @@\n \treturn retval;\n }\n \n-static char *diff_tree_usage = \"diff-tree [-r] [-z] <tree sha1> <tree sha1>\";\n+static char *diff_tree_usage = \"git-diff-tree [-r] [-z] <tree sha1> <tree sha1>\";\n \n int main(int argc, char **argv)\n {\nIndex: fsck-cache.c\n===================================================================\n--- c1546808797f6a3c4e6ae82069cee3dc316fbf24/fsck-cache.c  (mode:100644 sha1:280a104050b665515418c00c33af8e6b0b0e2101)\n+++ uncommitted/fsck-cache.c  (mode:100644)\n@@ -51,7 +51,7 @@\n static int fsck_tree(struct tree *item)\n {\n \tif (item->has_full_path) {\n-\t\tfprintf(stderr, \"warning: fsck-cache: tree %s \"\n+\t\tfprintf(stderr, \"warning: git-fsck-cache: tree %s \"\n \t\t\t\"has full pathnames in it\\n\", \n \t\t\tsha1_to_hex(item->object.sha1));\n \t}\n@@ -156,7 +156,7 @@\n \t\t\tcontinue;\n \t\t}\n \t\tif (*arg == '-')\n-\t\t\tusage(\"fsck-cache [--tags] [[--unreachable] <head-sha1>*]\");\n+\t\t\tusage(\"git-fsck-cache [--tags] [[--unreachable] <head-sha1>*]\");\n \t}\n \n \tsha1_dir = getenv(DB_ENVIRONMENT) ? : DEFAULT_DB_ENVIRONMENT;\nIndex: http-pull.c\n===================================================================\n--- c1546808797f6a3c4e6ae82069cee3dc316fbf24/http-pull.c  (mode:100644 sha1:192dcc370dee47c52c72915394bb6f2a79f64e12)\n+++ uncommitted/http-pull.c  (mode:100644)\n@@ -180,7 +180,7 @@\n \t\targ++;\n \t}\n \tif (argc < arg + 2) {\n-\t\tusage(\"http-pull [-c] [-t] [-a] commit-id url\");\n+\t\tusage(\"git-http-pull [-c] [-t] [-a] commit-id url\");\n \t\treturn 1;\n \t}\n \tcommit_id = argv[arg];\nIndex: ls-tree.c\n===================================================================\n--- c1546808797f6a3c4e6ae82069cee3dc316fbf24/ls-tree.c  (mode:100644 sha1:d2ab02e3484efaf851c50574e603c785d713bc87)\n+++ uncommitted/ls-tree.c  (mode:100644)\n@@ -80,7 +80,7 @@\n \treturn 0;\n }\n \n-static const char *ls_tree_usage = \"ls-tree [-r] [-z] <key>\";\n+static const char *ls_tree_usage = \"git-ls-tree [-r] [-z] <key>\";\n \n int main(int argc, char **argv)\n {\nIndex: merge-base.c\n===================================================================\n--- c1546808797f6a3c4e6ae82069cee3dc316fbf24/merge-base.c  (mode:100644 sha1:2c40881302e586366f03ae6ac6e7c0035847e2f0)\n+++ uncommitted/merge-base.c  (mode:100644)\n@@ -60,7 +60,7 @@\n \tif (argc != 3 ||\n \t    get_sha1_hex(argv[1], rev1key) ||\n \t    get_sha1_hex(argv[2], rev2key)) {\n-\t\tusage(\"merge-base <commit-id> <commit-id>\");\n+\t\tusage(\"git-merge-base <commit-id> <commit-id>\");\n \t}\n \trev1 = lookup_commit(rev1key);\n \trev2 = lookup_commit(rev2key);\nIndex: merge-cache.c\n===================================================================\n--- c1546808797f6a3c4e6ae82069cee3dc316fbf24/merge-cache.c  (mode:100644 sha1:11079b1cda9c50856a636a19bc41204903f1b522)\n+++ uncommitted/merge-cache.c  (mode:100644)\n@@ -33,7 +33,7 @@\n \tint found;\n \t\n \tif (pos >= active_nr)\n-\t\tdie(\"merge-cache: %s not in the cache\", path);\n+\t\tdie(\"git-merge-cache: %s not in the cache\", path);\n \targuments[0] = pgm;\n \targuments[1] = \"\";\n \targuments[2] = \"\";\n@@ -58,7 +58,7 @@\n \t\targuments[stage + 4] = ownbuf[stage];\n \t} while (++pos < active_nr);\n \tif (!found)\n-\t\tdie(\"merge-cache: %s not in the cache\", path);\n+\t\tdie(\"git-merge-cache: %s not in the cache\", path);\n \trun_program();\n \treturn found;\n }\n@@ -91,7 +91,7 @@\n \tint i, force_file = 0;\n \n \tif (argc < 3)\n-\t\tusage(\"merge-cache <merge-program> (-a | <filename>*)\");\n+\t\tusage(\"git-merge-cache <merge-program> (-a | <filename>*)\");\n \n \tread_cache();\n \n@@ -107,7 +107,7 @@\n \t\t\t\tmerge_all();\n \t\t\t\tcontinue;\n \t\t\t}\n-\t\t\tdie(\"merge-cache: unknown option %s\", arg);\n+\t\t\tdie(\"git-merge-cache: unknown option %s\", arg);\n \t\t}\n \t\tmerge_file(arg);\n \t}\nIndex: read-tree.c\n===================================================================\n--- c1546808797f6a3c4e6ae82069cee3dc316fbf24/read-tree.c  (mode:100644 sha1:604884a983e087e25afccc1c52beff3883036e58)\n+++ uncommitted/read-tree.c  (mode:100644)\n@@ -156,7 +156,7 @@\n \t}\n }\n \n-static char *read_tree_usage = \"read-tree (<sha> | -m <sha1> [<sha2> <sha3>])\";\n+static char *read_tree_usage = \"git-read-tree (<sha> | -m <sha1> [<sha2> <sha3>])\";\n \n int main(int argc, char **argv)\n {\nIndex: rev-list.c\n===================================================================\n--- c1546808797f6a3c4e6ae82069cee3dc316fbf24/rev-list.c  (mode:100644 sha1:77bfc29db1aad08ba9d7d87ce08d33d4a88e74e3)\n+++ uncommitted/rev-list.c  (mode:100644)\n@@ -8,7 +8,7 @@\n \tstruct commit *commit;\n \n \tif (argc != 2 || get_sha1_hex(argv[1], sha1))\n-\t\tusage(\"rev-list <commit-id>\");\n+\t\tusage(\"git-rev-list <commit-id>\");\n \n \tcommit = lookup_commit(sha1);\n \tif (!commit || parse_commit(commit) < 0)\nIndex: rev-tree.c\n===================================================================\n--- c1546808797f6a3c4e6ae82069cee3dc316fbf24/rev-tree.c  (mode:100644 sha1:03c900f459c0e6ae7fc9455589be00375f44eac8)\n+++ uncommitted/rev-tree.c  (mode:100644)\n@@ -69,7 +69,7 @@\n }\n \n /*\n- * Usage: rev-tree [--edges] [--cache <cache-file>] <commit-id> [<commit-id2>]\n+ * Usage: git-rev-tree [--edges] [--cache <cache-file>] <commit-id> [<commit-id2>]\n  *\n  * The cache-file can be quite important for big trees. This is an\n  * expensive operation if you have to walk the whole chain of\n@@ -103,7 +103,7 @@\n \t\t\tbasemask |= 1<<nr;\n \t\t}\n \t\tif (nr >= MAX_COMMITS || get_sha1_hex(arg, sha1[nr]))\n-\t\t\tusage(\"rev-tree [--edges] [--cache <cache-file>] <commit-id> [<commit-id>]\");\n+\t\t\tusage(\"git-rev-tree [--edges] [--cache <cache-file>] <commit-id> [<commit-id>]\");\n \t\tprocess_commit(sha1[nr]);\n \t\tnr++;\n \t}\nIndex: rpull.c\n===================================================================\n--- c1546808797f6a3c4e6ae82069cee3dc316fbf24/rpull.c  (mode:100644 sha1:c27af2c2464de28732b8ad1fff3ed8a0804250d6)\n+++ uncommitted/rpull.c  (mode:100644)\n@@ -108,13 +108,13 @@\n \t\targ++;\n \t}\n \tif (argc < arg + 2) {\n-\t\tusage(\"rpull [-c] [-t] [-a] commit-id url\");\n+\t\tusage(\"git-rpull [-c] [-t] [-a] commit-id url\");\n \t\treturn 1;\n \t}\n \tcommit_id = argv[arg];\n \turl = argv[arg + 1];\n \n-\tif (setup_connection(&fd_in, &fd_out, \"rpush\", url, arg, argv + 1))\n+\tif (setup_connection(&fd_in, &fd_out, \"git-rpush\", url, arg, argv + 1))\n \t\treturn 1;\n \n \tget_sha1_hex(commit_id, sha1);\nIndex: rpush.c\n===================================================================\n--- c1546808797f6a3c4e6ae82069cee3dc316fbf24/rpush.c  (mode:100644 sha1:0293a1a46311d7e20b13177143741ab9d6d0d201)\n+++ uncommitted/rpush.c  (mode:100644)\n@@ -56,12 +56,12 @@\n                 arg++;\n         }\n         if (argc < arg + 2) {\n-                usage(\"rpush [-c] [-t] [-a] commit-id url\");\n+                usage(\"git-rpush [-c] [-t] [-a] commit-id url\");\n                 return 1;\n         }\n \tcommit_id = argv[arg];\n \turl = argv[arg + 1];\n-\tif (setup_connection(&fd_in, &fd_out, \"rpull\", url, arg, argv + 1))\n+\tif (setup_connection(&fd_in, &fd_out, \"git-rpull\", url, arg, argv + 1))\n \t\treturn 1;\n \n \tservice(fd_in, fd_out);\nIndex: show-files.c\n===================================================================\n--- c1546808797f6a3c4e6ae82069cee3dc316fbf24/show-files.c  (mode:100644 sha1:d4061f83031447aa9ee8ad16544e7bc084908838)\n+++ uncommitted/show-files.c  (mode:100644)\n@@ -207,7 +207,7 @@\n }\n \n static const char *show_files_usage =\n-\t\"show-files [-z] (--[cached|deleted|others|stage|unmerged])* \"\n+\t\"git-show-files [-z] (--[cached|deleted|others|stage|unmerged])* \"\n \t\"[ --ignored [--exclude=<pattern>] [--exclude-from=<file>) ]\";\n \n int main(int argc, char **argv)\nIndex: tar-tree.c\n===================================================================\n--- c1546808797f6a3c4e6ae82069cee3dc316fbf24/tar-tree.c  (mode:100644 sha1:5cc7cfef6db1269d81589b82255537fb64ba02fa)\n+++ uncommitted/tar-tree.c  (mode:100644)\n@@ -4,7 +4,7 @@\n #define RECORDSIZE\t(512)\n #define BLOCKSIZE\t(RECORDSIZE * 20)\n \n-static const char *tar_tree_usage = \"tar-tree <key> [basedir]\";\n+static const char *tar_tree_usage = \"git-tar-tree <key> [basedir]\";\n \n static char block[BLOCKSIZE];\n static unsigned long offset;\n@@ -27,9 +27,9 @@\n \t\t\t\tcontinue;\n \t\t\tif (errno == EPIPE)\n \t\t\t\texit(0);\n-\t\t\tdie(\"tar-tree: %s\", strerror(errno));\n+\t\t\tdie(\"git-tar-tree: %s\", strerror(errno));\n \t\t} else if (!ret) {\n-\t\t\tdie(\"tar-tree: disk full?\");\n+\t\t\tdie(\"git-tar-tree: disk full?\");\n \t\t}\n \t\tsize -= ret;\n \t\tbuf += ret;\n@@ -176,7 +176,7 @@\n \tif (size > 99)\n \t\tsize++;\n \tif (size > RECORDSIZE)\n-\t\tdie(\"tar-tree: extended header too big, wtf?\");\n+\t\tdie(\"git-tar-tree: extended header too big, wtf?\");\n \twrite_header(NULL, NULL, NULL, headerfilename, 0100600, size);\n \n \trecords = block + offset;\n@@ -202,7 +202,7 @@\n \n \tnamelen = path_len(S_ISDIR(mode), basepath, prefix, path);\n \tif (namelen > 500) {\n-\t\tdie(\"tar-tree: name too log of object %s\\n\", sha1_to_hex(sha1));\n+\t\tdie(\"git-tar-tree: name too log of object %s\\n\", sha1_to_hex(sha1));\n \t} else if (namelen > 100) {\n \t\tchar *sha1_hex = sha1_to_hex(sha1);\n \t\tchar headerfilename[51];\nIndex: unpack-file.c\n===================================================================\n--- c1546808797f6a3c4e6ae82069cee3dc316fbf24/unpack-file.c  (mode:100644 sha1:6ff3d51c182627f42b104932ecea9b95d6225a5d)\n+++ uncommitted/unpack-file.c  (mode:100644)\n@@ -27,7 +27,7 @@\n \tunsigned char sha1[20];\n \n \tif (argc != 2 || get_sha1_hex(argv[1], sha1))\n-\t\tusage(\"unpack-file.c <sha1>\");\n+\t\tusage(\"git-unpack-file <sha1>\");\n \n \tputs(create_temp_file(sha1));\n \treturn 0;\n-- \nJonas Fonseca\n"}]}