Skip to content
This repository was archived by the owner on Jun 21, 2023. It is now read-only.

Reviewing PR with submodule changes MVP #1371

Merged
Parent: [Feature] Reviewing PR with submodule changes
merged 12 commits into from
Dec 14, 2017
Merged

Reviewing PR with submodule changes MVP #1371

merged 12 commits into from
Dec 14, 2017

Conversation

@jcansdale
Copy link
Collaborator

@jcansdale jcansdale commented Dec 7, 2017 •
edited
Loading

Get a MVP version of this functionality on the feature/submodule-changes feature branch.

It adds the following:

  • Option to sync submodules after checking out a PR with submodule changes
  • Allows user to check out a different PR branch when there are submodule change

Test plan

Syncing submodules

  1. Check out a PR
  2. Check out another PR with submodule changes (I've been using PR 614 for testing)
  3. Click the the [SyncSubmodules] button
    image
  4. Once sync submodules completes, the branch should appear up to date
    image

Ignoring submodules

  1. Check out a PR
  2. Check out another PR with submodule changes (I've been using PR 614 for testing)
  3. Ignore the [SyncSubmodules] button and check out original PR
  4. Original branch should appear up to date (previously this wouldn't have worked)

Git.exe not on PATH

  1. Remove Git.exe from PATH.
  2. Check out a PR
  3. Check out another PR with submodule changes (I've been using PR 614 for testing)
  4. Click the the [SyncSubmodules] button
    Something like this should appear (I renamed git to gitx for testing):
    image

Related issue #826

@jcansdale jcansdale mentioned this pull request Dec 12, 2017
Closed
@jcansdale jcansdale changed the base branch from master to feature/submodule-changes December 14, 2017 10:36
@jcansdale
Allow PR branch checkout when submodule changed
0a89577 
If we checkout a PR branch, we should allow the user to move away from that branch (if they haven't touched anything).
@jcansdale
Add IsSyncSubmodulesRequired method and tests
873494c
@jcansdale
Add sync submodules command
94f97bb 
Only show button when there are sunbmodules to sync.
@jcansdale
Don't pause after sync submodules
862f657
@jcansdale
Refresh VM after SyncSubmodules completes
ff800b7
@jcansdale
Send SyncSubmodules output to progress
c658ea0
@jcansdale
Refactor helper methods into RepositoryHelpers
4dc92b2
@jcansdale
Shell out to to add submodule
c746313 
Adding submodules using LibGit2Sharp wasn't working well.
@jcansdale jcansdale force-pushed the workflow/submodule-changes branch from 2a5a755 to c746313 Compare December 14, 2017 11:09
@jcansdale jcansdale changed the title [wip] Reviewing PR with submodule changes Reviewing PR with submodule changes MVP Dec 14, 2017
@jcansdale
Display error if git command fails
5a79b53 
If git.exe can't be found or returns an error code,  display stdout/err on UI.
@jcansdale jcansdale merged commit fba23fd into feature/submodule-changes Dec 14, 2017
@jcansdale jcansdale deleted the workflow/submodule-changes branch December 14, 2017 18:18
@jcansdale jcansdale mentioned this pull request Dec 14, 2017
Merged
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

@grokys grokys Awaiting requested review from grokys

@donokuda donokuda Awaiting requested review from donokuda

@meaghanlewis meaghanlewis Awaiting requested review from meaghanlewis

@drguthals drguthals Awaiting requested review from drguthals

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@jcansdale