Merge pull request #6695 from desktop/shiftkey/move-dispatcher-into-u…

…i-layer

move Dispatcher module into UI folder

app/src/ui/abort-merge/abort-merge-warning.tsx

@@ -2,7 +2,7 @@ import * as React from 'react'
 import { Button } from '../lib/button'
 import { ButtonGroup } from '../lib/button-group'
 import { Dialog, DialogContent, DialogFooter } from '../dialog'
-import { Dispatcher } from '../../lib/dispatcher'
+import { Dispatcher } from '../dispatcher'
 import { PopupType } from '../../models/popup'
 import { Repository } from '../../models/repository'
 import { Octicon, OcticonSymbol } from '../octicons'

app/src/ui/add-repository/add-existing-repository.tsx

@@ -1,7 +1,7 @@
 import { remote } from 'electron'
 import * as React from 'react'
 
-import { Dispatcher } from '../../lib/dispatcher'
+import { Dispatcher } from '../dispatcher'
 import { isGitRepository } from '../../lib/git'
 import { isBareRepository } from '../../lib/git'
 import { Button } from '../lib/button'

app/src/ui/add-repository/create-repository.tsx

@@ -3,7 +3,7 @@ import * as React from 'react'
 import * as Path from 'path'
 import * as FSE from 'fs-extra'
 
