summaryrefslogtreecommitdiff
path: root/git/remote.py
Commit message (Collapse)AuthorAgeFilesLines
* Low risk ReDoS vulnfixtheworstcomrade2022-02-181-1/+1
| | | | https://huntr.dev/bounties/8549d81f-dc45-4af7-9f2a-2d70752d8524/
* Extend IterableList[PushInfo] instead of IterableListSjoerd Langkemper2021-11-131-17/+16
|
* Specify type for PushInfoList.errorSjoerd Langkemper2021-11-131-1/+1
|
* Fix type handing on PushInfoListSjoerd Langkemper2021-11-131-3/+4
|
* Rename exception to error, raise_on_error to raise_if_errorSjoerd Langkemper2021-11-131-5/+5
|
* Let remote.push return a PushInfoListSjoerd Langkemper2021-11-131-3/+20
| | | | | | | List-like, so that it's backward compatible. But it has a new method raise_on_error, that throws an exception if anything failed to push. Related to #621
* Fix typing issues with delete_head and Remote.addRuss Allbery2021-09-201-1/+3
| | | | | | | | | | | | | | delete_head and Head.delete historically accept either Head objects or a str name of a head. Adjust the typing to match. This unfortunately requires suppressing type warnings in the signature of RemoteReference.delete, since it inherits from Head but does not accept str (since it needs access to the richer data of RemoteReference). Using assignment to make add an alias for create unfortunately confuses mypy, since it loses track of the fact that it's a classmethod and starts treating it like a staticmethod. Replace with a stub wrapper instead.
* update tests and add a comment about different behaviour of 'push' vs 'fetch'sroet2021-09-181-0/+2
|
* reuse kill_after_timeout kwargsroet2021-09-181-11/+25
|
* reset default timeout to Nonesroet2021-09-181-5/+5
|
* allow for timeout propagationsroet2021-09-181-9/+15
|
* Merge pull request #1318 from Yobmod/mainDominic2021-09-091-2/+2
|\ | | | | General fixes for next release
| * type fixoYobmod2021-08-081-0/+944
| |
| * add type check to conf_encoding (in thoery could be bool or int)Yobmod2021-08-081-944/+0
| |
* | Add encoding to utf-8 for fetch_info_lines;f1000242021-08-241-2/+2
|/ | | | Add encoding to utf-8 for fetch_head_info;
* Minor type fixesYobmod2021-08-021-2/+2
|
* replace more TBDs wiht runtime typesYobmod2021-07-311-5/+5
|
* Rmv with_metaclass shim, make section constraint generic wrt its ↵Yobmod2021-07-241-1/+2
| | | | configparser type
* Replace all Typeguard with cast, revert update to typing-extensions==3.10.0Yobmod2021-07-241-6/+6
|
* Change remaining type comments to py3.6+ typesYobmod2021-07-191-6/+6
|
* Make types in refs compatible with previousYobmod2021-07-191-22/+35
|
* Add remote.url typeYobmod2021-07-091-14/+7
|
* Rmv Diffable assert, add Remoote.url propertyYobmod2021-07-091-0/+8
|
* Try to distinguation git.diff module from diff.Diff.diff and ↵Yobmod2021-07-091-1/+1
| | | | diff.Daffable.diff()
* Add types to submodule.update()Yobmod2021-07-061-4/+7
|
* Type Traversable/list_traverse() better, make IterablleObj a protocolYobmod2021-06-301-0/+2
|
* Type Traversable.traverse() better, start types of submoduleYobmod2021-06-301-9/+7
|
* replace cast()s with asserts in remote.pyYobmod2021-06-251-5/+7
|
* Add '?' to controlcharacter literalYobmod2021-06-251-2/+2
|
* fix assertYobmod2021-06-251-1/+1
|
* Add is_flatLiteral() Typeguard[] to remote.pyYobmod2021-06-251-2/+9
|
* Make IterableList generic and update throughoutYobmod2021-06-241-15/+16
|
* Don't raise on unknown line when parsing stale refs (#1262)Sebastian Thiel2021-06-031-1/+1
|
* flake8 fixesyobmod2021-05-081-43/+54
|
* Add types to Remote. init getattr existsyobmod2021-05-081-3/+3
|
* fix Repo forward refyobmod2021-05-031-1/+1
|
* second pass of adding typesyobmod2021-05-031-15/+21
|
* add types to _from_line()yobmod2021-05-031-6/+7
|
* add overloads to to_progress_instance()yobmod2021-05-031-2/+18
|
* change flags type to intyobmod2021-05-031-4/+4
|
* change a type (Commit) to a forward refyobmod2021-05-031-1/+1
|
* make progress types more generalyobmod2021-05-031-3/+3
|
* add types to PushInfo.__init__() .remote_ref() and .old_commit()yobmod2021-05-031-4/+4
|
* update type of FetchInfo.refresh() to use Literalyobmod2021-05-031-2/+2
|
* add initial types to remote.pyyobmod2021-05-031-19/+18
|
* add types to git.util and git.__init__yobmod2021-03-011-1/+4
|
* fix(fetch): use the correct FETCH_HEAD from within a worktreeGiel van Schijndel2021-01-141-3/+2
| | | | | | | | FETCH_HEAD is one of the symbolic references local to the current worktree and as such should _not_ be looked up in the 'common_dir'. But instead of just hard coding the "right thing" (git_dir) lets defer this to the SymbolicReference class which already contains this knowledge in its 'abspath' property.
* 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