1
1
mirror of https://github.com/kahole/edamagit.git synced 2024-10-26 09:00:54 +03:00

Compare commits

...

2 Commits

Author SHA1 Message Date
Kristian Andersen Hole
584a5eeee5 changelog 2023-12-09 15:48:10 +01:00
Kristian Andersen Hole
31bd62b4c0 make commit and stash detail view update on changes (fixes #282) 2023-12-09 15:48:10 +01:00
10 changed files with 12 additions and 22 deletions

View File

@ -1,5 +1,8 @@
# Changelog # Changelog
## [0.6.51]
- Make commit and stash detail view update on changes (fixes #282)
## [0.6.50] ## [0.6.50]
- Show commit hash under cursor when checkout (@bzy-debug Bao Zhiyuan) - Show commit hash under cursor when checkout (@bzy-debug Bao Zhiyuan)
- Fix vscode-insiders path for the remote environment (@ianic Igor Anić) - Fix vscode-insiders path for the remote environment (@ianic Igor Anić)

4
package-lock.json generated
View File

@ -1,12 +1,12 @@
{ {
"name": "magit", "name": "magit",
"version": "0.6.50", "version": "0.6.51",
"lockfileVersion": 2, "lockfileVersion": 2,
"requires": true, "requires": true,
"packages": { "packages": {
"": { "": {
"name": "magit", "name": "magit",
"version": "0.6.50", "version": "0.6.51",
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"@vscode/iconv-lite-umd": "^0.7.0", "@vscode/iconv-lite-umd": "^0.7.0",

View File

@ -7,12 +7,13 @@
"author": { "author": {
"name": "Kristian Andersen Hole" "name": "Kristian Andersen Hole"
}, },
"version": "0.6.50", "version": "0.6.51",
"engines": { "engines": {
"vscode": "^1.50.0" "vscode": "^1.50.0"
}, },
"icon": "images/edamagit_logo.png", "icon": "images/edamagit_logo.png",
"categories": [ "categories": [
"SCM Providers",
"Other" "Other"
], ],
"keywords": [ "keywords": [

View File

@ -18,8 +18,6 @@ export class BlameView extends DocumentView {
this.addSubview(blameTextView); this.addSubview(blameTextView);
} }
public update(state: MagitRepository): void { }
static index = 0; static index = 0;
static encodeLocation(repository: MagitRepository, fileUri: Uri): Uri { static encodeLocation(repository: MagitRepository, fileUri: Uri): Uri {
return Uri.parse(`${Constants.MagitUriScheme}:${BlameView.UriPath}/${fileUri.path}?${repository.uri.fsPath}#${fileUri.path}#${BlameView.index++}`); return Uri.parse(`${Constants.MagitUriScheme}:${BlameView.UriPath}/${fileUri.path}?${repository.uri.fsPath}#${fileUri.path}#${BlameView.index++}`);

View File

@ -12,7 +12,6 @@ export class CommitDetailView extends DocumentView {
static UriPath: string = 'commit.magit'; static UriPath: string = 'commit.magit';
isHighlightable = false; isHighlightable = false;
needsUpdate = false;
constructor(uri: Uri, public commit: MagitCommit, header: string, diffChanges: MagitChange[]) { constructor(uri: Uri, public commit: MagitCommit, header: string, diffChanges: MagitChange[]) {
super(uri); super(uri);
@ -25,8 +24,6 @@ export class CommitDetailView extends DocumentView {
this.addSubview(commitTextView); this.addSubview(commitTextView);
} }
public update(state: MagitRepository): void { }
static encodeLocation(repository: MagitRepository, commitHash: string): Uri { static encodeLocation(repository: MagitRepository, commitHash: string): Uri {
return Uri.parse(`${Constants.MagitUriScheme}:${CommitDetailView.UriPath}?${repository.uri.fsPath}#${commitHash}`); return Uri.parse(`${Constants.MagitUriScheme}:${CommitDetailView.UriPath}?${repository.uri.fsPath}#${commitHash}`);
} }

View File

@ -18,8 +18,6 @@ export class DiffView extends DocumentView {
this.addSubview(diffTextView); this.addSubview(diffTextView);
} }
public update(state: MagitRepository): void { }
static index = 0; static index = 0;
static encodeLocation(repository: MagitRepository, diffId: string): Uri { static encodeLocation(repository: MagitRepository, diffId: string): Uri {
return Uri.parse(`${Constants.MagitUriScheme}:${DiffView.UriPath}?${repository.uri.fsPath}#${diffId}${DiffView.index++}`); return Uri.parse(`${Constants.MagitUriScheme}:${DiffView.UriPath}?${repository.uri.fsPath}#${diffId}${DiffView.index++}`);

View File

@ -13,7 +13,9 @@ export abstract class DocumentView extends View {
super(); super();
} }
public abstract update(state: MagitRepository): void; public update(state: MagitRepository): void {
this.triggerUpdate();
}
public triggerUpdate() { public triggerUpdate() {
if (this.emitter) { if (this.emitter) {

View File

@ -20,8 +20,6 @@ export class HelpView extends DocumentView {
this.addSubview(diffTextView); this.addSubview(diffTextView);
} }
public update(state: MagitRepository): void { }
static encodeLocation(repository: MagitRepository): Uri { static encodeLocation(repository: MagitRepository): Uri {
return Uri.parse(`${Constants.MagitUriScheme}:${HelpView.UriPath}?${repository.uri.path}#help`); return Uri.parse(`${Constants.MagitUriScheme}:${HelpView.UriPath}?${repository.uri.path}#help`);
} }

View File

@ -8,15 +8,13 @@ import GitTextUtils from '../utils/gitTextUtils';
import { CommitItemView } from './commits/commitSectionView'; import { CommitItemView } from './commits/commitSectionView';
import { DocumentView } from './general/documentView'; import { DocumentView } from './general/documentView';
import { TextView } from './general/textView'; import { TextView } from './general/textView';
import { Token } from './general/semanticTextView'; import { Ref } from '../typings/git';
import { SemanticTokenTypes } from '../common/constants';
import { Ref, RefType } from '../typings/git';
import ViewUtils from '../utils/viewUtils'; import ViewUtils from '../utils/viewUtils';
import { MagitRemote } from '../models/magitRemote';
export default class LogView extends DocumentView { export default class LogView extends DocumentView {
static UriPath: string = 'log.magit'; static UriPath: string = 'log.magit';
needsUpdate = false;
constructor(uri: Uri, log: MagitLog, magitState: MagitRepository, defaultBranches?: { [remoteName: string]: string }) { constructor(uri: Uri, log: MagitLog, magitState: MagitRepository, defaultBranches?: { [remoteName: string]: string }) {
super(uri); super(uri);
@ -28,8 +26,6 @@ export default class LogView extends DocumentView {
]; ];
} }
public update(state: MagitRepository): void { }
static index = 0; static index = 0;
static encodeLocation(repository: MagitRepository): Uri { static encodeLocation(repository: MagitRepository): Uri {
return Uri.parse(`${Constants.MagitUriScheme}:${LogView.UriPath}?${repository.uri.fsPath}#${LogView.index++}`); return Uri.parse(`${Constants.MagitUriScheme}:${LogView.UriPath}?${repository.uri.fsPath}#${LogView.index++}`);

View File

@ -11,7 +11,6 @@ import { Stash } from '../models/stash';
export class StashDetailView extends DocumentView { export class StashDetailView extends DocumentView {
static UriPath: string = 'stash.magit'; static UriPath: string = 'stash.magit';
needsUpdate = false;
constructor(public uri: Uri, stash: Stash, diffChanges: MagitChange[], untrackedFiles: MagitChange[] ) { constructor(public uri: Uri, stash: Stash, diffChanges: MagitChange[], untrackedFiles: MagitChange[] ) {
super(uri); super(uri);
@ -25,8 +24,6 @@ export class StashDetailView extends DocumentView {
this.addSubview(new ChangeSectionView(Section.Changes, diffChanges, `-stashDetail@{${stash.index}}`)); this.addSubview(new ChangeSectionView(Section.Changes, diffChanges, `-stashDetail@{${stash.index}}`));
} }
public update(state: MagitRepository): void { }
static index = 0; static index = 0;
static encodeLocation(repository: MagitRepository, stash: Stash): Uri { static encodeLocation(repository: MagitRepository, stash: Stash): Uri {
return Uri.parse(`${Constants.MagitUriScheme}:${StashDetailView.UriPath}?${repository.uri.fsPath}#stash@{${stash.index}}#${StashDetailView.index++}`); return Uri.parse(`${Constants.MagitUriScheme}:${StashDetailView.UriPath}?${repository.uri.fsPath}#stash@{${stash.index}}#${StashDetailView.index++}`);