Merge branch 'master' of https://github.com/gitpython-developers/GitPython

Author: barry-scott

.travis.yml

@@ -19,12 +19,7 @@ install:
  - pip install coveralls flake8 sphinx
 
 # generate some reflog as git-python tests need it (in master)
- - git tag __testing_point__
- - git checkout master || git checkout -b master
- - git reset --hard HEAD~1
- - git reset --hard HEAD~1
- - git reset --hard HEAD~1
- - git reset --hard __testing_point__
+ - ./init-tests-after-clone.sh
 
 # as commits are performed with the default user, it needs to be set for travis too
  - git config --global user.email "[email protected]"

README.md

@@ -34,16 +34,29 @@ Both commands will install the required package dependencies.
 A distribution package can be obtained for manual installation at:
 
 http://pypi.python.org/pypi/GitPython
+
+If you like to clone from source, you can do it like so:
+
+```bash
+git clone https://github.com/gitpython-developers/GitPython
+git submodule update --init --recursive
+./init-tests-after-clone.sh
+```
 
 ### RUNNING TESTS
 
+*Important*: Right after cloning this repository, please be sure to have executed the `init-tests-after-clone.sh` script in the repository root. Otherwise you will encounter test failures.
+
 The easiest way to run test is by using [tox](https://pypi.python.org/pypi/tox) a wrapper around virtualenv. It will take care of setting up environnements with the proper dependencies installed and execute test commands. To install it simply:
 
 pip install tox
 
 Then run:
 
 tox
+
+
+For more fine-grained control, you can use `nose`.
 
 ### Contributions
 

VERSION

@@ -1 +1 @@
-2.0.6dev0
+2.0.7dev0

doc/source/changes.rst

@@ -2,11 +2,17 @@
 Changelog
 =========
 
-2.0.6 - Fixes
-=============
-
+2.0.6 - Fixes and Features
+==========================
+
+* Fix: remote output parser now correctly matches refs with non-ASCII
+ chars in them
+* API: Diffs now have `a_rawpath`, `b_rawpath`, `raw_rename_from`,
+ `raw_rename_to` properties, which are the raw-bytes equivalents of their
+ unicode path counterparts.
 * Fix: TypeError about passing keyword argument to string decode() on
  Python 2.6.
+* Feature: `setUrl API on Remotes <https://github.com/gitpython-developers/GitPython/pull/446#issuecomment-224670539>`_
 
 2.0.5 - Fixes
 =============

git/cmd.py

@@ -14,7 +14,6 @@
 importmmap
 
 fromgit.odictimportOrderedDict
-
 fromcontextlibimportcontextmanager
 importsignal
 fromsubprocessimport (
@@ -40,7 +39,8 @@
 PY3,
 bchr,
 # just to satisfy flake8 on py3
-unicode
+unicode,
+safe_decode,
 )
 
 execute_kwargs= ('istream', 'with_keep_cwd', 'with_extended_output',
@@ -694,12 +694,12 @@ def _kill_process(pid):
 cmdstr=" ".join(command)
 
 defas_text(stdout_value):
-returnnotoutput_streamandstdout_value.decode(defenc) or'<OUTPUT_STREAM>'
+returnnotoutput_streamandsafe_decode(stdout_value) or'<OUTPUT_STREAM>'
 # end
 
 ifstderr_value:
 log.info("%s -> %d; stdout: '%s' stderr: '%s'",
-cmdstr, status, as_text(stdout_value), stderr_value.decode(defenc))
+cmdstr, status, as_text(stdout_value), safe_decode(stderr_value))
 elifstdout_value:
 log.info("%s -> %d; stdout: '%s'", cmdstr, status, as_text(stdout_value))
 else:
@@ -713,11 +713,11 @@ def as_text(stdout_value):
 raiseGitCommandError(command, status, stderr_value)
 
 ifisinstance(stdout_value, bytes) andstdout_as_string: # could also be output_stream
-stdout_value=stdout_value.decode(defenc)
+stdout_value=safe_decode(stdout_value)
 
 # Allow access to the command's status code
 ifwith_extended_output:
-return (status, stdout_value, stderr_value.decode(defenc))
+return (status, stdout_value, safe_decode(stderr_value))
 else:
 returnstdout_value
 

git/compat.py

@@ -35,6 +35,7 @@ def mviter(d):
 returnd.values()
 range=xrange
 unicode=str
+binary_type=bytes
 else:
 FileType=file
 # usually, this is just ascii, which might not enough for our encoding needs
@@ -44,6 +45,7 @@ def mviter(d):
 byte_ord=ord
 bchr=chr
 unicode=unicode
+binary_type=str
 range=xrange
 defmviter(d):
 returnd.itervalues()
@@ -54,7 +56,7 @@ def safe_decode(s):
 ifisinstance(s, unicode):
 returns
 elifisinstance(s, bytes):
-returns.decode(defenc, errors='replace')
+returns.decode(defenc, 'replace')
 raiseTypeError('Expected bytes or text, but got %r'% (s,))
 
 

git/diff.py

@@ -7,6 +7,7 @@
 
 fromgitdb.utilimporthex_to_bin
 
+from .compatimportbinary_type
 from .objects.blobimportBlob
 from .objects.utilimportmode_str_to_int
 
@@ -245,18 +246,20 @@ class Diff(object):
 NULL_HEX_SHA="0"*40
 NULL_BIN_SHA=b"\0"*20
 
-__slots__= ("a_blob", "b_blob", "a_mode", "b_mode", "a_path", "b_path",
-"new_file", "deleted_file", "rename_from", "rename_to", "diff")
+__slots__= ("a_blob", "b_blob", "a_mode", "b_mode", "a_rawpath", "b_rawpath",
+"new_file", "deleted_file", "raw_rename_from", "raw_rename_to", "diff")
 
-def__init__(self, repo, a_path, b_path, a_blob_id, b_blob_id, a_mode,
-b_mode, new_file, deleted_file, rename_from,
-rename_to, diff):
+def__init__(self, repo, a_rawpath, b_rawpath, a_blob_id, b_blob_id, a_mode,
+b_mode, new_file, deleted_file, raw_rename_from,
+raw_rename_to, diff):
 
 self.a_mode=a_mode
 self.b_mode=b_mode
 
-self.a_path=a_path
-self.b_path=b_path
+asserta_rawpathisNoneorisinstance(a_rawpath, binary_type)
+assertb_rawpathisNoneorisinstance(b_rawpath, binary_type)
+self.a_rawpath=a_rawpath
+self.b_rawpath=b_rawpath
 
 ifself.a_mode:
 self.a_mode=mode_str_to_int(self.a_mode)
@@ -266,19 +269,21 @@ def __init__(self, repo, a_path, b_path, a_blob_id, b_blob_id, a_mode,
 ifa_blob_idisNoneora_blob_id==self.NULL_HEX_SHA:
 self.a_blob=None
 else:
-self.a_blob=Blob(repo, hex_to_bin(a_blob_id), mode=self.a_mode, path=a_path)
+self.a_blob=Blob(repo, hex_to_bin(a_blob_id), mode=self.a_mode, path=self.a_path)
 
 ifb_blob_idisNoneorb_blob_id==self.NULL_HEX_SHA:
 self.b_blob=None
 else:
-self.b_blob=Blob(repo, hex_to_bin(b_blob_id), mode=self.b_mode, path=b_path)
+self.b_blob=Blob(repo, hex_to_bin(b_blob_id), mode=self.b_mode, path=self.b_path)
 
 self.new_file=new_file
 self.deleted_file=deleted_file
 
 # be clear and use None instead of empty strings
-self.rename_from=rename_fromorNone
-self.rename_to=rename_toorNone
+assertraw_rename_fromisNoneorisinstance(raw_rename_from, binary_type)
+assertraw_rename_toisNoneorisinstance(raw_rename_to, binary_type)
+self.raw_rename_from=raw_rename_fromorNone
+self.raw_rename_to=raw_rename_toorNone
 
 self.diff=diff
 
@@ -344,6 +349,22 @@ def __str__(self):
 # end
 returnres
 
+@property
+defa_path(self):
+returnself.a_rawpath.decode(defenc, 'replace') ifself.a_rawpathelseNone
+
+@property
+defb_path(self):
+returnself.b_rawpath.decode(defenc, 'replace') ifself.b_rawpathelseNone
+
+@property
+defrename_from(self):
+returnself.raw_rename_from.decode(defenc, 'replace') ifself.raw_rename_fromelseNone
+
+@property
+defrename_to(self):
+returnself.raw_rename_to.decode(defenc, 'replace') ifself.raw_rename_toelseNone
+
 @property
 defrenamed(self):
 """:returns: True if the blob of our diff has been renamed
@@ -388,6 +409,7 @@ def _index_from_patch_format(cls, repo, stream):
 new_file_mode, deleted_file_mode, \
 a_blob_id, b_blob_id, b_mode, \
 a_path, b_path=header.groups()
+
 new_file, deleted_file=bool(new_file_mode), bool(deleted_file_mode)
 
 a_path=cls._pick_best_path(a_path, rename_from, a_path_fallback)
@@ -404,15 +426,15 @@ def _index_from_patch_format(cls, repo, stream):
 a_mode=old_modeordeleted_file_modeor (a_pathand (b_modeornew_modeornew_file_mode))
 b_mode=b_modeornew_modeornew_file_modeor (b_pathanda_mode)
 index.append(Diff(repo,
-a_pathanda_path.decode(defenc),
-b_pathandb_path.decode(defenc),
+a_path,
+b_path,
 a_blob_idanda_blob_id.decode(defenc),
 b_blob_idandb_blob_id.decode(defenc),
 a_modeanda_mode.decode(defenc),
 b_modeandb_mode.decode(defenc),
 new_file, deleted_file,
-rename_fromandrename_from.decode(defenc),
-rename_toandrename_to.decode(defenc),
+rename_from,
+rename_to,
 None))
 
 previous_header=header
@@ -438,8 +460,8 @@ def _index_from_raw_format(cls, repo, stream):
 meta, _, path=line[1:].partition('\t')
 old_mode, new_mode, a_blob_id, b_blob_id, change_type=meta.split(None, 4)
 path=path.strip()
-a_path=path
-b_path=path
+a_path=path.encode(defenc)
+b_path=path.encode(defenc)
 deleted_file=False
 new_file=False
 rename_from=None
@@ -455,6 +477,8 @@ def _index_from_raw_format(cls, repo, stream):
 new_file=True
 elifchange_type[0] =='R': # parses RXXX, where XXX is a confidence value
 a_path, b_path=path.split('\t', 1)
+a_path=a_path.encode(defenc)
+b_path=b_path.encode(defenc)
 rename_from, rename_to=a_path, b_path
 # END add/remove handling
 

git/ext/gitdb

@@ -931,19 +931,24 @@ def move(self, items, skip_errors=False, **kwargs):
 returnout
 
 defcommit(self, message, parent_commits=None, head=True, author=None,
-committer=None, author_date=None, commit_date=None):
+committer=None, author_date=None, commit_date=None,
+skip_hooks=False):
 """Commit the current default index file, creating a commit object.
  For more information on the arguments, see tree.commit.
 
  :note: If you have manually altered the .entries member of this instance,
  don't forget to write() your changes to disk beforehand.
+ Passing skip_hooks=True is the equivalent of using `-n`
+ or `--no-verify` on the command line.
  :return: Commit object representing the new commit"""
-run_commit_hook('pre-commit', self)
+ifnotskip_hooks:
+run_commit_hook('pre-commit', self)
 tree=self.write_tree()
 rval=Commit.create_from_tree(self.repo, tree, message, parent_commits,
 head, author=author, committer=committer,
 author_date=author_date, commit_date=commit_date)
-run_commit_hook('post-commit', self)
+ifnotskip_hooks:
+run_commit_hook('post-commit', self)
 returnrval
 
 @classmethod