| FazBrowse GitHub Viewer | Trending | | Home |
| Tools: [Download Repo ZIP] [Original HTTPS Page] |
1 parent c23ae3a commit 8dffba5
17 files changed
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -540,7 +540,7 @@ def execute(self, command, | |||
| 540 | 540 | * str(output) if extended_output = False (Default) | |
| 541 | 541 | * tuple(int(status), str(stdout), str(stderr)) if extended_output = True | |
| 542 | 542 | ||
| 543 | - if ouput_stream is True, the stdout value will be your output stream: | ||
| 543 | + if output_stream is True, the stdout value will be your output stream: | ||
| 544 | 544 | * output_stream if extended_output = False | |
| 545 | 545 | * tuple(int(status), output_stream, str(stderr)) if extended_output = True | |
| 546 | 546 | ||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -212,9 +212,9 @@ def __init__(self, file_or_files, read_only=True, merge_includes=True): | |||
| 212 | 212 | self._is_initialized = False | |
| 213 | 213 | self._merge_includes = merge_includes | |
| 214 | 214 | self._lock = None | |
| 215 | - self._aquire_lock() | ||
| 215 | + self._acquire_lock() | ||
| 216 | 216 | ||
| 217 | - def _aquire_lock(self): | ||
| 217 | + def _acquire_lock(self): | ||
| 218 | 218 | if not self._read_only: | |
| 219 | 219 | if not self._lock: | |
| 220 | 220 | if isinstance(self._file_or_files, (tuple, list)): | |
@@ -239,7 +239,7 @@ def __del__(self): | |||
| 239 | 239 | self.release() | |
| 240 | 240 | ||
| 241 | 241 | def __enter__(self): | |
| 242 | - self._aquire_lock() | ||
| 242 | + self._acquire_lock() | ||
| 243 | 243 | return self | |
| 244 | 244 | ||
| 245 | 245 | def __exit__(self, exception_type, exception_value, traceback): | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -118,7 +118,7 @@ def __init__(self, command, status, stderr=None, stdout=None): | |||
| 118 | 118 | ||
| 119 | 119 | ||
| 120 | 120 | class RepositoryDirtyError(Exception): | |
| 121 | - """Thrown whenever an operation on a repository fails as it has uncommited changes that would be overwritten""" | ||
| 121 | + """Thrown whenever an operation on a repository fails as it has uncommitted changes that would be overwritten""" | ||
| 122 | 122 | ||
| 123 | 123 | def __init__(self, repo, message): | |
| 124 | 124 | self.repo = repo | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -433,7 +433,7 @@ def _write_path_to_stdin(self, proc, filepath, item, fmakeexc, fprogress, | |||
| 433 | 433 | try: | |
| 434 | 434 | proc.stdin.write(("%s\n" % filepath).encode(defenc)) | |
| 435 | 435 | except IOError: | |
| 436 | - # pipe broke, usually because some error happend | ||
| 436 | + # pipe broke, usually because some error happened | ||
| 437 | 437 | raise fmakeexc() | |
| 438 | 438 | # END write exception handling | |
| 439 | 439 | proc.stdin.flush() | |
@@ -846,7 +846,7 @@ def remove(self, items, working_tree=False, **kwargs): | |||
| 846 | 846 | ||
| 847 | 847 | :param working_tree: | |
| 848 | 848 | If True, the entry will also be removed from the working tree, physically | |
| 849 | - removing the respective file. This may fail if there are uncommited changes | ||
| 849 | + removing the respective file. This may fail if there are uncommitted changes | ||
| 850 | 850 | in it. | |
| 851 | 851 | ||
| 852 | 852 | :param kwargs: | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -51,7 +51,7 @@ def __call__(self, stage_blob): | |||
| 51 | 51 | class BaseIndexEntry(tuple): | |
| 52 | 52 | ||
| 53 | 53 | """Small Brother of an index entry which can be created to describe changes | |
| 54 | - done to the index in which case plenty of additional information is not requried. | ||
| 54 | + done to the index in which case plenty of additional information is not required. | ||
| 55 | 55 | ||
| 56 | 56 | As the first 4 data members match exactly to the IndexEntry type, methods | |
| 57 | 57 | expecting a BaseIndexEntry can also handle full IndexEntries even if they | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -152,7 +152,7 @@ def __init__(self, repo, binsha, mode=None, path=None): | |||
| 152 | 152 | def __hash__(self): | |
| 153 | 153 | """ | |
| 154 | 154 | :return: | |
| 155 | - Hash of our path as index items are uniquely identifyable by path, not | ||
| 155 | + Hash of our path as index items are uniquely identifiable by path, not | ||
| 156 | 156 | by their data !""" | |
| 157 | 157 | return hash(self.path) | |
| 158 | 158 | ||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -168,7 +168,7 @@ def count(self, paths='', **kwargs): | |||
| 168 | 168 | ||
| 169 | 169 | :param kwargs: | |
| 170 | 170 | Additional options to be passed to git-rev-list. They must not alter | |
| 171 | - the ouput style of the command, or parsing will yield incorrect results | ||
| 171 | + the output style of the command, or parsing will yield incorrect results | ||
| 172 | 172 | :return: int defining the number of reachable commits""" | |
| 173 | 173 | # yes, it makes a difference whether empty paths are given or not in our case | |
| 174 | 174 | # as the empty paths version will ignore merge commits for some reason. | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -92,7 +92,7 @@ class Submodule(IndexObject, Iterable, Traversable): | |||
| 92 | 92 | k_head_default = 'master' | |
| 93 | 93 | k_default_mode = stat.S_IFDIR | stat.S_IFLNK # submodules are directories with link-status | |
| 94 | 94 | ||
| 95 | - # this is a bogus type for base class compatability | ||
| 95 | + # this is a bogus type for base class compatibility | ||
| 96 | 96 | type = 'submodule' | |
| 97 | 97 | ||
| 98 | 98 | __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): | |||
| 423 | 423 | writer.set_value(cls.k_head_option, br.path) | |
| 424 | 424 | sm._branch_path = br.path | |
| 425 | 425 | ||
| 426 | - # we deliberatly assume that our head matches our index ! | ||
| 426 | + # we deliberately assume that our head matches our index ! | ||
| 427 | 427 | sm.binsha = mrepo.head.commit.binsha | |
| 428 | 428 | index.add([sm], write=True) | |
| 429 | 429 | ||
@@ -551,7 +551,7 @@ def update(self, recursive=False, init=True, to_latest_revision=False, progress= | |||
| 551 | 551 | with self.repo.config_writer() as writer: | |
| 552 | 552 | writer.set_value(sm_section(self.name), 'url', self.url) | |
| 553 | 553 | # END handle dry_run | |
| 554 | - # END handle initalization | ||
| 554 | + # END handle initialization | ||
| 555 | 555 | ||
| 556 | 556 | # DETERMINE SHAS TO CHECKOUT | |
| 557 | 557 | ############################ | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -133,7 +133,7 @@ class RefLog(list, Serializable): | |||
| 133 | 133 | of the head in question. Custom query methods allow to retrieve log entries | |
| 134 | 134 | by date or by other criteria. | |
| 135 | 135 | ||
| 136 | - Reflog entries are orded, the first added entry is first in the list, the last | ||
| 136 | + Reflog entries are ordered, the first added entry is first in the list, the last | ||
| 137 | 137 | entry, i.e. the last change of the head or reference, is last in the list.""" | |
| 138 | 138 | ||
| 139 | 139 | __slots__ = ('_path', ) | |
@@ -209,7 +209,7 @@ def entry_at(cls, filepath, index): | |||
| 209 | 209 | """:return: RefLogEntry at the given index | |
| 210 | 210 | :param filepath: full path to the index file from which to read the entry | |
| 211 | 211 | :param index: python list compatible index, i.e. it may be negative to | |
| 212 | - specifiy an entry counted from the end of the list | ||
| 212 | + specify an entry counted from the end of the list | ||
| 213 | 213 | ||
| 214 | 214 | :raise IndexError: If the entry didn't exist | |
| 215 | 215 | ||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -40,7 +40,7 @@ | |||
| 40 | 40 | log = logging.getLogger(__name__) | |
| 41 | 41 | ||
| 42 | 42 | DefaultDBType = GitCmdObjectDB | |
| 43 | - if sys.version_info[:2] < (2, 5): # python 2.4 compatiblity | ||
| 43 | + if sys.version_info[:2] < (2, 5): # python 2.4 compatibility | ||
| 44 | 44 | DefaultDBType = GitCmdObjectDB | |
| 45 | 45 | # END handle python 2.4 | |
| 46 | 46 | ||
@@ -418,7 +418,7 @@ def config_writer(self, config_level="repository"): | |||
| 418 | 418 | ||
| 419 | 419 | :param config_level: | |
| 420 | 420 | One of the following values | |
| 421 | - system = sytem wide configuration file | ||
| 421 | + system = system wide configuration file | ||
| 422 | 422 | global = user level configuration file | |
| 423 | 423 | repository = configuration file for this repostory only""" | |
| 424 | 424 | return GitConfigParser(self._get_config_path(config_level), read_only=False) | |
@@ -564,7 +564,7 @@ def _set_alternates(self, alts): | |||
| 564 | 564 | ||
| 565 | 565 | :raise NoSuchPathError: | |
| 566 | 566 | :note: | |
| 567 | - The method does not check for the existance of the paths in alts | ||
| 567 | + The method does not check for the existence of the paths in alts | ||
| 568 | 568 | as the caller is responsible.""" | |
| 569 | 569 | alternates_path = osp.join(self.git_dir, 'objects', 'info', 'alternates') | |
| 570 | 570 | if not alts: | |
@@ -629,7 +629,7 @@ def untracked_files(self): | |||
| 629 | 629 | return self._get_untracked_files() | |
| 630 | 630 | ||
| 631 | 631 | def _get_untracked_files(self, *args, **kwargs): | |
| 632 | - # make sure we get all files, no only untracked directores | ||
| 632 | + # make sure we get all files, not only untracked directories | ||
| 633 | 633 | proc = self.git.status(*args, | |
| 634 | 634 | porcelain=True, | |
| 635 | 635 | untracked_files=True, | |
@@ -681,7 +681,7 @@ def blame_incremental(self, rev, file, **kwargs): | |||
| 681 | 681 | ||
| 682 | 682 | stream = (line for line in data.split(b'\n') if line) | |
| 683 | 683 | while True: | |
| 684 | - line = next(stream) # when exhausted, casues a StopIteration, terminating this function | ||
| 684 | + line = next(stream) # when exhausted, causes a StopIteration, terminating this function | ||
| 685 | 685 | hexsha, orig_lineno, lineno, num_lines = line.split() | |
| 686 | 686 | lineno = int(lineno) | |
| 687 | 687 | num_lines = int(num_lines) | |
@@ -952,7 +952,7 @@ def archive(self, ostream, treeish=None, prefix=None, **kwargs): | |||
| 952 | 952 | * Use the 'format' argument to define the kind of format. Use | |
| 953 | 953 | specialized ostreams to write any format supported by python. | |
| 954 | 954 | * You may specify the special **path** keyword, which may either be a repository-relative | |
| 955 | - path to a directory or file to place into the archive, or a list or tuple of multipe paths. | ||
| 955 | + path to a directory or file to place into the archive, or a list or tuple of multiple paths. | ||
| 956 | 956 | ||
| 957 | 957 | :raise GitCommandError: in case something went wrong | |
| 958 | 958 | :return: self""" | |
@@ -972,7 +972,7 @@ def archive(self, ostream, treeish=None, prefix=None, **kwargs): | |||
| 972 | 972 | def has_separate_working_tree(self): | |
| 973 | 973 | """ | |
| 974 | 974 | :return: True if our git_dir is not at the root of our working_tree_dir, but a .git file with a | |
| 975 | - platform agnositic symbolic link. Our git_dir will be whereever the .git file points to | ||
| 975 | + platform agnositic symbolic link. Our git_dir will be wherever the .git file points to | ||
| 976 | 976 | :note: bare repositories will always return False here | |
| 977 | 977 | """ | |
| 978 | 978 | if self.bare: | |
| Back | FazBrowse Home | New Git URL |
0 commit comments