Add section for merge conflict files (#896)

- [WIP] See TODOs

Author: navn-r

src/commandsAndMenu.tsx

@@ -562,6 +562,16 @@ export function addCommands(
       for (const file of files) {
         const { context, filePath, isText, status } = file;
 
+        // Merge conflict
+        // TODO: handle
+        if (status === 'unmerged') {
+          logger.log({
+            message: 'File has conflicts!',
+            level: Level.ERROR
+          });
+          continue;
+        }
+
         // nothing to compare to for untracked files
         if (status === 'untracked') {
           continue;

src/components/FileItem.tsx

@@ -173,7 +173,10 @@ export class FileItem extends React.PureComponent<IFileItemProps> {
   render(): JSX.Element {
     const { file } = this.props;
     const status_code = file.status === 'staged' ? file.x : file.y;
-    const status = this._getFileChangedLabel(status_code as any);
+    const status =
+      file.status === 'unmerged'
+        ? 'Conflicted'
+        : this._getFileChangedLabel(status_code as any);
 
     return (
       <div
@@ -205,7 +208,11 @@ export class FileItem extends React.PureComponent<IFileItemProps> {
         />
         {this.props.actions}
         <span className={this._getFileChangedLabelClass(this.props.file.y)}>
-          {this.props.file.y === '?' ? 'U' : status_code}
+          {this.props.file.status === 'unmerged'
+            ? '!'
+            : this.props.file.y === '?'
+            ? 'U'
+            : status_code}
         </span>
       </div>
     );

src/components/FileList.tsx

@@ -79,7 +79,8 @@ export const CONTEXT_COMMANDS: ContextCommands = {
     ContextCommandIDs.gitCommitAmendStaged,
     ContextCommandIDs.gitFileHistory
   ],
-  unmodified: [ContextCommandIDs.gitFileHistory]
+  unmodified: [ContextCommandIDs.gitFileHistory],
+  unmerged: [ContextCommandIDs.gitFileOpen]
 };
 
 const SIMPLE_CONTEXT_COMMANDS: ContextCommands = {
@@ -107,7 +108,8 @@ const SIMPLE_CONTEXT_COMMANDS: ContextCommands = {
     ContextCommandIDs.gitIgnoreExtension,
     ContextCommandIDs.gitFileDelete
   ],
-  unmodified: [ContextCommandIDs.gitFileHistory]
+  unmodified: [ContextCommandIDs.gitFileHistory],
+  unmerged: [ContextCommandIDs.gitFileOpen]
 };
 
 export class FileList extends React.Component<IFileListProps, IFileListState> {
@@ -275,6 +277,7 @@ export class FileList extends React.Component<IFileListProps, IFileListState> {
       const stagedFiles: Git.IStatusFile[] = [];
       const unstagedFiles: Git.IStatusFile[] = [];
       const untrackedFiles: Git.IStatusFile[] = [];
+      const unmergedFiles: Git.IStatusFile[] = [];
 
       this.props.files.forEach(file => {
         switch (file.status) {
@@ -297,7 +300,9 @@ export class FileList extends React.Component<IFileListProps, IFileListState> {
               status: 'unstaged'
             });
             break;
-
+          case 'unmerged':
+            unmergedFiles.push(file);
+            break;
           default:
             break;
         }
@@ -311,6 +316,7 @@ export class FileList extends React.Component<IFileListProps, IFileListState> {
           <AutoSizer disableWidth={true}>
             {({ height }) => (
               <>
+                {this._renderUnmerged(unmergedFiles, height)}
                 {this._renderStaged(stagedFiles, height)}
                 {this._renderChanged(unstagedFiles, height)}
                 {this._renderUntracked(untrackedFiles, height)}
@@ -340,6 +346,59 @@ export class FileList extends React.Component<IFileListProps, IFileListState> {
     );
   }
 
+  /**
+   * Render an unmerged file
+   *
+   * Note: This is actually a React.FunctionComponent but defined as
+   * a private method as it needs access to FileList properties.
+   *
+   * @param rowProps Row properties
+   */
+  private _renderUnmergedRow = (
+    rowProps: ListChildComponentProps
+  ): JSX.Element => {
+    const { data, index, style } = rowProps;
+    const file = data[index] as Git.IStatusFile;
+    const diffButton = this._createDiffButton(file);
+    return (
+      <FileItem
+        trans={this.props.trans}
+        actions={diffButton}
+        file={file}
+        contextMenu={this.openContextMenu}
+        model={this.props.model}
+        selected={this._isSelectedFile(file)}
+        selectFile={this.updateSelectedFile}
+        onDoubleClick={() => this._openDiffView(file)}
+        style={style} // TODO probably want to give a different 'danger' style
+      />
+    );
+  };
+
+  private _renderUnmerged(files: Git.IStatusFile[], height: number) {
+    // Hide section if no merge conflicts are present
+    return files.length > 0 ? (
+      <GitStage
+        actions={
+          <ActionButton
+            className={hiddenButtonStyle}
+            disabled={files.length === 0}
+            icon={removeIcon}
+            title={this.props.trans.__('Stage all changes')}
+            onClick={() => {
+              // TODO open modal with confirmation to stage with merge conflicts
+            }}
+          />
+        }
+        collapsible
+        files={files}
+        heading={this.props.trans.__('Unmerged')}
+        height={height}
+        rowRenderer={this._renderUnmergedRow}
+      />
+    ) : null;
+  }
+
   /**
    * Render a staged file
    *

src/tokens.ts

@@ -878,6 +878,7 @@ export namespace Git {
     | 'unstaged'
     | 'partially-staged'
     | 'unmodified'
+    | 'unmerged'
     | null;
 
   export interface ITagResult {

src/utils.ts

@@ -11,6 +11,21 @@ export function extractFilename(path: string): string {
 }
 
 export function decodeStage(x: string, y: string): Git.Status {
+  /**
+   * All combinations of statuses for merge conflicts
+   * @see https://git-scm.com/docs/git-status#_short_format
+   */
+  const unmergedCombinations: Record<string, string[]> = {
+    D: ['D', 'U'],
+    A: ['U', 'A'],
+    U: ['D', 'A', 'U']
+  };
+
+  // If the file has a merge conflict
+  if ((unmergedCombinations[x] ?? []).includes(y)) {
+    return 'unmerged';
+  }
+
   // If file is untracked
   if (x === '?' && y === '?') {
     return 'untracked';