Commit graph

109 commits

Author SHA1 Message Date
RhodeCode Admin
102205ec73 feature(scm): added multibranch support for git and mercurial 2025-12-21 08:27:16 +01:00
ievgenii vdovenko
89d2a6aa05 feature: add an option to the repo settings to disable/enable
strategy selector for a user in a pull request
2025-07-04 12:38:36 +02:00
ievgenii vdovenko
802e8a8119 feature: initial implementation of squash functionality for git and hg; no enable/disable settings option yet 2025-07-04 12:38:33 +02:00
Serhii Ilin
a72f17a204 fix(branch removal(closing)): added check to avoid deleting(closing) landing branches during PR merge with delete source branch option enabled. 2025-02-11 13:14:03 +02:00
RhodeCode Admin
166db21812 core: run ruff format 2025-01-13 17:47:37 +01:00
RhodeCode Admin
3a41a8b915 fix(file-caching): fixed cases when old cache was used before changes to operate on bytestrings 2024-12-04 22:33:45 +01:00
RhodeCode Admin
d08633d220 fix(encoding for file): fixed support of non utf-8 files in all backends 2024-11-27 19:35:02 +01:00
RhodeCode Admin
4bd1cec615 fix(git): moved certain operations into vcsserver 2024-11-15 09:50:40 +01:00
RhodeCode Admin
82f0f8d214 core: updated copyright to 2024 2024-11-12 16:39:07 +01:00
RhodeCode Admin
1d5d2c0155 tests: fixed test suite for celery adoption 2024-11-08 16:17:57 +01:00
Serhii Ilin
7d866e5cad feat(delete-branch-after-merge-git): added ability to delete a branch automatically after merging PR (if it was configured). Fixes: RCCE-76 2024-06-17 14:59:54 +03:00
Serhii Ilin
59e99e4368 feat(branch removal trough UI): Added ability to remove branches trough UI from git and hg repositories. Fixes: RCCE-75 2024-06-07 12:28:04 +03:00
RhodeCode Admin
42cb5aabb1 fix(server-info): removed dulwich from update-server-info and added force flag support 2024-01-29 13:19:59 +01:00
Serhii Ilin
843367a511 fix(LFS): added git lfs push --all <GIT-URL> option's related changes. 2024-01-09 17:32:34 +02:00
Serhii Ilin
840ea1daef fix(LFS): fixed pull_changes method to support a new (sync_large_objects) flag, updated all parts that will use a new flag. Fixes: RCCE-8 2024-01-08 14:22:04 +02:00
RhodeCode Admin
9f37558774 fix(git): fixed strip command to always require a valid branch name for git.
unless specific branch is given git strip doesn't really work fine
2024-01-02 16:43:17 +01:00
RhodeCode Admin
a507c058d8 feat(git/svn): remove filesystem modifications from git/svn calls. When sharding comes in place we can't do this.
- This code was moved back to the vcsserver logic now
2023-12-01 10:18:51 +01:00
RhodeCode Admin
00bce73f62 code: import fix/pep8 2023-10-09 12:45:35 +02:00
RhodeCode Admin
96f8f6c4ed git: fix submodule handling for git repositories 2023-08-07 14:01:30 +02:00
RhodeCode Admin
b82349386a modernize: python3 updates 2023-07-18 14:50:17 +02:00
RhodeCode Admin
80f63bd18b libs: more python3 reformats 2023-07-18 14:12:39 +02:00
RhodeCode Admin
42301154fc copyrights: updated for 2023 2023-07-18 11:57:27 +02:00
RhodeCode Admin
3fdca0d681 vcs-lib: bulk of changes for python3 support 2023-07-18 11:41:47 +02:00
RhodeCode Admin
5357fb11f2 libs: removed utf8 markers 2023-07-18 10:57:59 +02:00
RhodeCode Admin
34af9cfa2f python3: fixed various code issues
- iterators
- use of u''
2023-03-20 20:51:25 +01:00
RhodeCode Admin
c9bdedb3ea python3: more unicode fixes 2023-03-10 11:41:09 +01:00
RhodeCode Admin
aab457fdca python3: removed more unicode usage 2023-03-10 10:05:54 +01:00
RhodeCode Admin
a31c7f35e5 git: fixed wrong regex on sha search 2023-03-07 09:58:00 +01:00
RhodeCode Admin
44cde4b5c1 python3: removed usage of .iteritems() 2023-03-06 23:46:33 +01:00
RhodeCode Admin
92fe8c512d python3: removed compat modules 2023-03-06 23:36:17 +01:00
RhodeCode Admin
255d0e78ee python3: fix import configparser 2023-03-06 23:30:53 +01:00
RhodeCode Admin
135f0f0cc6 python3: fixed usage of stringIO module 2023-03-06 23:09:06 +01:00
RhodeCode Admin
d300144665 repos: cleannup and fix landing-ref code.
with latest git update this exposed a bug when we allowed to set references like tip for git repos
now the defaults are loaded from a single place controlled by default branch for git.

