Merge branch 'master' into fixes/checkout-button-tooltips

Author: grokys

documentation/manifest.md

@@ -126,9 +126,39 @@
       - [ ] "Create New" Link button is displayed
       - [ ] Clicking on a pull request title opens browser window to pull request on .com
       - [ ] Clicking on a pull request number opens browser window to pull request on .com
+- [ ] **Click on a pull request title**
+      - [ ] A detailed description of the pull request is displayed.
+      - [ ] Pull request number matches the number in the list.
+      - [ ] Pull request title matches the title in the list.
+      - [ ] Source branch is displayed on the left
+      - [ ] Mousing over the source branch shows the entire branch name in a tool tip
+      - [ ] Target branch is displayed on the right
+      - [ ] Mousing over the target branch shows the entire branch name in a tool tip
+      - [ ] "View conversation on GitHub" link navigates to pull request on .com
+      - [ ] List of changed files displayed under pull request description
+      - [ ] Right clicking on a specific file displays options to open or compare file
+      - [ ] Double clicking on a file opens a diff view of the file or a single file (depends on current file option)
+      - [ ] Files in file diff view match diff on .com (pick any file)
+- [ ] **Change the changed files current view**
+      - [ ] The view has been changed to the view selected
+- [ ] **Close & reopen Visual Studio**
+- [ ] **Go to any pull request details**
+      - [ ] View of changed files was the selected view before closing Visual Studio
+- [ ] **Change the default file action**
+      - [ ] Double clicking on a file in the changed file list opens a diff view if previous action setting opened the file, or a single file if the previous action setting opened the diff view (depends on current file option)
+- [ ] **Close & reopen Visual Studio**
+- [ ] **Go to any pull request details**
+      - [ ] Double clicking on a file in the changed file list uses last default action setting open file/file diff
+- [ ] **Make a change any file and save it**
+- [ ] **Go to any pull request details and mouseover**
+      - [ ] "Checkout to [branch name]" is plain text (not hyperlink) and mouseover displays tool tip
+- [ ] **Undo pending changes (Many option to do this. One way: Go to Team Explorer > Home > Changes > Right click on files > Undo Changes)**
+- [ ] **Click on "checkout to [branch name]"**
+      - [ ] Git context (lower right) displays source branch name of pull request
+      - [ ] "Checkout to [branch name]" text has changed to "Local branch up to date"
 - [ ] **Create a new branch (can alternatively make commits on an existing branch)**
 - [ ] **Switch Git context to new branch**
-- [ ] **Click on Create New button**
+- [ ] **Navigate to the Pull Request List (Pull request icon in navigation toolbar) and click on Create New button**
       - [ ] Pane title displays "GitHub | (current repository)"
       - [ ] Selected pane tab title (on the bottom) displays "GitHub"
       - [ ] Create Pull Request button is disabled.
@@ -143,7 +173,8 @@
       - [ ] Pull request list is displayed with new pull request (that was just created) at the top of the list
       - [ ] "The Pull Request has been created at [target branch]" message is displayed at the top of the GitHub pane
       - [ ] Verify all non pushed commits prior to pull request creation have been pushed and exist on .com
-
+- [ ] **Click on back/right/pull request/refresh navigation items (any order)**
+      - [ ] Verify that navigation buttons show views are consistent with clicked navigation buttons
 
 # In VS text/code Editor (logged in to GitHub, open a file that is hosted on Github)
 - [ ] **Highlight code or text within solution, then right click.**

src/GitHub.VisualStudio/UI/Views/PullRequestDetailView.xaml

@@ -353,7 +353,7 @@
                                      DataContext and update the CommandParameter to the changed file -->
                                 <ContextMenu x:Key="FileContextMenu">
                                     <MenuItem Header="{x:Static prop:Resources.OpenFile}" Command="{Binding OpenFile}"/>
-                                    <MenuItem Header="{x:Static prop:Resources.CompareFile}" Command="{Binding CompareFile}"/>
+                                    <MenuItem Header="{x:Static prop:Resources.CompareFile}" Command="{Binding DiffFile}"/>
                                 </ContextMenu>
                             </Grid.Resources>