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

CHE-3609: Create visual Git history window instead of old one #3799

Merged
merged 3 commits into from
Feb 8, 2017

Conversation

vinokurig
Copy link
Contributor

@vinokurig vinokurig commented Jan 18, 2017

What does this PR do?

Add new visual Git history window instead of old one.

What issues does this PR fix or reference?

#3609

Changelog

Git history panel changed to a window to enable visualization of commit changes.

Release Notes

We've replaced the git history panel with a new window. This allows you to see the changes from each commit visually with a diff viewer. You can get to the git history from the git menu, or you can right-click on a file in the project explorer and select git history from the context menu.

The git history window will show you all the commits:

git_history_1

Double clicking on a revision item, or clicking the 'Compare' button will open the visual diff viewer:

git_history_2

Tests written?

Yes

@@ -98,6 +101,25 @@ public final void writeTo(OutputStream out) throws IOException {
}
}

private List<DiffEntry> EmptyToCommit(String commitId, DiffFormatter formatter) throws IOException {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

EmptyToCommit method name should starts with lowercase

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fixed

@@ -98,6 +101,25 @@ public final void writeTo(OutputStream out) throws IOException {
}
}

private List<DiffEntry> EmptyToCommit(String commitId, DiffFormatter formatter) throws IOException {
ObjectId commit = repository.resolve(commitId);
if (commit == null) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

FYI, guava has utility method com.google.common.base.Preconditions#checkArgument(boolean, java.lang.Object)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done


service.diff(appContext.getDevMachine(), project.getLocation(), filePatterns, RAW, false, 0, revision.getId(), isCached)
.then(new Operation<String>() {
private void FetchRevisions() {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Method name should starts with lowercase letter.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fixed

@@ -46,6 +45,7 @@
@Singleton
public class ResetToCommitPresenter implements ResetToCommitView.ActionDelegate {
public static final String RESET_COMMAND_NAME = "Git reset to commit";
public static final String LOG_COMMAND_NAME = "Git log";
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Formatting.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fixed

@vzhukovs
Copy link
Contributor

Other seems ok

@codenvy-ci
Copy link

@codenvy-ci
Copy link

@vinokurig vinokurig merged commit da8c419 into master Feb 8, 2017
@vinokurig vinokurig deleted the CHE-3609 branch February 8, 2017 08:37
@vinokurig vinokurig added this to the 5.3.0 milestone Feb 8, 2017
@slemeur slemeur added the kind/enhancement A feature request - must adhere to the feature request template. label Feb 8, 2017
@bmicklea bmicklea self-requested a review February 8, 2017 15:31
@JamesDrummond JamesDrummond mentioned this pull request Feb 17, 2017
9 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
kind/enhancement A feature request - must adhere to the feature request template.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants