summaryrefslogtreecommitdiff
path: root/git
Commit message (Collapse)AuthorAgeFilesLines
...
* Merge branch 'git_work_tree' of https://github.com/tbhartman/GitPython into ↵Sebastian Thiel2017-02-252-1/+30
|\ | | | | | | tbhartman-git_work_tree
| * check for GIT_WORK_TREETimothy B. Hartman2017-02-242-1/+30
| |
* | fix(refs): don't assume linux path separatorSebastian Thiel2017-02-251-1/+1
| | | | | | | | | | | | Instead, work with os.sep. Fixes #586
* | Merge pull request #582 from gitpython-developers/no_devnull_openSebastian Thiel2017-02-251-1/+1
|\ \ | | | | | | fix(cmd): checking process.DEVNUL were needlessly opening `os.devnull`
| * | fix(cmd): checking process.DEVNUL were needlessly opening `os.devnull`no_devnull_openKostis Anagnostopoulos2017-02-101-1/+1
| |/ | | | | | | | | | | | | 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')))
* | Merge pull request #555 from ankostis/cntxtmmanSebastian Thiel2017-02-254-23/+45
|\ \ | | | | | | Retrofit `repo` class as context-man to cleanup global mman on repo-delete
| * | style(cmd): pythonize cmd-args filtering for PY26, improve docstringKostis Anagnostopoulos2016-12-081-16/+19
| | | | | | | | | Apply codereview comments of #541.
| * | feat(util): export rmtree() to facilitate del of tmp-repos on WindowsKostis Anagnostopoulos2016-12-081-1/+2
| | | | | | | | | Usecase described in #553
| * | fix(leaks, TCs): attempt to cleanup mman before deleting tmp-dirsKostis Anagnostopoulos2016-12-081-6/+10
| | |
| * | fix(leaks): repo context-man to cleanup global mman on repo-deleteKostis Anagnostopoulos2016-12-081-0/+14
| | | | | | | | | | | | Improve API for problems like #553.
* | | fix(cmd): don't try to use TASKKILL on linuxSebastian Thiel2017-02-251-2/+3
| | | | | | | | | | | | Fixes #576
* | | fix(remote): assemble exception message completelySebastian Thiel2017-02-251-2/+2
| |/ |/| | | | | | | | | ... before trying to substitute values in. Fixes #575
* | Fix git.Commit docs typoReuben Sutton2017-02-021-1/+1
| |
* | DOC: minor typoRaphael Boidol2016-12-311-1/+1
| |
* | fix(remote): testSebastian Thiel2016-12-221-1/+1
| | | | | | | | | | Should have paid more attention to the test-failure before pushing the fix.
* | chore(lint): fixSebastian Thiel2016-12-221-2/+2
| |
* | fix(remote): set_url() uses correct argument orderSebastian Thiel2016-12-221-1/+1
| | | | | | | | Fixes #562
* | fix(tag): improve tag resolution handlingSebastian Thiel2016-12-221-2/+5
| | | | | | | | | | | | | | 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
* | chore(lint): flake8 pacificationSebastian Thiel2016-12-081-1/+0
| |
* | fix(refs): handle quoted branch namesSebastian Thiel2016-12-082-1/+19
| | | | | | | | Fixes #550
* | chore(repo): remove commentSebastian Thiel2016-12-081-1/+1
|/ | | | | | | As it does not appear to be the case. See https://github.com/gitpython-developers/GitPython/issues/547#issuecomment-257270026 [skip ci]
* Merge pull request #541 from andy-maier/py26_fixesSebastian Thiel2016-12-0812-27/+72
|\ | | | | Fixes to support Python 2.6 again.
| * Fixes to support Python 2.6 again.Andreas Maier2016-10-2412-27/+72
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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).
* | Merge pull request #554 from nvie/masterVincent Driessen2016-12-081-2/+0
|\ \ | | | | | | Don't change the meaning of string literals
| * | Don't change the meaning of string literalsVincent Driessen2016-12-071-2/+0
| |/
* | chore(lint): flake8Sebastian Thiel2016-12-084-2/+4
| | | | | | | | | | | | | | | | Interestingly only shows in particular python versions on travis. Maybe some caching effect? Locally it is reproducible easily, with the latest flake8
* | fix(submodule): don't fail if tracking branch can't be setupSebastian Thiel2016-12-081-1/+1
|/ | | | Fixes #545
* Merge branch 'win_mmap' of https://github.com/ankostis/GitPython into ↵Sebastian Thiel2016-10-223-23/+1
|\ | | | | | | ankostis-win_mmap
| * fix(win_mmap): unmark hidden win_errors due to smmap unicode foesKostis Anagnostopoulos2016-10-223-9/+0
| | | | | | | | | | | | | | 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
| * submodule-TCs: stop monekypatching smmap.MapRegion with files in WindowsKostis Anagnostopoulos2016-10-221-14/+0
| | | | | | | | Obviously it is not needed anymore, or nothing is worse without this monkeypatch.
* | chore(version-up): v2.1.02.1.0Sebastian Thiel2016-10-221-0/+0
| | | | | | | | Vastly improved windows support and a few bugfixes.
* | fix(repo): Use GIT_DIR only if no repo-path givenKostis Anagnostopoulos2016-10-221-3/+5
| | | | | | | | FIX #535 according to Byron's comment: https://github.com/gitpython-developers/GitPython/issues/535#issuecomment-255522529
* | Merge remote-tracking branch 'origin/master' into exp_git_dirKostis Anagnostopoulos2016-10-2222-66/+64
|\ \ | |/
| * Merge branch 'cygwin' of https://github.com/ankostis/GitPython into ↵Sebastian Thiel2016-10-2239-657/+931
| |\ | | | | | | | | | ankostis-cygwin
| * | Fix some typosSantiago Castro2016-10-2022-64/+63
| | |
* | | Merge with latest branch 'exp_git_dir'Kostis Anagnostopoulos2016-10-195-46/+74
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | Conflicts: git/repo/base.py git/repo/fun.py git/test/test_submodule.py
| * | repo: minor code and doc correcions.Kostis Anagnostopoulos2016-10-193-18/+19
| | | | | | | | | | | | | | | | | | | | | + 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()`).
| * | FIX #535: expand also GIT_DIR var on Repo-constructKostis Anagnostopoulos2016-10-191-3/+7
| |/ | | | | | | + Ignore "empty" GIT_DIR vars. + Improve documentation on the constructor `path` parameter.
| * Fix flake8 errorBenjamin Poldrack2016-10-191-1/+1
| |
| * Add a test for persistent git optionsBenjamin Poldrack2016-10-182-1/+15
| |
| * Allow for setting git options, that are persistent across subcommand callsBenjamin Poldrack2016-10-181-2/+20
| |
* | tc-helper: fix minor contexlib abuseKostis Anagnostopoulos2016-10-171-4/+3
| |
* | helper: minor fix prefix of temp-dirsKostis Anagnostopoulos2016-10-171-2/+2
| |
* | cygwin, appveyor, #533: Enable actual failures, hide certain 2+2 casesKostis Anagnostopoulos2016-10-164-8/+41
| |
* | Merge with #532, fix unicode filenames with escapesurogatesKostis Anagnostopoulos2016-10-165-14/+205
|\ \ | |/
| * fix(surrogateescape): enable on py2, fix testsSebastian Thiel2016-10-163-4/+13
| |
| * fix(unicode): use surrogateescape in bytes.decodeSebastian Thiel2016-10-163-7/+193
| | | | | | | | | | | | | | | | | | | | | | | | | | | | That way, we will try to decode as default encoding (usually utf-8), but allow ourselves to simply keep bytes that don't match within the resulting unicode string. That way, we allow for lossless decode/encode cycles while still assuring that decoding never fails. NOTE: I was too lazy to create a test that would verify it, but manually executed https://github.com/petertodd/gitpython-unicode-error. fixes #532
| * chore(release): v2.0.9Sebastian Thiel2016-10-161-0/+0
| | | | | | | | | | | | Also depend on gitdb2 to regain control and allow improvements. [skip ci]
* | cygwin, #533: FIX submodules detection (~10TCs fixed)Kostis Anagnostopoulos2016-10-163-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | + Decygpath sm's `.git` file contents. + Polish another path in `git add`; actually no main-code changes, just a replace \-->/ on a relative(!) path to make cygwin-git to work. - REGRESSION `test_git_submodules_and_add_sm_with_new_commit` asks for user/email settings. - Cygwin TCs failing: - PY2: err: 2, fail: 1 - PY3: err: 2, fail: 1
* | ci, deps: no PY26, ddt>=1.1.1, CIs `pip install test-requirements`Kostis Anagnostopoulos2016-10-163-5/+2
| | | | | | | | + Use environment-markers in requirement files (see http://stackoverflow.com/a/33451105/548792).
View Lorry Controller Status