Skip to content
This repository has been archived by the owner on Nov 6, 2020. It is now read-only.

Commit

Permalink
A little refactoring to lessen the code
Browse files Browse the repository at this point in the history
  • Loading branch information
@jpricket
jpricket committed Feb 15, 2017
1 parent 8d7aced commit 0daa4e5
Showing 1 changed file with 29 additions and 84 deletions.
113 changes: 29 additions & 84 deletions src/tfvc/tfvc-extension.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,7 @@ export class TfvcExtension {
}

public async TfvcCheckin(): Promise<void> {
if (!this._manager.EnsureInitialized(RepositoryType.TFVC)) {
this._manager.DisplayErrorMessage();
return;
}

try {
this.displayErrors(async () => {
// get the checkin info from the SCM viewlet
const checkinInfo: ICheckinInfo = TfvcSCMProvider.GetCheckinInfo();
if (!checkinInfo) {
Expand All @@ -51,88 +46,59 @@ export class TfvcExtension {
await this._repo.Checkin(checkinInfo.files, checkinInfo.comment, checkinInfo.workItemIds);
TfvcOutput.AppendLine("Changeset " + changeset + " checked in.");
TfvcSCMProvider.ClearCheckinMessage();
} catch (err) {
this._manager.DisplayErrorMessage(err.message);
}
});
}

public async TfvcExclude(uri?: Uri): Promise<void> {
if (!this._manager.EnsureInitialized(RepositoryType.TFVC)) {
this._manager.DisplayErrorMessage();
return;
}

this.displayErrors(async () => {
if (uri) {
//Keep an in-memory list of items that were explicitly excluded. The list is not persisted at this time.
await TfvcSCMProvider.Exclude(TfvcSCMProvider.GetPathFromUri(uri));
}
});
}

public async TfvcInclude(uri?: Uri): Promise<void> {
if (!this._manager.EnsureInitialized(RepositoryType.TFVC)) {
this._manager.DisplayErrorMessage();
return;
}
this.displayErrors(async () => {
if (uri) {
let resource: Resource = TfvcSCMProvider.ResolveTfvcResource(uri);
let path: string = TfvcSCMProvider.GetPathFromUri(uri);

if (uri) {
let resource: Resource = TfvcSCMProvider.ResolveTfvcResource(uri);
let path: string = TfvcSCMProvider.GetPathFromUri(uri);
//At this point, an unversioned file could be a candidate file, so call Add. Once it is added, it should be a Pending change.
if (!resource.IsVersioned) {
await this._repo.Add([path]);
//Don't return after adding, we may still need to unexclude it (it may have been excluded previously)
}

//At this point, an unversioned file could be a candidate file, so call Add. Once it is added, it should be a Pending change.
if (!resource.IsVersioned) {
await this._repo.Add([path]);
//Don't return after adding, we may still need to unexclude it (it may have been excluded previously)
//Otherwise, ensure its not in the explicitly excluded list (if it's already there)
//Unexclude doesn't explicitly INclude. It defers to the status of the individual item.
await TfvcSCMProvider.Unexclude(path);
}

//Otherwise, ensure its not in the explicitly excluded list (if it's already there)
//Unexclude doesn't explicitly INclude. It defers to the status of the individual item.
await TfvcSCMProvider.Unexclude(path);
}
});
}

public async TfvcOpenDiff(uri?: Uri): Promise<void> {
if (!this._manager.EnsureInitialized(RepositoryType.TFVC)) {
this._manager.DisplayErrorMessage();
return;
}

try {
this.displayErrors(async () => {
if (uri) {
let resource: Resource = TfvcSCMProvider.ResolveTfvcResource(uri);
TfvcSCMProvider.OpenDiff(resource);
}
} catch (err) {
this._manager.DisplayErrorMessage(err.message);
}
});
}

public async TfvcOpenFile(uri?: Uri): Promise<void> {
if (!this._manager.EnsureInitialized(RepositoryType.TFVC)) {
this._manager.DisplayErrorMessage();
return;
}

try {
this.displayErrors(async () => {
if (uri) {
let path: string = TfvcSCMProvider.GetPathFromUri(uri);
await window.showTextDocument(await workspace.openTextDocument(path));
}
} catch (err) {
this._manager.DisplayErrorMessage(err.message);
}
});
}

public async TfvcRefresh(): Promise<void> {
if (!this._manager.EnsureInitialized(RepositoryType.TFVC)) {
this._manager.DisplayErrorMessage();
return;
}

try {
this.displayErrors(async () => {
TfvcSCMProvider.Refresh();
} catch (err) {
this._manager.DisplayErrorMessage(err.message);
}
});
}

public async TfvcResolve(uri: Uri, autoResolveType: AutoResolveType): Promise<void> {
Expand Down Expand Up @@ -162,39 +128,25 @@ export class TfvcExtension {
* open the file in the editor.
*/
public async TfvcStatus(): Promise<void> {
if (!this._manager.EnsureInitialized(RepositoryType.TFVC)) {
this._manager.DisplayErrorMessage();
return;
}

try {
this.displayErrors(async () => {
Telemetry.SendEvent(TfvcTelemetryEvents.Status);
const chosenItem: IPendingChange = await UIHelper.ChoosePendingChange(await this._repo.GetStatus());
if (chosenItem) {
window.showTextDocument(await workspace.openTextDocument(chosenItem.localItem));
}
} catch (err) {
this._manager.DisplayErrorMessage(err.message);
}
});
}

/**
* This command runs a 'tf get' command on the VSCode workspace folder and
* displays the results to the user.
*/
public async TfvcSync(): Promise<void> {
if (!this._manager.EnsureInitialized(RepositoryType.TFVC)) {
this._manager.DisplayErrorMessage();
return;
}

try {
this.displayErrors(async () => {
Telemetry.SendEvent(TfvcTelemetryEvents.Sync);
const results: ISyncResults = await this._repo.Sync([this._repo.Path], true);
await UIHelper.ShowSyncResults(results, results.hasConflicts || results.hasErrors, true);
} catch (err) {
this._manager.DisplayErrorMessage(err.message);
}
});
}

/**
Expand All @@ -203,12 +155,7 @@ export class TfvcExtension {
* file system watcher will update the UI soon thereafter. No results are displayed to the user.
*/
public async TfvcUndo(uri?: Uri): Promise<void> {
if (!this._manager.EnsureInitialized(RepositoryType.TFVC)) {
this._manager.DisplayErrorMessage();
return;
}

try {
this.displayErrors(async () => {
//When calling from UI, we have the uri of the resource from which the command was invoked
let pathToUndo: string = TfvcSCMProvider.GetPathFromUri(uri);
if (!pathToUndo) {
Expand All @@ -225,9 +172,7 @@ export class TfvcExtension {
await this._repo.Undo([pathToUndo]);
}
}
} catch (err) {
this._manager.DisplayErrorMessage(err.message);
}
});
}

/**
Expand Down

0 comments on commit 0daa4e5

Please sign in to comment.