summaryrefslogtreecommitdiff
path: root/git/repo/fun.py
Commit message (Collapse)AuthorAgeFilesLines
* Fix exception causes in 7 modulesRam Rachum2020-06-131-6/+8
|
* Satisfy flake8 requirement related to #1000Sebastian Thiel2020-04-111-1/+1
|
* Try again to apply patch related to #1000Sebastian Thiel2020-04-111-1/+2
|
* Revert "When using GIT_OBJECT_DIRECTORY, don't require presence of 'objects' ↵Sebastian Thiel2020-04-111-2/+1
| | | | | | | | | subdirectory" This reverts commit eb792ea76888970d486323df07105129abbbe466. Seems to break CI Related to #1000
* When using GIT_OBJECT_DIRECTORY, don't require presence of 'objects' ↵Sebastian Thiel2020-04-111-1/+2
| | | | | | | | | subdirectory This will work for default git object databases only, which use git as object database directly. Related to #1000
* Remove and replace compat.xrangeHarmon2020-02-081-2/+1
|
* normalize path after joining submodule path and the relative path to the git ↵Joe Savage2019-07-201-1/+1
| | | | dir, to eliminate path length errors on Windows
* Repo: handle worktrees betterPeter Jones2017-07-011-1/+21
| | | | | | | | | | | | | 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>
* Merge remote-tracking branch 'origin/master' into exp_git_dirKostis Anagnostopoulos2016-10-221-3/+3
|\
| * Merge branch 'cygwin' of https://github.com/ankostis/GitPython into ↵Sebastian Thiel2016-10-221-20/+21
| |\ | | | | | | | | | ankostis-cygwin
| * | Fix some typosSantiago Castro2016-10-201-3/+3
| | |
* | | Merge with latest branch 'exp_git_dir'Kostis Anagnostopoulos2016-10-191-3/+5
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | Conflicts: git/repo/base.py git/repo/fun.py git/test/test_submodule.py
| * | repo: minor code and doc correcions.Kostis Anagnostopoulos2016-10-191-3/+4
| |/ | | | | | | | | | | | | + 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()`).
* | cygwin, #533: FIX submodules detection (~10TCs fixed)Kostis Anagnostopoulos2016-10-161-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | + 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
* | src: reduce needless deps to `gitdb.util`Kostis Anagnostopoulos2016-10-161-14/+9
| |
* | src: import os.path as ospKostis Anagnostopoulos2016-10-161-6/+8
|/
* src: No PyDev warningsKostis Anagnostopoulos2016-10-041-1/+1
| | | | | | | | + Mark all unused vars and other non-pep8 (PyDev) warnings + test_utils: + enable & fix forgotten IterableList looped path. + unittestize all assertions. + remote: minor fix progress dispatching unknown err-lines
* repo-TCs, #519: FIX config resource leaksKostis Anagnostopoulos2016-10-011-2/+2
| | | | | | + Modify lock/read-config-file code to ensure files closed. + Use `with GitConfigarser()` more systematically in TCs. + Clear any locks left hanging from prev Tcs. + Util: mark lock-files as SHORT_LIVED; save some SSDs...
* fix(repo): fail loudly if worktrees are usedSebastian Thiel2015-08-291-9/+16
| | | | | | | | | | | | | | | As GitPython is in maintenance mode, there will be no new features. However, I believe it's good idea to explicitly state we do not support certain things if this is the case. Therefore, when worktrees are encountered, we will throw an specific exception to indicate that. The current implementation is hacky to speed up development, and increases the risk of failing due to false-positive worktree directories. Related to #344
* Fix typoTanner Netterville2015-07-151-1/+1
|
* Overhauled all tutorials, and placed them in a unit-test.Sebastian Thiel2015-01-221-2/+0
| | | | | | That way they are protected from regression. Fixes #239
* Assured that branch changes are properly handled.Sebastian Thiel2015-01-211-0/+1
| | | | | | | | | 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
* Greatly improved possible safety of Submodule.update(), which is used by ↵Sebastian Thiel2015-01-201-1/+1
| | | | | | | | | | | | 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.
* Repo.init() now supports paths with a '~' in it, or environment variables in ↵Sebastian Thiel2015-01-101-3/+5
| | | | | | general. Fixes #83
* Added search_parent_directories keyword argument to Repo type.Sebastian Thiel2015-01-101-20/+9
| | | | | | | | 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
* Improved handling of name-resolution, which will not mangle names anymore.Sebastian Thiel2015-01-081-3/+6
| | | | | | | | | Previously, an unresolvable ref name like HEAD would end up as HEX and was presented as BadObject error, even though that exception is for invalid shas only. Now BadName is thrown, which converts into a more useful error message. Improves #105
* test_repo worksSebastian Thiel2015-01-061-1/+1
|
* test_remote worksSebastian Thiel2015-01-061-1/+1
| | | | | | | And I have to wonder why git-daemon serves under py2.7, but really wants receive-pack to be allowed under 3.4. Maybe it's a repository override which for some reason doesn't work in py3.4 ? Maybe because the change is not flushed ?
* Dum brute force conversion of all types.Sebastian Thiel2015-01-041-0/+1
| | | | | | However, StringIO really is ByteIO in most cases, and py2.7 should run but doesn't. This should be made work first.
* initial set of adjustments to make (most) imports work.Sebastian Thiel2015-01-041-1/+3
| | | | More to come, especially when it's about strings
* Applied autopep8Sebastian Thiel2014-11-191-19/+21
| | | | | Commandline was autopep8 -j 8 --max-line-length 120 --in-place --recursive --exclude "*gitdb*,*async*" git/
* Minor fix to make read_gitfile work .Sebastian Thiel2014-11-191-11/+16
|
* Merge branch 'separate-git-dir' of https://github.com/niyaton/GitPython into ↵Sebastian Thiel2014-11-191-0/+11
|\ | | | | | | | | | | | | niyaton-separate-git-dir Conflicts: git/repo/base.py
| * Added support for separeted git dir.niyaton2013-02-271-0/+11
| |
* | pep8 linting (trailing whitespace)Antoine Musso2014-11-161-5/+5
| | | | | | | | W291 trailing whitespace
* | pep8 linting (double spaces before comment)Antoine Musso2014-11-161-1/+1
| | | | | | | | E261 at least two spaces before inline comment
* | pep8 linting (whitespace before/after)Antoine Musso2014-11-161-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | pep8 linting (blank lines expectations)Antoine Musso2014-11-161-2/+5
| | | | | | | | | | | | E301 expected 1 blank line, found 0 E302 expected 2 blank lines, found 1 E303 too many blank lines (n)
* | pep8 linting (whitespaces)Antoine Musso2014-11-161-28/+28
| | | | | | | | | | | | | | | | | | | | | | 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
* | Fixes creating a Repo for a submoduleRemi Rampin2014-04-241-0/+13
| | | | | | | | Fixes #155.
* | tabs to 4 spaces - this won't make integrating the patches easier, but it's ↵Sebastian Thiel2014-02-091-258/+258
|/ | | | probably a good idea to go a little more pep8 (and fix sins of my youth ;) )
* Fixed incorrect handling of rev_parse if it was fed with branches that ↵Sebastian Thiel2011-02-231-1/+5
| | | | looked like hexshas. Thanks to Ning (frostyplanet) who pointed this issue out
* Moved everything into the git subdirectory - some tests still need to be ↵Sebastian Thiel2010-11-251-0/+280
adjusted