{"thread":{"id":"2504","subject":"[PATCH 4/4] Fix a typo in the \"add\" command's documentation","startedAt":"2005-11-14T16:50:07Z","lastAt":"2005-11-14T16:51:02Z","messageCount":5,"participants":["Chuck Lever"],"isPatch":true,"patchVersion":1,"patchTotal":4},"messages":[{"id":"11816","messageId":"20051114165007.22202.69803.stgit@dexter.citi.umich.edu","threadId":"2504","inReplyTo":null,"subject":"[PATCH 0/4] StGIT minor clean ups","fromName":"Chuck Lever","fromEmail":"cel@citi.umich.edu","sentAt":"2005-11-14T16:50:07Z","receivedAt":"2005-11-14T16:50:07Z","isPatch":true,"sender":{"key":"cel@citi.umich.edu","avatar":null},"body":"A few minor typos and additional error checking.\n\n -- Chuck Lever\n--\ncorporate: \npersonal: \n"},{"id":"11815","messageId":"20051114165055.22202.28533.stgit@dexter.citi.umich.edu","threadId":"2504","inReplyTo":"20051114165007.22202.69803.stgit@dexter.citi.umich.edu","subject":"[PATCH 1/4] Better error message when renaming patches to same name","fromName":"Chuck Lever","fromEmail":"cel@netapp.com","sentAt":"2005-11-14T16:50:55Z","receivedAt":"2005-11-14T16:50:55Z","isPatch":true,"sender":{"key":"cel@netapp.com","avatar":null},"body":"Generate a more precise error message when trying to rename a patch to the\nsame name. This is what we get currently:\n\n [cel@dexter main]$ stg rename nfs_direct_wait nfs_direct_wait\n Renaming patch \"nfs_direct_wait\" -> \"nfs_direct_wait\"...stg rename: Patch\n \"nfs_direct_wait\" already exists\n\n [cel@dexter main]$\n\nSigned-off-by: Chuck Lever \n---\n\n stgit/stack.py | 3 +++\n 1 files changed, 3 insertions(+), 0 deletions(-)\n\ndiff --git a/stgit/stack.py b/stgit/stack.py\nindex 1ffeaee..0907b37 100644\n--- a/stgit/stack.py\n+++ b/stgit/stack.py\n@@ -775,6 +775,9 @@ class Series:\n applied = self.get_applied()\n unapplied = self.get_unapplied()\n \n+ if oldname == newname:\n+ raise StackException, '\"To\" name and \"from\" name are the same'\n+\n if newname in applied or newname in unapplied:\n raise StackException, 'Patch \"%s\" already exists' % newname\n \n"},{"id":"11814","messageId":"20051114165057.22202.82090.stgit@dexter.citi.umich.edu","threadId":"2504","inReplyTo":"20051114165007.22202.69803.stgit@dexter.citi.umich.edu","subject":"[PATCH 2/4] use \"crt_series.get_branch()\" instead of \"git.get_head_file()\"","fromName":"Chuck Lever","fromEmail":"cel@netapp.com","sentAt":"2005-11-14T16:50:57Z","receivedAt":"2005-11-14T16:50:57Z","isPatch":true,"sender":{"key":"cel@netapp.com","avatar":null},"body":"More cleanup to the branch command.\n\nSigned-off-by: Chuck Lever \n---\n\n stgit/commands/branch.py | 6 +++---\n 1 files changed, 3 insertions(+), 3 deletions(-)\n\ndiff --git a/stgit/commands/branch.py b/stgit/commands/branch.py\nindex d85ba69..9bf6cdb 100644\n--- a/stgit/commands/branch.py\n+++ b/stgit/commands/branch.py\n@@ -147,7 +147,7 @@ def func(parser, options, args):\n elif options.protect:\n \n if len(args) == 0:\n- branch_name = git.get_head_file()\n+ branch_name = crt_series.get_branch()\n elif len(args) == 1:\n branch_name = args[0]\n else:\n@@ -182,7 +182,7 @@ def func(parser, options, args):\n elif options.unprotect:\n \n if len(args) == 0:\n- branch_name = git.get_head_file()\n+ branch_name = crt_series.get_branch()\n elif len(args) == 1:\n branch_name = args[0]\n else:\n@@ -222,4 +222,4 @@ def func(parser, options, args):\n if len(args) != 0:\n parser.error('incorrect number of arguments')\n \n- print git.get_head_file()\n+ print crt_series.get_branch()\n"},{"id":"11813","messageId":"20051114165059.22202.93316.stgit@dexter.citi.umich.edu","threadId":"2504","inReplyTo":"20051114165007.22202.69803.stgit@dexter.citi.umich.edu","subject":"[PATCH 3/4] Fix a typo in \"stg pick\"","fromName":"Chuck Lever","fromEmail":"cel@netapp.com","sentAt":"2005-11-14T16:50:59Z","receivedAt":"2005-11-14T16:50:59Z","isPatch":true,"sender":{"key":"cel@netapp.com","avatar":null},"body":"\"Unknown\" is misspelled.\n\nSigned-off-by: Chuck Lever \n---\n\n stgit/commands/pick.py | 2 +-\n 1 files changed, 1 insertions(+), 1 deletions(-)\n\ndiff --git a/stgit/commands/pick.py b/stgit/commands/pick.py\nindex 3c52a49..c01c799 100644\n--- a/stgit/commands/pick.py\n+++ b/stgit/commands/pick.py\n@@ -64,7 +64,7 @@ def func(parser, options, args):\n elif len(patch_branch) == 2:\n patch = patch_branch[0]\n else:\n- raise CmdException, 'Unkown patch name'\n+ raise CmdException, 'Unknown patch name'\n \n commit_id = git_id(commit_str)\n commit = git.Commit(commit_id)\n"},{"id":"11812","messageId":"20051114165101.22202.91257.stgit@dexter.citi.umich.edu","threadId":"2504","inReplyTo":"20051114165007.22202.69803.stgit@dexter.citi.umich.edu","subject":"[PATCH 4/4] Fix a typo in the \"add\" command's documentation","fromName":"Chuck Lever","fromEmail":"cel@netapp.com","sentAt":"2005-11-14T16:51:02Z","receivedAt":"2005-11-14T16:51:02Z","isPatch":true,"sender":{"key":"cel@netapp.com","avatar":null},"body":"Signed-off-by: J. Bruce Fields \nSigned-off-by: Chuck Lever \n---\n\n stgit/commands/add.py | 2 +-\n 1 files changed, 1 insertions(+), 1 deletions(-)\n\ndiff --git a/stgit/commands/add.py b/stgit/commands/add.py\nindex 999ce2b..fc9c5a7 100644\n--- a/stgit/commands/add.py\n+++ b/stgit/commands/add.py\n@@ -27,7 +27,7 @@ from stgit import stack, git\n help = 'add files or directories to the repository'\n usage = \"\"\"%prog [options] \n \n-Add a the files or directories passed as arguments to the\n+Add the files or directories passed as arguments to the\n repository. When a directory name is given, all the files and\n subdirectories are recursively added.\"\"\"\n \n"}]}