dsh-ide-git 0.19.1 → 0.19.3

package/src/index.js

@@ -778,6 +778,40 @@ async function log(payload) {
   const hasMore = all.length > limit
   return { repoRoot: root, commits: hasMore ? all.slice(0, limit) : all, hasMore, skip, limit }
 }
+/* The merge that carried `from` INTO `to`, newest first — the anchor the
+   branch tree's double-click-to-browse lands on (IDEA-style: double-click
+   branch 2, then branch 1, and 1's list opens scrolled to the merge commit
+   where 2 was merged in, so "2 has been merged here" is visible at a
+   glance even though 1 kept moving. No merge relationship -> null, and the
+   caller just opens the list at the top. Pure rev arithmetic, no network. */
+/* Who am I here: git config resolves user.name/email through its usual
+   cascade (repo-local overrides global), so the answer is per repository.
+   The client caches it per repo root for the whole panel lifetime — a git
+   identity rarely changes mid-session — and pins it to the top of the
+   author filter (v0.19.3), even when this branch has no commits by me:
+   picking it and seeing an empty list IS the answer ("I never committed
+   here"). Empty strings mean no identity is configured. */
+async function me(payload) {
+  const cwd = cwdOf(payload)
+  const root = await repoRootOf(cwd, payload)
+  const name = await runGit(root, ['config', 'user.name'])
+  const email = await runGit(root, ['config', 'user.email'])
+  return {
+    repoRoot: root,
+    name: name.code === 0 ? name.stdout.trim() : '',
+    email: email.code === 0 ? email.stdout.trim() : '',
+  }
+}
+
+async function mergePoint(payload) {
+  const cwd = cwdOf(payload)
+  const root = await repoRootOf(cwd, payload)
+  const from = requireRef(payload.from, 'from')
+  const to = requireRef(payload.to, 'to')
+  const out = await git(root, ['rev-list', '--merges', '--ancestry-path', '--max-count=1', from + '..' + to])
+  const hash = out.trim().split('\n')[0] || ''
+  return { repoRoot: root, hash: hash === '' ? null : hash }
+}
 
 async function commitDetail(payload) {
   const cwd = cwdOf(payload)
@@ -1434,6 +1468,12 @@ function repoRow(root, submodulePath, kind) {
     name: submodulePath === undefined ? path.basename(root) : submodulePath,
     label: submodulePath === undefined ? path.basename(root) : submodulePath.split('/').pop(),
     branch: null,
+    /** The checkout's own repository name, cut from its origin URL (v0.19.2):
+     *  the picker shows this first and falls back to the directory name, with
+     *  the directory name as the small sub line whenever the two differ — so
+     *  two clones of one repository stay tellable apart. Filled in by the
+     *  scan below (an origin-less checkout keeps the empty string). */
+    origin: '',
     kind,
     ...(submodulePath === undefined ? {} : { submodulePath }),
   }
@@ -1540,6 +1580,11 @@ async function scanRepos(cwd) {
   const capped = rows.slice(0, REPO_LIST_LIMIT).map((row) => ({ ...row }))
   const branches = await Promise.all(capped.map((row) => branchOrNull(row.path)))
   for (let index = 0; index < capped.length; index += 1) capped[index].branch = branches[index]
+  /* Origin names ride the same one-call-per-row pass as the branches: a local
+     `git remote get-url` read, cheap, and the 15s cache means repeated picker
+     opens pay for it once. */
+  const origins = await Promise.all(capped.map((row) => originNameOf(row.path)))
+  for (let index = 0; index < capped.length; index += 1) capped[index].origin = origins[index]
   repoScanCache.set(cwd, { at: Date.now(), rows: capped })
   return { cached: false, rows: capped.map((row) => ({ ...row })) }
 }
@@ -1928,6 +1973,8 @@ const METHODS = {
   stats,
   branches,
   log,
+  me,
+  'merge-point': mergePoint,
   commitDetail,
   diff,
   compare,