Skip to content

0.3 with unicode fixes #200

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Nov 12, 2014
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .gitmodules
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[submodule "gitdb"]
path = git/ext/gitdb
url = http://github.com/gitpython-developers/gitdb.git
url = https://github.com/gitpython-developers/gitdb.git
4 changes: 4 additions & 0 deletions git/cmd.py
Original file line number Diff line number Diff line change
Expand Up @@ -410,12 +410,16 @@ def transform_kwargs(self, split_single_char_options=False, **kwargs):
@classmethod
def __unpack_args(cls, arg_list):
if not isinstance(arg_list, (list,tuple)):
if isinstance(arg_list, unicode):
return [arg_list.encode('utf-8')]
return [ str(arg_list) ]

outlist = list()
for arg in arg_list:
if isinstance(arg_list, (list, tuple)):
outlist.extend(cls.__unpack_args( arg ))
elif isinstance(arg_list, unicode):
outlist.append(arg_list.encode('utf-8'))
# END recursion
else:
outlist.append(str(arg))
Expand Down
4 changes: 2 additions & 2 deletions git/repo/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -376,7 +376,7 @@ def commit(self, rev=None):
if rev is None:
return self.head.commit
else:
return self.rev_parse(str(rev)+"^0")
return self.rev_parse(unicode(rev)+"^0")

def iter_trees(self, *args, **kwargs):
""":return: Iterator yielding Tree objects
Expand All @@ -399,7 +399,7 @@ def tree(self, rev=None):
if rev is None:
return self.head.commit.tree
else:
return self.rev_parse(str(rev)+"^{tree}")
return self.rev_parse(unicode(rev)+"^{tree}")

def iter_commits(self, rev=None, paths='', **kwargs):
"""A list of Commit objects representing the history of a given ref/commit
Expand Down
31 changes: 20 additions & 11 deletions git/test/test_git.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,9 @@
# the BSD License: http://www.opensource.org/licenses/bsd-license.php

import os, sys
from git.test.lib import ( TestBase,
patch,
from git.test.lib import (
TestBase,
patch,
raises,
assert_equal,
assert_true,
Expand All @@ -16,7 +17,7 @@
GitCommandError )

class TestGit(TestBase):

@classmethod
def setUp(cls):
super(TestGit, cls).setUp()
Expand All @@ -29,6 +30,14 @@ def test_call_process_calls_execute(self, git):
assert_true(git.called)
assert_equal(git.call_args, ((['git', 'version'],), {}))

def test_call_unpack_args_unicode(self):
args = Git._Git__unpack_args(u'Unicode' + unichr(40960))
assert_equal(args, ['Unicode\xea\x80\x80'])

def test_call_unpack_args(self):
args = Git._Git__unpack_args(['git', 'log', '--', u'Unicode' + unichr(40960)])
assert_equal(args, ['git', 'log', '--', 'Unicode\xea\x80\x80'])

@raises(GitCommandError)
def test_it_raises_errors(self):
self.git.this_does_not_exist()
Expand Down Expand Up @@ -58,7 +67,7 @@ def test_it_ignores_false_kwargs(self, git):
# this_should_not_be_ignored=False implies it *should* be ignored
output = self.git.version(pass_this_kwarg=False)
assert_true("pass_this_kwarg" not in git.call_args[1])

def test_persistent_cat_file_command(self):
# read header only
import subprocess as sp
Expand All @@ -67,37 +76,37 @@ def test_persistent_cat_file_command(self):
g.stdin.write("b2339455342180c7cc1e9bba3e9f181f7baa5167\n")
g.stdin.flush()
obj_info = g.stdout.readline()

# read header + data
g = self.git.cat_file(batch=True, istream=sp.PIPE,as_process=True)
g.stdin.write("b2339455342180c7cc1e9bba3e9f181f7baa5167\n")
g.stdin.flush()
obj_info_two = g.stdout.readline()
assert obj_info == obj_info_two

# read data - have to read it in one large chunk
size = int(obj_info.split()[2])
data = g.stdout.read(size)
terminating_newline = g.stdout.read(1)

# now we should be able to read a new object
g.stdin.write("b2339455342180c7cc1e9bba3e9f181f7baa5167\n")
g.stdin.flush()
assert g.stdout.readline() == obj_info


# same can be achived 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)
assert typename == typename_two and size == size_two

def test_version(self):
v = self.git.version_info
assert isinstance(v, tuple)
for n in v:
assert isinstance(n, int)
#END verify number types

def test_cmd_override(self):
prev_cmd = self.git.GIT_PYTHON_GIT_EXECUTABLE
try:
Expand Down