ksercs/gitcherry

One-click cherry-picking and pull request creating right in Visual Studio Code

gitcherry's Issues

Strict requirement for repository names

Current version of this extension requires name upstream name remote repo. If repo has another name, extension stop work.

Reviewers are not added to pull request anymore

Log

INFO: Payload is getting
INFO: First commit: {"hash":"7be3e796c35a79ac20069300ef2778702da9df3a","date":"2021-05-03T15:13:47+03:00","message":"first","refs":"","body":"","author_name":"ksercs","author_email":"[email protected]"}
INFO: Title input is shown
INFO: Accepted title: first
INFO: Description input is created
INFO: Accepted description: 
INFO: start pull requests creating
INFO: prepared payload: {"title":"first","description":"","upstreams":["19_2"],"reviewers":[],"labels":["WIP"]}
INFO: branch: m__master, localBranch: m, baseUpstreamBranch: master, upstreams: 19_2
INFO: git checkout m__19_2
INFO: now at branch: m__19_2
INFO: Commits are pushed to the branch m__19_2
INFO: Start PR creating: 19_2
INFO: login: ksercs
INFO: Pull request creating payload: {"owner":"jtoming830","repo":"dxCherry","base":"19_2","head":"ksercs:m__19_2","title":"first","body":""}
INFO: Pull request is created
INFO: PR is customized
INFO: checkout back to m__master
INFO: git checkout m__master
INFO: now at branch: m__master

Command GitCherry.cherry_pick not found

Steps to reproduce:

1. Installed gitcherry
2. Clicked on cherry pick

Actual result:
Getting command 'gitcherry.cherry_pick' not found

When I click on the "cherries" I get that message. When I click on the right pointing arrow. I get GetCherry.pull_request not found

It seems like it is missing something installed?
Expected result:

Log

<!--
Please attach the log lines from `GitCherry` output channel.
-->

Display user name in addition to user login for reviewers

Improve performance: bundle files and ignore unnecessary

Problem: This extension consists of 612 files, out of which 468 are JavaScript files. We should bundle it to improve performance .

What to do:

• bundle the extension: https://aka.ms/vscode-bundle-extension
• exclude unnecessary files by adding them to your .vscodeignore

Info about v1.0.1 version: 612 files, 28.85MB

Add a possibility to collapse expanded treeView nodes

Standalone pull request creating raises NoCommitError

Log

INFO: Payload is getting
INFO: First commit: undefined
ERROR: There is no new commits in "contentReady_renovation__21_2" branch
ERROR: There is no new commits in "contentReady_renovation__21_2" branch
ERROR: no payload

Move version to variable (no hardcode, plz)

It is not possible to cancel cherry picking operation if finish cherry picking manually

Steps to reproduce:

1. Start cherry picking to branch where conflicts are exists.
2. Extension says that you should resolve conflicts.
3. Resolve conflicts, commit them and push to remote branch.
4. Checkout to master or another branch.
5. Open extension and click Cancel Cherry Pick button.

Current behaviour:
Error occurred and previous cherry picking is not canceled. Only after VSCode reloading cherry picking continues working.

Expected behaviour:
Cancel cherry picking should works if user finish cherry picking manually.

Add a possibility to cherry pick when there is not staged changes

Steps to reproduce

1. Change 2 files
2. Commit changed in the single file
3. Try to cherry-pick

Actual result: Not staged changes are found. error is raised
Expected result: No errors is raised, cherry picking is successful

Log

INFO: You are logged in GitHub as ksercs
INFO: Payload is getting
INFO: First commit: {"hash":"3a6eb656538dc4c266b525bc91a0547b4c00d74d","date":"2021-06-13T19:06:23+03:00","message":"first change","refs":"HEAD -> jjj__master","body":"","author_name":"ksercs","author_email":"[email protected]"}
INFO: branch: jjj__master, localBranch: jjj, baseUpstreamBranch: master, upstreams: 20_1
INFO: start cherry picking
INFO: prepared payload: {"0":{"title":"first change","description":"","upstreams":["20_1"],"reviewers":[],"labels":[]}}
INFO: commits are picked: firstCommit=[object Object], lastCommit=[object Object]
INFO: cherryState set: {"upstreams":["20_1"],"firstCommit":"3a6eb656538dc4c266b525bc91a0547b4c00d74d","lastCommit":"3a6eb656538dc4c266b525bc91a0547b4c00d74d","isAborted":false,"currentBranchToCherryPick":""}
INFO: start cherry-picking to 20_1
INFO: no local branch jjj__20_1
INFO: git fetch upstream 20_1
INFO: git checkout upstream/20_1
ERROR: Not staged changes are found. Your local changes to the following files would be overwritten by checkout:
	README.md
Please commit your changes or stash them before you switch branches.
Aborting

ERROR: Error: error: Your local changes to the following files would be overwritten by checkout:
	README.md
Please commit your changes or stash them before you switch branches.
Aborting

Offer: maybe we should make stash before check out during cherry pick and make stash apply after that?

Add possibility to unselect all checkboxes

It's not conveniently to unselect each checkbox in tree view after big pull request creating

The 'refusing to allow an OAuth App to create or update workflow' error is not handled

Steps to reproduce:

1. Make sure that you have invalid login information for github stored in Windows Credentials Manager
2. Create a pull request for a branch (on upstream) created after April 2021

Actual result: dxCherry shows that it attempted to make a pull request and then nothing. In fact, the following error appeared (in log for dxCherry): ! [remote rejected] master -> master (refusing to allow an OAuth App to create or update workflow .github/workflows/file.yml without workflow scope)

Expected result: dxSherry shows that this error appeared

Solution is described at: gitextensions/gitextensions#4916 (comment)