-import { Dispatcher } from '../../lib/dispatcher'
+import { Dispatcher } from '../dispatcher'
 import {
   initGitRepository,
   createCommit,

app/src/ui/app-menu/app-menu-bar-button.tsx

@@ -3,7 +3,7 @@ import { IMenu, ISubmenuItem } from '../../models/app-menu'
 import { MenuListItem } from './menu-list-item'
 import { AppMenu, CloseSource } from './app-menu'
 import { ToolbarDropdown } from '../toolbar'
-import { Dispatcher } from '../../lib/dispatcher'
+import { Dispatcher } from '../dispatcher'
 
 interface IAppMenuBarButtonProps {
   /**

app/src/ui/app-menu/app-menu-bar.tsx

@@ -6,7 +6,7 @@ import {
   itemIsSelectable,
 } from '../../models/app-menu'
 import { AppMenuBarButton } from './app-menu-bar-button'
-import { Dispatcher } from '../../lib/dispatcher'
+import { Dispatcher } from '../dispatcher'
 import { AppMenuFoldout, FoldoutType } from '../../lib/app-state'
 
 interface IAppMenuBarProps {

app/src/ui/app-menu/app-menu.tsx

@@ -1,6 +1,6 @@
 import * as React from 'react'
 import { MenuPane } from './menu-pane'
-import { Dispatcher } from '../../lib/dispatcher'
+import { Dispatcher } from '../dispatcher'
 import { IMenu, MenuItem, ISubmenuItem } from '../../models/app-menu'
 import { SelectionSource, ClickSource } from '../lib/list'
 

app/src/ui/app.tsx

@@ -11,7 +11,7 @@ import {
   SuccessfulMergeBannerState,
   MergeConflictsBannerState,
 } from '../lib/app-state'
-import { Dispatcher } from '../lib/dispatcher'
+import { Dispatcher } from './dispatcher'
 import { AppStore, GitHubUserStore, IssuesStore } from '../lib/stores'
 import { assertNever } from '../lib/fatal-error'
 import { shell } from '../lib/app-shell'

app/src/ui/autocompletion/issues-autocompletion-provider.tsx

@@ -1,7 +1,7 @@
 import * as React from 'react'
 import { IAutocompletionProvider } from './index'
 import { IssuesStore } from '../../lib/stores'
-import { Dispatcher } from '../../lib/dispatcher'
+import { Dispatcher } from '../dispatcher'
 import { GitHubRepository } from '../../models/github-repository'
 import { ThrottledScheduler } from '../lib/throttled-scheduler'
 

app/src/ui/banners/merge-conflicts-banner.tsx

@@ -1,7 +1,7 @@
 import * as React from 'react'
 import { Octicon, OcticonSymbol } from '../octicons'
 import { Banner } from './banner'
-import { Dispatcher } from '../../lib/dispatcher'
+import { Dispatcher } from '../dispatcher'
 import { Popup } from '../../models/popup'
 import { LinkButton } from '../lib/link-button'
 

app/src/ui/banners/update-available.tsx

@@ -1,5 +1,5 @@
 import * as React from 'react'
-import { Dispatcher } from '../../lib/dispatcher/index'
+import { Dispatcher } from '../dispatcher/index'
 import { LinkButton } from '../lib/link-button'
 import { updateStore } from '../lib/update-store'
 import { Octicon, OcticonSymbol } from '../octicons'

app/src/ui/branches/branches-container.tsx

@@ -7,7 +7,7 @@ import { Branch } from '../../models/branch'
 import { BranchesTab } from '../../models/branches-tab'
 import { PopupType } from '../../models/popup'
 
-import { Dispatcher } from '../../lib/dispatcher'
+import { Dispatcher } from '../dispatcher'
 import { FoldoutType } from '../../lib/app-state'
 import { assertNever } from '../../lib/fatal-error'
 

app/src/ui/branches/push-branch-commits.tsx

@@ -1,5 +1,5 @@
 import * as React from 'react'
-import { Dispatcher } from '../../lib/dispatcher'
+import { Dispatcher } from '../dispatcher'
 import { Branch } from '../../models/branch'
 import { ButtonGroup } from '../lib/button-group'
 import { Button } from '../lib/button'

app/src/ui/changes/changes-list.tsx

@@ -2,7 +2,7 @@ import * as React from 'react'
 import * as Path from 'path'
 
 import { IGitHubUser } from '../../lib/databases'
-import { Dispatcher } from '../../lib/dispatcher'
+import { Dispatcher } from '../dispatcher'
 import { IMenuItem } from '../../lib/menu-item'
 import { revealInFileManager } from '../../lib/app-shell'
 import {

app/src/ui/changes/changes.tsx

@@ -4,7 +4,7 @@ import { ChangedFileDetails } from './changed-file-details'
 import { DiffSelection, IDiff, ImageDiffType } from '../../models/diff'
 import { WorkingDirectoryFileChange } from '../../models/status'
 import { Repository } from '../../models/repository'
-import { Dispatcher } from '../../lib/dispatcher'
+import { Dispatcher } from '../dispatcher'
 
 interface IChangesProps {
   readonly repository: Repository

app/src/ui/changes/commit-message.tsx

@@ -8,7 +8,7 @@ import {
 } from '../autocompletion'
 import { CommitIdentity } from '../../models/commit-identity'
 import { ICommitMessage } from '../../models/commit-message'
-import { Dispatcher } from '../../lib/dispatcher'
+import { Dispatcher } from '../dispatcher'
 import { IGitHubUser } from '../../lib/databases/github-user-database'
 import { Repository } from '../../models/repository'
 import { Button } from '../lib/button'

app/src/ui/changes/oversized-files-warning.tsx

@@ -5,7 +5,7 @@ import { Dialog, DialogContent, DialogFooter } from '../dialog'
 import { LinkButton } from '../lib/link-button'
 import { Monospaced } from '../lib/monospaced'
 import { PathText } from '../lib/path-text'
-import { Dispatcher } from '../../lib/dispatcher'
+import { Dispatcher } from '../dispatcher'
 import { Repository } from '../../models/repository'
 import { ICommitContext } from '../../models/commit'
 import { DefaultCommitMessage } from '../../models/commit-message'

app/src/ui/changes/sidebar.tsx

@@ -5,7 +5,7 @@ import { ChangesList } from './changes-list'
 import { DiffSelectionType } from '../../models/diff'
 import { IChangesState } from '../../lib/app-state'
 import { Repository } from '../../models/repository'
-import { Dispatcher } from '../../lib/dispatcher'
+import { Dispatcher } from '../dispatcher'
 import { IGitHubUser } from '../../lib/databases'
 import { IssuesStore, GitHubUserStore } from '../../lib/stores'
 import { CommitIdentity } from '../../models/commit-identity'
@@ -20,7 +20,7 @@ import {
 import { ClickSource } from '../lib/list'
 import { WorkingDirectoryFileChange } from '../../models/status'
 import { CSSTransitionGroup } from 'react-transition-group'
-import { openFile } from '../../lib/open-file'
+import { openFile } from '../lib/open-file'
 import { Account } from '../../models/account'
 import { PopupType } from '../../models/popup'
 import { enableFileSizeWarningCheck } from '../../lib/feature-flag'

app/src/ui/clone-repository/clone-repository.tsx

@@ -5,7 +5,7 @@ import { readdir } from 'fs-extra'
 
 import { Button } from '../lib/button'
 import { ButtonGroup } from '../lib/button-group'
-import { Dispatcher } from '../../lib/dispatcher'
+import { Dispatcher } from '../dispatcher'
 import { getDefaultDir, setDefaultDir } from '../lib/default-dir'
 import { Account } from '../../models/account'
 import {

app/src/ui/create-branch/create-branch-dialog.tsx

@@ -1,7 +1,7 @@
 import * as React from 'react'
 
 import { Repository } from '../../models/repository'
-import { Dispatcher } from '../../lib/dispatcher'
+import { Dispatcher } from '../dispatcher'
 import { sanitizedBranchName } from '../../lib/sanitize-branch'
 import { Branch, StartPoint } from '../../models/branch'
 import { TextBox } from '../lib/text-box'

app/src/ui/delete-branch/delete-branch-dialog.tsx

@@ -1,6 +1,6 @@
 import * as React from 'react'
 
-import { Dispatcher } from '../../lib/dispatcher'
+import { Dispatcher } from '../dispatcher'
 import { Repository } from '../../models/repository'
 import { Branch } from '../../models/branch'
 import { Button } from '../lib/button'

app/src/ui/delete-branch/delete-pull-request-dialog.tsx

@@ -1,6 +1,6 @@
 import * as React from 'react'
 
-import { Dispatcher } from '../../lib/dispatcher'
+import { Dispatcher } from '../dispatcher'
 
 import { Repository } from '../../models/repository'
 import { Branch } from '../../models/branch'

app/src/ui/diff/binary-file.tsx

@@ -2,8 +2,8 @@ import * as React from 'react'
 import * as Path from 'path'
 
 import { Repository } from '../../models/repository'
-import { openFile } from '../../lib/open-file'
-import { Dispatcher } from '../../lib/dispatcher/dispatcher'
+import { openFile } from '../lib/open-file'
+import { Dispatcher } from '../dispatcher'
 
 import { LinkButton } from '../lib/link-button'
 

app/src/ui/diff/index.tsx

@@ -4,7 +4,7 @@ import { Editor } from 'codemirror'
 import { assertNever } from '../../lib/fatal-error'
 import { encodePathAsUrl } from '../../lib/path'
 
-import { Dispatcher } from '../../lib/dispatcher/dispatcher'
+import { Dispatcher } from '../dispatcher'
 
 import { Repository } from '../../models/repository'
 import {

app/src/ui/discard-changes/discard-changes-dialog.tsx

@@ -1,7 +1,7 @@
 import * as React from 'react'
 
 import { Repository } from '../../models/repository'
-import { Dispatcher } from '../../lib/dispatcher'
+import { Dispatcher } from '../dispatcher'
 import { WorkingDirectoryFileChange } from '../../models/status'
 import { Button } from '../lib/button'
 import { ButtonGroup } from '../lib/button-group'

app/src/lib/dispatcher/dispatcher.ts → app/src/ui/dispatcher/dispatcher.ts

@@ -1,70 +1,74 @@
-import * as Path from 'path'
-
 import { remote } from 'electron'
 import { Disposable } from 'event-kit'
+import * as Path from 'path'
 
-import { Account } from '../../models/account'
-import { Repository } from '../../models/repository'
-import {
-  WorkingDirectoryFileChange,
-  CommittedFileChange,
-  WorkingDirectoryStatus,
-} from '../../models/status'
-import { DiffSelection, ImageDiffType } from '../../models/diff'
+import { IAPIUser } from '../../lib/api'
+import { shell } from '../../lib/app-shell'
 import {
-  RepositorySectionTab,
+  CompareAction,
   Foldout,
   FoldoutType,
-  CompareAction,
   ICompareFormUpdate,
+  MergeConflictsBannerState,
   MergeResultStatus,
+  RepositorySectionTab,
   SuccessfulMergeBannerState,
-  MergeConflictsBannerState,
-} from '../app-state'
-import { AppStore } from '../stores/app-store'
-import { CloningRepository } from '../../models/cloning-repository'
-import { Branch } from '../../models/branch'
-import { Commit, ICommitContext } from '../../models/commit'
+} from '../../lib/app-state'
 import { ExternalEditor } from '../../lib/editors'
-import { IAPIUser } from '../../lib/api'
-import { GitHubRepository } from '../../models/github-repository'
-import { ICommitMessage } from '../../models/commit-message'
-import { executeMenuItem } from '../../ui/main-process-proxy'
-import { AppMenu, ExecutableMenuItem } from '../../models/app-menu'
+import { assertNever, fatalError } from '../../lib/fatal-error'
 import {
-  matchExistingRepository,
-  urlMatchesCloneURL,
-} from '../../lib/repository-matching'
-import { ILaunchStats, StatsStore } from '../stats'
-import { fatalError, assertNever } from '../fatal-error'
-import { isGitOnPath } from '../is-git-on-path'
-import { shell } from '../app-shell'
-import {
-  URLActionType,
-  IOpenRepositoryFromURLAction,
-  IUnknownAction,
-} from '../parse-app-url'
+  setGenericPassword,
+  setGenericUsername,
+} from '../../lib/generic-git-auth'
+import { isGitRepository } from '../../lib/git'
+import { isGitOnPath } from '../../lib/is-git-on-path'
 import {
+  rejectOAuthRequest,
   requestAuthenticatedUser,
   resolveOAuthRequest,
-  rejectOAuthRequest,
 } from '../../lib/oauth'
-import { installCLI } from '../../ui/lib/install-cli'
-import { setGenericUsername, setGenericPassword } from '../generic-git-auth'
-import { RetryAction, RetryActionType } from '../../models/retry-actions'
-import { Shell } from '../shells'
-import { CloneRepositoryTab } from '../../models/clone-repository-tab'
+import {
+  IOpenRepositoryFromURLAction,
+  IUnknownAction,
+  URLActionType,
+} from '../../lib/parse-app-url'
+import {
+  matchExistingRepository,
+  urlMatchesCloneURL,
+} from '../../lib/repository-matching'
+import { Shell } from '../../lib/shells'
+import { ILaunchStats, StatsStore } from '../../lib/stats'
+import { AppStore } from '../../lib/stores/app-store'
 import { validatedRepositoryPath } from '../../lib/stores/helpers/validated-repository-path'
+import { RepositoryStateCache } from '../../lib/stores/repository-state-cache'
+
+import { Account } from '../../models/account'
+import { AppMenu, ExecutableMenuItem } from '../../models/app-menu'
+import { IAuthor } from '../../models/author'
+import { Branch } from '../../models/branch'
 import { BranchesTab } from '../../models/branches-tab'
+import { CloneRepositoryTab } from '../../models/clone-repository-tab'
+import { CloningRepository } from '../../models/cloning-repository'
+import { Commit, ICommitContext } from '../../models/commit'
+import { ICommitMessage } from '../../models/commit-message'
+import { DiffSelection, ImageDiffType } from '../../models/diff'
 import { FetchType } from '../../models/fetch'
+import { GitHubRepository } from '../../models/github-repository'
+import { ManualConflictResolution } from '../../models/manual-conflict-resolution'
+import { Popup, PopupType } from '../../models/popup'
 import { PullRequest } from '../../models/pull-request'
-import { IAuthor } from '../../models/author'
-import { isGitRepository } from '../git'
-import { ApplicationTheme } from '../../ui/lib/application-theme'
+import { Repository } from '../../models/repository'
+import { RetryAction, RetryActionType } from '../../models/retry-actions'
+import {
+  CommittedFileChange,
+  WorkingDirectoryFileChange,
+  WorkingDirectoryStatus,
+} from '../../models/status'
 import { TipState } from '../../models/tip'
-import { RepositoryStateCache } from '../stores/repository-state-cache'
-import { Popup, PopupType } from '../../models/popup'
-import { ManualConflictResolution } from '../../models/manual-conflict-resolution'
+
+import { ApplicationTheme } from '../lib/application-theme'
+import { installCLI } from '../lib/install-cli'
+import { executeMenuItem } from '../main-process-proxy'
 
 /**
  * An error handler function.

app/src/lib/dispatcher/error-handlers.ts → app/src/ui/dispatcher/error-handlers.ts

@@ -1,17 +1,19 @@
-import { Dispatcher } from './index'
-import { GitError } from '../git/core'
 import {
   GitError as DugiteError,
   RepositoryDoesNotExistErrorCode,
 } from 'dugite'
-import { ErrorWithMetadata } from '../error-with-metadata'
-import { ExternalEditorError } from '../editors/shared'
-import { AuthenticationErrors } from '../git/authentication'
-import { Repository } from '../../models/repository'
-import { PopupType } from '../../models/popup'
-import { ShellError } from '../shells'
-import { UpstreamAlreadyExistsError } from '../stores/upstream-already-exists-error'
+
+import { Dispatcher } from '.'
+import { ExternalEditorError } from '../../lib/editors/shared'
+import { ErrorWithMetadata } from '../../lib/error-with-metadata'
+import { AuthenticationErrors } from '../../lib/git/authentication'
+import { GitError } from '../../lib/git/core'
+import { ShellError } from '../../lib/shells'
+import { UpstreamAlreadyExistsError } from '../../lib/stores/upstream-already-exists-error'
+
 import { FetchType } from '../../models/fetch'
+import { PopupType } from '../../models/popup'
+import { Repository } from '../../models/repository'
 import { TipState } from '../../models/tip'
 
 /** An error which also has a code property. */

app/src/ui/history/compare.tsx

@@ -12,7 +12,7 @@ import {
 import { CommitList } from './commit-list'
 import { Repository } from '../../models/repository'
 import { Branch } from '../../models/branch'
-import { Dispatcher } from '../../lib/dispatcher'
+import { Dispatcher } from '../dispatcher'
 import { ThrottledScheduler } from '../lib/throttled-scheduler'
 import { BranchList } from '../branches'
 import { TextBox } from '../lib/text-box'

app/src/ui/history/merge-call-to-action-with-conflicts.tsx

@@ -3,7 +3,7 @@ import * as React from 'react'
 import { MergeResultStatus, HistoryTabMode } from '../../lib/app-state'
 import { Repository } from '../../models/repository'
 import { Branch } from '../../models/branch'
-import { Dispatcher } from '../../lib/dispatcher'
+import { Dispatcher } from '../dispatcher'
 import { Button } from '../lib/button'
 import { MergeStatusHeader } from './merge-status-header'
 import { MergeResultKind } from '../../models/merge'

app/src/ui/history/merge-call-to-action.tsx

@@ -3,7 +3,7 @@ import * as React from 'react'
 import { ICompareBranch, HistoryTabMode } from '../../lib/app-state'
 import { Repository } from '../../models/repository'
 import { Branch } from '../../models/branch'
-import { Dispatcher } from '../../lib/dispatcher'
+import { Dispatcher } from '../dispatcher'
 import { Button } from '../lib/button'
 
 interface IMergeCallToActionProps {