Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Don't choke on (legitimately) invalidly encoded Unicode pathsfix-dont-choke-on-invalid-unicode-paths | Vincent Driessen | 2016-06-06 | 3 | -10/+18 |
| | |||||
* | Merge pull request #460 from ddanier/autointerrupt_del_no_os_kill | Sebastian Thiel | 2016-06-02 | 1 | -1/+1 |
|\ | | | | | Make sure os is not even partly destroyed | ||||
| * | Make sure os is not even partly destroyed | David Danier | 2016-06-01 | 1 | -1/+1 |
| | | |||||
* | | fix(test): remove unused import | Sebastian Thiel | 2016-06-02 | 2 | -1/+1 |
|/ | |||||
* | Merge pull request #459 from andy-maier/fix-457-typerror-on-py26 | Vincent Driessen | 2016-06-01 | 2 | -4/+5 |
|\ | | | | | Fixes #457: 'TypeError: decode() takes no keyword arguments' on Python 2.6 | ||||
| * | Fixed 'TypeError: decode() takes no keyword arguments' on Python 2.6 | Andreas Maier | 2016-06-01 | 2 | -4/+5 |
|/ | |||||
* | fix(test): do not skip test on travis | Sebastian Thiel | 2016-06-01 | 2 | -2/+0 |
| | | | | | | | Please exclude the particular assertion instead. Related to https://github.com/gitpython-developers/GitPython/commit/a3f24f64a20d1e09917288f67fd21969f4444acd#commitcomment-17691581 | ||||
* | chore(compat): state py2.6 support officially | Sebastian Thiel | 2016-06-01 | 2 | -0/+3 |
| | | | | | | More information in the respective issue. Fixes #453 | ||||
* | Bump for new version | Vincent Driessen | 2016-05-30 | 2 | -1/+6 |
| | |||||
* | This is 2.0.52.0.5 | Vincent Driessen | 2016-05-30 | 1 | -1/+1 |
| | |||||
* | Fix regex | Vincent Driessen | 2016-05-30 | 2 | -1/+6 |
| | | | | | This catches the case where the matched line contains "(" or ")" characters. | ||||
* | This is 2.0.42.0.4 | Vincent Driessen | 2016-05-30 | 1 | -1/+1 |
| | |||||
* | Update changelog | Vincent Driessen | 2016-05-30 | 1 | -0/+3 |
| | |||||
* | Merge pull request #456 from ↵ | Sebastian Thiel | 2016-05-30 | 3 | -3/+16 |
|\ | | | | | | | | | gitpython-developers/fix-for-invalid-data-in-commits Add test case as example of Git commit with invalid data | ||||
| * | Ignore invalid data when decoding commit objectsfix-for-invalid-data-in-commits | Vincent Driessen | 2016-05-30 | 1 | -3/+3 |
| | | | | | | | | | | | | Previously, GitPython chokes on this while decoding. Rather than choking, instead accept the error and replace the invalid bytes by the � (\x80) char. | ||||
| * | Add test case as example of Git commit with invalid data | Vincent Driessen | 2016-05-30 | 2 | -0/+13 |
| | | | | | | | | | | | | | | | | | | | | This is a real commit from the microjs.com open source project, see https://github.com/madrobby/microjs.com/commit/7e8457c17850d0991763941213dcb403d80f39f8, which is declared to be encoded in UTF-8, but contains invalid bytes. This makes GitPython choke on it while decoding. Rather than choking, this should instead accept the error and replace the invalid bytes by the � (\x80) char. | ||||
* | | Merge pull request #454 from ↵ | Sebastian Thiel | 2016-05-30 | 4 | -8/+31 |
|\ \ | | | | | | | | | | | | | gitpython-developers/fix-octal-escaped-path-parser-bug Fix bug in diff parser output | ||||
| * | | Fix bug in diff parser outputfix-octal-escaped-path-parser-bug | Vincent Driessen | 2016-05-30 | 4 | -8/+31 |
| |/ | | | | | | | | | | | | | | | | | | | | | | | The diff --patch parser was missing some edge case where Git would encode non-ASCII chars in path names as octals, but these weren't decoded properly. \360\237\222\251.txt Decoded via utf-8, that will return: 💩.txt | ||||
* | | Merge pull request #455 from gitpython-developers/fix-ci-tests | Vincent Driessen | 2016-05-30 | 1 | -5/+6 |
|\ \ | |/ |/| | Skip test that always fails on Travis CI | ||||
| * | Skip test that always fails on Travis CIfix-ci-tests | Vincent Driessen | 2016-05-30 | 1 | -5/+6 |
|/ | |||||
* | chore(remote): better super-class call syntax | Sebastian Thiel | 2016-05-29 | 1 | -1/+1 |
| | | | | | | Python :) !! Related to #451 | ||||
* | chore(flake8): whitespace ... | Sebastian Thiel | 2016-05-29 | 1 | -1/+1 |
| | | | | | | Related to #451 Signed-off-by: Sebastian Thiel <byronimo@gmail.com> | ||||
* | Merge pull request #451 from barry-scott/pr-fix-callable-remote-progress | Sebastian Thiel | 2016-05-29 | 1 | -2/+2 |
|\ | | | | | Fix traceback because _seen_ops is not initialised | ||||
| * | Fix traceback because _seen_ops is not initialised | Barry Scott | 2016-05-29 | 1 | -2/+2 |
|/ | | | | must call the base class __init__ | ||||
* | fix(remote): improve version check | Sebastian Thiel | 2016-05-29 | 1 | -2/+2 |
| | | | | | | | | | | | | | Make version check much more readable, and fix it at the same time. The previous implementation would assume progress is supported just by looking at the patch-level for instance. A quick check of the git sources seems to indicate the --progress flag exists in v1.7 of the git command-line already. Fixes #449 | ||||
* | fix(remote): Add CallableRemoteProgress | Sebastian Thiel | 2016-05-29 | 2 | -12/+22 |
| | | | | | | That way, the base type doesn't need any adjustment. Related to #450 | ||||
* | doc(changes): inform about new progress API | Sebastian Thiel | 2016-05-29 | 1 | -0/+3 |
| | | | | Related to #450 | ||||
* | chore(misc): cleanup and docs | Sebastian Thiel | 2016-05-29 | 4 | -34/+24 |
| | | | | | | Minor adjustments to PR to match current code style. Related to #450 | ||||
* | Merge pull request #450 from barry-scott/master | Sebastian Thiel | 2016-05-29 | 3 | -10/+54 |
|\ | | | | | The progress arg to push, pull, fetch and clone is now a python calla… | ||||
| * | Merge remote-tracking branch 'upstream/master' | Barry Scott | 2016-05-28 | 4 | -17/+40 |
| |\ | |/ |/| | |||||
* | | Merge pull request #447 from Xender/patch-1 | Sebastian Thiel | 2016-05-27 | 1 | -1/+1 |
|\ \ | | | | | | | Use proper syntax for conditional expressions. | ||||
| * | | Use proper syntax for conditional expression | Aleksander Nitecki | 2016-05-26 | 1 | -1/+1 |
| | | | | | | | | | (instead of abusing the "short-circuit" property of logical operations) | ||||
* | | | Merge pull request #445 from guyzmo/got_rid_of_warning | Sebastian Thiel | 2016-05-27 | 1 | -1/+1 |
|\ \ \ | |/ / |/| | | Changing warning to debug logging, to avoid warning showing off when nothing's wrong | ||||
| * | | Changing warning to debug logging, to avoid warning showing off when ↵ | Guyzmo | 2016-05-26 | 1 | -1/+1 |
|/ / | | | | | | | | | | | | | | | nothing's wrong cf #444 Signed-off-by: Guyzmo <guyzmo+github@m0g.net> | ||||
* | | fix(remote): py3 compatibility | Sebastian Thiel | 2016-05-26 | 1 | -2/+2 |
| | | | | | | | | Related to #444 | ||||
* | | fix(remote): py3 compatibility | Sebastian Thiel | 2016-05-26 | 1 | -2/+2 |
| | | |||||
* | | fix(remote): use universal_newlines for fetch/push | Sebastian Thiel | 2016-05-26 | 2 | -6/+13 |
| | | | | | | | | | | | | That way, real-time parsing of output should finally be possible. Related to #444 | ||||
* | | fix(remote): real-time reading of lines from stderr | Sebastian Thiel | 2016-05-26 | 1 | -1/+1 |
| | | | | | | | | | | | | That way, progress usage will behave as expected. Fixes #444 | ||||
* | | chore(compat): another attempt to get travis right | Sebastian Thiel | 2016-05-26 | 2 | -2/+3 |
| | | |||||
* | | chore(compat): re-add allowed breakage of py2.6 | Sebastian Thiel | 2016-05-26 | 1 | -0/+4 |
| | | | | | | | | As inspired by comments in #431 | ||||
* | | Merge pull request #443 from boegel/fix_ordereddict | Sebastian Thiel | 2016-05-26 | 1 | -1/+1 |
|\ \ | | | | | | | import OrderedDict from git.odict rather than directly from collections, to pix Py2.6 compatibility | ||||
| * | | import OrderedDict from git.odict rather than directly from collections, to ↵ | Kenneth Hoste | 2016-05-26 | 1 | -1/+1 |
|/ / | | | | | | | pix Py2.6 compatibility | ||||
* | | fix(remote): better array truncation logic | Sebastian Thiel | 2016-05-25 | 1 | -5/+9 |
| | | | | | | | | | | | | | | Previously, the logic was not correct. Now it should work either way, truncating the correct list to assure both always have the same length. Related to #442 | ||||
* | | fix(remote): remove assertion in favour of runtime stability | Sebastian Thiel | 2016-05-25 | 1 | -4/+11 |
| | | | | | | | | Fixes #442 | ||||
| * | The progress arg to push, pull, fetch and clone is now a python callable. | Barry Scott | 2016-05-28 | 3 | -10/+54 |
|/ | | | | | | | | | | | | | This simplifies the API and removes the parser, RemoteProgres, from the API as RemoteProgress is an internal detail of the implementation. progress is accepted as: * None - drop progress messages * callable (function etc) - call the function with the same args as update * object - assume its RemoteProgress derived as use as before RemoteProgress takes an optional progress_function argument. It will call the progress function if not None otherwise call self.update as it used to. | ||||
* | chore(changes): put fix to correct patch level | Sebastian Thiel | 2016-05-25 | 1 | -1/+5 |
| | |||||
* | fix(requirements): now works with tox | Sebastian Thiel | 2016-05-25 | 1 | -1/+0 |
| | |||||
* | fix(RemoteProgress): improve message sanitization | Sebastian Thiel | 2016-05-25 | 3 | -10/+22 |
| | | | | | | Don't allow `, ` prefixes or suffixes in messages. Fixes #438 | ||||
* | Fix link to latest changelog | Vincent Driessen | 2016-05-24 | 1 | -1/+1 |
| | |||||
* | Fixes for RST syntax | Vincent Driessen | 2016-05-24 | 1 | -5/+5 |
| |