Repos without master are now working just fine with new git and new logic.
2023-01-18 22:10:40 +01:00
RhodeCode Admin
ce7e048a7d git: allow overriding default master branch with an env variable. 2022-08-11 09:39:24 +02:00
Milka Kuzminski
72085d16b0 pull-requests: fixed problems with unicode characters in branches. 2021-04-08 16:59:58 +02:00
Milka Kuzminski
c0508d2945 git: fix for unicode branches 2021-03-18 15:26:51 +01:00
Milka Kuzminski
723ccff72e git: fix lookups.
- prioritize referenace names over numerical ids
- numerical ids are supported as a fallback if ref matching is unsuccessful.
2021-03-17 17:55:02 +01:00
Milka Kuzminski
2cc353de2c backends: use reference explicitly to properly translate GIT references to commits such as numeric branches 2021-03-16 23:18:52 +01:00
Marcin Kuzminski
293a3535ae pull-requests: fix way how pull-request calculates common ancestors.
- fixes #5561
- added new preview for size (commits/files) of PRs before opening, this is now based on the special logic that calculates common ancestor and has access to preview diff
- store common ancestor in DB so updates of pull-requests are consistent
2020-05-08 08:43:51 +02:00
Marcin Kuzminski
4b277c70fe git: fixed readme searcher for libgit2 2020-05-14 09:40:41 +02:00
Marcin Kuzminski
fe96e16646 code: update copyrights to 2020 2020-04-16 00:34:52 +02:00
Marcin Kuzminski
4de6dd537c pull-requests: fixed case for GIT repositories when a merge check failed due to merge conflicts the pull request wrongly reported missing commits.
- we're now searching for dangling commits in a repo that has them and cannot see them because of failed merge checks.
- pull-request: will save metadata during merge simulation so merge conflicts are permanently stored, and showed to all users.
2020-04-08 11:17:10 +02:00
Marcin Kuzminski
bd9e5dc1c3 api: exposed modified added/modified/deleted functions of commit to return only paths.
This combined with full text search build for certain repositories that each commit
contains lots of file changes results in *huge* (10x in some cases) performance gain.
2020-03-16 15:09:45 +01:00
Marcin Kuzminski
54a47cd524 git: use safe configparser for git submodules to prevent from errors on submodules with % sign.
- This is treated as interpolation sign and can cause errors on regular ConfigParser instance.
2020-02-20 11:28:18 +01:00
Marcin Kuzminski
0bed1e9849 git: fixed issue with git submodules detection. 2019-12-03 14:59:06 +01:00
Marcin Kuzminski
ef0be3b6e8 pull-requests: added nicer formatting for merge conflicting files 2019-11-19 16:38:56 +01:00
Marcin Kuzminski
1eb782ad15 pull-requests: expose unresolved files in merge response. 2019-11-15 01:00:13 +01:00
Daniel Dourvaris
337400c423 git: fixed py3 compat for submodule read. 2019-09-25 19:32:20 +02:00
Marcin Kuzminski
70d5bb346a shadow-repos: skip init of full repo to generate shadow repo path. 2019-09-20 21:00:31 +02:00
Daniel Dourvaris
ff0c66acf2 diffs: handle paths with quotes in diffs. 2019-08-26 21:49:06 +02:00