diff --git a/gitless/cli/file_cmd.py b/gitless/cli/file_cmd.py index d184319..e2c2806 100644 --- a/gitless/cli/file_cmd.py +++ b/gitless/cli/file_cmd.py @@ -39,7 +39,7 @@ def f(args, repo): fp, 'n' if subcmd.startswith(VOWELS) else '', subcmd, '' if subcmd.endswith('e') else 'e')) except KeyError: - pprint.err('Can\'t {0} non-existent file {1}'.format(subcmd, fp)) + pprint.err('Can\'t {0} nonexistent file {1}'.format(subcmd, fp)) success = False except ValueError as e: pprint.err(e) diff --git a/gitless/cli/gl_diff.py b/gitless/cli/gl_diff.py index 36346d0..fdeeb6d 100644 --- a/gitless/cli/gl_diff.py +++ b/gitless/cli/gl_diff.py @@ -38,7 +38,7 @@ def main(args, repo): try: patch = curr_b.diff_file(fp) except KeyError: - pprint.err('Can\'t diff non-existent file {0}'.format(fp)) + pprint.err('Can\'t diff nonexistent file {0}'.format(fp)) success = False continue diff --git a/gitless/cli/gl_remote.py b/gitless/cli/gl_remote.py index bb549f9..62725a2 100644 --- a/gitless/cli/gl_remote.py +++ b/gitless/cli/gl_remote.py @@ -87,7 +87,7 @@ def _do_rename(rename_r, remotes): errors_found = False if len(rename_r) != 2: pprint.err( - 'Expected 2 arguments in the folllowing format: ' + 'Expected 2 arguments in the following format: ' 'gl remote -rn current_remote_name new_remote_name') errors_found = True else: diff --git a/gitless/cli/gl_status.py b/gitless/cli/gl_status.py index 1be3398..2914a50 100644 --- a/gitless/cli/gl_status.py +++ b/gitless/cli/gl_status.py @@ -131,7 +131,7 @@ def _print_untracked_files(untracked_list, relative_paths, repo): def _print_conflict_exp(op): pprint.msg( 'You are in the middle of a {0}; all conflicts must be resolved before ' - 'commiting'.format(op)) + 'committing'.format(op)) pprint.exp( 'use gl {0} --abort to go back to the state before the {0}'.format(op)) pprint.exp('use gl resolve f to mark file f as resolved') diff --git a/gitless/core.py b/gitless/core.py index 258d887..fa39c09 100644 --- a/gitless/core.py +++ b/gitless/core.py @@ -198,7 +198,7 @@ def lookup_tag(self, tag_name): def listall_tags(self): """Returns a list with the names of all tags in this repository. - Use lookup_tag to get the Tag object corresponding to eacn name. + Use lookup_tag to get the Tag object corresponding to each name. """ for ref in self.git_repo.listall_references(): if ref.startswith('refs/tags/'): @@ -1051,7 +1051,7 @@ def fuse(self, src, ip, only=None, exclude=None, op_cb=None): are inserted after this commit. ip has to correspond to one of the divergent commits from self or the divergent point. only: ids of commits to use only. - exclude: ids of commtis to exclude. + exclude: ids of commits to exclude. op_cb: see OpCb. """ self._check_is_current() diff --git a/gitless/tests/test_core.py b/gitless/tests/test_core.py index 8002018..69264f4 100644 --- a/gitless/tests/test_core.py +++ b/gitless/tests/test_core.py @@ -593,7 +593,7 @@ class TestFileDiff(TestFile): @assert_status_unchanged( UNTRACKED_FP, UNTRACKED_FP_WITH_SPACE, IGNORED_FP, IGNORED_FP_WITH_SPACE) - def test_diff_nontracked(self): + def test_diff_untracked(self): fps = [ UNTRACKED_FP, UNTRACKED_FP_WITH_SPACE, IGNORED_FP, IGNORED_FP_WITH_SPACE] @@ -947,7 +947,7 @@ def test_switch_contents_still_there_tracked_commit(self): self.repo.switch_current_branch(self.repo.lookup_branch('master')) self.assertEqual('commit', utils_lib.read_file(TRACKED_FP)) - def test_switch_file_classification_is_mantained(self): + def test_switch_file_classification_is_maintained(self): self.curr_b.untrack_file(TRACKED_FP) self.repo.switch_current_branch(self.repo.lookup_branch(BRANCH)) st = self.curr_b.status_file(TRACKED_FP) diff --git a/gitless/tests/test_e2e.py b/gitless/tests/test_e2e.py index a2daeb3..b461d0b 100755 --- a/gitless/tests/test_e2e.py +++ b/gitless/tests/test_e2e.py @@ -62,11 +62,11 @@ def test_basic_functionality(self): # Track utils.gl('track', 'file1') self.assertRaises(CalledProcessError, utils.gl, 'track', 'file1') - self.assertRaises(CalledProcessError, utils.gl, 'track', 'non-existent') + self.assertRaises(CalledProcessError, utils.gl, 'track', 'nonexistent') # Untrack utils.gl('untrack', 'file1') self.assertRaises(CalledProcessError, utils.gl, 'untrack', 'file1') - self.assertRaises(CalledProcessError, utils.gl, 'untrack', 'non-existent') + self.assertRaises(CalledProcessError, utils.gl, 'untrack', 'nonexistent') # Commit utils.gl('track', 'file1') utils.gl('commit', '-m', 'file1 commit') @@ -155,7 +155,7 @@ def test_basic_functionality(self): self.assertRaises( CalledProcessError, utils.gl, 'commit', '-m', 'resolve not called') self.assertRaises( - CalledProcessError, utils.gl, 'resolve', 'non-existent') + CalledProcessError, utils.gl, 'resolve', 'nonexistent') utils.gl('resolve', 'file1') utils.gl('commit', '-m', 'fixed conflicts') @@ -222,13 +222,13 @@ def test_commit_no_files(self): CalledProcessError, utils.gl, 'commit', '--exclude', self.TRACKED_FP, self.DIR_TRACKED_FP, '-m', 'msg') self.assertRaises( - CalledProcessError, utils.gl, 'commit', 'non-existent', '-m', 'msg') + CalledProcessError, utils.gl, 'commit', 'nonexistent', '-m', 'msg') self.assertRaises( CalledProcessError, utils.gl, 'commit', '-m', 'msg', - '--exclude', 'non-existent') + '--exclude', 'nonexistent') self.assertRaises( CalledProcessError, utils.gl, 'commit', '-m', 'msg', - '--include', 'non-existent') + '--include', 'nonexistent') def test_commit_dir(self): fp = 'dir/f' @@ -313,9 +313,9 @@ def test_remove(self): def test_upstream(self): self.assertRaises(CalledProcessError, utils.gl, 'branch', '-uu') self.assertRaises( - CalledProcessError, utils.gl, 'branch', '-su', 'non-existent') + CalledProcessError, utils.gl, 'branch', '-su', 'nonexistent') self.assertRaises( - CalledProcessError, utils.gl, 'branch', '-su', 'non-existent/non-existent') + CalledProcessError, utils.gl, 'branch', '-su', 'nonexistent/nonexistent') def test_list(self): utils.gl('branch', '-c', self.BRANCH_1) @@ -487,7 +487,7 @@ def test_basic(self): def test_only_errors(self): self.assertRaises( - CalledProcessError, utils.gl, 'fuse', self.OTHER, '-o', 'non-existent-id') + CalledProcessError, utils.gl, 'fuse', self.OTHER, '-o', 'nonexistent-id') self.assertRaises( CalledProcessError, utils.gl, 'fuse', self.OTHER, '-o', self.commits['master'][1]) @@ -504,7 +504,7 @@ def test_only_some(self): def test_exclude_errors(self): self.assertRaises( - CalledProcessError, utils.gl, 'fuse', self.OTHER, '-e', 'non-existent-id') + CalledProcessError, utils.gl, 'fuse', self.OTHER, '-e', 'nonexistent-id') self.assertRaises( CalledProcessError, utils.gl, 'fuse', self.OTHER, '-e', self.commits['master'][1]) diff --git a/gitless/tests/utils.py b/gitless/tests/utils.py index a1d9d28..e7376fe 100644 --- a/gitless/tests/utils.py +++ b/gitless/tests/utils.py @@ -47,7 +47,7 @@ def assertRaisesRegexp(self, exc, r, fun, *args, **kwargs): def rmtree(path): # On Windows, running shutil.rmtree on a folder that contains read-only - # files throws errors. To workaround this, if removing a path fails, we make + # files throws errors. To work around this, if removing a path fails, we make # the path writable and then try again def onerror(func, path, unused_exc_info): # error handler for rmtree if not os.access(path, os.W_OK):