From d27cf0b687ec4c65fbad65ceaf45e0429943b415 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=2E=20David=20Ib=C3=A1=C3=B1ez?= <jdavid.ibp@gmail.com> Date: Mon, 18 Jun 2012 11:22:56 -0300 Subject: [PATCH] style: remove trailing white-spaces --- .travis.yml | 2 +- setup.py | 2 +- src/pygit2/error.c | 4 ++-- src/pygit2/repository.c | 4 ++-- test/test_revwalk.py | 9 +++++---- test/test_tag.py | 2 +- 6 files changed, 12 insertions(+), 11 deletions(-) diff --git a/.travis.yml b/.travis.yml index 84418b1..a1cdbec 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,5 +12,5 @@ before_install: - sudo apt-get install cmake - "./.travis.sh" -script: +script: - python setup.py test diff --git a/setup.py b/setup.py index a20a2a5..6eaee92 100644 --- a/setup.py +++ b/setup.py @@ -56,7 +56,7 @@ class TestCommand(Command): """Command for running unittests without install.""" user_options = [("args=", None, '''The command args string passed to - unittest framework, such as + unittest framework, such as --args="-v -f"''')] def initialize_options(self): diff --git a/src/pygit2/error.c b/src/pygit2/error.c index fccf8a8..c8e0af5 100644 --- a/src/pygit2/error.c +++ b/src/pygit2/error.c @@ -56,9 +56,9 @@ PyObject* Error_set(int err) PyErr_SetNone(Error_type(err)); } else { //critical failure const git_error* error = giterr_last(); - char* message = (error == NULL) ? + char* message = (error == NULL) ? "(No error information given)" : error->message; - + PyErr_SetString(Error_type(err), message); } diff --git a/src/pygit2/repository.c b/src/pygit2/repository.c index d416580..4375964 100644 --- a/src/pygit2/repository.c +++ b/src/pygit2/repository.c @@ -165,7 +165,7 @@ Repository_head(Repository *self) git_reference *head; const git_oid *oid; int err; - + err = git_repository_head(&head, self->repo); if(err < 0) { if(err == GIT_ENOTFOUND) @@ -416,7 +416,7 @@ Repository_create_blob(Repository *self, PyObject *args) if (!PyArg_ParseTuple(args, "s#", &raw, &size)) return NULL; - + err = git_blob_create_frombuffer(&oid, self->repo, (const void*)raw, size); if (err < 0) diff --git a/test/test_revwalk.py b/test/test_revwalk.py index 47058ac..8add64a 100644 --- a/test/test_revwalk.py +++ b/test/test_revwalk.py @@ -59,10 +59,11 @@ REVLOGS = [ class RevlogTestTest(utils.RepoTestCase): def test_log(self): - ref = self.repo.lookup_reference('HEAD') - for i,entry in enumerate(ref.log()): - self.assertEqual(entry.committer.name, REVLOGS[i][0]) - self.assertEqual(entry.message, REVLOGS[i][1]) + ref = self.repo.lookup_reference('HEAD') + for i,entry in enumerate(ref.log()): + self.assertEqual(entry.committer.name, REVLOGS[i][0]) + self.assertEqual(entry.message, REVLOGS[i][1]) + class WalkerTest(utils.RepoTestCase): diff --git a/test/test_tag.py b/test/test_tag.py index ca11569..f60a435 100644 --- a/test/test_tag.py +++ b/test/test_tag.py @@ -65,7 +65,7 @@ class TagTest(utils.BareRepoTestCase): target_prefix = target[:5] too_short_prefix = target[:3] - self.assertRaises(ValueError, self.repo.create_tag, name, + self.assertRaises(ValueError, self.repo.create_tag, name, too_short_prefix, pygit2.GIT_OBJ_BLOB, tagger, message) sha = self.repo.create_tag(name, target_prefix, pygit2.GIT_OBJ_BLOB,