aboutsummaryrefslogtreecommitdiff
path: root/git
AgeCommit message (Collapse)Author
2017-03-07Add a fixture to test incremental blame output for git 2.11.1+George Hickman
2017-03-07Document the use of next to throw an exception when hitting EOFGeorge Hickman
2017-03-07Ignore all lines of subsequent hunks until last one is foundGeorge Hickman
Git version 2.11.1+ introduced extra lines into the subsequent hunk sections for incremental blame output. The documentation notes that parsers of this output should ignore all lines between the start and end for robust parsing.
2017-03-01BF: there is no exc variable, raising NotASurrogateError if that is the ↵Yaroslav Halchenko
right thing todo
2017-02-25chore(flake): satisfy linterSebastian Thiel
2017-02-25Merge branch 'git_work_tree' of https://github.com/tbhartman/GitPython into ↵Sebastian Thiel
tbhartman-git_work_tree
2017-02-25fix(refs): don't assume linux path separatorSebastian Thiel
Instead, work with os.sep. Fixes #586
2017-02-25Merge pull request #582 from gitpython-developers/no_devnull_openSebastian Thiel
fix(cmd): checking process.DEVNUL were needlessly opening `os.devnull`
2017-02-25Merge pull request #555 from ankostis/cntxtmmanSebastian Thiel
Retrofit `repo` class as context-man to cleanup global mman on repo-delete
2017-02-25fix(cmd): don't try to use TASKKILL on linuxSebastian Thiel
Fixes #576
2017-02-25fix(remote): assemble exception message completelySebastian Thiel
... before trying to substitute values in. Fixes #575
2017-02-24check for GIT_WORK_TREETimothy B. Hartman
2017-02-10fix(cmd): checking process.DEVNUL were needlessly opening `os.devnull`no_devnull_openKostis Anagnostopoulos
Fixes resource-leak warning on Windows Puython-3.5.3+: D:\python-3.5.2.amd64\lib\site-packages\git\cmd.py:583: ResourceWarning: unclosed file <_io.BufferedWriter name='nul'> else getattr(subprocess, 'DEVNULL', open(os.devnull, 'wb')))
2017-02-02Fix git.Commit docs typoReuben Sutton
2016-12-31DOC: minor typoRaphael Boidol
2016-12-22fix(remote): testSebastian Thiel
Should have paid more attention to the test-failure before pushing the fix.
2016-12-22chore(lint): fixSebastian Thiel
2016-12-22fix(remote): set_url() uses correct argument orderSebastian Thiel
Fixes #562
2016-12-22fix(tag): improve tag resolution handlingSebastian Thiel
The handling is similar, but the error message makes clear what is happening, and what can be done to handle such a case. Related to #561
2016-12-08chore(lint): flake8 pacificationSebastian Thiel
2016-12-08fix(refs): handle quoted branch namesSebastian Thiel
Fixes #550
2016-12-08style(cmd): pythonize cmd-args filtering for PY26, improve docstringKostis Anagnostopoulos
Apply codereview comments of #541.
2016-12-08feat(util): export rmtree() to facilitate del of tmp-repos on WindowsKostis Anagnostopoulos
Usecase described in #553
2016-12-08chore(repo): remove commentSebastian Thiel
As it does not appear to be the case. See https://github.com/gitpython-developers/GitPython/issues/547#issuecomment-257270026 [skip ci]
2016-12-08fix(leaks, TCs): attempt to cleanup mman before deleting tmp-dirsKostis Anagnostopoulos
2016-12-08fix(leaks): repo context-man to cleanup global mman on repo-deleteKostis Anagnostopoulos
Improve API for problems like #553.
2016-12-08Merge pull request #541 from andy-maier/py26_fixesSebastian Thiel
Fixes to support Python 2.6 again.
2016-12-08Merge pull request #554 from nvie/masterVincent Driessen
Don't change the meaning of string literals
2016-12-08chore(lint): flake8Sebastian Thiel
Interestingly only shows in particular python versions on travis. Maybe some caching effect? Locally it is reproducible easily, with the latest flake8
2016-12-08fix(submodule): don't fail if tracking branch can't be setupSebastian Thiel
Fixes #545
2016-12-07Don't change the meaning of string literalsVincent Driessen
2016-10-24Fixes to support Python 2.6 again.Andreas Maier
Details: - Added Python 2.6 again to .travis.yml (it was removed in commit 4486bcb). - Replaced the use of dictionary comprehensions in `git/cmd.py` around line 800 with the code before that change (in commit 25a2ebf). Reason: dict comprehensions were introduced only in Python 2.7. - Changed the import source for `SkipTest` and `skipIf` from `unittest.case` to first trying `unittest` and upon ImportError from `unittest2`. This was done in `git/util.py` and in several testcases. Reason: `SkipTest` and `skipIf` were introduced to unittest only in Python 2.7, and `unittest2` is a backport of `unittest` additions to Python 2.6. - In git/test/lib/helper.py, fixed the definition of `assertRaisesRegex` to work on py26. - For Python 2.6, added the `unittest2` dependency to `requirements.txt` and changed `.travis.yml` to install `unittest2`. Because git/util.py uses SkipTest from unittest/unittest2, the dependency could not be added to `test-requirements.txt`. - Fixed an assertion in `git/test/test_index.py` to also allow a Python 2.6 specific exception message. - In `is_cygwin_git()` in `git/util.py`, replaced `check_output()` with `Popen()`. It was added in Python 2.7. - Enabled Python 2.6 for Windows: - Added Python 2.6 for MINGW in .appveyor.yml. - When defining `PROC_CREATIONFLAGS` in `git/cmd.py`, made use of certain win32 and subprocess flags that were introduced in Python 2.7, dependent on whether we run on Python 2.7 or higher. - In `AutoInterrupt.__del__()` in `git/cmd.py`, allowed for `os` not having `kill()`. `os.kill()` was added for Windows in Python 2.7 (For Linux, it existed in Python 2.6 already).
2016-10-22Merge branch 'win_mmap' of https://github.com/ankostis/GitPython into ↵Sebastian Thiel
ankostis-win_mmap
2016-10-22chore(version-up): v2.1.02.1.0Sebastian Thiel
Vastly improved windows support and a few bugfixes.
2016-10-22fix(win_mmap): unmark hidden win_errors due to smmap unicode foesKostis Anagnostopoulos
Now 2 more TCs pass in Windows: + TestRepo.test_file_handle_leaks() + TestObjDbPerformance.test_random_access() See https://github.com/gitpython-developers/smmap/pull/30
2016-10-22fix(repo): Use GIT_DIR only if no repo-path givenKostis Anagnostopoulos
FIX #535 according to Byron's comment: https://github.com/gitpython-developers/GitPython/issues/535#issuecomment-255522529
2016-10-22Merge remote-tracking branch 'origin/master' into exp_git_dirKostis Anagnostopoulos
2016-10-22submodule-TCs: stop monekypatching smmap.MapRegion with files in WindowsKostis Anagnostopoulos
Obviously it is not needed anymore, or nothing is worse without this monkeypatch.
2016-10-22Merge branch 'cygwin' of https://github.com/ankostis/GitPython into ↵Sebastian Thiel
ankostis-cygwin
2016-10-20Fix some typosSantiago Castro
2016-10-19Merge with latest branch 'exp_git_dir'Kostis Anagnostopoulos
Conflicts: git/repo/base.py git/repo/fun.py git/test/test_submodule.py
2016-10-19repo: minor code and doc correcions.Kostis Anagnostopoulos
+ Expansion of paths also `osp.normalize()` them. + Make Repo-fields --> class-fields to avoid initializations on construct. + Explain and rename `git.repo.fun.find_git_dir()` is for submodules (`find_submodule_git_dir()`).
2016-10-19FIX #535: expand also GIT_DIR var on Repo-constructKostis Anagnostopoulos
+ Ignore "empty" GIT_DIR vars. + Improve documentation on the constructor `path` parameter.
2016-10-19Fix flake8 errorBenjamin Poldrack
2016-10-18Add a test for persistent git optionsBenjamin Poldrack
2016-10-18Allow for setting git options, that are persistent across subcommand callsBenjamin Poldrack
2016-10-17tc-helper: fix minor contexlib abuseKostis Anagnostopoulos
2016-10-17helper: minor fix prefix of temp-dirsKostis Anagnostopoulos
2016-10-16cygwin, appveyor, #533: Enable actual failures, hide certain 2+2 casesKostis Anagnostopoulos
2016-10-16Merge with #532, fix unicode filenames with escapesurogatesKostis Anagnostopoulos