summaryrefslogtreecommitdiff
path: root/git
Commit message (Collapse)AuthorAgeFilesLines
...
* Fix encoding issue with stderr_value and kill_after_timeoutPaul Belanger2017-10-051-2/+2
| | | | | | We don't properly encode our error message under python3. Signed-off-by: Paul Belanger <pabelanger@redhat.com>
* Store submodule nameJohn Kirkham2017-10-011-1/+3
|
* Keeping env values passed to `clone_from`Piotr Babij2017-09-302-1/+14
|
* Merge branch 'master' into masterSebastian Thiel2017-09-284-18/+195
|\
| * Merge branch 'master' into adding_setup_for_git_executableSebastian Thiel2017-09-2811-67/+105
| |\
| * | Minor bug fixesOdegard, Ken2017-07-261-5/+15
| | | | | | | | | | | | | | | | | | Added tilde expansion as part of the refresh function. Added python version check such that we properly capture PermissionError in Python >=3 and OSError in Python <3.
| * | Minor additional cleanupOdegard, Ken2017-07-253-28/+59
| | | | | | | | | | | | | | | | | | | | | Added additional information in the import warning/error that tells the user how to silence the warning/error. Also added a GIT_OK variable that allows for a quick check whether the refresh has succeeded instead of needing to test an actual git command.
| * | Renamed GIT_PYTHON_INITERR to GIT_PYTHON_REFRESHOdegard, Ken2017-07-131-27/+36
| | | | | | | | | | | | Renamed and cleaned up variable names.
| * | Removed remaining references to git.setup functionOdegard, Ken2017-07-131-5/+5
| | | | | | | | | | | | | | | Removed few remaining references to git.setup function (as it was renamed to refresh).
| * | Expanded ability of importOdegard, Ken2017-07-131-5/+27
| | | | | | | | | | | | | | | | | | | | | | | | Renamed GIT_PYTHON_NOWARN to GIT_PYTHON_INITERR and added values for quiet import, warning import, and raise import. These respectively mean that no message or error is printed if git is non-existent, a plain warning is printed but the import succeeds, and an ImportError exception is raised.
| * | Added ability to silence initial warningOdegard, Ken2017-07-091-4/+13
| | | | | | | | | | | | | | | Added the ability to silence the first refresh warning upon import by setting an environment variable.
| * | Renamed refresh to setup and removed alias function & added unittestOdegard, Ken2017-07-092-6/+12
| | | | | | | | | | | | | | | | | | Renamed to simplify and avoid issue with nose tests trying to use `setup` as a setup for testing. Unittest implements basic test for refreshing with a bad git path versus a good git path.
| * | Moved setup function into top level __init__Odegard, Ken2017-07-093-44/+67
| | | | | | | | | | | | | | | | | | | | | | | | Discovered that the remote module also relies on the git executable as such it also needs to be “refreshed” anytime the git executable is updated or changed. This was best solved by moving the setup function into the top level __init__ where the setup simply calls git.cmd.Git.refresh and git.remote.FetchInfo.refresh.
| * | Preliminary implementation of setup/refresh functionsOdegard, Ken2017-07-091-8/+75
| | | | | | | | | | | | | | | | | | | | | | | | Added one function (setup) and an alias (refresh simply calls setup). These functions give the developer one more way to configure the git executable path. This also allows the user to interactively adjust the git executable configured during runtime as these functions dynamically update the executable path for the entire git module.
* | | Merge branch 'master' into masterSebastian Thiel2017-09-2811-67/+105
|\ \ \ | | |/ | |/|
| * | Merge pull request #649 from OddBloke/hide_re_fetch_resultSebastian Thiel2017-09-281-2/+2
| |\ \ | | | | | | | | FetchInfo.re_fetch_result has no reason to be public
| | * | FetchInfo.re_fetch_result has no reason to be publicDaniel Watkins2017-07-281-2/+2
| | |/ | | | | | | | | | | | | And when using the API interactively, having it show up as public is confusing.
| * | Merge pull request #658 from terminalmage/issue657Sebastian Thiel2017-09-281-17/+20
| |\ \ | | | | | | | | Fix GitError being raised in initial `import git`
| | * | Fix GitError being raised in initial `import git`Erik Johnson2017-08-101-17/+20
| | |/ | | | | | | | | | | | | | | | This catches any raise of one of the custom exceptions defined in `git.exc` during the imports in the dunder init, and raises an `ImportError` in those cases.
| * | Merge pull request #654 from vathpela/worktreesSebastian Thiel2017-09-285-29/+45
| |\ \ | | | | | | | | worktrees: make non-packed refs also work correctly.
| | * | worktrees: make non-packed refs also work correctly.Peter Jones2017-08-225-29/+45
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Turns out aec58a9 did the right thing for /packed/ refs, but didn't work correctly on /unpacked/ refs. So this patch gives unpacked refs the same treatment. Without the fix here, the test added will cause this traceback: ====================================================================== ERROR: Check that we find .git as a worktree file and find the worktree ---------------------------------------------------------------------- Traceback (most recent call last): File "/home/pjones/devel/github.com/GitPython/git/test/lib/helper.py", line 92, in wrapper return func(self, path) File "/home/pjones/devel/github.com/GitPython/git/test/test_repo.py", line 938, in test_git_work_tree_dotgit self.assertIsInstance(repo.heads['aaaaaaaa'], Head) File "/home/pjones/devel/github.com/GitPython/git/util.py", line 893, in __getitem__ raise IndexError("No item found with id %r" % (self._prefix + index)) IndexError: No item found with id 'aaaaaaaa' Woops. Things I've learned: - test_remote doesn't work currently if you start on a branch. I think it never did? - Because of 346424da, all *sorts* of stuff in the test suite doesn't work if you name your development branch "packed-refs" (This seems like a bug...) Signed-off-by: Peter Jones <pjones@redhat.com>
| * | Merge branch 'master' of https://github.com/Plazmaz/GitPython into ↵Sebastian Thiel2017-09-282-7/+22
| |\ \ | | | | | | | | | | | | Plazmaz-master
| | * | Fixed missing parameter and changed nameDylan Katz2017-08-241-14/+16
| | | |
| | * | Fix leaking environment variablesDylan Katz2017-08-211-6/+18
| | |/
| * | Fix test_docsSebastian Thiel2017-09-281-2/+2
| | | | | | | | | | | | It's not portable to test for a secific author name
| * | Merge pull request #664 from Horgix/path_expansionSebastian Thiel2017-09-283-10/+13
| |\ \ | | | | | | | | util: move expand_path from repo/base and use it in Git class init
| | * | util: move expand_path from repo/base and use it in Git class initAlexis Horgix Chotard2017-08-253-10/+13
| | |/
| * | version bump2.1.6Sebastian Thiel2017-09-251-0/+0
| | |
| * | Merge pull request #666 from bpoldrack/bf-nullhandlerYaroslav Halchenko2017-09-211-0/+1
| |\ \ | | | | | | | | BF: Added missing NullHandler to logger in git.remote
| | * | BF: Added missing NullHandler to logger in git.remoteBenjamin Poldrack2017-09-211-0/+1
| | |/
| * | BF: use get, not casting get_value while dealing with submodule path/url etcYaroslav Halchenko2017-09-191-5/+5
| |/
* | Merge branch 'tests'Anson Mansfield2017-07-192-0/+15
|\ \
| * | test if it accepts environment variables in commandsAnson Mansfield2017-07-192-0/+15
| |/
* | implemented per-call environment variable supportAnson Mansfield2017-07-191-1/+8
|/
* Update changelog and improve docs on skipped testSebastian Thiel2017-07-011-1/+2
| | | | [skip ci]
* Try to ignore test on windows as it fails for the wrong reasonsSebastian Thiel2017-07-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | Here is the error log we see: ====================================================================== ERROR: test_git_submodules_and_add_sm_with_new_commit (git.test.test_submodule.TestSubmodule) ---------------------------------------------------------------------- Traceback (most recent call last): File "C:\projects\gitpython\git\test\lib\helper.py", line 92, in wrapper return func(self, path) File "C:\projects\gitpython\git\test\test_submodule.py", line 709, in test_git_submodules_and_add_sm_with_new_commit smm.git.commit(m="new file added") File "C:\projects\gitpython\git\cmd.py", line 425, in <lambda> return lambda *args, **kwargs: self._call_process(name, *args, **kwargs) File "C:\projects\gitpython\git\cmd.py", line 877, in _call_process return self.execute(call, **exec_kwargs) File "C:\projects\gitpython\git\cmd.py", line 688, in execute raise GitCommandError(command, status, stderr_value, stdout_value) GitCommandError: Cmd('git') failed due to: exit code(128) cmdline: git commit -m new file added stderr: ' *** Please tell me who you are.
* Maybe work around AppVeyor setting a bad email?Peter Jones2017-07-011-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | One of the submodule tests says: Traceback (most recent call last): File "C:\projects\gitpython\git\test\lib\helper.py", line 92, in wrapper return func(self, path) File "C:\projects\gitpython\git\test\test_submodule.py", line 706, in test_git_submodules_and_add_sm_with_new_commit smm.git.commit(m="new file added") File "C:\projects\gitpython\git\cmd.py", line 425, in <lambda> return lambda *args, **kwargs: self._call_process(name, *args, **kwargs) File "C:\projects\gitpython\git\cmd.py", line 877, in _call_process return self.execute(call, **exec_kwargs) File "C:\projects\gitpython\git\cmd.py", line 688, in execute raise GitCommandError(command, status, stderr_value, stdout_value) git.exc.GitCommandError: Cmd('git') failed due to: exit code(128) cmdline: git commit -m new file added stderr: ' *** Please tell me who you are. Run git config --global user.email "you@example.com" git config --global user.name "Your Name" to set your account's default identity. Omit --global to set the identity only in this repository. fatal: unable to auto-detect email address (got 'appveyor@APPVYR-WIN.(none)')' Clearly this is failing because (none) isn't a valid TLD, but I figure I'll try to set a fake value and see if that works around it.
* Repo: handle worktrees betterPeter Jones2017-07-015-19/+104
| | | | | | | | | | | | | This makes Repo("foo") work when foo/.git is a file of the form created by "git worktree add", i.e. it's a text file that says: gitdir: /home/me/project/.git/worktrees/bar and where /home/me/project/.git/ is the nominal gitdir, but /home/me/project/.git/worktrees/bar has this worktree's HEAD etc and a "gitdir" file that contains the path of foo/.git . Signed-off-by: Peter Jones <pjones@redhat.com>
* Add base class for package exceptions.Konstantin Popov2017-05-292-6/+37
|
* remote: compatibility with git version > 2.10wusisu2017-05-291-2/+7
|
* Python 3.6 invalid escape sequence deprecation fixesVille Skyttä2017-04-098-12/+12
| | | | https://docs.python.org/3/whatsnew/3.6.html#deprecated-python-behavior
* Handle non-deterministic __del__ in RepoSebastian Thiel2017-04-091-1/+4
| | | | Fixes #610
* so minor that wasn't even worth my time typing this commentYaroslav Halchenko2017-04-041-1/+1
|
* Spelling fixesVille Skyttä2017-03-0917-30/+30
|
* BF: pass original exception into replace_surrogate_encodeYaroslav Halchenko2017-03-081-3/+3
| | | | Fixes my incorrect fix in #598
* Add a fixture to test incremental blame output for git 2.11.1+George Hickman2017-03-072-18/+53
|
* Document the use of next to throw an exception when hitting EOFGeorge Hickman2017-03-071-1/+1
|
* Ignore all lines of subsequent hunks until last one is foundGeorge Hickman2017-03-071-5/+8
| | | | | | | 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.
* BF: there is no exc variable, raising NotASurrogateError if that is the ↵Yaroslav Halchenko2017-03-011-1/+1
| | | | right thing todo
* chore(flake): satisfy linterSebastian Thiel2017-02-251-2/+0
|
View Lorry Controller Status