summaryrefslogtreecommitdiff
path: root/git/remote.py
Commit message (Collapse)AuthorAgeFilesLines
* Fixed all warnings in documentation and updated Makefile to treat warnings ↵Kian Cross2020-07-131-3/+1
| | | | as errors.
* Fix exception causes in 7 modulesRam Rachum2020-06-131-6/+6
|
* BF: tollerate errors while parsing fetch linesYaroslav Halchenko2020-05-311-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | At first I thought to provide special treatment to git config lines and otherwise keep raising uncaught exception, but then decided that it might be better to loose some progress information than to crash. Also _get_push_info below is doing similarish catching of all exceptions (although doesn't even log them). With this change, log (if enabled and not suppressed) would show [WARNING] Git informed while fetching: git config pull.rebase false # merge (the default strategy) in the case of recently introduced change to the output in the following git commit : d18c950a69f3a24e1e3add3d9fc427641f53e12b is the first bad commit commit d18c950a69f3a24e1e3add3d9fc427641f53e12b Author: Alex Henrie <alexhenrie24@gmail.com> Date: Mon Mar 9 21:54:20 2020 -0600 pull: warn if the user didn't say whether to rebase or to merge Often novice Git users forget to say "pull --rebase" and end up with an unnecessary merge from upstream. What they usually want is either "pull --rebase" in the simpler cases, or "pull --ff-only" to update the copy of main integration branches, and rebase their work separately. The pull.rebase configuration variable exists to help them in the simpler cases, but there is no mechanism to make these users aware of it. Issue a warning message when no --[no-]rebase option from the command line and no pull.rebase configuration variable is given. This will inconvenience those who never want to "pull --rebase", who haven't had to do anything special, but the cost of the inconvenience is paid only once per user, which should be a reasonable cost to help a number of new users. Signed-off-by: Alex Henrie <alexhenrie24@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> builtin/pull.c | 16 ++++++++++++++++ t/t5521-pull-options.sh | 22 +++++++++++----------- t/t7601-merge-pull-config.sh | 38 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 65 insertions(+), 11 deletions(-) Closes #1014
* Fix flake8 errorsSebastian Thiel2020-05-281-1/+1
|
* Improve unfortunate wordingSebastian Thiel2020-05-281-1/+1
| | | | Fixes #1013
* Remove forced verbosity when fetching from a remoteNico2020-04-111-2/+3
|
* Fix #820JJ Graham2019-10-241-2/+2
|
* removed Unnecessary “else” after “return”Pratik Anurag2019-10-151-2/+1
|
* removed trailing whitespacesPratik Anurag2019-10-151-1/+1
|
* removed trailing whitespacesPratik Anurag2019-10-151-1/+1
|
* renamed unused varsPratik Anurag2019-10-151-1/+1
|
* renamed unused variablesPratik Anurag2019-10-151-1/+1
|
* add type check to git.Remote.__eq__Tzu-ting2019-09-281-1/+1
|
* Parse rejected deletes.Uri Baghin2019-09-281-1/+4
|
* Merge branch 'master' of https://github.com/sstancu/GitPython into ↵Sebastian Thiel2019-07-201-4/+3
|\ | | | | | | sstancu-master
| * Ensure git remote urls (multiple) are read from the correct git repo configStefan Stancu2019-04-051-4/+3
| |
* | Added a Dockerfile that creates a clean Ubuntu Xenial test environmentJames E. King III2019-05-051-0/+2
|/
* Remove unnecessary list comprehension - 'any' can take a generatorHugo2018-03-181-1/+1
|
* Rewrite unnecessary dict/list/tuple calls as literalsHugo2018-03-181-1/+1
|
* RF: primarily flake8 lints + minor RF to reduce duplication in PATHEXTYaroslav Halchenko2017-11-271-3/+5
| | | | | I did keep some "bare" except with catch all Exception: , while tried to disable flake8 complaints where clearly all exceptions are to be catched
* Further update for machines without ssh installed or on the pathRichard C Gerkin2017-11-051-1/+1
|
* Update remote.py to fix issue #694Richard C Gerkin2017-11-051-4/+12
|
* Merge branch 'master' into adding_setup_for_git_executableSebastian Thiel2017-09-281-3/+4
|\
| * 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 #654 from vathpela/worktreesSebastian Thiel2017-09-281-1/+1
| |\ \ | | | | | | | | worktrees: make non-packed refs also work correctly.
| | * | worktrees: make non-packed refs also work correctly.Peter Jones2017-08-221-1/+1
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | BF: Added missing NullHandler to logger in git.remoteBenjamin Poldrack2017-09-211-0/+1
| |/
* | Minor additional cleanupOdegard, Ken2017-07-251-1/+2
| | | | | | | | | | | | | | 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.
* | Moved setup function into top level __init__Odegard, Ken2017-07-091-10/+30
|/ | | | | | | | 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.
* remote: compatibility with git version > 2.10wusisu2017-05-291-2/+7
|
* Python 3.6 invalid escape sequence deprecation fixesVille Skyttä2017-04-091-2/+2
| | | | https://docs.python.org/3/whatsnew/3.6.html#deprecated-python-behavior
* fix(remote): assemble exception message completelySebastian Thiel2017-02-251-2/+2
| | | | | | ... before trying to substitute values in. Fixes #575
* fix(remote): set_url() uses correct argument orderSebastian Thiel2016-12-221-1/+1
| | | | Fixes #562
* Merge branch 'cygwin' of https://github.com/ankostis/GitPython into ↵Sebastian Thiel2016-10-221-16/+19
|\ | | | | | | ankostis-cygwin
| * src: reduce needless deps to `gitdb.util`Kostis Anagnostopoulos2016-10-161-16/+19
| |
* | Fix some typosSantiago Castro2016-10-201-5/+5
|/
* remote, #525: FIX BUG push-cmd misses error messagesKostis Anagnostopoulos2016-10-141-6/+8
| | | | | | + Bug discovered after enabling TC in prev commit and rework of fetch. + remote_tc: unitestize assertions. + util: DEL unused `_mktemp()`.
* remote, #525: pump fetch-infos instead of GIL-read stderrKostis Anagnostopoulos2016-10-131-16/+10
| | | | | | + `handle_process_output()` accepts null-finalizer, to pump completely stderr before raising any errors. + test: Enable `TestGit.test_environment()` on Windows (to checks stderr consumption).
* daemon, #525: FIX remote urls in config-filesKostis Anagnostopoulos2016-10-121-2/+2
| | | | | | | | | | | | + Parse most remote & config-urls \-->/. + Used relative daemon-paths. + Use git-daemon PORT above 10k; on Windows all below need Admin rights. +FIXED git-daemon @with_rw_and_rw_remote_repo(): + test_base.test_with_rw_remote_and_rw_repo() PASS. + test_remote.test_base() now freezes! (so still hidden win_err) + repo_test: minor finally delete test-repos created inside this repo. + util: delete unused `absolute_project_path()`.
* remote, #528: Fix regression shadowing exceptionsGuyzmo2016-10-121-0/+2
|
* remote, #528: fix prev cmt, Git<2.7 miss `get-url`Kostis Anagnostopoulos2016-10-111-5/+17
|
* remote, #528: Improved way of listing URLsGuyzmo2016-10-111-3/+2
| | | | | | | | | | + Instead of using `git remote show` that may triggers connection to remote repo, use `git remote get-url --all` that works by only reading the `.git/config`. + Change should have no functional impact, so no test needed. + Works only with git -2.7+. Signed-off-by: Guyzmo <guyzmo+github@m0g.net>
* remote: unfix fetch-infos paring of 8a2f7dce4(pydev fixes)Kostis Anagnostopoulos2016-10-111-2/+2
| | | + Mark another TC failing when not in master.
* src: No PyDev warningsKostis Anagnostopoulos2016-10-041-4/+4
| | | | | | | | + 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
* io, #519: ALL open() --> with open()Kostis Anagnostopoulos2016-10-011-3/+2
| | | + Some cases had restructuring of code.
* Proc, #519: Rework error-exc msgs & log thread-pumps errorsKostis Anagnostopoulos2016-09-281-2/+1
| | | | | + No WindowsError exception. + Add `test_exc.py` for unicode issues. + Single-arg for decoding-streams in pump-func.
* remote, #519: FIX1-of-2 double-decoding push-infosKostis Anagnostopoulos2016-09-281-1/+2
| | | | | + When `universal_lines==True` (515a6b9ccf8) must tel `handle_process_output` to stop decoding strings.
* src: constify is_<platform>() callsKostis Anagnostopoulos2016-09-281-1/+1
| | | + TCs: unittest-asserts for git-tests.
* src, #519: collect all is_<platform>() callsKostis Anagnostopoulos2016-09-271-10/+9
|
View Lorry Controller Status