engineering/unrhodecode
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
3585 commits 1 branch 0 tags 110 MiB
Commit graph

49 commits

Author SHA1 Message Date
Marcin Kuzminski
1b48364bb6 commits: allow tag commit translation to be skipped for faster commit fetching in big chunks. 2019-02-11 19:58:34 +01:00
Marcin Kuzminski
4c846e8f05 git: use rev-list for fetching last commit data inc ase of single commit. It's faster that using git log 2019-02-07 11:31:55 +01:00
Marcin Kuzminski
bd1a9c8201 docs: updated copyrights to 2019 2019-01-02 18:13:27 +01:00
Daniel Dourvaris
599f9b7964 pull-requests: ensure merge response provide more details 
- refactor merge responses with detailed messages
- fixes #5520
- code cleanups
 2018-12-30 11:00:09 +01:00
Marcin Kuzminski
169a8475bb vcs: rename get_file_history to get_path_history as it better reflects what it does. 2018-12-07 09:43:58 +01:00
Marcin Kuzminski
f3d3f479b4 code: fixed deprecated octal calls for py3 compat. 2018-11-30 11:49:27 +01:00
Daniel Dourvaris
a55c002d0c git: reset should use explicit -- to distinguish we want reset of branch name. 2018-10-16 17:53:16 +02:00
Marcin Kuzminski
5a4a98b40e git: use a fetch_sync based creation of remote repos. 
- skips fragile dulwich code that has problems with large repos
- is in sync with logic that does remote fetch
- is faster and more efficient
 2018-09-21 13:35:45 +02:00
