aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2015-01-02[IMP] branch names may contain '#' charactersThomas Rehn
2014-12-19Merge branch 'yarikoptic-bf/time_parse' into 0.3Sebastian Thiel
2014-12-19Simplified parse_date implementationSebastian Thiel
This allows to deal with the previous UTC issue without manually reversing timezone adjustments
2014-12-18BF: adjust mktime output for the local offset (Close #218)Yaroslav Halchenko
2014-12-11Merge pull request #215 from niyaton/fix-reflog-encoding-bugSebastian Thiel
encode name of actor to utf-8
2014-12-12encode name of actor to utf-8Kenji Fujiwara
2014-11-29With docs up on http://gitpython.readthedocs.org, a manually maintained ↵Sebastian Thiel
index isn't required anymore [ci skip]
2014-11-19Fixes #64Sebastian Thiel
[ci skip]
2014-11-19Merge branch 'read-the-docs' into 0.3Sebastian Thiel
2014-11-19Added build-the-docs badge and updated urlSebastian Thiel
2014-11-19Fixes #122Sebastian Thiel
For now, referencing github directly seems to be safest.
2014-11-19Merge branch 'chroto-130' into 0.3Sebastian Thiel
2014-11-19Fixes https://github.com/gitpython-developers/GitPython/issues/130Sebastian Thiel
2014-11-19Merge branch 'autopep' into 0.3Sebastian Thiel
Resolves https://github.com/gitpython-developers/GitPython/pull/182
2014-11-19Applied autopep8Sebastian Thiel
Commandline was autopep8 -j 8 --max-line-length 120 --in-place --recursive --exclude "*gitdb*,*async*" git/
2014-11-19Merge branch 'igetgames-feature/0.3/git-file-support' into 0.3Sebastian Thiel
Resolves https://github.com/gitpython-developers/GitPython/pull/89
2014-11-19Merge branch 'feature/0.3/git-file-support' of ↵Sebastian Thiel
https://github.com/igetgames/GitPython into igetgames-feature/0.3/git-file-support Using the previous implementation of read_gitfile, but added the previously missing test from this PR. Conflicts: git/repo/base.py git/test/test_repo.py
2014-11-19Merge branch 'niyaton-separate-git-dir' into 0.3Sebastian Thiel
2014-11-19Minor fix to make read_gitfile work .Sebastian Thiel
2014-11-19Merge branch 'separate-git-dir' of https://github.com/niyaton/GitPython into ↵Sebastian Thiel
niyaton-separate-git-dir Conflicts: git/repo/base.py
2014-11-19Added SymbolicReference.is_remote() utility method.Sebastian Thiel
Based on the functionality proposed in https://github.com/gitpython-developers/GitPython/pull/101 [ci skip]
2014-11-19Backport of https://github.com/gitpython-developers/GitPython/pull/118Sebastian Thiel
2014-11-19Merge branch 'migurski-patch-1' into 0.3Sebastian Thiel
Handles https://github.com/gitpython-developers/GitPython/pull/143
2014-11-19Removed assertion inserted in previous commitSebastian Thiel
2014-11-19Implemented assertion based on ↵Sebastian Thiel
https://github.com/gitpython-developers/GitPython/pull/143 The assertion will trigger, which shows that we are still getting thigs slightly wrong. For now, we are better off without.
2014-11-18Bumping version 0.3.2.10.3.2.1Sebastian Thiel
2014-11-17Merge branch 'electrofelix-0.3-fix-env-usage' into 0.3Sebastian Thiel
2014-11-17Copy environment for subprocess executionDarragh Bailey
Git utilizes multiple environment variables to control various behaviours. Make sure to set LC_MESSAGES on a copy of the environment instead of discarding any variables that may be set by the user or default shell environment such as EDITOR. Add test to assert that when overriding GIT_EDITOR via os.environ that the modified value will be picked up by and git commands called.
2014-11-17Merge branch 'boppreh-patch-1' into 0.3Sebastian Thiel
2014-11-17Merge branch 'patch-1' of https://github.com/boppreh/GitPython into ↵Sebastian Thiel
boppreh-patch-1 Adjusted patch to only run git command in shell mode on windows. Conflicts: git/cmd.py
2014-11-17Merge branch 'moshevds-0.3' into 0.3Sebastian Thiel
Backport of https://github.com/gitpython-developers/GitPython/pull/131
2014-11-17Allow Index.add() on bare repositoriesSebastian Thiel
2014-11-17Merge branch 'firm1-0.3' into 0.3Sebastian Thiel
This includes a few fixes to not break backwards compatiblity
2014-11-17Assure API remains backwards compatible; update API docsSebastian Thiel
2014-11-17Merge branch '0.3' of https://github.com/firm1/GitPython into firm1-0.3Sebastian Thiel
Fixed most pressing issues, more to come in next commit as we introduced a regression here. Conflicts: git/objects/commit.py git/refs/log.py git/refs/symbolic.py
2014-11-17Merge pull request #205 from hashar/rm-unicode-bomSebastian Thiel
Remove Byte Order Mark from git/cmd.py
2014-11-17Merge pull request #204 from hashar/pep8-lintingSebastian Thiel
Pep8 linting
2014-11-16Remove Byte Order Mark from git/cmd.pyAntoine Musso
The Unicode Byte Order Mark is usually unwanted. git/cmd.py had one inserted in 2008 by cf37099e, a commit that fix a Windows related issue which indicate the file has most probably be edited with a text editor that automatically insert the Byte Order Mark. Remove the BOM from git/cmd.py For details aboute the BOM: https://en.wikipedia.org/wiki/Byte_order_mark
2014-11-16pep8 linting (trailing whitespace)Antoine Musso
W291 trailing whitespace
2014-11-16pep8 linting (double spaces before comment)Antoine Musso
E261 at least two spaces before inline comment
2014-11-16pep8 linting (whitespace before/after)Antoine Musso
E201 whitespace after '(' E202 whitespace before ')' E203 whitespace before ':' E225 missing whitespace around operator E226 missing whitespace around arithmetic operator E227 missing whitespace around bitwise or shift operator E228 missing whitespace around modulo operator E231 missing whitespace after ',' E241 multiple spaces after ',' E251 unexpected spaces around keyword / parameter equals
2014-11-16pep8 linting (blank lines expectations)Antoine Musso
E301 expected 1 blank line, found 0 E302 expected 2 blank lines, found 1 E303 too many blank lines (n)
2014-11-16pep8 linting (whitespaces)Antoine Musso
W191 indentation contains tabs E221 multiple spaces before operator E222 multiple spaces after operator E225 missing whitespace around operator E271 multiple spaces after keyword W292 no newline at end of file W293 blank line contains whitespace W391 blank line at end of file
2014-11-15Merge branch 'johnsca-sf-master' into 0.3Sebastian Thiel
Merge all fixes from https://github.com/gitpython-developers/GitPython/pull/134
2014-11-15Merge branch 'sf-master' of https://github.com/johnsca/GitPython into ↵Sebastian Thiel
johnsca-sf-master Conflicts: git/cmd.py git/objects/commit.py git/objects/fun.py git/objects/util.py git/remote.py git/repo/base.py git/test/lib/helper.py git/test/test_commit.py git/test/test_fun.py git/util.py
2014-11-15Merge pull request #202 from hashar/toxSebastian Thiel
tox commands now have {posargs} as argument
2014-11-15Merge pull request #203 from hashar/lint-setup_pySebastian Thiel
Lint setup.py
2014-11-14Lint setup.pyAntoine Musso
Pass flake8 on setup.py. I have left behing the 'line too long' errors though since they are usually controversial. The setup() call has been reindented to save a level of indentation.
2014-11-14tox commands now have {posargs} as argumentAntoine Musso
When invoking an environement, one might want to pass extra argument to the command. That is done in tox by invoking an env and passing the extra arguments after '--' which are then available as '{posargs}'. Examples: # Reports flake8 error statistics tox -eflake8 -- --statistics # Only run test_util.py tests, printing a line per test: tox -epy27 -- --verbose git/test/test_util.py
2014-11-14Don't use tuples in setup.py requirement specsSebastian Thiel
[skip ci] See https://github.com/gitpython-developers/GitPython/issues/186 for the motivation of this fix.