GarettWithOneR/pijul-vscode - Change OKOH6H2FW3PK6Q2Y5CO7TRCRH2JZS6EIBKLIZO5OZAS3MFHJKRLQC

add push and pull commands

Created by Freax13 on August 5, 2021

OKOH6H2FW3PK6Q2Y5CO7TRCRH2JZS6EIBKLIZO5OZAS3MFHJKRLQC

Dependencies

In discussions

#7 add Remote commands

Change contents

Insertion in src/repository.ts at line 194 [7.16]

[5.478]

[6.31]

  }
  /**
   * Prompt the user to choose a remote
   */
  private async chooseChannel (placeHolder?: string): Promise<string | undefined> {
    // TODO: Show more channel information with QuickPickOption
    const items = (await this.repository.getChannels()).map(c => c.name);
    return await window.showQuickPick(items, { placeHolder: placeHolder ?? 'Channel Name', ignoreFocusOut: true });

Replacement in src/repository.ts at line 213 [7.16]

B:BD[2.346] → [2.346:505]

      channelName = await window.showQuickPick((await this.repository.getChannels()).map(c => c.name), { placeHolder: 'Channel Name', ignoreFocusOut: true });

[2.346]

[2.505]

      channelName = await this.chooseChannel();

Insertion in src/repository.ts at line 370 [7.16]

[8.427]

[9.115]

    }
  }
  /**
   * Prompt the user to choose a remote
   */
  private async chooseRemote (): Promise<PijulRemote | undefined> {
    const items = (await this.repository.getRemotes()).map(c => ({
      label: c.url,
      description: c.remoteid,
      value: c
    }));
    const pick = await window.showQuickPick(items, { placeHolder: 'Remote url', ignoreFocusOut: true });
    return pick?.value;
  }
  /**
   * Pull changes from a remote
   * @param targetRemote The remote that will be pulled from
   */
  async pull (options: {from: boolean, to: boolean}, targetRemote?: PijulRemote): Promise<void> {
    if (!targetRemote) {
      targetRemote = await this.chooseRemote();
    }
    let from;
    if (options.from) {
      from = await this.chooseChannel('From Channel');
      if (from === undefined) { return; }
    }
    let to;
    if (options.to) {
      to = await this.chooseChannel('To Channel');
      if (to === undefined) { return; }
    }
    if (targetRemote) {
      await this.repository.pull(targetRemote, from, to);

Insertion in src/repository.ts at line 412 [7.16]

[9.132]

   * Push changes to a remote
   * @param targetRemote The remote that will be pushed to
   */
  async push (options: {from: boolean, to: boolean}, targetRemote?: PijulRemote): Promise<void> {
    if (!targetRemote) {
      targetRemote = await this.chooseRemote();
    }
    let from;
    if (options.from) {
      from = await this.chooseChannel('From Channel');
      if (from === undefined) { return; }
    }
    let to;
    if (options.to) {
      to = await this.chooseChannel('To Channel');
      if (to === undefined) { return; }
    }
    if (targetRemote) {
      await this.repository.push(targetRemote, from, to);
    }
  }
  /**

Replacement in src/repository.ts at line 442 [7.16]

B:BD[9.308] → [9.308:601]

      const items = (await this.repository.getRemotes()).map(c => ({
        label: c.url,
        description: c.remoteid,
        value: c
      }));
      const pick = await window.showQuickPick(items, { placeHolder: 'Remote url', ignoreFocusOut: true });
      targetRemote = pick?.value;

[9.308]

[8.427]

      targetRemote = await this.chooseRemote();

Insertion in src/repository.ts at line 444 [7.16]
[8.433]
[9.602]
```
    if (!targetRemote) return;
```

Replacement in src/repository.ts at line 446 [7.16]

B:BD[9.603] → [9.603:689]

    if (targetRemote) {
      await this.repository.deleteRemote(targetRemote);
    }

[9.603]

[8.433]

    const pick = await window.showWarningMessage('Are you sure you want to delete ' + targetRemote.url + '?', { modal: true }, 'Yes');
    if (pick !== 'Yes') return;
    await this.repository.deleteRemote(targetRemote);

Insertion in src/pijul.ts at line 525 [11.11]

[3.257]

[10.763]

  }
  /**
   * Pull from a remote of this repository with `pijul pull [url] -a`
   */
  async pull (targetRemote: PijulRemote, from: string | undefined, to: string | undefined): Promise<void> {
    const args = ['pull', targetRemote.url, '-a'];
    if (from !== undefined) {
      args.push('--from-channel', from);
    }
    if (to !== undefined) {
      args.push('--to-channel', to);
    }
    await this.pijul.exec(this.repositoryRoot, args);
  }
  /**
   * Push to a remote of this repository with `pijul push [url] -a`
   */
  async push (targetRemote: PijulRemote, from: string | undefined, to: string | undefined): Promise<void> {
    const args = ['push', targetRemote.url, '-a'];
    if (from !== undefined) {
      args.push('--from-channel', from);
    }
    if (to !== undefined) {
      args.push('--to-channel', to);
    }
    await this.pijul.exec(this.repositoryRoot, args);

Insertion in src/commands.ts at line 366 [12.14]

[8.900]

  }
  /**
   * Pull changes
   * @param repository The repository that contains the remote
   * @param targetRemote The remote to be pulled from
   */
  @command('pijul.pull', { repository: true })
  async pull (repository: Repository, targetRemote?: PijulRemote): Promise<void> {
    await repository.pull({ from: false, to: false }, targetRemote);
  }
  /**
   * Pull changes from a channel
   * @param repository The repository that contains the remote
   * @param targetRemote The remote to be pulled from
   */
  @command('pijul.pullFrom', { repository: true })
  async pullFrom (repository: Repository, targetRemote?: PijulRemote): Promise<void> {
    await repository.pull({ from: true, to: false }, targetRemote);
  }
  /**
   * Pull changes to a channel
   * @param repository The repository that contains the remote
   * @param targetRemote The remote to be pulled from
   */
  @command('pijul.pullTo', { repository: true })
  async pullTo (repository: Repository, targetRemote?: PijulRemote): Promise<void> {
    await repository.pull({ from: false, to: true }, targetRemote);
  }
  /**
   * Pull changes from a channel to another channel
   * @param repository The repository that contains the remote
   * @param targetRemote The remote to be pulled from
   */
  @command('pijul.pullFromTo', { repository: true })
  async pullFromTo (repository: Repository, targetRemote?: PijulRemote): Promise<void> {
    await repository.pull({ from: true, to: true }, targetRemote);
  }
  /**
   * Push changes
   * @param repository The repository that contains the remote
   * @param targetRemote The remote to be pushed to
   */
  @command('pijul.push', { repository: true })
  async push (repository: Repository, targetRemote?: PijulRemote): Promise<void> {
    await repository.push({ from: false, to: false }, targetRemote);
  }
  /**
   * Push changes from a channel
   * @param repository The repository that contains the remote
   * @param targetRemote The remote to be pushed to
   */
  @command('pijul.pushFrom', { repository: true })
  async pushFrom (repository: Repository, targetRemote?: PijulRemote): Promise<void> {
    await repository.push({ from: true, to: false }, targetRemote);
  }
  /**
   * Push changes to a channel
   * @param repository The repository that contains the remote
   * @param targetRemote The remote to be pushed to
   */
  @command('pijul.pushTo', { repository: true })
  async pushTo (repository: Repository, targetRemote?: PijulRemote): Promise<void> {
    await repository.push({ from: false, to: true }, targetRemote);
  }
  /**
   * Push changes from a channel to another channel
   * @param repository The repository that contains the remote
   * @param targetRemote The remote to be pushed to
   */
  @command('pijul.pushFromTo', { repository: true })
  async pushFromTo (repository: Repository, targetRemote?: PijulRemote): Promise<void> {
    await repository.push({ from: true, to: true }, targetRemote);

Insertion in package.json at line 163 [13.108189]

[8.1085]

[9.1393]

			},
			{
				"command": "pijul.pull",
				"title": "Pull",
				"category": "Pijul",
				"icon": "$(repo-pull)"
			},
			{
				"command": "pijul.pullFrom",
				"title": "Pull from ...",
				"category": "Pijul",
				"icon": "$(repo-pull)"
			},
			{
				"command": "pijul.pullTo",
				"title": "Pull to ...",
				"category": "Pijul",
				"icon": "$(repo-pull)"

Insertion in package.json at line 183 [13.108189]

[9.1404]

				"command": "pijul.pullFromTo",
				"title": "Pull from ... to ...",
				"category": "Pijul",
				"icon": "$(repo-pull)"
			},
			{
				"command": "pijul.push",
				"title": "Push",
				"category": "Pijul",
				"icon": "$(repo-push)"
			},
			{
				"command": "pijul.pushFrom",
				"title": "Push from ...",
				"category": "Pijul",
				"icon": "$(repo-push)"
			},
			{
				"command": "pijul.pushTo",
				"title": "Push to ...",
				"category": "Pijul",
				"icon": "$(repo-push)"
			},
			{
				"command": "pijul.pushFromTo",
				"title": "Push from ... to ...",
				"category": "Pijul",
				"icon": "$(repo-push)"
			},
			{

Insertion in package.json at line 554 [13.108189]

[8.1356]

[4.857]

				},
				{
					"command": "pijul.push",
					"when": "view == pijul.views.remotes && viewItem == pijulRemote",
					"group": "changeFirst@1"
				},
				{
					"command": "pijul.pull",
					"when": "view == pijul.views.remotes && viewItem == pijulRemote",
					"group": "changeFirst@2"
				},
				{
					"submenu": "pijul.pushpull",
					"when": "view == pijul.views.remotes && viewItem == pijulRemote",
					"group": "changeFirst@3"

Insertion in package.json at line 572 [13.108189]
[4.908]
[4.908]
```
					"name": "Delete",
```
Replacement in package.json at line 574 [13.108189]
B:BD[4.979] → [4.979:1007]
```
					"group": "changeFirst"
```
[4.979]
[4.1007]
```
					"group": "changeSecond"
```
Replacement in package.json at line 579 [13.108189]
B:BD[4.1130] → [4.1130:1159]
```
					"group": "changeSecond"
```
[4.1130]
[4.1159]
```
					"group": "changeThird"
```
Replacement in package.json at line 584 [13.108189]
B:BD[4.1281] → [4.1281:1310]
```
					"group": "changeSecond"
```
[4.1281]
[9.1521]
```
					"group": "changeThird"
```

Insertion in package.json at line 591 [13.108189]

[14.1942]

[15.1311]

			],
			"pijul.pushpull": [
				{
					"command": "pijul.push",
					"when": "view == pijul.views.remotes && viewItem == pijulRemote",
					"group": "changeFirst@1"
				},
				{
					"command": "pijul.pushFrom",
					"when": "view == pijul.views.remotes && viewItem == pijulRemote",
					"group": "changeFirst@2"
				},
				{
					"command": "pijul.pushTo",
					"when": "view == pijul.views.remotes && viewItem == pijulRemote",
					"group": "changeFirst@3"
				},
				{
					"command": "pijul.pushFromTo",
					"when": "view == pijul.views.remotes && viewItem == pijulRemote",
					"group": "changeFirst@4"
				},
				{
					"command": "pijul.pull",
					"when": "view == pijul.views.remotes && viewItem == pijulRemote",
					"group": "changeFirst@5"
				},
				{
					"command": "pijul.pullFrom",
					"when": "view == pijul.views.remotes && viewItem == pijulRemote",
					"group": "changeFirst@6"
				},
				{
					"command": "pijul.pullTo",
					"when": "view == pijul.views.remotes && viewItem == pijulRemote",
					"group": "changeFirst@7"
				},
				{
					"command": "pijul.pullFromTo",
					"when": "view == pijul.views.remotes && viewItem == pijulRemote",
					"group": "changeFirst@8"
				}

Insertion in package.json at line 635 [13.108189]

[16.2698]

		"submenus": [
			{
				"id": "pijul.pushpull",
				"label": "Push/Pull"
			}
		],