Spelling fixes

Author: scop

git/cmd.py

@@ -540,7 +540,7 @@ def execute(self, command,
             * str(output) if extended_output = False (Default)
             * tuple(int(status), str(stdout), str(stderr)) if extended_output = True
 
-            if ouput_stream is True, the stdout value will be your output stream:
+            if output_stream is True, the stdout value will be your output stream:
             * output_stream if extended_output = False
             * tuple(int(status), output_stream, str(stderr)) if extended_output = True
 

git/config.py

@@ -212,9 +212,9 @@ def __init__(self, file_or_files, read_only=True, merge_includes=True):
         self._is_initialized = False
         self._merge_includes = merge_includes
         self._lock = None
-        self._aquire_lock()
+        self._acquire_lock()
 
-    def _aquire_lock(self):
+    def _acquire_lock(self):
         if not self._read_only:
             if not self._lock:
                 if isinstance(self._file_or_files, (tuple, list)):
@@ -239,7 +239,7 @@ def __del__(self):
         self.release()
 
     def __enter__(self):
-        self._aquire_lock()
+        self._acquire_lock()
         return self
 
     def __exit__(self, exception_type, exception_value, traceback):

git/exc.py

@@ -118,7 +118,7 @@ def __init__(self, command, status, stderr=None, stdout=None):
 
 
 class RepositoryDirtyError(Exception):
-    """Thrown whenever an operation on a repository fails as it has uncommited changes that would be overwritten"""
+    """Thrown whenever an operation on a repository fails as it has uncommitted changes that would be overwritten"""
 
     def __init__(self, repo, message):
         self.repo = repo

git/index/base.py

@@ -433,7 +433,7 @@ def _write_path_to_stdin(self, proc, filepath, item, fmakeexc, fprogress,
         try:
             proc.stdin.write(("%s\n" % filepath).encode(defenc))
         except IOError:
-            # pipe broke, usually because some error happend
+            # pipe broke, usually because some error happened
             raise fmakeexc()
         # END write exception handling
         proc.stdin.flush()
@@ -846,7 +846,7 @@ def remove(self, items, working_tree=False, **kwargs):
 
         :param working_tree:
             If True, the entry will also be removed from the working tree, physically
-            removing the respective file. This may fail if there are uncommited changes
+            removing the respective file. This may fail if there are uncommitted changes
             in it.
 
         :param kwargs:

git/index/typ.py

@@ -51,7 +51,7 @@ def __call__(self, stage_blob):
 class BaseIndexEntry(tuple):
 
     """Small Brother of an index entry which can be created to describe changes
-    done to the index in which case plenty of additional information is not requried.
+    done to the index in which case plenty of additional information is not required.
 
     As the first 4 data members match exactly to the IndexEntry type, methods
     expecting a BaseIndexEntry can also handle full IndexEntries even if they

git/objects/base.py

@@ -152,7 +152,7 @@ def __init__(self, repo, binsha, mode=None, path=None):
     def __hash__(self):
         """
         :return:
-            Hash of our path as index items are uniquely identifyable by path, not
+            Hash of our path as index items are uniquely identifiable by path, not
             by their data !"""
         return hash(self.path)
 

git/objects/commit.py

@@ -168,7 +168,7 @@ def count(self, paths='', **kwargs):
 
         :param kwargs:
             Additional options to be passed to git-rev-list. They must not alter
-            the ouput style of the command, or parsing will yield incorrect results
+            the output style of the command, or parsing will yield incorrect results
         :return: int defining the number of reachable commits"""
         # yes, it makes a difference whether empty paths are given or not in our case
         # as the empty paths version will ignore merge commits for some reason.

git/objects/submodule/base.py

@@ -92,7 +92,7 @@ class Submodule(IndexObject, Iterable, Traversable):
     k_head_default = 'master'
     k_default_mode = stat.S_IFDIR | stat.S_IFLNK        # submodules are directories with link-status
 
-    # this is a bogus type for base class compatability
+    # this is a bogus type for base class compatibility
     type = 'submodule'
 
     __slots__ = ('_parent_commit', '_url', '_branch_path', '_name', '__weakref__')
@@ -423,7 +423,7 @@ def add(cls, repo, name, path, url=None, branch=None, no_checkout=False):
                 writer.set_value(cls.k_head_option, br.path)
                 sm._branch_path = br.path
 
-        # we deliberatly assume that our head matches our index !
+        # we deliberately assume that our head matches our index !
         sm.binsha = mrepo.head.commit.binsha
         index.add([sm], write=True)
 
@@ -551,7 +551,7 @@ def update(self, recursive=False, init=True, to_latest_revision=False, progress=
                     with self.repo.config_writer() as writer:
                         writer.set_value(sm_section(self.name), 'url', self.url)
                 # END handle dry_run
-            # END handle initalization
+            # END handle initialization
 
             # DETERMINE SHAS TO CHECKOUT
             ############################

git/refs/log.py

@@ -133,7 +133,7 @@ class RefLog(list, Serializable):
     of the head in question. Custom query methods allow to retrieve log entries
     by date or by other criteria.
 
-    Reflog entries are orded, the first added entry is first in the list, the last
+    Reflog entries are ordered, the first added entry is first in the list, the last
     entry, i.e. the last change of the head or reference, is last in the list."""
 
     __slots__ = ('_path', )
@@ -209,7 +209,7 @@ def entry_at(cls, filepath, index):
         """:return: RefLogEntry at the given index
         :param filepath: full path to the index file from which to read the entry
         :param index: python list compatible index, i.e. it may be negative to
-            specifiy an entry counted from the end of the list
+            specify an entry counted from the end of the list
 
         :raise IndexError: If the entry didn't exist
 

git/repo/base.py

@@ -40,7 +40,7 @@
 log = logging.getLogger(__name__)
 
 DefaultDBType = GitCmdObjectDB
-if sys.version_info[:2] < (2, 5):     # python 2.4 compatiblity
+if sys.version_info[:2] < (2, 5):     # python 2.4 compatibility
     DefaultDBType = GitCmdObjectDB
 # END handle python 2.4
 
@@ -418,7 +418,7 @@ def config_writer(self, config_level="repository"):
 
         :param config_level:
             One of the following values
-            system = sytem wide configuration file
+            system = system wide configuration file
             global = user level configuration file
             repository = configuration file for this repostory only"""
         return GitConfigParser(self._get_config_path(config_level), read_only=False)
@@ -564,7 +564,7 @@ def _set_alternates(self, alts):
 
         :raise NoSuchPathError:
         :note:
-            The method does not check for the existance of the paths in alts
+            The method does not check for the existence of the paths in alts
             as the caller is responsible."""
         alternates_path = osp.join(self.git_dir, 'objects', 'info', 'alternates')
         if not alts:
@@ -629,7 +629,7 @@ def untracked_files(self):
         return self._get_untracked_files()
 
     def _get_untracked_files(self, *args, **kwargs):
-        # make sure we get all files, no only untracked directores
+        # make sure we get all files, not only untracked directories
         proc = self.git.status(*args,
                                porcelain=True,
                                untracked_files=True,
@@ -681,7 +681,7 @@ def blame_incremental(self, rev, file, **kwargs):
 
         stream = (line for line in data.split(b'\n') if line)
         while True:
-            line = next(stream)  # when exhausted, casues a StopIteration, terminating this function
+            line = next(stream)  # when exhausted, causes a StopIteration, terminating this function
             hexsha, orig_lineno, lineno, num_lines = line.split()
             lineno = int(lineno)
             num_lines = int(num_lines)
@@ -952,7 +952,7 @@ def archive(self, ostream, treeish=None, prefix=None, **kwargs):
             * Use the 'format' argument to define the kind of format. Use
               specialized ostreams to write any format supported by python.
             * You may specify the special **path** keyword, which may either be a repository-relative
-              path to a directory or file to place into the archive, or a list or tuple of multipe paths.
+              path to a directory or file to place into the archive, or a list or tuple of multiple paths.
 
         :raise GitCommandError: in case something went wrong
         :return: self"""
@@ -972,7 +972,7 @@ def archive(self, ostream, treeish=None, prefix=None, **kwargs):
     def has_separate_working_tree(self):
         """
         :return: True if our git_dir is not at the root of our working_tree_dir, but a .git file with a
-            platform agnositic symbolic link. Our git_dir will be whereever the .git file points to
+            platform agnositic symbolic link. Our git_dir will be wherever the .git file points to
         :note: bare repositories will always return False here
         """
         if self.bare:

git/test/lib/helper.py

@@ -227,7 +227,7 @@ def with_rw_and_rw_remote_repo(working_tree_ref):
     Same as with_rw_repo, but also provides a writable remote repository from which the
     rw_repo has been forked as well as a handle for a git-daemon that may be started to
     run the remote_repo.
-    The remote repository was cloned as bare repository from the rorepo, wheras
+    The remote repository was cloned as bare repository from the rorepo, whereas
     the rw repo has a working tree and was cloned from the remote repository.
 
     remote_repo has two remotes: origin and daemon_origin. One uses a local url,

git/test/test_config.py

@@ -216,7 +216,7 @@ def check_test_value(cr, value):
             with self.assertRaises(cp.NoSectionError):
                 check_test_value(cr, tv)
 
-        # But can make it skip includes alltogether, and thus allow write-backs
+        # But can make it skip includes altogether, and thus allow write-backs
         with GitConfigParser(fpa, read_only=False, merge_includes=False) as cw:
             write_test_value(cw, tv)
 

git/test/test_docs.py

@@ -433,7 +433,7 @@ def test_references_and_objects(self, rw_dir):
         # reset the index and working tree to match the pointed-to commit
         repo.head.reset(index=True, working_tree=True)
 
-        # To detach your head, you have to point to a commit directy
+        # To detach your head, you have to point to a commit directly
         repo.head.reference = repo.commit('HEAD~5')
         assert repo.head.is_detached
         # now our head points 15 commits into the past, whereas the working tree

git/test/test_git.py

@@ -131,7 +131,7 @@ def test_persistent_cat_file_command(self):
         g.stdin.flush()
         self.assertEqual(g.stdout.readline(), obj_info)
 
-        # same can be achived using the respective command functions
+        # same can be achieved using the respective command functions
         hexsha, typename, size = self.git.get_object_header(hexsha)
         hexsha, typename_two, size_two, data = self.git.get_object_data(hexsha)  # @UnusedVariable
         self.assertEqual(typename, typename_two)
@@ -189,7 +189,7 @@ def test_insert_after_kwarg_raises(self):
         self.failUnlessRaises(ValueError, self.git.remote, 'add', insert_kwargs_after='foo')
 
     def test_env_vars_passed_to_git(self):
-        editor = 'non_existant_editor'
+        editor = 'non_existent_editor'
         with mock.patch.dict('os.environ', {'GIT_EDITOR': editor}):  # @UndefinedVariable
             self.assertEqual(self.git.var("GIT_EDITOR"), editor)
 

git/test/test_remote.py

@@ -163,7 +163,7 @@ def _do_test_fetch_info(self, repo):
 
     def _commit_random_file(self, repo):
         # Create a file with a random name and random data and commit it to  repo.
-        # Return the commited absolute file path
+        # Return the committed absolute file path
         index = repo.index
         new_file = self._make_file(osp.basename(tempfile.mktemp()), str(random.random()), repo)
         index.add([new_file])

git/test/test_repo.py

@@ -96,7 +96,7 @@ def test_new_should_raise_on_invalid_repo_location(self):
         Repo(tempfile.gettempdir())
 
     @raises(NoSuchPathError)
-    def test_new_should_raise_on_non_existant_path(self):
+    def test_new_should_raise_on_non_existent_path(self):
         Repo("repos/foobar")
 
     @with_rw_repo('0.3.2.1')

git/util.py

@@ -809,7 +809,7 @@ def __init__(self, file_path, check_interval_s=0.3, max_block_time_s=MAXSIZE):
     def _obtain_lock(self):
         """This method blocks until it obtained the lock, or raises IOError if
         it ran out of time or if the parent directory was not available anymore.
-        If this method returns, you are guranteed to own the lock"""
+        If this method returns, you are guaranteed to own the lock"""
         starttime = time.time()
         maxtime = starttime + float(self._max_block_time)
         while True: