Merge pull request #1671 from phyllisstein/master

Sort staged and unstaged files by path.

lib/models/repository.js

@@ -183,12 +183,16 @@ export default class Repository {
 
   async getUnstagedChanges() {
     const {unstagedFiles} = await this.getStatusBundle();
-    return Object.keys(unstagedFiles).map(filePath => { return {filePath, status: unstagedFiles[filePath]}; });
+    return Object.keys(unstagedFiles)
+      .sort()
+      .map(filePath => { return {filePath, status: unstagedFiles[filePath]}; });
   }
 
   async getStagedChanges() {
     const {stagedFiles} = await this.getStatusBundle();
-    return Object.keys(stagedFiles).map(filePath => { return {filePath, status: stagedFiles[filePath]}; });
+    return Object.keys(stagedFiles)
+      .sort()
+      .map(filePath => { return {filePath, status: stagedFiles[filePath]}; });
   }
 
   async getMergeConflicts() {

test/models/repository.test.js

@@ -370,6 +370,30 @@ describe('Repository', function() {
 
       `);
     });
+
+    it('sorts staged and unstaged files', async function() {
+      const workingDirPath = await cloneRepository('three-files');
+      const repo = new Repository(workingDirPath);
+      await repo.getLoadPromise();
+
+      const zShortPath = path.join('z-dir', 'a.txt');
+      const zFilePath = path.join(workingDirPath, zShortPath);
+      const wFilePath = path.join(workingDirPath, 'w.txt');
+      fs.mkdirSync(path.join(workingDirPath, 'z-dir'));
+      fs.renameSync(path.join(workingDirPath, 'a.txt'), zFilePath);
+      fs.renameSync(path.join(workingDirPath, 'b.txt'), wFilePath);
+      const unstagedChanges = await repo.getUnstagedChanges();
+      const unstagedPaths = unstagedChanges.map(change => change.filePath);
+
+      assert.deepStrictEqual(unstagedPaths, ['a.txt', 'b.txt', 'w.txt', zShortPath]);
+
+      await repo.stageFiles([zFilePath]);
+      await repo.stageFiles([wFilePath]);
+      const stagedChanges = await repo.getStagedChanges();
+      const stagedPaths = stagedChanges.map(change => change.filePath);
+
+      assert.deepStrictEqual(stagedPaths, ['w.txt', zShortPath]);
+    });
   });
 
   describe('getFilePatchForPath', function() {