Feat: Allow Creation of MRs for Forked Target #303

harrisoncramer · 2024-05-27T16:40:03Z

This MR adds the ability for users to create an MR targeting another project, when targeting that project via a fork.

The setting is enabled via the settings.create_mr.fork settings like this:

      create_mr = {
        fork = {
          enabled = true,
          -- forked_project_id = 10, -- Optional, will prompt for a user to input the ProjectID during creation if not provided.
        },
        target = "main",
        template_file = "default.md",
        squash = true,
        delete_branch = true,
      },

* Fix: Toggle modified notes (#188) * Fix: Toggle discussion nodes correctly * Feat: Show Help keymap in discussion tree winbar * Fix: Enable toggling nodes from the note body Previously, the cursor had to be placed on the first line of the note (the one with the author name) for toggling to work. * Fix: Enable toggling resolved status from child nodes Previously, the cursor had to be placed on the root node of the discussion for toggling resolved status to work. * Fix: Only try to show emoji popup on note nodes Without this fix, there was an error whenever the cursor moved to a file_name or path node in the "by_file_name" discussion tree. * Feat: Add keymap for toggling tree type Previously, tree type could only be set in the plugin configuration. Now it can be toggled within a session. The keymap "i" is chosen based on a similar functionality in DiffView. * Fix: Disable tree type toggling in Notes Tree type toggling only makes sense in the (linked) Discussions and making it possible in the Notes could confuse users.

Fix: Multi-line discussions. The calculation of a range for a multiline comment has been consolidated and moved into the location.lua file. This does not attempt to fix diagnostics. Refactor: It refactors the discussions code to split hunk parsing and management into a separate module Fix: Don't allow comments on modified buffers #194 by preventing comments on the reviewer when using --imply-local and when the working tree is dirty entirely. Refactor: It introduces a new List class for data aggregation, filtering, etc. Fix: It removes redundant API calls and refreshes from the discussion pane

Fix: Allow users to switch tabs while creating comments

Fixes an issue in the old sha where the index when iterating through the lines of the hunk in the old SHA was off by one

* Updated lua/gitlab/actions/discussions/signs.lua * Initial commit of changes * Updated lua/gitlab/actions/discussions/signs.lua * Updated lua/gitlab/actions/discussions/signs.lua * Updated lua/gitlab/actions/discussions/init.lua * Updated lua/gitlab/actions/discussions/signs.lua * Split up signs and diagnostics * Moved common to common file * Continued modularization * added formatting * Moved signs/diagnostic lines into appropriate files * Updated lua/gitlab/reviewer/init.lua * Renamed is_current_sha => is_current_sha_focused * Updated lua/gitlab/reviewer/init.lua * Moved actions.indicators => indicators * Split discussions/signs apart into separate modules * Fixed filter function, fixed discussions * Updated lua/gitlab/indicators/diagnostics.lua * Setting diagnostics, handling and catching errors * Greatly simplified diagnostics setup * Re-split multi-line * Updated lua/gitlab/indicators/diagnostics.lua * Setting up signs * Updated lua/gitlab/indicators/signs.lua * Updated signs + display options * Updated lua/gitlab/state.lua * Updated doc/gitlab.nvim.txt * Updated readme * Added deprecation warning * formatting

@jakubbortlik

Fixes off-by one in new SHA comment creation, thank you @jakubbortlik for catching this

Fixes issue where jumping to the reviewer would jump to the wrong buffer (old SHA vs new SHA). Also addresses an issue in the refactor where ranged signs were being placed on top of comment signs.

Fixes typo in settings check, this is a #PATCH release

…211) fix: Calculate new line in ranged comment after all hunks correctly

Fix: Ranged comments in new SHA

fix: This MR fixes a missing function from the reviewer that was affecting the ability to add suggestion comments

Fixes an issue where the diagnostics were not being created correctly on a deleted line

This MR allows you to ignore bad x509 certificates when connecting to Gitlab (e.g. make an insecure connection). Helpful for self-hosted or enterprise environments where the instance is not up to date.

This MR removes the `<esc>` keybinding from the application for popups to avoid accidentally nuking existing changes. Addresses #239.

This MR deprecates the "backup" register which was a hot-fix used to deal with bugs upon comment and note creation

