Add compare api #11187

Madongming · 2020-04-23T07:10:05Z

Add compare api:
Respond to requests with api https://host:prot/api/v1/repos/:username/:reponame/git/compare/base...head
For the response structure, please refer to the file modules/structs/repo_compare.go

Signed-off-by: jolheiser <john.olheiser@gmail.com> Co-authored-by: Antoine GIRARD <sapk@users.noreply.github.com> Co-authored-by: Antoine GIRARD <sapk@users.noreply.github.com>

* Add HTML URL to API Issues Signed-off-by: jolheiser <john.olheiser@gmail.com> * Swagger Signed-off-by: jolheiser <john.olheiser@gmail.com> Co-authored-by: Lauris BH <lauris@nix.lv> Co-authored-by: Lauris BH <lauris@nix.lv>

* Fix nil reference Signed-off-by: jolheiser <john.olheiser@gmail.com> * Tighten Signed-off-by: jolheiser <john.olheiser@gmail.com>

Co-authored-by: zeripath <art27@cantab.net>

) * Restore IsPasswordSet previous value * Update models/user.go Co-authored-by: Lauris BH <lauris@nix.lv>

Fomantic expects all tabs to have a target element with content as defined by the data-tab attribute. All our usage of the tab module seems to use <a> element tabs that link to new pages so these content elements are never present and fomantic complains about that in the console with an "Activated tab cannot be found" error. This silences that error.

* fix * fix options * add TEST Co-authored-by: Antoine GIRARD <sapk@users.noreply.github.com> Co-authored-by: Antoine GIRARD <sapk@users.noreply.github.com>

…-gitea#9725) * Delay printing hook statuses until after 1 second * Move to a 5s delay, wrapped writer structure and add config * Update cmd/hook.go * Apply suggestions from code review * Update cmd/hook.go Co-authored-by: Antoine GIRARD <sapk@users.noreply.github.com> Co-authored-by: Antoine GIRARD <sapk@users.noreply.github.com>

* Move Errored PRs out of StatusChecking (go-gitea#9675) * Set Errored PRs out of StatusChecking * Ensure that api status is correctly set too * Update models/pull.go Co-Authored-By: John Olheiser <42128690+jolheiser@users.noreply.github.com> Co-authored-by: John Olheiser <42128690+jolheiser@users.noreply.github.com> * Update services/pull/check.go Co-authored-by: John Olheiser <42128690+jolheiser@users.noreply.github.com>

webpack polyfills did not work because useBuiltIns: 'entry' expects a explicit core-js import. Changed it to 'usage' which does not require these explicit imports and polyfills based on browserslist. As a result, the built index.js now went from 128kB to 192kB. Ref: https://babeljs.io/docs/en/babel-preset-env#usebuiltins

…) (go-gitea#9764) * Fix missing updated time on migrated issues and comments * Fix testing and missing updated on migrating pullrequest Co-authored-by: Antoine GIRARD <sapk@users.noreply.github.com> Co-authored-by: Antoine GIRARD <sapk@users.noreply.github.com>

Signed-off-by: jolheiser <john.olheiser@gmail.com> Co-authored-by: John Olheiser <42128690+jolheiser@users.noreply.github.com>

Co-authored-by: zeripath <art27@cantab.net>

Signed-off-by: jolheiser <john.olheiser@gmail.com> Co-authored-by: zeripath <art27@cantab.net> Co-authored-by: zeripath <art27@cantab.net> Co-authored-by: Antoine GIRARD <sapk@users.noreply.github.com>

* backport state of 2020-01-14 * Apply suggestions from code review Co-Authored-By: 6543 <6543@obermui.de> Co-authored-by: zeripath <art27@cantab.net>

…gitea#9778)

* backport korean 20-20-01-15 | fix go-gitea#9761 * update state 14:43:10 UTC

…9794)

* Fix push-to-create Signed-off-by: jolheiser <john.olheiser@gmail.com> * Check URL path and service Signed-off-by: jolheiser <john.olheiser@gmail.com> * Send dummy payload on receive-pack GET Signed-off-by: jolheiser <john.olheiser@gmail.com> * The space was actually a NUL byte Signed-off-by: jolheiser <john.olheiser@gmail.com> * Use real bare repo instead of manufactured payload Signed-off-by: jolheiser <john.olheiser@gmail.com> Co-authored-by: zeripath <art27@cantab.net>

Co-authored-by: techknowlogick <matti@mdranta.net> Co-authored-by: techknowlogick <matti@mdranta.net>

…gitea#9827) (go-gitea#9830)

