summaryrefslogtreecommitdiff
path: root/git
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'bf/run_hooks_from_working_dir' of ↵Sebastian Thiel2015-02-091-0/+1
|\ | | | | | | https://github.com/yarikoptic/GitPython into yarikoptic-bf/run_hooks_from_working_dir
| * BF: run commit hook with repo.working_dir as cwdYaroslav Halchenko2015-02-081-0/+1
| | | | | | | | | | | | | | | | Otherwise commit hook might rightfully fail, as happens if repository is e.g. git-annex repository. See e.g. now failing https://travis-ci.org/datalad/datalad/builds/49802394\#L1590 which seems to pass tests nicely with patch as this
* | Minor Flake8 fixes.Sebastian Thiel2015-02-093-8/+10
| | | | | | | | Latest version of it is required to show the issues travis shows as well
* | BF: skip unicode filename test in env not supporting unicode encodingsYaroslav Halchenko2015-02-071-0/+9
| |
* | ENH: respect GIT_PYTHON_TEST_GIT_REPO_BASE env var in testsYaroslav Halchenko2015-02-071-1/+1
|/
* This should fix the test failure on travisSebastian Thiel2015-01-301-0/+5
|
* Added test to verify we can handle fetch prunes.Sebastian Thiel2015-01-301-0/+13
| | | | | | They are just skipped. Fixes #249
* Remote.update() didn't pass kwargs along to git command.Sebastian Thiel2015-01-301-1/+1
| | | | Fixes #250
* Removed Git.sshkey() as it couldn't be distributed properly.0.3.6Sebastian Thiel2015-01-225-40/+11
| | | | | | | However, I kept information on how to achieve the same thing with `custom_environment()` in the test. Related to #234
* Bumped version to 0.3.6Sebastian Thiel2015-01-221-6/+1
| | | | | | Unfortunately, installation of a executable script has proven to be so difficult thanks setuptools gloriousness, which will force me to remove that feature
* Improved performance of rev-parse test.Sebastian Thiel2015-01-221-2/+9
| | | | | | Hoping to make this significantly faster on travis. Related to #245
* Minor improvements to submodule test for windows portabilitySebastian Thiel2015-01-221-4/+4
| | | | | | | | | However, most tests fail for reasons unknown - SHA cannot be found. For now, I will wait until someone complains, as I doubt too many people will use it on windows. Related to #244
* Added test for `sshkey` context manager.Sebastian Thiel2015-01-223-7/+21
| | | | | | | | It verifies that the script is actually called. Interestingly, the shell script version works within an msysgit environment on windows. Fixes #234
* Merge branch 'master' into teeberg-masterSebastian Thiel2015-01-2215-35/+372
|\ | | | | | | | | | | Need latest master to proceed with test Conflicts: doc/source/tutorial.rst
| * This should finally fix travis ciSebastian Thiel2015-01-221-1/+1
| |
| * Fetch now deals with custom refspecs much better.Sebastian Thiel2015-01-225-6/+40
| | | | | | | | | | | | | | | | | | Even though the test-csae only verifies this spec: +refs/pull/*:refs/heads/pull/* I could locally verify that it indeed handles other ones just as well: +refs/pull/*:refs/pull/* Fixes #243
| * Overhauled all tutorials, and placed them in a unit-test.Sebastian Thiel2015-01-2211-29/+324
| | | | | | | | | | | | That way they are protected from regression. Fixes #239
* | Intermediate commit on my way to get this finalized.Sebastian Thiel2015-01-223-23/+44
| | | | | | | | | | Renamed context manager 'with_environment' to 'custom_environment'. On my way to implement sshkey test.
* | Add a few testsJonas Trappenberg2015-01-211-0/+20
| |
* | Rename 'environment' and 'set_environment'Jonas Trappenberg2015-01-211-10/+10
| |
* | Add method to query environmentJonas Trappenberg2015-01-211-0/+3
| |
* | Add 'sshkey' context managerJonas Trappenberg2015-01-211-1/+75
| |
* | Fix some typosJonas Trappenberg2015-01-213-5/+5
|/
* Fixed regression in test-suite for IndexFileSebastian Thiel2015-01-215-24/+38
| | | | | Previously, it checked for AssertionErrors, now we have to implement need-unbare-repo check ourselves.
* Added advance usage examples to tutorial and made minor fixes.Sebastian Thiel2015-01-2111-33/+185
| | | | | | GIT_PYTHON_TRACE would actually fail (now) if we debugged archive operations. Related to #239
* Initial set of documentation improvements, and a fix to the submodule tests.Sebastian Thiel2015-01-214-8/+52
| | | | | | Now travisci tests should work once again. Related to #239
* Merge branch 'issue-232-reproduction' - keep fetch/pull simplificationsSebastian Thiel2015-01-212-2/+7
|\ | | | | | | | | | | Make sure we keep the improvements made to fetch and pull Relates to #232
| * removed debug codeissue-232-reproductionSebastian Thiel2015-01-211-9/+1
| |
| * Remote.fetch|pull() will not use poll/threads anymore as only stderr is read.Sebastian Thiel2015-01-202-4/+10
| | | | | | | | | | | | | | This simplification should improve performance and remove issues like those in #232. NOTE: Debug code is still contained here
| * Added debug code to keep lines fed into progress handler and the contents of ↵Sebastian Thiel2015-01-161-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | FETCH_HEAD. This data will be written into the git-repository itself, prefixed with the number of the operation. Thus, a test-run with exactly one fetch operation would look like this afterwards: ls -l .git total 96 -----> -rw-r--r-- 1 byron staff 141B Jan 16 11:54 000_debug_git-python_FETCH_HEAD <----- -----> -rw-r--r-- 1 byron staff 180B Jan 16 11:54 000_debug_git-python_stderr <----- -rw-r--r-- 1 byron staff 487B Jan 16 11:54 FETCH_HEAD -rw-r--r-- 1 byron staff 22B Jan 16 11:54 HEAD -rw-r--r-- 1 byron staff 41B Jan 16 11:54 ORIG_HEAD drwxr-xr-x 2 byron staff 68B Jan 16 11:54 branches/ -rw-r--r-- 1 byron staff 560B Jan 16 11:54 config -rw-r--r-- 1 byron staff 73B Jan 16 11:54 description drwxr-xr-x 11 byron staff 374B Jan 16 11:54 hooks/ -rw-r--r-- 1 byron staff 13K Jan 16 11:54 index drwxr-xr-x 3 byron staff 102B Jan 16 11:54 info/ drwxr-xr-x 4 byron staff 136B Jan 16 11:54 logs/ drwxr-xr-x 12 byron staff 408B Jan 16 11:54 objects/ -rw-r--r-- 1 byron staff 1.2K Jan 16 11:54 packed-refs drwxr-xr-x 5 byron staff 170B Jan 16 11:54 refs/ [ci skip]
* | Assured that branch changes are properly handled.Sebastian Thiel2015-01-215-30/+77
| | | | | | | | | | | | | | | | | | Previously we could try to remove the branch we are on. Of course, we have a test-case elaborate enough to verify we don't destroy changes in submodules accidentally. Therefore I am confident that this implementation is correct. Fixes #49
* | Fixed flake8 and a minor test regression.Sebastian Thiel2015-01-205-30/+33
| | | | | | | | | | The latter happened as now BadName is thrown, instead of BadObject. Changes.rst was marked accordingly
* | Impemented keep_going flag for `Submodule.update()`Sebastian Thiel2015-01-203-352/+381
| | | | | | | | Fixes #50
* | Submodule.parent_commit() now automatically points to repo.head unless it ↵Sebastian Thiel2015-01-202-33/+42
| | | | | | | | | | | | | | | | was set before. That way, you don't always have to keep the parent commit uptodate when changing the repo, which can lead to errors which are hard to debug and make no sense to the user, who previously never set parent_commit (yet it matters thanks to the cache).
* | Greatly improved possible safety of Submodule.update(), which is used by ↵Sebastian Thiel2015-01-207-58/+170
| | | | | | | | | | | | | | | | | | | | | | | | default. Previously, the implementation would gladly reset new commits in submodules, and/or reset a dirty working tree. Now the new force_reset/force flag has to be specified explicitly to get back to the old behaviour. All submodule tests except for one are working.
* | Another take on fixing the current concurrent read implementation in git.cmdSebastian Thiel2015-01-201-34/+77
| | | | | | | | | | | | | | | | There have been rather obvious errors in there, as we forgot to unregister the filehandles. Now we will read from a buffer ourselves, which should be faster and ideally, doesn't lead to spurious errors anymore. Related to #232
* | Added tutorial about initializing a repository.Sebastian Thiel2015-01-191-0/+26
| | | | | | | | | | | | | | | | Additionally, for this and future examples, there is a test_doc.py suite to contain all code mentioned in the docs. That way, we know if things stop working. Fixes #236
* | Improved installation docs to mention `pip`, not `easy_install`Sebastian Thiel2015-01-191-2/+3
| | | | | | | | | | Fixes #235 [ci skip]
* | Improved unicode handling when using os.environ or GitConfigParserSebastian Thiel2015-01-193-6/+21
| | | | | | | | | | | | | | Assured unicode values are supported when reading the configuration, and when getting author/committer information from the environment. Fixes #237
* | Fixed configuration file test - release call was missing.Sebastian Thiel2015-01-191-0/+1
| | | | | | | | Once again, __del__ is not being called as usual anymore in python 3 ... .
* | Submodule.move() will auto-rename the submodule if the name was equal to the ↵Sebastian Thiel2015-01-192-1/+10
| | | | | | | | | | | | path Fixes #238
* | Implemented Submodule.rename()Sebastian Thiel2015-01-196-6/+145
| | | | | | | | | | | | A test verifies it's truly working. Related to #238
* | Submodule.move() fixed to deal with 'non-gitfile' clones appropriately.Sebastian Thiel2015-01-192-5/+15
| | | | | | | | | | | | | | Improved a test to assure multiple update(init=False|True) calls don't throw. Fixes #93
* | Basic submodule tests are working once again !Sebastian Thiel2015-01-192-21/+33
| | | | | | | | | | | | | | | | After all, it was easier than expected. It seems that previous assertions the test made should have never been true to begin with. Thus we might have improved the test thanks to our improved implementation. Fixes #233
* | Submodule.remove() now seems to work properly, nearly all tests are back.Sebastian Thiel2015-01-173-24/+35
| | | | | | | | | | | | This also means that now we seem to be able to properly handle .git files in submodules Related to #233
* | Made sure dry-run is properly implemented in Submodule.remove()Sebastian Thiel2015-01-172-11/+20
| | | | | | | | | | The root-submodule test is still failing though, this time even earlier than before
* | Submodule.remove() now deals with .git files correctly.Sebastian Thiel2015-01-173-21/+41
| | | | | | | | A simple test verifies this at least.
* | Assured Submodule.(update|move) are dealing with .git files appropriately.Sebastian Thiel2015-01-172-60/+106
| | | | | | | | | | However, a simple test-case still fails for reasons not yet understood. There is more to be fixed here - .remove() still fails.
* | Implemented more tests and made use of .git files when adding submodulesSebastian Thiel2015-01-162-8/+79
|/ | | | | | | There is some more work to do, as renames and updates still have to be adjusted accordinlgy. Relates #233
* Fixed previously failing testSebastian Thiel2015-01-152-4/+5
| | | | | | It actually revealed a bug in the implementation of Submodule.add, which just showed in python 3 for the wrong reasons. Thankfully, failing tests after all allowed to get this issue fixed ... .
View Lorry Controller Status