* Fixing labels and updating go gitlab * Fixing up labels.lua

Enables fetching of pipeline information on main and master branches. Allows plugin startup on main/master branches for future extensibility improvements.

This PR adds the ability to access the underlying data in the plugin, such as pipeline information, the information about a merge request, and other data. This data can be integrated into other plugins such as statusline plugins, or other workflows.

fix: correcting some problem with review mode

fix: restores focus to recent buffer after making comment

fix: issue with editing draft notes; jumping to correct position for draft notes; and replying (not supported) to draft notes.

feat: check the up-to-date status of the remote feature branch before creating a MR, starting a review, or opening the MR summary

feat: better error checking in git commands feat: allow toggling between live mode and draft mode, adds "D" keybinding to discussion tree

fix: We require some state from Packer, this fixes the docs to reflect a way to load that state prior to running the gitlab plugin. Fixes #94.

fix: do not allow line-linked comments on non-existent buffers

* Feat: Make toggle_draft_mode available outside discussion tree

* feat: implements refresh function for discussion tree view * fix: corrects collapsing tree nodes on create/edit

* Add support for draft note replies, e.g. replies to existing notes and comments in draft form

* fix: The base_sha should be used for calculating the correct diff hunks because it is also used for the DiffviewOpen command

fix: Use backticks in code suggestions (#292)

* fix(mr.create): consider remote branches * fix(utils): prevent require loop

fix: save popup contents to temp registers

…origin-to-remote-upstream

fix: show signs for diagnostic range feat: enable hiding diagnostic sign docs: unify gitlab.nvim.txt with README

…te-origin-to-remote-upstream

harrisoncramer and others added 30 commits February 26, 2024 08:00

trim trailing slash from custom URLs

e3d7dfe

Updated .github/CONTRIBUTING.md

438d126

Updated .github/ISSUE_TEMPLATE/bug_report.md

d29bd0b

Fix: location provider (#198)

8859c47

fix: add nil check for diffview performance issue (#199)

00e3e24

Fix: Switch Tabs During Comment Creation (#200)

8937783

Fix: Allow users to switch tabs while creating comments

Fix: Check if file is modified (#201)

7a3e761

Fix: Off by 1 Error in Old Sha (#202)

4c4f4b5

Fixes an issue in the old sha where the index when iterating through the lines of the hunk in the old SHA was off by one

Fixes Off-By-One Issue w/ New SHA (#205)

f6ada57

Fixes off-by one in new SHA comment creation, thank you @jakubbortlik for catching this

Fix: Reviewer Jump (#206)

949e076

Fixes issue where jumping to the reviewer would jump to the wrong buffer (old SHA vs new SHA). Also addresses an issue in the refactor where ranged signs were being placed on top of comment signs.

Merge branch 'main' into develop

816338f

Fix Typo In Settings Check (#209)

e6cc34c

Fixes typo in settings check, this is a #PATCH release

fix: Calculate new line in ranged comment after all hunks correctly (#…

d5ad0ea

…211) fix: Calculate new line in ranged comment after all hunks correctly

fix: range in new SHA (#212)

ca35faa

Fix: Ranged comments in new SHA

Merge branch 'main' into develop

6288ab5

fix: address mIssing get_lines function (#224)

1bf75e2

fix: This MR fixes a missing function from the reviewer that was affecting the ability to add suggestion comments

fix: diagnostic creation for comments on deleted lines (#226)

6016624

Fixes an issue where the diagnostics were not being created correctly on a deleted line

feat: Allow insecure https connection to Gitlab (#229)

3e9b155

This MR allows you to ignore bad x509 certificates when connecting to Gitlab (e.g. make an insecure connection). Helpful for self-hosted or enterprise environments where the instance is not up to date.

Merge branch 'main' into develop

6b4fba3

Merge branch 'main' into develop

f55852f

fix: remove esc keybinding (#240)

8b4ccaf

This MR removes the `<esc>` keybinding from the application for popups to avoid accidentally nuking existing changes. Addresses #239.

Removes backup register option (#242)

61291a3

This MR deprecates the "backup" register which was a hot-fix used to deal with bugs upon comment and note creation

fix: update go-gitlab and fix label code (#243)

09d5c55

* Fixing labels and updating go gitlab * Fixing up labels.lua

feat: enable pipeline command on main/master (#244)

081ad8f

Enables fetching of pipeline information on main and master branches. Allows plugin startup on main/master branches for future extensibility improvements.

Expose Gitlab Data via API (#235)

b00b168

This PR adds the ability to access the underlying data in the plugin, such as pipeline information, the information about a merge request, and other data. This data can be integrated into other plugins such as statusline plugins, or other workflows.

fix: line code fix (#245)

db90a36

fix: correcting some problem with review mode

Merge branch 'main' into develop

3852084

harrisoncramer and others added 22 commits April 20, 2024 11:44

Fix: Restore focus (#277)

2c2d0eb

fix: restores focus to recent buffer after making comment

fix: draft note edits + reply keybinding (#279)

9ec134d

fix: issue with editing draft notes; jumping to correct position for draft notes; and replying (not supported) to draft notes.

Feat: Check feature branch is up-to-date on remote (#278)

681c29e

feat: check the up-to-date status of the remote feature branch before creating a MR, starting a review, or opening the MR summary

feat: wrap CLI commands, toggle draft/live mode (#280)

fa16905

feat: better error checking in git commands feat: allow toggling between live mode and draft mode, adds "D" keybinding to discussion tree

fix: Update readme w/ correct packer installation (#285)

8affee7

fix: We require some state from Packer, this fixes the docs to reflect a way to load that state prior to running the gitlab plugin. Fixes #94.

fix: non-existent buffer comments (#284)

9c22fd1

fix: do not allow line-linked comments on non-existent buffers

Merge branch 'main' into develop

7a6e9c2

Feat: Make toggle_draft_mode available outside discussion tree (#281)

8a546af

* Feat: Make toggle_draft_mode available outside discussion tree

feat: allow refreshing discussion data (#288)

80fbcee

* feat: implements refresh function for discussion tree view * fix: corrects collapsing tree nodes on create/edit

Always refresh discussion data for discussion view toggle

8382d1f

feat: support draft note replies (#290)

fcd8dbc

* Add support for draft note replies, e.g. replies to existing notes and comments in draft form

remove print note

475b950

Fix: Use base_sha for calculating diff hunks (#291)

81d7f0c

* fix: The base_sha should be used for calculating the correct diff hunks because it is also used for the DiffviewOpen command

fix: Use backticks in code suggestions (#292)

85737e9

fix: Use backticks in code suggestions (#292)

Merge branch 'main' into develop

0115c58

Fix: Copy node url to clipboard (#295)

3592d9e

Fix: List remote branches for merge targets (#293)

a8b82b1

fix: consider remote branches (#297)

3dabc55

* fix(mr.create): consider remote branches * fix(utils): prevent require loop

Fix: Save popup contents to temp_registers (#294)

2c7d983

fix: save popup contents to temp registers

added feature

8c7cf2c

Merge branch 'main' into 301-how-to-create-merge-reqeust-from-remote-…

a7ce384

…origin-to-remote-upstream

fixed linting

4912dcf

harrisoncramer marked this pull request as ready for review May 27, 2024 16:41

harrisoncramer linked an issue May 27, 2024 that may be closed by this pull request

how to create merge reqeust from remote origin to remote upstream #301

Closed

jakubbortlik and others added 5 commits June 10, 2024 14:44

Fix: Ranged comment signs not showing (#305)

75e5536

fix: show signs for diagnostic range feat: enable hiding diagnostic sign docs: unify gitlab.nvim.txt with README

Updated lua/gitlab/actions/create_mr.lua

19dfb68

Updated lua/gitlab/actions/create_mr.lua

1a8c0d8

Merge branch 'develop' into 301-how-to-create-merge-reqeust-from-remo…

c259d20

…te-origin-to-remote-upstream

Updated README.md

daf3e97

harrisoncramer merged commit 53d5647 into main Jun 10, 2024
6 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Feat: Allow Creation of MRs for Forked Target #303

Feat: Allow Creation of MRs for Forked Target #303

harrisoncramer commented May 27, 2024

Feat: Allow Creation of MRs for Forked Target #303

Feat: Allow Creation of MRs for Forked Target #303

Conversation

harrisoncramer commented May 27, 2024