aboutsummaryrefslogtreecommitdiff
path: root/git
AgeCommit message (Collapse)Author
2016-06-02Merge pull request #460 from ddanier/autointerrupt_del_no_os_killSebastian Thiel
Make sure os is not even partly destroyed
2016-06-02fix(test): remove unused importSebastian Thiel
2016-06-01Make sure os is not even partly destroyedDavid Danier
2016-06-01Fixed 'TypeError: decode() takes no keyword arguments' on Python 2.6Andreas Maier
2016-06-01fix(test): do not skip test on travisSebastian Thiel
Please exclude the particular assertion instead. Related to https://github.com/gitpython-developers/GitPython/commit/a3f24f64a20d1e09917288f67fd21969f4444acd#commitcomment-17691581
2016-05-30Fix regexVincent Driessen
This catches the case where the matched line contains "(" or ")" characters.
2016-05-30Merge pull request #456 from ↵Sebastian Thiel
gitpython-developers/fix-for-invalid-data-in-commits Add test case as example of Git commit with invalid data
2016-05-30Merge pull request #454 from ↵Sebastian Thiel
gitpython-developers/fix-octal-escaped-path-parser-bug Fix bug in diff parser output
2016-05-30Make sure that stderr is converted to bytesBarry Scott
remove stderr for a wait() that is not the GitPython wrapper.
2016-05-30Ignore invalid data when decoding commit objectsVincent Driessen
Previously, GitPython chokes on this while decoding. Rather than choking, instead accept the error and replace the invalid bytes by the � (\x80) char.
2016-05-30Add test case as example of Git commit with invalid dataVincent Driessen
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.
2016-05-30Fix flake8 complaintsBarry Scott
2016-05-30Skip test that always fails on Travis CIfix-ci-testsVincent Driessen
2016-05-30Fix bug in diff parser outputVincent Driessen
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
2016-05-29Return stderr lines from a pull() call that failsBarry Scott
2016-05-29Return all the stderr messge after an error is detected for pull()Barry Scott
2016-05-29chore(remote): better super-class call syntaxSebastian Thiel
Python :) !! Related to #451
2016-05-29chore(flake8): whitespace ...Sebastian Thiel
Related to #451 Signed-off-by: Sebastian Thiel <byronimo@gmail.com>
2016-05-29Fix traceback because _seen_ops is not initialisedBarry Scott
must call the base class __init__
2016-05-29fix(remote): improve version checkSebastian Thiel
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
2016-05-29fix(remote): Add CallableRemoteProgressSebastian Thiel
That way, the base type doesn't need any adjustment. Related to #450
2016-05-29chore(misc): cleanup and docsSebastian Thiel
Minor adjustments to PR to match current code style. Related to #450
2016-05-28Merge remote-tracking branch 'upstream/master'Barry Scott
2016-05-28The progress arg to push, pull, fetch and clone is now a python callable.Barry Scott
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.
2016-05-27Merge pull request #447 from Xender/patch-1Sebastian Thiel
Use proper syntax for conditional expressions.
2016-05-26Use proper syntax for conditional expressionAleksander Nitecki
(instead of abusing the "short-circuit" property of logical operations)
2016-05-26Changing warning to debug logging, to avoid warning showing off when ↵Guyzmo
nothing's wrong cf #444 Signed-off-by: Guyzmo <guyzmo+github@m0g.net>
2016-05-26fix(remote): py3 compatibilitySebastian Thiel
Related to #444
2016-05-26fix(remote): py3 compatibilitySebastian Thiel
2016-05-26fix(remote): use universal_newlines for fetch/pushSebastian Thiel
That way, real-time parsing of output should finally be possible. Related to #444
2016-05-26fix(remote): real-time reading of lines from stderrSebastian Thiel
That way, progress usage will behave as expected. Fixes #444
2016-05-26import OrderedDict from git.odict rather than directly from collections, to ↵Kenneth Hoste
pix Py2.6 compatibility
2016-05-25fix(remote): better array truncation logicSebastian Thiel
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
2016-05-25fix(remote): remove assertion in favour of runtime stabilitySebastian Thiel
Fixes #442
2016-05-25fix(RemoteProgress): improve message sanitizationSebastian Thiel
Don't allow `, ` prefixes or suffixes in messages. Fixes #438
2016-05-24Merge branch 'jonathanchu-master'Vincent Driessen
2016-05-24Ignore trailing last empty string in .split() outputVincent Driessen
2016-05-24Check if byte string is empty for py3 compatibilityJonathan Chu
2016-05-24fix(cmd): fix with_stdout implementationSebastian Thiel
Admittedly this fix is solely based on the documentation provided for this parameter, which indicated a different intend than was actually implemented. Also I don't believe doing this will cause any harm. As a special note: the call to `open(os.devnull, 'wb')` does not seem leak the handle, apparently it is given as-is to the subprocess, which will then close it naturally. This was tested using an interactive session via `htop` on osx. Fixes #437
2016-05-24Split lines by new line charactersJonathan Chu
Opt to split lines by the new line character instead of letting `splitlines()` do this. This helps catch the issue when there are special characters in the line, particular the commit summary section.
2016-05-24fix(cmd): don't catch progress handler exceptionsSebastian Thiel
Fixes #435
2016-05-19Merge pull request #433 from StevenWColby/masterSebastian Thiel
Need spaces in Emacs style encoding comment
2016-05-19Merge pull request #431 from guyzmo/fix-opt_arg-orderSebastian Thiel
Fix order of operators before executing the git command
2016-05-19Use correct mode for executable filesSebastian Thiel
Fixes #430
2016-05-19Clarify costs of certain propertiesSebastian Thiel
Fixes #428
2016-05-19Deprecate Diffable.rename for .renamed_fileSebastian Thiel
Fixes #426
2016-05-18Need spaces in Emacs style encoding commentSteven Colby
Although it's hard to see, PEP-0263 does have ws delimiting the 'coding' string. This commit will fix the root cause of (at least) one bug: https://lists.fedoraproject.org/archives/list/eclipse-sig@lists.fedoraproject.org/thread/5XQ5JRHG6DPPMGRDU7TA2AO4EYS2H7AG/
2016-05-12Fix order of operators before executing the git commandGuyzmo
Since Python 3.3, the hash value of an object is seeded randomly, making it change between each call. As a consequence, the `dict` type relying on the hash value for the order of the items upon iterating on it, and the parameters passed to `git` being passed as `kwargs` to the `execute()` method, the order of parameters will change randomly between calls. For example, when you call `git.remote.pull()` in a code, two consecutives run will generate: 1. git pull --progress -v origin master 2. git pull -v --progress origin master Within the `transform_kwargs()` method, I'm promoting `kwargs` into an `collections.OrderedDict` being built with `kwargs` sorted on the keys. Then it will ensure that each subsequent calls will execute the parameters in the same order.
2016-04-24Allow "@" sign in fetch output linesVincent Driessen
2016-04-22Fix assertion2.0.0Sebastian Thiel
Who would have thought we ever go 2.0 ;).