stgit: typo fixes

Signed-off-by: Pavel Roskin <proski@gnu.org>

diff --git a/gitmergeonefile.py b/gitmergeonefile.py
index 9344d33b8a17eee746fd8f0163eec4ba04dc9f12..2f327a38234fca06d8eae2aeb27dbc7fcc8d202c 100755 (executable)
--- a/gitmergeonefile.py
+++ b/gitmergeonefile.py
@@ -121,7 +121,7 @@ def __conflict():
 #   $2 - file in branch1 SHA1 (or empty)
 #   $3 - file in branch2 SHA1 (or empty)
 #   $4 - pathname in repository
 #   $2 - file in branch1 SHA1 (or empty)
 #   $3 - file in branch2 SHA1 (or empty)
 #   $4 - pathname in repository

-#   $5 - orignal file mode (or empty)
+#   $5 - original file mode (or empty)

 #   $6 - file in branch1 mode (or empty)
 #   $7 - file in branch2 mode (or empty)
 #
 #   $6 - file in branch1 mode (or empty)
 #   $7 - file in branch2 mode (or empty)
 #


@@ -140,7 +140,7 @@ __checkout_files()
 if orig_hash:
     # modified in both
     if file1_hash and file2_hash:
 if orig_hash:
     # modified in both
     if file1_hash and file2_hash:

-        # if modes are the same (git-read-tree probably dealed with it)
+        # if modes are the same (git-read-tree probably dealt with it)

         if file1_hash == file2_hash:
             if os.system('git-update-index --cacheinfo %s %s %s'
                          % (file1_mode, file1_hash, path)) != 0:
         if file1_hash == file2_hash:
             if os.system('git-update-index --cacheinfo %s %s %s'
                          % (file1_mode, file1_hash, path)) != 0:


@@ -242,8 +242,8 @@ else:
         __remove_files()
         sys.exit(os.system('git-checkout-index -u -f -- %s' % path))
 
         __remove_files()
         sys.exit(os.system('git-checkout-index -u -f -- %s' % path))
 

-# Un-handled case
-print >> sys.stderr, 'Error: Un-handled merge conflict'
+# Unhandled case
+print >> sys.stderr, 'Error: Unhandled merge conflict'

 print >> sys.stderr, 'gitmergeonefile.py "%s" "%s" "%s" "%s" "%s" "%s" "%s"' \
       % tuple(sys.argv[1:8])
 __conflict()
 print >> sys.stderr, 'gitmergeonefile.py "%s" "%s" "%s" "%s" "%s" "%s" "%s"' \
       % tuple(sys.argv[1:8])
 __conflict()

diff --git a/stgit/commands/common.py b/stgit/commands/common.py
index 8084cbd2f7963e2965ac322c95a2c9c34fc84adc..88f1433a961e978da1aaf48d2816534d4f327b52 100644 (file)
--- a/stgit/commands/common.py
+++ b/stgit/commands/common.py
@@ -1,4 +1,4 @@
-"""Function/variables commmon to all the commands
+"""Function/variables common to all the commands

 """
 
 __copyright__ = """
 """
 
 __copyright__ = """


@@ -92,7 +92,7 @@ def check_head_top_equal():
     if not crt_series.head_top_equal():
         raise CmdException, \
               'HEAD and top are not the same. You probably committed\n' \
     if not crt_series.head_top_equal():
         raise CmdException, \
               'HEAD and top are not the same. You probably committed\n' \

-              '  changes to the tree ouside of StGIT. If you know what you\n' \
+              '  changes to the tree outside of StGIT. If you know what you\n' \

               '  are doing, use the "refresh -f" command'
 
 def check_conflicts():
               '  are doing, use the "refresh -f" command'
 
 def check_conflicts():

diff --git a/stgit/commands/imprt.py b/stgit/commands/imprt.py
index 6ccdcc92e1ee69e2166625316a18fd1a5c535abc..87fd5dad16a87c6bd2c1ad1aef7825f43be416a9 100644 (file)
--- a/stgit/commands/imprt.py
+++ b/stgit/commands/imprt.py
@@ -28,7 +28,7 @@ usage = """%prog [options] [<file>]
 
 Create a new patch and apply the given GNU diff file (or the standard
 input). By default, the file name is used as the patch name but this
 
 Create a new patch and apply the given GNU diff file (or the standard
 input). By default, the file name is used as the patch name but this

-can be overriden with the '--name' option. The patch can either be a
+can be overridden with the '--name' option. The patch can either be a

 normal file with the description at the top or it can have standard
 mail format, the Subject, From and Date headers being used for
 generating the patch information.
 normal file with the description at the top or it can have standard
 mail format, the Subject, From and Date headers being used for
 generating the patch information.


@@ -219,7 +219,7 @@ def func(parser, options, args):
     elif filename:
         patch = os.path.basename(filename)
     else:
     elif filename:
         patch = os.path.basename(filename)
     else:

-        raise CmdException, 'Unkown patch name'
+        raise CmdException, 'Unknown patch name'

 
     # the defaults
     message = author_name = author_email = author_date = committer_name = \
 
     # the defaults
     message = author_name = author_email = author_date = committer_name = \

diff --git a/stgit/commands/pick.py b/stgit/commands/pick.py
index c01c799a271397431ecedc4f37f931efa815fcde..e932cf061517f419ea58ad915ae6faa5e84269ae 100644 (file)
--- a/stgit/commands/pick.py
+++ b/stgit/commands/pick.py
@@ -28,7 +28,7 @@ usage = """%prog [options] [<patch@branch>|<commit>]
 
 Import a patch from a different branch or a commit object into the
 current series. By default, the name of the imported patch is used as
 
 Import a patch from a different branch or a commit object into the
 current series. By default, the name of the imported patch is used as

-the name of the current patch. It can be overriden with the '--name'
+the name of the current patch. It can be overridden with the '--name'

 option. A commit object can be reverted with the '--reverse'
 option. The log and author information are those of the commit object."""
 
 option. A commit object can be reverted with the '--reverse'
 option. The log and author information are those of the commit object."""
 

diff --git a/stgit/git.py b/stgit/git.py
index a7b1c3f193041fd76aa9d1ad6afa0e5c1cf61e72..61436bb8abe19a492d7564d9013a215860f33641 100644 (file)
--- a/stgit/git.py
+++ b/stgit/git.py
@@ -274,7 +274,7 @@ def rev_parse(git_id):
         raise GitException, 'Unknown revision: %s' % git_id
 
 def branch_exists(branch):
         raise GitException, 'Unknown revision: %s' % git_id
 
 def branch_exists(branch):

-    """Existance check for the named branch
+    """Existence check for the named branch

     """
     for line in _output_lines(['git-rev-parse', '--symbolic', '--all']):
         if line.strip() == branch:
     """
     for line in _output_lines(['git-rev-parse', '--symbolic', '--all']):
         if line.strip() == branch: