Skip to content

Commit c85a345

Browse files
authored
Merge branch 'master' into delete_unversioned
2 parents b5a1095 + 2139b9c commit c85a345

File tree

5 files changed

+35
-1
lines changed

5 files changed

+35
-1
lines changed

package.json

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,6 +164,15 @@
164164
"dark": "icons/dark/refresh.svg"
165165
}
166166
},
167+
{
168+
"command": "svn.refreshRemoteChanges",
169+
"title": "Refresh Remote Changes",
170+
"category": "SVN",
171+
"icon": {
172+
"light": "icons/light/refresh.svg",
173+
"dark": "icons/dark/refresh.svg"
174+
}
175+
},
167176
{
168177
"command": "svn.switchBranch",
169178
"title": "Switch Branch",
@@ -455,7 +464,18 @@
455464
"when": "scmProvider == svn"
456465
}
457466
],
458-
"scm/resourceGroup/context": [],
467+
"scm/resourceGroup/context": [
468+
{
469+
"command": "svn.refreshRemoteChanges",
470+
"when": "config.svn.enabled && scmProvider == svn && scmResourceGroup == remotechanges",
471+
"group": "inline"
472+
},
473+
{
474+
"command": "svn.refreshRemoteChanges",
475+
"when": "config.svn.enabled && scmProvider == svn && scmResourceGroup == remotechanges",
476+
"group": "navigation"
477+
}
478+
],
459479
"scm/resourceState/context": [
460480
{
461481
"command": "svn.add",

src/commands.ts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -509,6 +509,11 @@ export class SvnCommands implements IDisposable {
509509
}
510510
}
511511

512+
@command("svn.refreshRemoteChanges", { repository: true })
513+
public async refreshRemoteChanges(repository: Repository) {
514+
await repository.updateRemoteChangedFiles();
515+
}
516+
512517
@command("svn.openResourceBase")
513518
public async openResourceBase(resource: Resource): Promise<void> {
514519
await this._openResource(resource, "BASE", undefined, true, false);

src/common/types.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,7 @@ export enum Operation {
107107

108108
export interface ISvnResourceGroup extends SourceControlResourceGroup {
109109
resourceStates: Resource[];
110+
repository?: Repository;
110111
}
111112

112113
export interface IWcStatus {

src/model.ts

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import {
66
Disposable,
77
Event,
88
EventEmitter,
9+
SourceControlResourceGroup,
910
Uri,
1011
window,
1112
workspace,
@@ -343,6 +344,12 @@ export class Model implements IDisposable {
343344
return this.openRepositories.find(r => r.repository === hint);
344345
}
345346

347+
if ((hint as any).repository instanceof Repository) {
348+
return this.openRepositories.find(
349+
r => r.repository === (hint as any).repository
350+
);
351+
}
352+
346353
if (typeof hint === "string") {
347354
hint = Uri.file(hint);
348355
}

src/repository.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -665,6 +665,7 @@ export class Repository {
665665
"Remote Changes"
666666
) as ISvnResourceGroup;
667667

668+
this.remoteChanges.repository = this;
668669
this.remoteChanges.hideWhenEmpty = true;
669670
this.remoteChanges.resourceStates = tempResourceStates;
670671
}

0 commit comments

Comments
 (0)