Marcin Kuzminski
9effaef334 git: use smarter way for checking if repo is empty. This doesn't spam logs with some dulwich exceptions, we shouldn't really care about here.` 2018-08-11 14:20:58 +02:00
Marcin Kuzminski
426032d9a2 caches: make gevent curl connection cache friendly. 
- gevent threads needs it's own cache, and connection
- added strict detection of cache problem in gevent curl
 2018-08-06 19:28:16 +02:00
Marcin Kuzminski
42c80fe075 shadow-repos: use numeric repo id for creation of shadow repos. 
- Fixes a problem after rename or move into repository group.
 2018-06-21 14:04:06 +02:00
Marcin Kuzminski
367a32a69a git: use force fetch and update for target ref. This solves a case 
when in PRs a target is force updated and is out of sync. Before
we used a pull which --ff-only fails obviosly because two are out of
sync. This change uses new logic that resets the target branch according to the
source target branch allowing smooth merge simulation.
 2018-06-08 15:42:01 +02:00
Marcin Kuzminski
ce7620668d git: add option to skip stderr logging. 2018-06-08 11:54:41 +02:00
Marcin Kuzminski
1a3259da85 git: quote fake merge user to prevent this command to potentially fail 2018-06-05 00:07:14 +02:00
Marcin Kuzminski
ede517c6b1 shadow-repos: use safer way to destroy shadow repositories. 
we had reported errors on removal of shadow repos. Not reproduced, however
suspecting are filesystem sync/symlink race-conditions on shared storage.

End result were existing shadow-repo directories that tricked rhodecode
into thinking shadow repos is existing, but infact it was a dummy
structure semi-removed. Using shutil.move we ENSURE rhodecode doesn't
read those back even if removal fails.
 2018-06-05 09:53:29 +02:00
Marcin Kuzminski
3ea058d91b code: code fixes and small adjustments 2018-02-20 17:49:26 +01:00
Marcin Kuzminski
f689a025ce vcs: use proper attributes/inits on base and child classes. 2018-02-20 17:47:18 +01:00
Marcin Kuzminski
b2c7cd47ea pull-request, git: add option to skip --ff-only 2018-02-07 18:26:38 +01:00
Marcin Kuzminski
fe5628ee44 mercurial: fix new 4.4.X code change that does strict requirement checks. 
in few cases we init bare repos for checking, and we should use defauls that
always work.

- fixes #5433
 2018-02-01 18:25:24 +01:00
Marcin Kuzminski
c36b8f3d79 git: use force branch checkout to prevent cases when .gitattributes modifies 
files by specific rule and then checkout is blocked by potential file conflicts.
 2018-01-29 14:37:03 +01:00
Marcin Kuzminski
0bc9813397 git: allow force checkouts for git repository 2018-01-23 22:06:41 +01:00
Marcin Kuzminski
93a93bbb19 scm: added push options for Mercurial and Git to allow remote repository sync. 2018-01-22 18:15:51 +01:00
Marcin Kuzminski
00b45c1fa7 release: update copyright year to 2018 2018-01-19 17:13:16 +01:00
Marcin Kuzminski
5b71fc3fef git: fix diff rendering with branches with '/'. 2018-01-16 16:23:16 +01:00
Marcin Kuzminski
05d8801422 git: merge test, fetch other branch if it's different from target. This 
prevents potentially missing commits when doing a test merge.
 2018-01-15 19:13:31 +01:00
Marcin Kuzminski
fad0fcf1c3 git: use bool condition to check if the git path is fine. Using exceptions 
spams the logs with confusing tracebacks.
 2017-12-18 15:31:48 +01:00
Marcin Kuzminski
af533f47d8 compat: use py3 compatible configparser in all places. 2017-11-15 20:35:22 +01:00
Marcin Kuzminski
862e0c122b commits: hide evolve commits. Fixes #5392 2017-10-03 16:37:39 +02:00
Marcin Kuzminski
3718a47d3f changelog: fix and optimize loading of chunks for file history. 
- load-next/prev wasn't working
- make sure pagination works as expected
- speed up certain actions by pre-loading more attributes
 2017-09-27 13:21:57 +02:00
Marcin Kuzminski
bffc3ecda9 git: added identify command for checking the current checkout commit 2017-08-24 18:44:31 +02:00
Mathieu Cantin
761e973359 mercurial: Add option to close a branch before merging 2017-08-08 13:46:42 -04:00
Marcin Kuzminski
91c104ae49 largefiles: enabled download of largefiles for git and mercurial from web interface. 
- fixes #2817
 2017-03-27 14:00:36 +02:00
Marcin Kuzminski
ae3b38d628 git-lfs: create default LFS storage on new installation 
- ref #4635
 2017-03-18 12:28:23 +01:00
Marcin Kuzminski
a06ed60656 vcs-core: add a shadow-repo extractor for pull-requests, and git objects. 2017-01-23 22:53:53 +01:00
Marcin Kuzminski
07a595c030 vcs: added possibility to pre-load attributes for FileNodes. 2017-01-25 12:45:05 +01:00
Marcin Kuzminski
c50ec095c3 hg,git: change method of extracting last_change to use actualy date object 
instead of re-parsing it again.
 2017-01-24 15:26:14 +01:00
Marcin Kuzminski
9effdf9ee6 git: show stderr only if it happen for calling GIT commands 2017-01-10 10:42:46 +01:00
Marcin Kuzminski
fcc027c282 license: updated copyright year to 2017 2017-01-02 09:30:39 +01:00
Marcin Kuzminski
c68c339c0b system-info: fetch vcs settings from vcsserver. Fixes #4276 
- redone the system info page. Errors/Warnings now show next to the
data, and also show up in API call.
- implemented fetching of git/hg/svn version from running vcsserver
- implemented fetching of vcsserver version from itself
- added more warnings/errors detection on RAM/Inodes etc
- few cleanups
 2016-11-14 21:14:29 +01:00
Martin Bornhold
66a336156c vcs: Use more specific merge error reason (either target or source ref missing) 2016-10-27 12:50:02 +02:00
Martin Bornhold
929f1ab661 vcs: Return merge reference in merge response. 
Previously we returned only the merge commit id. Now we set a bookmark(hg)
or branch reference(git) to point to the merge commit. By returning a
merge reference we have both informations available (id and name)
 2016-10-23 16:02:41 +02:00
Martin Bornhold
d6e0fb2739 pep8: Remove unused imports and variables. 2016-10-23 16:00:16 +02:00
Martin Bornhold
939cf321a7 pr-shadow: Set reference in git shadow repositories on successful merge. #1055 2016-10-23 14:33:45 +02:00
Daniel Dourvaris
12ebe4382a diffs: replace compare controller with new html based diffs: 
* side/side + unified support
* redesign of diff changes/operations
* added button to see file before the change
* auto collapses large diffs

refs #4232
 2016-10-19 14:29:51 +03:00
Daniel Dourvaris
091418c182 vcs: change way refs are retrieved for git so same name branch/tags 
and remotes can be supported, fixes #298
 2016-09-12 06:56:30 +03:00
Martin Bornhold
488bd2df2f settings: Add argument to select rebase as merge strategy. 2016-06-27 13:16:10 +02:00
Daniel Dourvaris
bf510fd33c vcs: make commit datetimes utc 2016-06-09 05:20:58 +03:00
Daniel Dourvaris
dbb993b0d4 logging: log the original error when a merge failure occurs 2016-05-31 16:08:21 +03:00
Marcin Kuzminski
9a0d8c0b77 project: added all source files and assets 2016-05-24 15:56:53 +02:00