WIP: Move git as modules/git #5991

lunny · 2019-02-07T08:49:39Z

This will still keep all the git commit histories.

Update README.md

try to fix Duplicate of files in directory (gogs#2254 )

This fixes regression introduced in ebd9fb2, that GetSubModules was always returning empty submodule info because c.submoduleCache != nil check was always true since parseCommitData was setting commit.submoduleCache = newObjectCache() so it was always not-nil. Now we initialize submoduleCache in first GetSubModules call, next call will return cached entries.

This fixes GetCommitsInfo returning GetSubModule (/somemodule): object does not exist [id: , rel_path: .gitmodules] when /somemodule is a ref entry but no .gitmodules file is present. Instead failing we just check for IsErrNotExist and return empty submodule url. This also fixes HTTP 500 internal error in Gogs for case described above.

Fix submodule info loading

…o-gitea#113) * GetCommit() returns a ErrNotExist if short commit ID does not exists Currently, GetCommit() returns a generic error if a short commit ID does not exists in a repository. When a commit is not found by git-rev-parse, it returns an errors which contains "fatal: ambiguous argument". GetCommit() now search if the error contains this string, and, if it does, returns an ErrNotExist. The idea is to allow commits to be accessed from gitea with a short commit ID. Without this change, it would return a 500 Internal Server Error when a short ID does not exists in the repository. Signed-off-by: Alban Gruin <alban@pa1ch.fr> * GetCommit(): change the comparison for short commit messages `fatal: ambiguous argument` can be the beginning of two errors in git. This changes the comparison to something less ambiguous. Signed-off-by: Alban Gruin <alban@pa1ch.fr>

…e5c' git-subtree-dir: modules/git git-subtree-mainline: 2d213b6 git-subtree-split: 0aea7f1

…ile and Gopkg.toml

codecov-io · 2019-02-09T10:48:10Z

Codecov Report

Merging #5991 into master will increase coverage by 0.65%.
The diff coverage is 0%.

@@            Coverage Diff             @@
##           master    #5991      +/-   ##
==========================================
+ Coverage   38.72%   39.38%   +0.65%     
==========================================
  Files         332      360      +28     
  Lines       48992    50816    +1824     
==========================================
+ Hits        18973    20014    +1041     
- Misses      27271    27939     +668     
- Partials     2748     2863     +115

Impacted Files	Coverage Δ
models/repo_branch.go	`58.73% <ø> (ø)`	⬆️
modules/git/tree.go	`64.81% <ø> (ø)`
models/repo_tag.go	`62.5% <ø> (ø)`	⬆️
routers/init.go	`71.83% <ø> (ø)`	⬆️
routers/repo/setting.go	`10.35% <ø> (ø)`	⬆️
modules/git/repo_tag.go	`63.63% <ø> (ø)`
modules/git/tree_entry.go	`73.73% <ø> (ø)`
models/graph.go	`81.03% <ø> (ø)`	⬆️
routers/repo/view.go	`46.1% <ø> (-1.2%)`	⬇️
modules/notification/base/null.go	`22.72% <ø> (ø)`	⬆️
... and 100 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 8c865f3...9558cc8. Read the comment docs.

zeripath · 2019-02-09T11:20:03Z

Hey @lunny I hope you don't mind that I took the liberty of getting this to build.

I think there's still a few things left:

Ensure that everything in modules/git/Makefile is covered by the main gitea Makefile.
There's a still a modules/git/docker folder which should probably be removed.

zeripath · 2019-02-10T01:21:16Z

I looked a bit more at this earlier today, there are issues in terms of the tests and benchmarks of the git module. These will add files to modules/git directory by default - these aren't cleaned and as some are go files will then cause other make tasks to fail.

They should probably be changed to download to a temporary directory which is deleted at the end of a test.

lunny · 2019-02-11T12:08:53Z

@zeripath please feel free to submit your commits. This PR still needs many changes.

zeripath · 2019-02-11T12:17:39Z

They should already be there - I used my manager rights to push changes to your GitHub branch. If you pull from that locally you should get the changes.

techknowlogick · 2019-02-24T04:58:56Z

We don’t need to keep git history because 1. We will have it in old repo (and can archive that repo), and 2. When this is merged it’ll be squashed into one commit then merged.

lunny · 2019-03-11T05:28:34Z

should fix #5954

lunny · 2019-03-19T03:39:43Z

Please go #6364 to discuss further.

unknwon and others added 30 commits November 26, 2015 17:34

initial command

6c18987

migrate some commands

e97767e

minor fix

d86a90f

more helpers

19510da

hide log

7445c6c

add license and ci

a77d3dc

add simple tests

615a33a

more APIs

de77627

improve log and clone repo command

05d41d5

git fsck

d14b1e8

complete migration from gogs module

4cc1cbb

readboferelimit

1ffc4bc

Handle windows case

3835dd7

speed up for getting a lot commits

ebd9fb2

remove dep to gogs

e092efd

support pure tag

2a390ae

fix get version on widnows

ddc7293

fix #1

5cd57b9

Update README.md

186b686

Merge pull request #2 from goldbattle/patch-1

9dc84c9

Update README.md

try to fix Duplicate of files in directory (gogs#2254 )

d18ad23

gogs/gogs#2254

change commitInfo.entry to commitInfo.entryName

1de2a32

remove commitInfo.id (not need anymore)

c7a2974

Merge pull request #3 from novaeye/patch-1

2617983

try to fix Duplicate of files in directory (gogs#2254 )

gogs/gogs#2373 500 when filename starts with ':'

081966e

Merge pull request #4 from nanoant/patch/fix-submodule-info

1193908

Fix submodule info loading

Add timeout safe check for fsck

f354a82

fix compile error

3c8c495

agrn and others added 5 commits February 2, 2019 22:21

get branch from commit sha1 (go-gitea#142)

fbe468c

fix get tag list (go-gitea#143)

0aea7f1

Add 'modules/git/' from commit '0aea7f12d36ed49bcac560b61301cff88e478…

2fe6ebd

…e5c' git-subtree-dir: modules/git git-subtree-mainline: 2d213b6 git-subtree-split: 0aea7f1

remove git vendor and replace all imports

87162f2

lunny added the topic/build PR changes how Gitea is built, i.e. regarding Docker or the Makefile label Feb 7, 2019

lunny changed the title ~~Move git as modules/git~~ WIP: Move git as modules/git Feb 7, 2019

zeripath added 8 commits February 7, 2019 17:34

remove git vendor directory and other unnecssary things, adjust makef…

c0375aa

…ile and Gopkg.toml

dep ensured

de5bec9

Merge branch 'master' into lunny/add_git_as_module

a6d7cfb

Fix repo_tag import

af0701e

fmt changes

83894c0

Fix spelling

eccea8b

Merge branch 'master' into lunny/add_git_as_module

ecffc4b

More spelling fixes

9558cc8

GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Feb 9, 2019

techknowlogick added this to the 1.9.0 milestone Feb 19, 2019

lunny mentioned this pull request Mar 19, 2019

move code.gitea.io/git to code.gitea.io/gitea/modules/git #6364

Merged

lunny closed this Mar 19, 2019

lunny removed this from the 1.9.0 milestone Mar 19, 2019

lunny deleted the lunny/add_git_as_module branch March 19, 2019 03:55

go-gitea locked and limited conversation to collaborators Nov 24, 2020

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

WIP: Move git as modules/git #5991

WIP: Move git as modules/git #5991

lunny commented Feb 7, 2019 •

edited

Loading

codecov-io commented Feb 9, 2019

zeripath commented Feb 9, 2019

zeripath commented Feb 10, 2019

lunny commented Feb 11, 2019

zeripath commented Feb 11, 2019

techknowlogick commented Feb 24, 2019

lunny commented Mar 11, 2019

lunny commented Mar 19, 2019

WIP: Move git as modules/git #5991

WIP: Move git as modules/git #5991

Conversation

lunny commented Feb 7, 2019 • edited Loading

codecov-io commented Feb 9, 2019

Codecov Report

zeripath commented Feb 9, 2019

zeripath commented Feb 10, 2019

lunny commented Feb 11, 2019

zeripath commented Feb 11, 2019

techknowlogick commented Feb 24, 2019

lunny commented Mar 11, 2019

lunny commented Mar 19, 2019

lunny commented Feb 7, 2019 •

edited

Loading