Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add support for checkout exception #733

Open
wants to merge 1 commit into
base: 3.x
Choose a base branch
from

Conversation

i053322
Copy link
Contributor

@i053322 i053322 commented Aug 9, 2016

What does this PR do?

The PR add new functionality for the checkout got API. new you can raise the relevant error and not GitAPIException. meaning that you can get the relevant error code and not only 500 and also move the parameters the relevant to the error.
Also there is no mapper for the git messages.

What issues does this PR fix or reference?

In checkout scenario in git you get the relevant error of conflict 409 and not 500. also you get the conflictPath of the error.

Previous Behavior

If there was an error you always get GitAPIException and not the relevant error.

New Behavior

Remove this section if not relevant
For each error in checkout API we will raise the relevant error with the relevant parameters for each error.

Tests written?

No for specific exception scenario.

Docs requirements?

Include the content for all the docs changes required.

  1. API changes
  2. User docs changes

Please review Che's Contributing Guide for best practices.

Change-Id: Ib41bc35dd6395656f9d7a9cccf0886e809e8dc5f
Signed-off-by: i053322 [email protected]

Change-Id: Ib41bc35dd6395656f9d7a9cccf0886e809e8dc5f
Signed-off-by: i053322 <[email protected]>
@i053322
Copy link
Contributor Author

i053322 commented Aug 9, 2016

@vinokurig - added the PR from che 4.x

@vinokurig
Copy link
Contributor

Please change imports of GitException in che-plugins and plugins 3.x

@i053322
Copy link
Contributor Author

i053322 commented Aug 10, 2016

@vinokurig - what did you mean? I moved it and did refactor for all the classes .Do I need to do clone to another repository ?

@vinokurig
Copy link
Contributor

vinokurig commented Aug 10, 2016

You refactored GitException to org.eclipse.che.api.git.exception package, but in che-plugins and plugins projects GitException is imorted by org.eclipse.che.api.git.GitException. Please create pull requests there too

@i053322
Copy link
Contributor Author

i053322 commented Aug 10, 2016

@vinokurig - I found this repository https://github.com/codenvy/che-plugins for che-plugins
what is the repository for plugins 3.x ?

@vinokurig
Copy link
Contributor

sorry, plugins is a private repository

@vinokurig
Copy link
Contributor

Ok for me

@i053322
Copy link
Contributor Author

i053322 commented Aug 10, 2016

@vinokurig - I did it forche-plugins codenvy-legacy/che-plugins#631 is it ok ?

@vinokurig
Copy link
Contributor

Looks like you opened a pull request for master but you should open it for 3.x

@i053322
Copy link
Contributor Author

i053322 commented Aug 10, 2016

@vinokurig -I did it for 3.x

@i053322
Copy link
Contributor Author

i053322 commented Aug 10, 2016

@vinokurig - this is the last commit in the branch
commit f1a29a06f5a924bdc2c0f436f9bdb60adbb9619e
Author: Igor Vinokur [email protected]
Date: Fri May 27 13:06:43 2016 +0300

CHE-336: Refactoring of GitUrl class

@i053322
Copy link
Contributor Author

i053322 commented Aug 10, 2016

@vinokurig
I checked the config of my branch
branch.checkout_error.remote=codenvy
branch.checkout_error.merge=refs/heads/3.x

@i053322
Copy link
Contributor Author

i053322 commented Aug 10, 2016

@vinokurig
Copy link
Contributor

ok

@skabashnyuk
Copy link
Contributor

ok @tareqhs it's up to you to merge this pr

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants