diff --git a/CHANGELOG.md b/CHANGELOG.md index 5e493724..b27c4b02 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # Change Log +## 1.4.3 - 2019-03-17 +* #17 Automatic refresh when repo changes while Git Graph is visible. +* #32 Checkout a specific commit from the commit context menu. +* #20 Hide the "Git Graph" status bar item when the workspace has no Git repository. +* #28 Fixed the text colour used for dropdowns and dialogs, to support use with other VSCode colour themes. +* Added the Git Graph icon to the tab when Git Graph is opened. By default the icon is coloured, but it can be set to greyscale with the new configuration setting `git-graph.tabIconColourTheme`. + ## 1.4.2 - 2019-03-10 * #22 New setting to show the current branch by default when Git Graph is opened, instead of showing all branches. By default `git-graph.showCurrentBranchByDefault` is false. * #24 Display all lines of the commit body in the commit details view. Thanks @ShoshinNikita! diff --git a/README.md b/README.md index d94e92f9..bb8913d7 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ View a Git Graph of your repository, and easily perform Git actions from the gra * Perform Git Actions (available by right clicking on a commit / branch / tag): * Create, Checkout, Rename, Delete & Merge branches * Add & Delete tags - * Revert & Cherry Pick commits + * Checkout, Cherry Pick & Revert commits * Reset current branch to commit * Copy Commit Hash to Clipboard * Configurable settings (e.g. graph style, branch colours, and more...) @@ -36,6 +36,7 @@ This extension contributes the following settings: * `git-graph.showCurrentBranchByDefault`: Show the current branch by default when Git Graph is opened. Default: false (show all branches) * `git-graph.showStatusBarItem`: Show a Status Bar item which opens Git Graph when clicked. * `git-graph.showUncommittedChanges`: Show uncommitted changes (set to false to decrease load time on large repositories). +* `git-graph.tabIconColourTheme`: Specifies the colour theme of the icon displayed on the Git Graph tab. This extension consumes the following settings: diff --git a/package.json b/package.json index be941c47..f05e8b62 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "git-graph", "displayName": "Git Graph", - "version": "1.4.2", + "version": "1.4.3", "publisher": "mhutchie", "author": { "name": "Michael Hutchison", @@ -137,6 +137,7 @@ "compile": "npm run clean && npm run compile-src && npm run compile-web", "compile-src": "tsc -p ./src", "compile-web": "tsc -p ./web && uglifyjs ./media/dropdown.js ./media/graph.js ./media/main.js --mangle --output ./media/out.min.js", + "compile-web-debug": "tsc -p ./web && uglifyjs ./media/dropdown.js ./media/graph.js ./media/main.js -b --output ./media/out.min.js", "package": "vsce package", "postinstall": "node ./node_modules/vscode/bin/install" }, diff --git a/web/main.ts b/web/main.ts index 395936eb..0015cfa1 100644 --- a/web/main.ts +++ b/web/main.ts @@ -189,22 +189,14 @@ /* Refresh */ public refresh(hard: boolean) { - if (this.expandedCommit !== null) { - this.expandedCommit = null; - this.saveState(); - } if (hard) { + if (this.expandedCommit !== null) { + this.expandedCommit = null; + this.saveState(); + } this.renderShowLoading(); - this.requestLoadBranchesAndCommits(true); - } else { - this.requestLoadBranches(false, (branchChanges: boolean) => { - this.requestLoadCommits(false, (commitChanges: boolean) => { - if (branchChanges || commitChanges) { - hideDialogAndContextMenu(); - } - }); - }); } + this.requestLoadBranchesAndCommits(hard); } /* Requests */ @@ -226,7 +218,13 @@ }); } private requestLoadBranchesAndCommits(hard: boolean) { - this.requestLoadBranches(hard, () => this.requestLoadCommits(hard, () => { })); + this.requestLoadBranches(hard, (branchChanges: boolean) => { + this.requestLoadCommits(hard, (commitChanges: boolean) => { + if (!hard && (branchChanges || commitChanges)) { + hideDialogAndContextMenu(); + } + }); + }); } /* State */