…#10883) * Protect against NPEs in notifications list (go-gitea#10879) Unfortunately there appears to be potential race with notifications being set before the associated issue has been committed. This PR adds protection in to the notifications list to log any failures and remove these notifications from the display. References go-gitea#10815 - and prevents the panic but does not completely fix this. Signed-off-by: Andrew Thornton <art27@cantab.net> * add log import * Update models/notification.go Co-Authored-By: Lauris BH <lauris@nix.lv> Co-authored-by: Lauris BH <lauris@nix.lv>

…10904) * Fix milestones too many SQL variables bug * Fix test * Don't display repositories with no milestone and fix tests * Remove unused code and add some comments

* Only update merge_base if not already merged Fix go-gitea#10766 Signed-off-by: Andrew Thornton <art27@cantab.net> * Prevent race in transfer pull request * Update services/pull/pull.go

* output of changelog * Apply suggestions from code review * Update CHANGELOG.md Co-authored-by: zeripath <art27@cantab.net>

modules/structs/repo_compare.go

6543 · 2020-04-25T11:12:37Z

routers/api/v1/repo/compare.go

+	return nil
+}
+
+func toCompareDiff(ctx *context.APIContext, compareDiffFile *gitdiff.DiffFile) (*api.DiffFile, error) {


type convertions expecialy for API should go into modules/convert/....go

This method of organization is modeled after the file routers/api/v1/repo/commits.go, and it is not just a conversion structure, but also other logic.

convertion logic also should went to convert ... make it reusable :)

6543 · 2020-04-25T11:13:09Z

and it would be nice if you add some tests 👍

6543 · 2020-04-25T11:59:44Z

routers/api/v1/repo/compare.go

+
+// GetCompare get a comparison of the two versions via shaes / branches / tags
+func GetCompare(ctx *context.APIContext) {
+	// swagger:operation GET /repos/{owner}/{repo}/git/compare/{<base sha | branch | tag>}...{[<head repo>:]<sha | branch | tag>} comparison of the two versions


is there a reason to put it under /git/ ?

Because its data source is the git diff command. so..., Because his data source is the git diff command, just my thoughts :>

I'll have a closer look soon

6543 · 2020-04-25T12:00:56Z

GitHub Reference: https://developer.github.com/v3/repos/commits/#compare-two-commits
GET /repos/:owner/:repo/compare/:base...:head

-> https://github.com/go-gitea/gitea/blob/master/CONTRIBUTING.md#api-v1

modules/structs/repo_compare.go

routers/api/v1/repo/compare.go

6543

pleace make it more similar to githubs api - so other projects can easely port there software to gitea
& make it reusable!

modules/structs/repo_compare.go

6543 · 2020-04-29T14:03:17Z

modules/structs/repo_compare.go

+	Diff         *Diff     `json:"diff"`
+	BaseCommitID string    `json:"base_commit_id"`
+	HeadCommitID string    `json:"head_commit_id"`
+}


pleace add url, html_url, permalink_url, diff_url and patch_url as described in https://developer.github.com/v3/repos/commits/#compare-two-commits

and also "status" would be helpfull

6543 · 2020-04-29T14:04:14Z

modules/structs/repo_compare.go

+	Commits      []*Commit `json:"commits"`
+	CommitCount  int       `json:"commit_count"`
+	Diff         *Diff     `json:"diff"`
+	BaseCommitID string    `json:"base_commit_id"`


Suggested change

BaseCommitID string `json:"base_commit_id"`

BaseCommit *Commit `json:"base_commit"`

and return a full Commit object

6543 · 2020-04-29T14:04:51Z

modules/structs/repo_compare.go

+	CommitCount  int       `json:"commit_count"`
+	Diff         *Diff     `json:"diff"`
+	BaseCommitID string    `json:"base_commit_id"`
+	HeadCommitID string    `json:"head_commit_id"`


Suggested change

HeadCommitID string `json:"head_commit_id"`

HeadCommit *Commit `json:"merge_base_commit"`

... as above

6543 · 2020-04-29T14:07:00Z

modules/structs/repo_compare.go

