{"thread":{"id":"661","subject":"[PATCH] cleanup of in-code names","startedAt":"2005-05-19T11:17:16Z","lastAt":"2005-05-19T11:17:16Z","messageCount":1,"participants":["Alexey Nezhdanov"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"3543","messageId":"20050519111717.4453.qmail@penza-gsm.ru","threadId":"661","inReplyTo":null,"subject":"[PATCH] cleanup of in-code names","fromName":"Alexey Nezhdanov","fromEmail":"snake@penza-gsm.ru","sentAt":"2005-05-19T11:17:16Z","receivedAt":"2005-05-19T11:17:16Z","isPatch":true,"sender":{"key":"snake@penza-gsm.ru","avatar":null},"body":"Fixes all in-code names that leaved during \"big name change\".\n\nSigned-off-by: Alexey Nezhdanov <snake@penza-gsm.ru>\n\n---\n\nIndex: checkout-cache.c\n===================================================================\n--- 9adfcec0fcbf1828127b46991ffb7f6c76586b73/checkout-cache.c  (mode:100644)\n+++ uncommitted/checkout-cache.c  (mode:100644)\n@@ -5,22 +5,22 @@\n  *\n  * Careful: order of argument flags does matter. For example,\n  *\n- *\tcheckout-cache -a -f file.c\n+ *\tgit-checkout-cache -a -f file.c\n  *\n  * Will first check out all files listed in the cache (but not\n  * overwrite any old ones), and then force-checkout \"file.c\" a\n  * second time (ie that one _will_ overwrite any old contents\n  * with the same filename).\n  *\n- * Also, just doing \"checkout-cache\" does nothing. You probably\n- * meant \"checkout-cache -a\". And if you want to force it, you\n- * want \"checkout-cache -f -a\".\n+ * Also, just doing \"git-checkout-cache\" does nothing. You probably\n+ * meant \"git-checkout-cache -a\". And if you want to force it, you\n+ * want \"git-checkout-cache -f -a\".\n  *\n  * Intuitiveness is not the goal here. Repeatability is. The\n  * reason for the \"no arguments means no work\" thing is that\n  * from scripts you are supposed to be able to do things like\n  *\n- *\tfind . -name '*.h' -print0 | xargs -0 checkout-cache -f --\n+ *\tfind . -name '*.h' -print0 | xargs -0 git-checkout-cache -f --\n  *\n  * which will force all existing *.h files to be replaced with\n  * their cached copies. If an empty command line implied \"all\",\n@@ -122,7 +122,7 @@\n \tif (!new || strcmp(type, \"blob\")) {\n \t\tif (new)\n \t\t\tfree(new);\n-\t\treturn error(\"checkout-cache: unable to read sha1 file of %s (%s)\",\n+\t\treturn error(\"git-checkout-cache: unable to read sha1 file of %s (%s)\",\n \t\t\tpath, sha1_to_hex(ce->sha1));\n \t}\n \tswitch (ntohl(ce->ce_mode) & S_IFMT) {\n@@ -130,14 +130,14 @@\n \t\tfd = create_file(path, ntohl(ce->ce_mode));\n \t\tif (fd < 0) {\n \t\t\tfree(new);\n-\t\t\treturn error(\"checkout-cache: unable to create file %s (%s)\",\n+\t\t\treturn error(\"git-checkout-cache: unable to create file %s (%s)\",\n \t\t\t\tpath, strerror(errno));\n \t\t}\n \t\twrote = write(fd, new, size);\n \t\tclose(fd);\n \t\tfree(new);\n \t\tif (wrote != size)\n-\t\t\treturn error(\"checkout-cache: unable to write file %s\", path);\n+\t\t\treturn error(\"git-checkout-cache: unable to write file %s\", path);\n \t\tbreak;\n \tcase S_IFLNK:\n \t\tmemcpy(target, new, size);\n@@ -145,14 +145,14 @@\n \t\tcreate_directories(path);\n \t\tif (symlink(target, path)) {\n \t\t\tfree(new);\n-\t\t\treturn error(\"checkout-cache: unable to create symlink %s (%s)\",\n+\t\t\treturn error(\"git-checkout-cache: unable to create symlink %s (%s)\",\n \t\t\t\tpath, strerror(errno));\n \t\t}\n \t\tfree(new);\n \t\tbreak;\n \tdefault:\n \t\tfree(new);\n-\t\treturn error(\"checkout-cache: unknown file mode for %s\", path);\n+\t\treturn error(\"git-checkout-cache: unknown file mode for %s\", path);\n \t}\n \treturn 0;\n }\n@@ -172,7 +172,7 @@\n \t\t\treturn 0;\n \t\tif (!force) {\n \t\t\tif (!quiet)\n-\t\t\t\tfprintf(stderr, \"checkout-cache: %s already exists\\n\", path);\n+\t\t\t\tfprintf(stderr, \"git-checkout-cache: %s already exists\\n\", path);\n \t\t\treturn 0;\n \t\t}\n \n@@ -195,7 +195,7 @@\n \t\tif (!quiet) {\n \t\t\tpos = -pos - 1;\n \t\t\tfprintf(stderr,\n-\t\t\t\t\"checkout-cache: %s is %s.\\n\",\n+\t\t\t\t\"git-checkout-cache: %s is %s.\\n\",\n \t\t\t\tname,\n \t\t\t\t(pos < active_nr &&\n \t\t\t\t !strcmp(active_cache[pos]->name, name)) ?\nIndex: commit-tree.c\n===================================================================\n--- 9adfcec0fcbf1828127b46991ffb7f6c76586b73/commit-tree.c  (mode:100644)\n+++ uncommitted/commit-tree.c  (mode:100644)\n@@ -98,7 +98,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--- 9adfcec0fcbf1828127b46991ffb7f6c76586b73/convert-cache.c  (mode:100644)\n+++ uncommitted/convert-cache.c  (mode:100644)\n@@ -304,7 +304,7 @@\n \tstruct entry *entry;\n \n \tif (argc != 2 || get_sha1(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--- 9adfcec0fcbf1828127b46991ffb7f6c76586b73/diff-cache.c  (mode:100644)\n+++ uncommitted/diff-cache.c  (mode:100644)\n@@ -179,7 +179,7 @@\n \t\targv++;\n \t\targc--;\n \t\tif (!strcmp(arg, \"-r\")) {\n-\t\t\t/* We accept the -r flag just to look like diff-tree */\n+\t\t\t/* We accept the -r flag just to look like git-diff-tree */\n \t\t\tcontinue;\n \t\t}\n \t\tif (!strcmp(arg, \"-p\")) {\nIndex: diff-files.c\n===================================================================\n--- 9adfcec0fcbf1828127b46991ffb7f6c76586b73/diff-files.c  (mode:100644)\n+++ uncommitted/diff-files.c  (mode:100644)\n@@ -7,7 +7,7 @@\n #include \"diff.h\"\n \n static const char *diff_files_usage =\n-\"diff-files [-p] [-q] [-r] [-z] [paths...]\";\n+\"git-diff-files [-p] [-q] [-r] [-z] [paths...]\";\n \n static int generate_patch = 0;\n static int line_termination = '\\n';\nIndex: diff-tree.c\n===================================================================\n--- 9adfcec0fcbf1828127b46991ffb7f6c76586b73/diff-tree.c  (mode:100644)\n+++ uncommitted/diff-tree.c  (mode:100644)\n@@ -258,7 +258,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@@ -379,7 +379,7 @@\n \t\theader = generate_header(name, sha1_to_hex(parent), buf, size);\n \t\tdiff_tree_sha1(parent, commit, \"\");\n \t\tif (!header && verbose_header)\n-\t\t\theader_prefix = \"\\ndiff-tree \";\n+\t\t\theader_prefix = \"\\ngit-diff-tree \";\n \t\toffset += 48;\n \t}\n \treturn 0;\n@@ -408,7 +408,7 @@\n }\n \n static char *diff_tree_usage =\n-\"diff-tree [-p] [-r] [-z] [--stdin] [-m] [-s] [-v] <tree sha1> <tree sha1>\";\n+\"git-diff-tree [-p] [-r] [-z] [--stdin] [-m] [-s] [-v] <tree sha1> <tree sha1>\";\n \n int main(int argc, char **argv)\n {\n@@ -461,7 +461,7 @@\n \t\t}\n \t\tif (!strcmp(arg, \"-v\")) {\n \t\t\tverbose_header = 1;\n-\t\t\theader_prefix = \"diff-tree \";\n+\t\t\theader_prefix = \"git-diff-tree \";\n \t\t\tcontinue;\n \t\t}\n \t\tif (!strcmp(arg, \"--stdin\")) {\nIndex: fsck-cache.c\n===================================================================\n--- 9adfcec0fcbf1828127b46991ffb7f6c76586b73/fsck-cache.c  (mode:100644)\n+++ uncommitted/fsck-cache.c  (mode:100644)\n@@ -152,7 +152,7 @@\n \t}\n \n \tif (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@@ -385,7 +385,7 @@\n \t\t\tcontinue;\n \t\t}\n \t\tif (*arg == '-')\n-\t\t\tusage(\"fsck-cache [--tags] [[--unreachable] [--cache] <head-sha1>*]\");\n+\t\t\tusage(\"git-fsck-cache [--tags] [[--unreachable] [--cache] <head-sha1>*]\");\n \t}\n \n \tsha1_dir = get_object_directory();\nIndex: ls-files.c\n===================================================================\n--- 9adfcec0fcbf1828127b46991ffb7f6c76586b73/ls-files.c  (mode:100644)\n+++ uncommitted/ls-files.c  (mode:100644)\n@@ -283,7 +283,7 @@\n }\n \n static const char *ls_files_usage =\n-\t\"ls-files [-z] [-t] (--[cached|deleted|others|stage|unmerged|killed])* \"\n+\t\"git-ls-files [-z] [-t] (--[cached|deleted|others|stage|unmerged|killed])* \"\n \t\"[ --ignored [--exclude=<pattern>] [--exclude-from=<file>) ]\";\n \n int main(int argc, char **argv)\nIndex: ls-tree.c\n===================================================================\n--- 9adfcec0fcbf1828127b46991ffb7f6c76586b73/ls-tree.c  (mode:100644)\n+++ uncommitted/ls-tree.c  (mode:100644)\n@@ -81,7 +81,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--- 9adfcec0fcbf1828127b46991ffb7f6c76586b73/merge-base.c  (mode:100644)\n+++ uncommitted/merge-base.c  (mode:100644)\n@@ -60,7 +60,7 @@\n \tif (argc != 3 ||\n \t    get_sha1(argv[1], rev1key) ||\n \t    get_sha1(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_reference(rev1key);\n \trev2 = lookup_commit_reference(rev2key);\nIndex: merge-cache.c\n===================================================================\n--- 9adfcec0fcbf1828127b46991ffb7f6c76586b73/merge-cache.c  (mode:100644)\n+++ uncommitted/merge-cache.c  (mode:100644)\n@@ -39,7 +39,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@@ -64,7 +64,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@@ -97,7 +97,7 @@\n \tint i, force_file = 0;\n \n \tif (argc < 3)\n-\t\tusage(\"merge-cache [-o] <merge-program> (-a | <filename>*)\");\n+\t\tusage(\"git-merge-cache [-o] <merge-program> (-a | <filename>*)\");\n \n \tread_cache();\n \n@@ -118,7 +118,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--- 9adfcec0fcbf1828127b46991ffb7f6c76586b73/read-tree.c  (mode:100644)\n+++ uncommitted/read-tree.c  (mode:100644)\n@@ -159,7 +159,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--- 9adfcec0fcbf1828127b46991ffb7f6c76586b73/rev-list.c  (mode:100644)\n+++ uncommitted/rev-list.c  (mode:100644)\n@@ -27,7 +27,7 @@\n \t}\n \n \tif (!commit_arg || get_sha1(commit_arg, sha1))\n-\t\tusage(\"usage: rev-list [OPTION] commit-id\\n\"\n+\t\tusage(\"usage: git-rev-list [OPTION] commit-id\\n\"\n \t\t      \"  --max-count=nr\\n\"\n \t\t      \"  --max-age=epoch\\n\"\n \t\t      \"  --min-age=epoch\\n\");\nIndex: rev-tree.c\n===================================================================\n--- 9adfcec0fcbf1828127b46991ffb7f6c76586b73/rev-tree.c  (mode:100644)\n+++ uncommitted/rev-tree.c  (mode:100644)\n@@ -64,7 +64,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@@ -98,7 +98,7 @@\n \t\t\tbasemask |= 1<<nr;\n \t\t}\n \t\tif (nr >= MAX_COMMITS || get_sha1(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: rpush.c\n===================================================================\n--- 9adfcec0fcbf1828127b46991ffb7f6c76586b73/rpush.c  (mode:100644)\n+++ uncommitted/rpush.c  (mode:100644)\n@@ -14,7 +14,7 @@\n \t\tdo {\n \t\t\tsize = read(fd_in, sha1 + posn, 20 - posn);\n \t\t\tif (size < 0) {\n-\t\t\t\tperror(\"rpush: read \");\n+\t\t\t\tperror(\"git-rpush: read \");\n \t\t\t\treturn;\n \t\t\t}\n \t\t\tif (!size)\n@@ -26,7 +26,7 @@\n \n \t\tbuf = map_sha1_file(sha1, &objsize);\n \t\tif (!buf) {\n-\t\t\tfprintf(stderr, \"rpush: could not find %s\\n\", \n+\t\t\tfprintf(stderr, \"git-rpush: could not find %s\\n\", \n \t\t\t\tsha1_to_hex(sha1));\n \t\t\treturn;\n \t\t}\n@@ -35,9 +35,9 @@\n \t\t\tsize = write(fd_out, buf + posn, objsize - posn);\n \t\t\tif (size <= 0) {\n \t\t\t\tif (!size) {\n-\t\t\t\t\tfprintf(stderr, \"rpush: write closed\");\n+\t\t\t\t\tfprintf(stderr, \"git-rpush: write closed\");\n \t\t\t\t} else {\n-\t\t\t\t\tperror(\"rpush: write \");\n+\t\t\t\t\tperror(\"git-rpush: write \");\n \t\t\t\t}\n \t\t\t\treturn;\n \t\t\t}\n@@ -56,7 +56,7 @@\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];\nIndex: tar-tree.c\n===================================================================\n--- 9adfcec0fcbf1828127b46991ffb7f6c76586b73/tar-tree.c  (mode:100644)\n+++ uncommitted/tar-tree.c  (mode:100644)\n@@ -17,7 +17,7 @@\n #define EXT_HEADER_PATH\t\t1\n #define EXT_HEADER_LINKPATH\t2\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@@ -40,9 +40,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;\nIndex: unpack-file.c\n===================================================================\n--- 9adfcec0fcbf1828127b46991ffb7f6c76586b73/unpack-file.c  (mode:100644)\n+++ uncommitted/unpack-file.c  (mode:100644)\n@@ -27,7 +27,7 @@\n \tunsigned char sha1[20];\n \n \tif (argc != 2 || get_sha1(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;\nIndex: update-cache.c\n===================================================================\n--- 9adfcec0fcbf1828127b46991ffb7f6c76586b73/update-cache.c  (mode:100644)\n+++ uncommitted/update-cache.c  (mode:100644)\n@@ -10,7 +10,7 @@\n  * Default to not allowing changes to the list of files. The\n  * tool doesn't actually care, but this makes it harder to add\n  * files to the revision control by mistake by doing something\n- * like \"update-cache *\" and suddenly having all the object\n+ * like \"git-update-cache *\" and suddenly having all the object\n  * files be revision controlled.\n  */\n static int allow_add = 0, allow_remove = 0, allow_replace = 0, not_new = 0;\n@@ -179,7 +179,7 @@\n  * file that hasn't been changed but where the stat entry is\n  * out of date.\n  *\n- * For example, you'd want to do this after doing a \"read-tree\",\n+ * For example, you'd want to do this after doing a \"git-read-tree\",\n  * to link up the stat cache details with the proper files.\n  */\n static struct cache_entry *refresh_entry(struct cache_entry *ce)\n@@ -373,17 +373,17 @@\n \t\t\t}\n \t\t\tif (!strcmp(path, \"--cacheinfo\")) {\n \t\t\t\tif (i+3 >= argc)\n-\t\t\t\t\tdie(\"update-cache: --cacheinfo <mode> <sha1> <path>\");\n+\t\t\t\t\tdie(\"git-update-cache: --cacheinfo <mode> <sha1> <path>\");\n \t\t\t\tif (add_cacheinfo(argv[i+1], argv[i+2], argv[i+3]))\n-\t\t\t\t\tdie(\"update-cache: --cacheinfo cannot add %s\", argv[i+3]);\n+\t\t\t\t\tdie(\"git-update-cache: --cacheinfo cannot add %s\", argv[i+3]);\n \t\t\t\ti += 3;\n \t\t\t\tcontinue;\n \t\t\t}\n \t\t\tif (!strcmp(path, \"--force-remove\")) {\n \t\t\t\tif (argc <= i + 1)\n-\t\t\t\t\tdie(\"update-cache: --force-remove <path>\");\n+\t\t\t\t\tdie(\"git-update-cache: --force-remove <path>\");\n \t\t\t\tif (remove_file_from_cache(argv[i+1]))\n-\t\t\t\t\tdie(\"update-cache: --force-remove cannot remove %s\", argv[i+1]);\n+\t\t\t\t\tdie(\"git-update-cache: --force-remove cannot remove %s\", argv[i+1]);\n \t\t\t\ti++;\n \t\t\t\tcontinue;\n \t\t\t}\nIndex: write-tree.c\n===================================================================\n--- 9adfcec0fcbf1828127b46991ffb7f6c76586b73/write-tree.c  (mode:100644)\n+++ uncommitted/write-tree.c  (mode:100644)\n@@ -89,7 +89,7 @@\n \tunsigned char sha1[20];\n \n \tif (entries < 0)\n-\t\tdie(\"write-tree: error reading cache\");\n+\t\tdie(\"git-write-tree: error reading cache\");\n \n \t/* Verify that the tree is merged */\n \tfunny = 0;\n@@ -104,7 +104,7 @@\n \t\t}\n \t}\n \tif (funny)\n-\t\tdie(\"write-tree: not able to write tree\");\n+\t\tdie(\"git-write-tree: not able to write tree\");\n \n \t/* Also verify that the cache does not have path and path/file\n \t * at the same time.  At this point we know the cache has only\n@@ -131,11 +131,11 @@\n \t\t}\n \t}\n \tif (funny)\n-\t\tdie(\"write-tree: not able to write tree\");\n+\t\tdie(\"git-write-tree: not able to write tree\");\n \n \t/* Ok, write it out */\n \tif (write_tree(active_cache, entries, \"\", 0, sha1) != entries)\n-\t\tdie(\"write-tree: internal error\");\n+\t\tdie(\"git-write-tree: internal error\");\n \tprintf(\"%s\\n\", sha1_to_hex(sha1));\n \treturn 0;\n }\n"}]}