GarettWithOneR/pijul-vscode - Change PT4BQ3EA66QQOSTYW3WQRIOMYXEBZPDUPYEF25KVG7ITGRV5CBTQC

add comparing push operations

Created by Freax13 on August 5, 2021

PT4BQ3EA66QQOSTYW3WQRIOMYXEBZPDUPYEF25KVG7ITGRV5CBTQC

Dependencies

In discussions

#7 add Remote commands

Change contents

Replacement in src/repository.ts at line 197 [3.16]
B:BD[2.11] → [2.11:51]
```
   * Prompt the user to choose a remote
```
[2.11]
[2.51]
```
   * Prompt the user to choose a channel
```

Replacement in src/repository.ts at line 199 [3.16]

B:BD[2.57] → [2.57:141]

  private async chooseChannel (placeHolder?: string): Promise<string | undefined> {

[2.57]

[2.141]

  private async chooseChannel (placeHolder: string): Promise<string | undefined> {

Replacement in src/repository.ts at line 202 [3.16]

B:BD[2.279] → [2.279:395]

    return await window.showQuickPick(items, { placeHolder: placeHolder ?? 'Channel Name', ignoreFocusOut: true });

[2.279]

[4.31]

    return await window.showQuickPick(items, {
      placeHolder: placeHolder,
      ignoreFocusOut: true
    });
  }
  /**
   * Prompt the user to choose a channel name
   */
  private async chooseChannelName (prompt: string, placeHolder: string): Promise<string | undefined> {
    // TODO: Show more channel information with QuickPickOption
    return await window.showInputBox({
      placeHolder: placeHolder,
      prompt,
      ignoreFocusOut: true,
      validateInput: name => {
        if (name.includes(':')) {
          return 'Channel name may not contain a colon';
        } else {
          return undefined;
        }
      }
    });

Replacement in src/repository.ts at line 234 [3.16]

B:BD[5.280] → [5.280:346]

B:BD[5.346] → [2.396:444]

      // TODO: Show more channel information with QuickPickOption
      channelName = await this.chooseChannel();

[5.280]

[5.505]

      channelName = await this.chooseChannel('Channel Name');

Replacement in src/repository.ts at line 333 [3.16]

B:BD[6.375] → [6.375:568]

      newName = await window.showInputBox({
        placeHolder: 'Channel Name',
        prompt: 'Please enter the new name for channel ' + channel.name,
        ignoreFocusOut: true
      });

[6.375]

[6.568]

      newName = await this.chooseChannelName('Please enter the new name for channel ' + channel.name, 'Channel Name');

Replacement in src/repository.ts at line 365 [3.16]

B:BD[7.198] → [7.198:381]

      channelName = await window.showInputBox({
        placeHolder: 'Channel Name',
        prompt: 'Please enter a name for the new Channel',
        ignoreFocusOut: true
      });

[7.198]

[7.381]

      channelName = await this.chooseChannelName('Please enter a name for the new Channel', 'Channel Name');

Insertion in src/repository.ts at line 406 [3.16]
[2.1128]
[2.1128]
```
      if (!targetRemote) { return; }
```

Replacement in src/repository.ts at line 420 [3.16]

B:BD[2.1408] → [2.1408:1490]

∅:D[2.1490] → [8.115:121]

B:BD[9.427] → [8.115:121]

    if (targetRemote) {
      await this.repository.pull(targetRemote, from, to);
    }

[2.1408]

[8.121]

    await this.repository.pull(targetRemote, from, to);

Insertion in src/repository.ts at line 430 [3.16]
[2.1757]
[2.1757]
```
      if (!targetRemote) { return; }
```

Insertion in src/repository.ts at line 442 [3.16]

[2.2030]

    }
    await this.repository.push(targetRemote, from, to);
  }
  /**
   * Push changes to a remote comparing to a channel
   * @param targetRemote The remote that will be pushed to
   */
  async compareToAndPushTo (targetRemote?: PijulRemote): Promise<void> {
    if (!targetRemote) {
      targetRemote = await this.chooseRemote();
      if (!targetRemote) { return; }

Replacement in src/repository.ts at line 457 [3.16]

B:BD[2.2037] → [2.2037:2119]

    if (targetRemote) {
      await this.repository.push(targetRemote, from, to);

[2.2037]

[2.2119]

    const comparison = await this.chooseChannel('Comparison Channel');
    if (comparison === undefined) { return; }
    const to = await this.chooseChannelName('Please enter the name of the channel to push to', 'To Channel');
    if (to === undefined) { return; }
    await this.repository.push(targetRemote, undefined, comparison + ':' + to);
  }
  /**
   * Push changes to a remote comparing to a channel
   * @param targetRemote The remote that will be pushed to
   */
  async compareToCurrentAndPushTo (targetRemote?: PijulRemote): Promise<void> {
    if (!targetRemote) {
      targetRemote = await this.chooseRemote();
      if (!targetRemote) { return; }
    }
    const to = await this.chooseChannelName('Please enter the name of the channel to push to', 'To Channel');
    if (to === undefined) { return; }
    await this.repository.push(targetRemote, undefined, ':' + to);
  }
  /**
   * Push changes to a remote comparing to a channel
   * @param targetRemote The remote that will be pushed to
   */
  async compareToAndPushFromTo (targetRemote?: PijulRemote): Promise<void> {
    if (!targetRemote) {
      targetRemote = await this.chooseRemote();
      if (!targetRemote) { return; }
    }
    const comparison = await this.chooseChannel('Comparison Channel');
    if (comparison === undefined) { return; }
    const from = await this.chooseChannel('From Channel');
    if (from === undefined) { return; }
    const to = await this.chooseChannelName('Please enter the name of the channel to push to', 'To Channel');
    if (to === undefined) { return; }
    await this.repository.push(targetRemote, from, comparison + ':' + to);
  }
  /**
   * Push changes to a remote comparing to a channel
   * @param targetRemote The remote that will be pushed to
   */
  async compareToAndPushFromTo2 (targetRemote?: PijulRemote): Promise<void> {
    if (!targetRemote) {
      targetRemote = await this.chooseRemote();
      if (!targetRemote) { return; }

Insertion in src/repository.ts at line 513 [3.16]

[2.2125]


    const from = await this.chooseChannel('From Channel');
    if (from === undefined) { return; }
    const to = await this.chooseChannelName('Please enter the name of the channel to push to', 'To Channel');
    if (to === undefined) { return; }
    await this.repository.push(targetRemote, from, ':' + to);

Insertion in src/commands.ts at line 446 [10.14]

[2.6300]

[9.900]

  }
  /**
   * Push changes
   * @param repository The repository that contains the remote
   * @param targetRemote The remote to be pushed to
   */
  @command('pijul.compareToAndPushTo', { repository: true })
  async compareToAndPushTo (repository: Repository, targetRemote?: PijulRemote): Promise<void> {
    await repository.compareToAndPushTo(targetRemote);
  }
  /**
   * Push changes from a channel
   * @param repository The repository that contains the remote
   * @param targetRemote The remote to be pushed to
   */
  @command('pijul.compareToCurrentAndPushTo', { repository: true })
  async compareToCurrentAndPushTo (repository: Repository, targetRemote?: PijulRemote): Promise<void> {
    await repository.compareToCurrentAndPushTo(targetRemote);
  }
  /**
   * Push changes to a channel
   * @param repository The repository that contains the remote
   * @param targetRemote The remote to be pushed to
   */
  @command('pijul.compareToAndPushFromTo', { repository: true })
  async compareToAndPushFromTo (repository: Repository, targetRemote?: PijulRemote): Promise<void> {
    await repository.compareToAndPushFromTo(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.compareToAndPushFromTo2', { repository: true })
  async compareToAndPushFromTo2 (repository: Repository, targetRemote?: PijulRemote): Promise<void> {
    await repository.compareToAndPushFromTo2(targetRemote);

Insertion in package.json at line 209 [11.108189]

[2.7231]

				"category": "Pijul",
				"icon": "$(repo-push)"
			},
			{
				"command": "pijul.compareToAndPushTo",
				"title": "Compare to ... and push to ...",
				"category": "Pijul",
				"icon": "$(repo-push)"
			},
			{
				"command": "pijul.compareToCurrentAndPushTo",
				"title": "Compare to current and push to ...",
				"category": "Pijul",
				"icon": "$(repo-push)"
			},
			{
				"command": "pijul.compareToAndPushFromTo",
				"title": "Compare to ... and push from ... to ...",

Insertion in package.json at line 231 [11.108189]

[2.7294]

[8.1404]

				"command": "pijul.compareToAndPushFromTo2",
				"title": "Compare to and push from ... to ...",
				"category": "Pijul",
				"icon": "$(repo-push)"
			},
			{

Replacement in package.json at line 638 [11.108189]
B:BD[2.8467] → [2.8467:8497]
```
					"command": "pijul.pull",
```
[2.8467]
[2.8497]
```
					"command": "pijul.compareToAndPushTo",
```
Replacement in package.json at line 643 [11.108189]
B:BD[2.8611] → [2.8611:8645]
```
					"command": "pijul.pullFrom",
```
[2.8611]
[2.8645]
```
					"command": "pijul.compareToCurrentAndPushTo",
```
Replacement in package.json at line 648 [11.108189]
B:BD[2.8759] → [2.8759:8791]
```
					"command": "pijul.pullTo",
```
[2.8759]
[2.8791]
```
					"command": "pijul.compareToAndPushFromTo",
```
Replacement in package.json at line 653 [11.108189]
B:BD[2.8905] → [2.8905:8941]
```
					"command": "pijul.pullFromTo",
```
[2.8905]
[2.8941]
```
					"command": "pijul.compareToAndPushFromTo2",
```

Insertion in package.json at line 656 [11.108189]

[2.9042]

				},
				{
					"command": "pijul.pull",
					"when": "view == pijul.views.remotes && viewItem == pijulRemote",
					"group": "changeFirst@9"
				},
				{
					"command": "pijul.pullFrom",
					"when": "view == pijul.views.remotes && viewItem == pijulRemote",
					"group": "changeFirst@10"
				},
				{
					"command": "pijul.pullTo",
					"when": "view == pijul.views.remotes && viewItem == pijulRemote",
					"group": "changeFirst@11"
				},
				{
					"command": "pijul.pullFromTo",
					"when": "view == pijul.views.remotes && viewItem == pijulRemote",
					"group": "changeFirst@12"