+
+// Compare information.
+type Compare struct {
+	Title        string    `json:"title"`


Title is not needed: it will be reprecented by the url filds and the status is represented by total_commits & ahead_by+behind_by

Suggested change

Title string `json:"title"`

6543 · 2020-04-29T14:10:10Z

modules/structs/repo_compare.go

+	Title        string    `json:"title"`
+	Commits      []*Commit `json:"commits"`
+	CommitCount  int       `json:"commit_count"`
+	Diff         *Diff     `json:"diff"`


pleace split diff into files and diff_stats <- diff_stats is a custom field we can use to add stuff like TotalAddition and so on
files contain array of DiffFile

6543 · 2020-04-29T14:16:39Z

modules/structs/repo_compare.go

+}
+
+// DiffFile represents a file diff.
+type DiffFile struct {


pleace make it the same type as github does -> I will need this in #10933 and #10921 too ...
If you like to add extra infos github does not profide this is fine but with two limitations: the new fileds should not colide with github onec and info should not be profided elswhere (only if this would cause to mouch new api calls ...)

6543 · 2020-04-29T14:18:12Z

modules/structs/repo_compare.go

@@ -0,0 +1,68 @@
+// Copyright 2019 The Gitea Authors. All rights reserved.


I would rename this file to repo_diff.go since it will be reused by other api endpoints

routers/api/v1/repo/compare.go

6543 · 2020-04-29T14:19:01Z

routers/api/v1/api.go

@@ -817,6 +817,7 @@ func RegisterRoutes(m *macaron.Macaron) {
 					m.Get("/trees/:sha", context.RepoRef(), repo.GetTree)
 					m.Get("/blobs/:sha", context.RepoRef(), repo.GetBlob)
 					m.Get("/tags/:sha", context.RepoRef(), repo.GetTag)
+					m.Get("/compare/*", context.ReferencesGitRepo(false), repo.GetCompare)


move out of git group

6543 · 2020-04-29T14:21:54Z

I will start on #10933 and #10921 witch will use similar struct types so pleace make it reusable!

6543 · 2020-05-05T18:36:11Z

@Madongming I think you messed up things with an rebase or something like this :(

6543 · 2020-05-05T18:37:06Z

If I guess you rebased your branch to release/v1.11 but you have to rebase it to master!!

6543 · 2020-06-28T15:58:15Z

@Madongming whats the status of this?

Bowser1704 · 2020-10-10T05:47:04Z

@Madongming What's the situation now？

6543 and others added 30 commits January 8, 2020 17:32

fix go-gitea#9648 (go-gitea#9652)

e39c238

Add PR review webhook to Telegram (go-gitea#9653) (go-gitea#9655)

f523372

Signed-off-by: jolheiser <john.olheiser@gmail.com> Co-authored-by: Antoine GIRARD <sapk@users.noreply.github.com> Co-authored-by: Antoine GIRARD <sapk@users.noreply.github.com>

Add HTML URL to API Issues (go-gitea#9654) (go-gitea#9661)

04a77b1

* Add HTML URL to API Issues Signed-off-by: jolheiser <john.olheiser@gmail.com> * Swagger Signed-off-by: jolheiser <john.olheiser@gmail.com> Co-authored-by: Lauris BH <lauris@nix.lv> Co-authored-by: Lauris BH <lauris@nix.lv>

Fix nil reference in repo generation (go-gitea#9660) (go-gitea#9666)

a2b7cc1

* Fix nil reference Signed-off-by: jolheiser <john.olheiser@gmail.com> * Tighten Signed-off-by: jolheiser <john.olheiser@gmail.com>

Prevent redirect to Host (go-gitea#9678) (go-gitea#9679)

3a00a69

remove google font call (go-gitea#9668) (go-gitea#9681)

3fb906d

eliminate horizontal scroll caused by footer (go-gitea#9674)

11bce6f

Co-authored-by: zeripath <art27@cantab.net>

Load milestone in API PR list (go-gitea#9671) (go-gitea#9700)

a516a7b

Don't attempt to close issue if already closed (go-gitea#9699)

ff16099

Never allow an empty password to validate (go-gitea#9682) (go-gitea#9683

7eaba6b

) * Restore IsPasswordSet previous value * Update models/user.go Co-authored-by: Lauris BH <lauris@nix.lv>

Missed q.lock.Unlock() will cause panic (go-gitea#9706)

0e53a16

Remove unused lock (go-gitea#9710)

f8ea50c

[BugFix] [API] /repos/issues/search (go-gitea#9698) (go-gitea#9724)

dbeef6b

* fix * fix options * add TEST Co-authored-by: Antoine GIRARD <sapk@users.noreply.github.com> Co-authored-by: Antoine GIRARD <sapk@users.noreply.github.com>

Fix milestones page (go-gitea#9771)

1980e59

Signed-off-by: jolheiser <john.olheiser@gmail.com> Co-authored-by: John Olheiser <42128690+jolheiser@users.noreply.github.com>

Fix go-gitea#9752 (go-gitea#9769) (go-gitea#9775)

602c5da

Co-authored-by: zeripath <art27@cantab.net>

Fix SimpleMDE quote reply (go-gitea#9757) (go-gitea#9768)

c579ad9

Signed-off-by: jolheiser <john.olheiser@gmail.com> Co-authored-by: zeripath <art27@cantab.net> Co-authored-by: zeripath <art27@cantab.net> Co-authored-by: Antoine GIRARD <sapk@users.noreply.github.com>

Backport Locales [2020-01-14] (go-gitea#9773)

73c90c2

* backport state of 2020-01-14 * Apply suggestions from code review Co-Authored-By: 6543 <6543@obermui.de> Co-authored-by: zeripath <art27@cantab.net>

Fix add team on collaborator page when same name as organization (go-…

42663a6

…gitea#9778)

Fix (go-gitea#9761) Korean locales (go-gitea#9780)

6d1f7e9

* backport korean 20-20-01-15 | fix go-gitea#9761 * update state 14:43:10 UTC

Fix missing unlock in uniquequeue (go-gitea#9791)

dbe6136

Fix missing msteam webhook on organization (go-gitea#9781) (go-gitea#…

c8bb0ec

…9794)

Fix compare (go-gitea#9808) (go-gitea#9814)

e2ddc42

Co-authored-by: techknowlogick <matti@mdranta.net> Co-authored-by: techknowlogick <matti@mdranta.net>

fix dump non-exist log directory (go-gitea#9818) (go-gitea#9819)

f766719

Fix wrong identify poster on a migrated pull request when submi… (go-…

69a2a29

…gitea#9827) (go-gitea#9830)

zeripath and others added 4 commits March 30, 2020 15:23

Fix milestones too many SQL variables bug (go-gitea#10880) (go-gitea#…

139fc7c

…10904) * Fix milestones too many SQL variables bug * Fix test * Don't display repositories with no milestone and fix tests * Remove unused code and add some comments

Only update merge_base if not already merged (go-gitea#10909)

bfce841

* Only update merge_base if not already merged Fix go-gitea#10766 Signed-off-by: Andrew Thornton <art27@cantab.net> * Prevent race in transfer pull request * Update services/pull/pull.go

Changelog v1.11.4 (go-gitea#10916)

3afbbfe

* output of changelog * Apply suggestions from code review * Update CHANGELOG.md Co-authored-by: zeripath <art27@cantab.net>

6543 reviewed Apr 23, 2020

View reviewed changes

modules/structs/repo_compare.go Outdated Show resolved Hide resolved

GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Apr 23, 2020

Madongming force-pushed the add-compare-api branch from 5f8599b to bcf3532 Compare April 25, 2020 05:18

6543 reviewed Apr 25, 2020

View reviewed changes

guillep2k reviewed Apr 28, 2020

View reviewed changes

modules/structs/repo_compare.go Outdated Show resolved Hide resolved

routers/api/v1/repo/compare.go Outdated Show resolved Hide resolved

6543 requested changes Apr 29, 2020

View reviewed changes

This was referenced Apr 29, 2020

[Feature] [API] GET commit content #10921

Closed

[Feature] [API] List pull requests files #10933

Closed

add compare api

94e7636

Madongming force-pushed the add-compare-api branch from 8b04511 to 94e7636 Compare May 5, 2020 11:07

Madongming closed this Jul 26, 2020

Madongming deleted the add-compare-api branch July 26, 2020 08:19

jtackaberry mentioned this pull request Aug 31, 2020

API to GET all changed files in Pull Request #654

Closed

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

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add compare api #11187

Add compare api #11187

Madongming commented Apr 23, 2020

6543 Apr 25, 2020

Madongming Apr 26, 2020

6543 Apr 29, 2020

6543 commented Apr 25, 2020

6543 Apr 25, 2020

Madongming Apr 26, 2020

6543 Apr 26, 2020

6543 commented Apr 25, 2020

6543 left a comment

6543 Apr 29, 2020

6543 Apr 29, 2020

6543 Apr 29, 2020

6543 Apr 29, 2020

6543 Apr 29, 2020

6543 Apr 29, 2020

6543 Apr 29, 2020

6543 Apr 29, 2020

6543 Apr 29, 2020

6543 commented Apr 29, 2020

6543 commented May 5, 2020

6543 commented May 5, 2020

6543 commented Jun 28, 2020

Bowser1704 commented Oct 10, 2020

	BaseCommitID string `json:"base_commit_id"`
	BaseCommit *Commit `json:"base_commit"`

	HeadCommitID string `json:"head_commit_id"`
	HeadCommit *Commit `json:"merge_base_commit"`

		@@ -0,0 +1,68 @@
		// Copyright 2019 The Gitea Authors. All rights reserved.

Add compare api #11187

Add compare api #11187

Conversation

Madongming commented Apr 23, 2020

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

6543 commented Apr 25, 2020

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

6543 commented Apr 25, 2020

6543 left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

6543 commented Apr 29, 2020

6543 commented May 5, 2020

6543 commented May 5, 2020

6543 commented Jun 28, 2020

Bowser1704 commented Oct 10, 2020