summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* | 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(version): 2.1.12.1.1Sebastian Thiel2016-12-082-1/+8
| |
* | 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-0815-27/+81
|\ | | | | Fixes to support Python 2.6 again.
| * Fixes to support Python 2.6 again.Andreas Maier2016-10-2415-27/+81
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-085-2/+5
| | | | | | | | | | | | | | | | 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-223-1/+19
| | | | | | | | Vastly improved windows support and a few bugfixes.
* | Merge pull request #537 from ankostis/exp_git_dirSebastian Thiel2016-10-223-44/+42
|\ \ | |/ |/| FIX #535: expand also GIT_DIR var on Repo-construction
| * 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-2225-82/+80
| |\ | |/ |/|
* | Merge branch 'cygwin' of https://github.com/ankostis/GitPython into ↵Sebastian Thiel2016-10-2244-685/+960
|\ \ | | | | | | | | | ankostis-cygwin
* \ \ Merge pull request #539 from bryant1410/typosKostis Anagnostopoulos2016-10-2125-80/+79
|\ \ \ | | | | | | | | Fix some typos
| * | | Fix some typosSantiago Castro2016-10-2025-80/+79
|/ / /
| | * 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.
* | Merge pull request #536 from bpoldrack/nf-persistent-git-optionsKostis Anagnostopoulos2016-10-192-2/+34
|\ \ | | | | | | Allow for setting git generic options, persisted across subcommand calls.
| * | 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-165-9/+42
| |
| * Merge with #532, fix unicode filenames with escapesurogatesKostis Anagnostopoulos2016-10-167-17/+208
| |\ | |/ |/|
* | 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(version): 2.0.10dev02.0.9Sebastian Thiel2016-10-161-1/+1
| | | | | | | | [skip ci]
* | chore(release): v2.0.9Sebastian Thiel2016-10-163-3/+3
| | | | | | | | | | | | Also depend on gitdb2 to regain control and allow improvements. [skip ci]
* | chore(version): dev1Sebastian Thiel2016-10-161-1/+1
| | | | | | | | | | | | | | Just to allow uploading a more recent one, that ideally works now. [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-168-18/+9
| | | | | | | | + Use environment-markers in requirement files (see http://stackoverflow.com/a/33451105/548792).
| * src: reduce needless deps to `gitdb.util`Kostis Anagnostopoulos2016-10-1621-151/+124
| |
| * src: import os.path as ospKostis Anagnostopoulos2016-10-1624-332/+361
| |
| * cygwin, #533: polish abs-paths in `git add` commandsKostis Anagnostopoulos2016-10-163-2/+4
| | | | | | | | | | | | | | | | | | | | | | + Modify TCs - no main-code changes. + FIXed: + `TestSubmodule.test_git_submodules_and_add_sm_with_new_commit()` + TestDiff.test_diff_with_staged_file() - Cygwin TCs failing: - PY2: err: 12, fail: 2 - PY3: err: 11, fail: 2
| * cygwin, #533: Allow '/cygdrive/c/' paths on repo initKostis Anagnostopoulos2016-10-144-29/+75
| | | | | | | | | | | | - Cygwin TCs failing: - PY2: err: 13, fail: 2 - PY3: err: 12, fail: 2
| * cygwin, #533: Polish also --git-separate-dirKostis Anagnostopoulos2016-10-141-5/+8
| | | | | | | | | | | | - Cygwin TCs failing: - PY2: err: 13, fail: 3 - PY3: err: 12, fail: 3
| * cygwin, #533: FIX daemon launchingKostis Anagnostopoulos2016-10-142-112/+122
| | | | | | | | | | | | | | | | + Rework git-daemon launching with `with` resource-management. + cmd: add `is_cygwin` optional override kwd on `Git.polish_url()`. - Cygwin TCs failing: - PY2: err: 13, fail: 3 - PY3: err: 12, fail: 3
| * cygwin, #533: Try to make it work with Cygwin's Git.Kostis Anagnostopoulos2016-10-145-67/+250
| | | | | | | | | | | | | | | | | | + Make `Git.polish_url()` convert paths into Cygwin-friendly paths. + Add utility and soe TCs for funcs for detecting cygwin and converting abs-paths to `/cygdrive/c/...`. - Cygwin TCs failing: - PY2: err: 14, fail: 3 - PY3: err: 13, fail: 3
| * appveyor, #533: enable CYGWIN TCs without failingKostis Anagnostopoulos2016-10-141-16/+23
|/ | | | | | - Cygwin TCs failing (start, no Cygwin specific code): - PY2: err: 44, fail: 0 - PY3: err: 13, fail: 0
* Merge pull request #530 fixing some #525 Windows errorsKostis Anagnostopoulos2016-10-1412-361/+328
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + git-daemon: + Use git-daemon PORT above 10k; on Windows all below need Admin rights. + Used relative daemon-paths with `--base-pth`. + Simplify git-daemon start/stop/ex-hanlding. +FIXED git-daemon @with_rw_and_rw_remote_repo(): + "Polish" most remote & config urls, converting \-->/. + test_base.test_with_rw_remote_and_rw_repo() PASS. + Remote: + test_remote: apply polish-urls on `_do_test_fetch()` checking function. + test_remote.test_base() now freezes on Windows! (so still hidden win_err). pump fetch-infos instead of GIL-reading stderr. + Push-cmd also keep (and optionally raise) any error messages. + `cmd.handle_process_output()` accepts null-finalizer, to pump completely stderr before raising any errors. + test: Enable `TestGit.test_environment()` on Windows (to checks stderr consumption). + util: delete unused `absolute_project_path()`. + Control separately *freezing* TCs on Windows with `git.util.HIDE_WINDOWS_FREEZE_ERRORS` flag.
| * cmd, #525: Always include stdout+stderr in exceptionsKostis Anagnostopoulos2016-10-141-4/+1
| | | | | | | | | | + Ignore `with_extended_output` arg when reaising the exception, keep its behavior when `status==0`.
| * remote, #525: FIX BUG push-cmd misses error messagesKostis Anagnostopoulos2016-10-145-83/+91
| | | | | | | | | | | | + Bug discovered after enabling TC in prev commit and rework of fetch. + remote_tc: unitestize assertions. + util: DEL unused `_mktemp()`.
View Lorry Controller Status