Merge pull request #5555 from unisonweb/cp/switch-by-recency

Author: aryairani

codebase2/codebase-sqlite/U/Codebase/Sqlite/Queries.hs

@@ -111,6 +111,7 @@ module U.Codebase.Sqlite.Queries
     loadProjectByName,
     expectProject,
     loadAllProjects,
+    loadAllProjectsByRecentlyAccessed,
     loadAllProjectsBeginningWith,
     insertProject,
     renameProject,
@@ -3602,6 +3603,17 @@ loadAllProjects =
       ORDER BY name ASC
     |]
 
+-- | Load all projects.
+loadAllProjectsByRecentlyAccessed :: Transaction [Project]
+loadAllProjectsByRecentlyAccessed =
+  queryListRow
+    [sql|
+      SELECT project.id, project.name
+      FROM project
+        JOIN project_branch ON project.id = project_branch.project_id
+      ORDER BY project_branch.last_accessed DESC NULLS LAST, project.name ASC
+    |]
+
 -- | Load all projects whose name matches a prefix.
 loadAllProjectsBeginningWith :: Maybe Text -> Transaction [Project]
 loadAllProjectsBeginningWith mayPrefix = do
@@ -3740,7 +3752,7 @@ loadAllProjectBranchNamePairs =
       FROM
         project
         JOIN project_branch ON project.id = project_branch.project_id
-      ORDER BY project.name ASC, project_branch.name ASC
+      ORDER BY project_branch.last_accessed DESC NULLS LAST, project.name ASC, project_branch.name ASC
     |]
     <&> fmap \(projectName, branchName, projectId, branchId) ->
       ( ProjectAndBranch projectName branchName,

unison-cli/src/Unison/CommandLine/FZFResolvers.hs

@@ -164,25 +164,20 @@ projectNameResolver = FZFResolver {getOptions = projectNameOptions}
 -- E.g. '@unison/base'
 projectNameOptions :: OptionFetcher
 projectNameOptions codebase _projCtx _searchBranch0 = do
-  fmap (into @Text . SqliteProject.name) <$> Codebase.runTransaction codebase Q.loadAllProjects
+  fmap (into @Text . SqliteProject.name) <$> Codebase.runTransaction codebase Q.loadAllProjectsByRecentlyAccessed
 
 -- | All possible local project/branch names.
 -- E.g. '@unison/base/main'
 projectBranchOptions :: OptionFetcher
 projectBranchOptions codebase projCtx _searchBranch0 = do
   projs <- Codebase.runTransaction codebase Q.loadAllProjectBranchNamePairs
   projs
-    & foldMap
-      ( \(names, projIds) ->
-          if projIds.project == projCtx.project.projectId
-            then -- If the branch is in the current project, put a shortened version of the branch name first,
-            -- then the long-form name at the end of the list (in case the user still types the full name)
-              [(0 :: Int, "/" <> into @Text names.branch), (2, into @Text names)]
-            else [(1, into @Text names)]
+    & filter
+      ( \(_names, projIds) ->
+          -- If it's the same as the current branch, just omit it.
+          projIds.branch /= projCtx.branch.branchId
       )
-    -- Put branches in this project first.
-    & List.sort
-    & fmap snd
+    & fmap (into @Text . fst)
     & pure
 
 -- | All possible local branch names within the current project.

unison-src/transcripts/idempotent/api-list-projects-branches.md

@@ -14,19 +14,19 @@ scratch/main> project.create-empty project-banana
 
 scratch/main> project.create-empty project-apple
 
-project-apple/main> branch z-branch-cherry
+project-apple/main> branch a-branch-cherry
 
-project-apple/main> branch z-branch-banana
+project-apple/main> branch a-branch-banana
 
-project-apple/main> branch z-branch-apple
+project-apple/main> branch a-branch-apple
 ```
 
 ``` api
 -- Should list all projects
 GET /api/projects
   [
       {
-          "activeBranchRef": "z-branch-apple",
+          "activeBranchRef": "a-branch-apple",
           "projectName": "project-apple"
       },
       {
@@ -54,23 +54,23 @@ GET /api/projects?query=bana
 GET /api/projects/project-apple/branches
   [
       {
-          "branchName": "main"
+          "branchName": "a-branch-apple"
       },
       {
-          "branchName": "z-branch-apple"
+          "branchName": "a-branch-banana"
       },
       {
-          "branchName": "z-branch-banana"
+          "branchName": "a-branch-cherry"
       },
       {
-          "branchName": "z-branch-cherry"
+          "branchName": "main"
       }
   ]
 -- Can query for some  infix of the project name
 GET /api/projects/project-apple/branches?query=bana
   [
       {
-          "branchName": "z-branch-banana"
+          "branchName": "a-branch-banana"
       }
   ]
 ```

unison-src/transcripts/idempotent/fuzzy-options.md

@@ -71,12 +71,9 @@ myproject/main> branch mybranch
 scratch/main> debug.fuzzy-options switch _
 
   Select a project or branch to switch to:
-    * /empty
-    * /main
     * myproject/main
     * myproject/mybranch
     * scratch/empty
-    * scratch/main
     * myproject
     * scratch
 ```