summaryrefslogtreecommitdiff
path: root/git
Commit message (Collapse)AuthorAgeFilesLines
* 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 ... .
* Verified that it apparently is impossible to add empty submodules using ↵Sebastian Thiel2015-01-151-4/+20
| | | | | | | | | | | | | | | | | | | git-python. This is the case with `git submodule add` as well. This makes sense as an empty git repository doesn't have a commit, which needs to be specified as SHA in the parent repositories tree entry for the respective submodule. When manually adding the empty submodule to the .gitmodules file, git-python will throw another error related to the inability to find the submodule in the index. Even if an iteration would be possible, git-python would now throw a BadName exception, which clearly indicates that the 'HEAD' revision is invalid (as it doesn't point to any commit). Fixes #152 Fixes #105
* Submodule.add() can now handle absolute module paths in agreement to the doc ↵Sebastian Thiel2015-01-152-3/+22
| | | | | | | | | | string. Previously, it would say it can handle absolute module paths, but didn't actually do so. A test-case was improved to check for this case. Fixes #161
* For some reason, the new submodule test still broke on py3Sebastian Thiel2015-01-151-3/+0
| | | | | | | Adjusted code to not check for .gitmodules existence anymore, we will deal with it. Fixes #117
* Added the first submodule will no longer cause an IOError.Sebastian Thiel2015-01-152-1/+8
| | | | | | This is verified by the respective test. Fixes #117
* Fixed some doc strings to build correctly with sphinxSebastian Thiel2015-01-147-32/+32
| | | | | | Fixes #7 [ci skip]
* An attempt to help the threaded reading to not show spurious errors anymore.Sebastian Thiel2015-01-141-8/+8
| | | | | It does not necessarily seem to work, but at least we don't access a dict concurrently anymore.
* Added 'path' keyword argument to Repo.archive().Sebastian Thiel2015-01-142-3/+10
| | | | | | | This allows sub-trees to be archived as well, and makes `.archive()` feature complete. Fixes #67
* GitConfigParser now respects and merges 'include' sectionsSebastian Thiel2015-01-144-16/+142
| | | | | | | | | | | | | We implement it as described in this article: http://stackoverflow.com/questions/1557183/is-it-possible-to-include-a-file-in-your-gitconfig Thus we handle * cycles * relative and absolute include paths * write-backs in case of writable GitConfigParser instances Fixes #201
* Added `Repo.merge_base(...)` implementation, including test-case.Sebastian Thiel2015-01-132-2/+58
| | | | Fixes #169
* IndexFile.commit() now runs pre-commit and post-commit hooks.Sebastian Thiel2015-01-125-11/+87
| | | | | | | | | However, it does so only on posix. The test-case will run on posix only as well. Please note that in theory, even on windows we will attempt to run hooks, even though I am not sure that this will actually work. Fixes #81
* Removed os.path.realpath invocations as they are not necessary if paths are ↵Sebastian Thiel2015-01-123-5/+11
| | | | | | | | used consistently. This will save IOPs, and make the code easier to understand (I suppose). Related to #224
* Removed all previously added invocations of os.path.realpath as it wasn't ↵Sebastian Thiel2015-01-122-4/+3
| | | | | | | | | required afterall. Turns out that the now removed `read_gitfile` functions applied os.path.realpath which caused the issue described in #224. Fixes #224
* Repo paths are now converted to real paths, as well as all paths involved in ↵Sebastian Thiel2015-01-123-7/+12
| | | | | | | | | index related work. That way, we don't try to compare a real-path to a non-real one, which would make the implementation think a file is not actually part of the repository. Fixes #224
* Added specific test for roughly checking configuration paths.Sebastian Thiel2015-01-122-1/+6
| | | | | | | For some reason, I didn't trust the existing one as it tests that code more indirectly. Related to #160
* Re-implemented 'user' config level based on suggestion by @jzempelSebastian Thiel2015-01-121-6/+2
| | | | | | | The point is that XDG_CONFIG_HOME is meant to point at the '.config' directory, whereas '.config' has to be added only if HOME is used instead. Fixes #160
* Added 'user' configuration level.Sebastian Thiel2015-01-101-1/+8
| | | | Fixes #160
* Fixed test to actually use tilde and environment variables respectively.Sebastian Thiel2015-01-101-2/+6
| | | | Related to #83
* Repo.init() now supports paths with a '~' in it, or environment variables in ↵Sebastian Thiel2015-01-103-6/+23
| | | | | | general. Fixes #83
* Added search_parent_directories keyword argument to Repo type.Sebastian Thiel2015-01-103-28/+15
| | | | | | | | Now by default, we will not walk up the directory structure and possibly find git directories that the user didn't intend to find. If required, that kind of behaviour can be turned back on. Fixes #65
* rewrote test-string to have a chance to make flake8 happy.Sebastian Thiel2015-01-101-10/+9
| | | | | That way, flake won't have to completely ignore issues it might have in other portions of this file.
* Implemented multi-line parsing of git-config to the point where a sepcific ↵Sebastian Thiel2015-01-103-39/+271
| | | | | | | | | | test-file is working. This brings us much closer to what git can do, and should at least prevent errors while reading configuration files (which would break a lot of features, like handling of remotes since these rely reading configuration files). Fixes #112
* Added test for complex blame revision query.Sebastian Thiel2015-01-092-0/+184
| | | | | It works as expected by me at least. Related to #71
* Now Diff.__str__ works correctly in all python versions.Sebastian Thiel2015-01-092-9/+31
| | | | | | | | | Additionally, unicode handling was improved to the point where we deal with all diff(create_path=True) data as binary. Therefore we don't claim to know all encodings of all textfiles in the world, even though we still assume that everything git throws at us is utf-8 encoded. Fixes #113
* Fixed mode-handling in Diff creation, and added assertions to catch this in ↵Sebastian Thiel2015-01-092-3/+10
| | | | | | future There is still some work todo in terms of how we handle the encoding
View Lorry Controller Status