reslop 0.1.8 → 0.1.9

package/lib/session/actions.js

@@ -11,10 +11,7 @@ const ACTIONS = {
   feedback: ['f'],
   todo: ['t'],
   code: ['e'],
-  reload: ['r'],
   branch: ['b'],
-  pull: ['p'],
-  push: ['s'],
   quit: ['q', 'ctrl-c'],
 };
 const ACTION_IDS = Object.keys(ACTIONS);
@@ -23,6 +20,14 @@ const BRANCH_ACTIONS = {
   newBranch: ['n'],
   rebase: ['r'],
   drop: ['d'],
+  pull: ['p'],
+  push: ['s'],
+};
+
+const COMMIT_ACTIONS = {
+  amend: ['a'],
+  fixup: ['f'],
+  drop: ['d'],
 };
 
 const ACTION_HOT = {
@@ -40,8 +45,9 @@ const ACTION_LABEL = {
   next: '→',
 };
 
-const DIFF_DISABLED = ['commit', 'reload', 'branch', 'pull', 'push'];
+const DIFF_DISABLED = ['commit', 'branch', 'pull', 'push'];
 const FILES_DISABLED = ['layout', 'feedback', 'code'];
+const FILES_HIDDEN = [...FILES_DISABLED, 'prev', 'next', 'commit'];
 const FILES_GIT_DISABLED = ['add', 'unstage', 'revert'];
 const FILES_TODO_DISABLED = [...FILES_GIT_DISABLED, ...FILES_DISABLED];
 const TODO_DISABLED = [
@@ -53,7 +59,6 @@ const TODO_DISABLED = [
   'feedback',
   'todo',
   'code',
-  'reload',
   'branch',
   'pull',
   'push',
@@ -67,8 +72,21 @@ const BRANCHES_DISABLED = [
   'feedback',
   'todo',
   'code',
-  'reload',
   'branch',
+  'prev',
+  'next',
+];
+const COMMITS_DISABLED = [
+  'add',
+  'unstage',
+  'revert',
+  'layout',
+  'feedback',
+  'todo',
+  'code',
+  'branch',
+  'prev',
+  'next',
   'pull',
   'push',
 ];
@@ -82,9 +100,23 @@ const diffGitDisabled = (item) => {
   return ['unstage'];
 };
 
+const BRANCH_REMOTE = ['pull', 'push'];
+
 const branchGitDisabled = (item) => {
-  if (item && !item.current) return [];
-  return ['rebase', 'drop'];
+  const off = item && !item.current ? [] : ['rebase', 'drop'];
+  if (!item || !item.current) return [...off, ...BRANCH_REMOTE];
+  return off;
+};
+
+const commitWriteDisabled = (item) => {
+  if (!item || !item.sha) return ['amend', 'fixup', 'drop'];
+  return [];
+};
+
+const commitGitDisabled = (item) => {
+  const off = commitWriteDisabled(item);
+  if (item && item.canCommit === true) return off;
+  return [...off, 'commit', 'fixup'];
 };
 
 const disabledActions = (pane, item) => {
@@ -93,6 +125,9 @@ const disabledActions = (pane, item) => {
   if (pane === 'branches') {
     return [...BRANCHES_DISABLED, ...branchGitDisabled(item)];
   }
+  if (pane === 'commits') {
+    return [...COMMITS_DISABLED, ...commitWriteDisabled(item)];
+  }
   if (onTodos) return TODO_DISABLED;
   return [...DIFF_DISABLED, ...diffGitDisabled(item)];
 };
@@ -116,16 +151,27 @@ const SCROLL = {
 };
 
 const KEY_TO_ACTION = {};
-const PANE_ONLY = ['branch', 'pull', 'push'];
+const PANE_ONLY = ['branch'];
 const FILES_KEYS = {};
 for (const id of PANE_ONLY) {
   for (const key of ACTIONS[id]) FILES_KEYS[key] = id;
 }
+for (const id of BRANCH_REMOTE) {
+  for (const key of BRANCH_ACTIONS[id]) FILES_KEYS[key] = id;
+}
 const BRANCH_KEYS = {};
 for (const id of Object.keys(BRANCH_ACTIONS)) {
   for (const key of BRANCH_ACTIONS[id]) BRANCH_KEYS[key] = id;
 }
-const PANE_KEYS = { files: FILES_KEYS, branches: BRANCH_KEYS };
+const COMMIT_KEYS = {};
+for (const id of Object.keys(COMMIT_ACTIONS)) {
+  for (const key of COMMIT_ACTIONS[id]) COMMIT_KEYS[key] = id;
+}
+const PANE_KEYS = {
+  files: FILES_KEYS,
+  branches: BRANCH_KEYS,
+  commits: COMMIT_KEYS,
+};
 
 for (const id of ACTION_IDS) {
   if (PANE_ONLY.includes(id)) continue;
@@ -135,12 +181,16 @@ for (const id of ACTION_IDS) {
 for (const key of Object.keys(SCROLL)) KEY_TO_ACTION[key] = SCROLL[key];
 
 const actionFromKey = (key, pane) => {
+  const listPane =
+    pane === 'files' || pane === 'branches' || pane === 'commits';
+  if (listPane && (key === 'left' || key === 'right')) return null;
   const paneKeys = PANE_KEYS[pane];
   if (paneKeys && paneKeys[key]) return paneKeys[key];
   return KEY_TO_ACTION[key] ?? null;
 };
 
-const actionKeys = (id) => ACTIONS[id] ?? BRANCH_ACTIONS[id] ?? [];
+const actionKeys = (id) =>
+  ACTIONS[id] ?? BRANCH_ACTIONS[id] ?? COMMIT_ACTIONS[id] ?? [];
 
 const actionHot = (id) => ACTION_HOT[id] ?? actionKeys(id)[0];
 
@@ -173,19 +223,6 @@ const CONFIRM = {
       escape: 'cancel',
     },
   },
-  confirmCommit: {
-    choices: [
-      { letter: 'c', label: 'commit', lead: ' ' },
-      { letter: 'a', label: 'amend', lead: '  ' },
-      { letter: 'f', label: 'fixup', lead: '  ' },
-    ],
-    keys: {
-      c: 'commit',
-      a: 'amend',
-      f: 'fixup',
-      escape: 'cancel',
-    },
-  },
   confirmUpdate: {
     choices: YES_NO,
     prefix: (view) => {
@@ -248,19 +285,23 @@ module.exports = {
   ACTIONS,
   ACTION_IDS,
   BRANCH_ACTIONS,
+  COMMIT_ACTIONS,
   ACTION_HOT,
   ACTION_LABEL,
   DIFF_DISABLED,
   FILES_DISABLED,
+  FILES_HIDDEN,
   FILES_GIT_DISABLED,
   FILES_TODO_DISABLED,
   TODO_DISABLED,
   BRANCHES_DISABLED,
+  COMMITS_DISABLED,
   SCROLL,
   PANE_ONLY,
   disabledActions,
   diffGitDisabled,
   branchGitDisabled,
+  commitGitDisabled,
   actionFromKey,
   actionKeys,
   actionHot,

package/lib/session/branches.js

@@ -21,6 +21,11 @@ const refreshBranchList = (api) => {
   if (nav.branchCursor > last) nav.branchCursor = Math.max(0, last);
 };
 
+const refreshAfterWrite = (api, extra = {}) => {
+  refreshBranchList(api);
+  api.options.refreshFromRepo({ keepEmpty: true, ...extra });
+};
+
 const onBranch = (api) => {
   if (api.options.getMode() === 'compose') return;
   if (!api.options.canCommit()) return;
@@ -93,10 +98,7 @@ const onCheckoutBranch = (api) => {
 
 const rebaseAsync = (api, onto, done, write) => {
   const run = (top) => write(top, onto);
-  const after = () => {
-    refreshBranchList(api);
-    api.options.refreshFromRepo({ keepEmpty: true, doneStatus: done });
-  };
+  const after = () => refreshAfterWrite(api, { doneStatus: done });
   return void api.options.runner.runBusy('rebasing', done, run, after);
 };
 
@@ -117,8 +119,7 @@ const onRebaseBranch = (api) => {
     api.options.repo().rebase(top, onto);
   });
   if (!ok) return;
-  refreshBranchList(api);
-  api.options.refreshFromRepo({ keepEmpty: true });
+  refreshAfterWrite(api);
   if (!api.options.getStatus()) api.options.setStatus(done);
 };
 
@@ -140,10 +141,7 @@ const cancelDropBranch = (api) => {
 
 const dropAsync = (api, name, done, write) => {
   const run = (top) => write(top, name);
-  const after = () => {
-    refreshBranchList(api);
-    api.options.refreshFromRepo({ keepEmpty: true, doneStatus: done });
-  };
+  const after = () => refreshAfterWrite(api, { doneStatus: done });
   return void api.options.runner.runBusy('dropping', done, run, after);
 };
 
@@ -163,8 +161,7 @@ const confirmDropBranch = (api) => {
     api.options.repo().drop(top, name);
   });
   if (!ok) return;
-  refreshBranchList(api);
-  api.options.refreshFromRepo({ keepEmpty: true });
+  refreshAfterWrite(api);
   if (!api.options.getStatus()) api.options.setStatus(done);
 };
 
@@ -178,8 +175,7 @@ const createAsync = (api, name, done, write) => {
   api.options.composer.closeCompose();
   api.options.showFiles();
   const run = (top) => write(top, name);
-  const after = () =>
-    api.options.refreshFromRepo({ keepEmpty: true, doneStatus: done });
+  const after = () => refreshAfterWrite(api, { doneStatus: done });
   return void api.options.runner.runBusy('creating branch', done, run, after);
 };
 
@@ -203,7 +199,7 @@ const finishCreateBranch = (api) => {
   if (!ok) return;
   api.options.composer.closeCompose();
   api.options.showFiles();
-  api.options.refreshFromRepo({ keepEmpty: true });
+  refreshAfterWrite(api);
   if (!api.options.getStatus()) api.options.setStatus(done);
 };
 
@@ -212,7 +208,7 @@ const onPull = (api) => {
   const repo = api.options.repo();
   const picked = pickRepoWrite(repo, 'pull', api.options.uiOpen());
   if (picked.async) {
-    const after = () => api.options.refreshFromRepo({ keepEmpty: true });
+    const after = () => refreshAfterWrite(api);
     const write = (top) => picked.write(top);
     return void api.options.runner.runBusy('pulling', 'pulled', write, after);
   }
@@ -220,7 +216,7 @@ const onPull = (api) => {
     repo.pull(top);
   });
   if (!ok) return;
-  api.options.refreshFromRepo({ keepEmpty: true });
+  refreshAfterWrite(api);
   if (!api.options.getStatus()) api.options.setStatus('pulled');
 };
 
@@ -232,7 +228,8 @@ const startPush = (api, force) => {
   const picked = pickRepoWrite(repo, 'push', api.options.uiOpen());
   if (picked.async) {
     const write = (top) => picked.write(top, force);
-    return void api.options.runner.runBusy(kind, done, write);
+    const after = () => refreshAfterWrite(api);
+    return void api.options.runner.runBusy(kind, done, write, after);
   }
   try {
     repo.push(api.options.top(), force);
@@ -245,6 +242,7 @@ const startPush = (api, force) => {
     api.options.setStatus(error.message);
     return;
   }
+  refreshAfterWrite(api);
   api.options.setStatus(done);
 };
 

package/lib/session/change-actions.js

@@ -1,7 +1,7 @@
 'use strict';
 
 const files = require('../files.js');
-const { itemPath, isTodoItem, isTodosEntry } = files;
+const { listPath, isTodoItem, isTodosEntry } = files;
 const items = require('./items.js');
 const { needsReload, npmBusyKind, sameBlock } = items;
 const { isReadOnlyOrigin } = require('./origins.js');
@@ -27,6 +27,9 @@ const COMMANDS = {
 
 const keepOrigin = (options, item, origin) => {
   options.collection.keepOrigin(item, origin);
+  const idx = options.collection.findRestoredIndex({ ...item, origin });
+  if (idx >= 0) options.nav.index = idx;
+  if (options.ignoreWatch) options.ignoreWatch();
   options.nav.clearSelection();
   options.syncReviewPath();
   options.syncFileCursor();
@@ -44,7 +47,7 @@ const fileActionItems = (options) => {
   const selected = [];
   for (const item of options.getItems()) {
     if (isTodoItem(item)) continue;
-    if (itemPath(item) !== rel) continue;
+    if (listPath(item) !== rel) continue;
     selected.push(item);
   }
   return selected;
@@ -222,7 +225,7 @@ const onFileAdd = (options) => {
     return;
   }
   if (!guardWritable(options, selected[0])) return;
-  const rel = itemPath(selected[0]);
+  const rel = listPath(selected[0]);
   const targets = selected.filter(COMMANDS.add.match);
   if (!targets.length) {
     options.setStatus('already staged');
@@ -257,7 +260,7 @@ const onFileUnstage = (options) => {
     return;
   }
   if (!guardWritable(options, selected[0])) return;
-  const rel = itemPath(selected[0]);
+  const rel = listPath(selected[0]);
   const targets = selected.filter(COMMANDS.unstage.match);
   if (!targets.length) {
     options.setStatus('not staged');
@@ -283,7 +286,7 @@ const onFileRevert = (options) => {
     return;
   }
   if (!guardWritable(options, selected[0])) return;
-  const rel = itemPath(selected[0]);
+  const rel = listPath(selected[0]);
   for (const item of selected) {
     if (needsReload(item)) options.collection.dismiss(item);
   }

package/lib/session/commit.js

@@ -33,19 +33,71 @@ const hasStagedChanges = (options) => {
   return false;
 };
 
-const onCommit = (options) => {
-  if (!canCommit(options)) return;
-  options.setMode('confirmCommit');
-  options.setStatus('');
+const selectedCommit = (api) => {
+  const cursor = api.options.nav.commitCursor;
+  return api.state.commits[cursor] ?? null;
 };
 
-const cancelCommit = (options) => {
-  options.setMode('review');
-  options.composer.state.commitKind = null;
-  options.setStatus('');
+const clampCommitCursor = (api) => {
+  const last = api.state.commits.length - 1;
+  const nav = api.options.nav;
+  if (nav.commitCursor > last) nav.commitCursor = Math.max(0, last);
 };
 
-const startGitCommit = (options, kind) => {
+const refreshCommitList = (api) => {
+  const repo = api.options.repo();
+  if (!repo.listCommits) return;
+  try {
+    api.state.commits = repo.listCommits(api.options.top());
+  } catch (error) {
+    api.options.setStatus(error.message);
+    return;
+  }
+  clampCommitCursor(api);
+};
+
+const refreshAfterWrite = (api, extra = {}) => {
+  refreshCommitList(api);
+  api.options.refreshFromRepo({ keepEmpty: true, ...extra });
+};
+
+const showCommits = (api) => {
+  if (api.options.getMode() === 'compose') return;
+  if (!canCommit(api.options)) return;
+  const repo = api.options.repo();
+  if (!repo.listCommits) {
+    api.options.setStatus('read only');
+    return;
+  }
+  try {
+    api.state.commits = repo.listCommits(api.options.top());
+  } catch (error) {
+    api.options.setStatus(error.message);
+    return;
+  }
+  api.options.nav.commitCursor = 0;
+  api.options.nav.pane = 'commits';
+  api.options.setStatus('');
+  api.options.nav.clearSelection();
+};
+
+const onCommitMove = (api, delta) => {
+  const commits = api.state.commits;
+  if (!commits.length) {
+    api.options.setStatus('nothing to review');
+    return;
+  }
+  const next = Math.min(
+    commits.length - 1,
+    Math.max(0, api.options.nav.commitCursor + delta),
+  );
+  if (next === api.options.nav.commitCursor) return;
+  api.options.nav.commitCursor = next;
+  api.options.setStatus('');
+};
+
+const startGitCommit = (api, kind) => {
+  const options = api.options;
   if (kind !== 'amend' && !hasStagedChanges(options)) {
     options.setMode('review');
     options.composer.state.commitKind = null;
@@ -54,25 +106,50 @@ const startGitCommit = (options, kind) => {
   }
   options.composer.state.commitKind = kind;
   let text = '';
-  if (kind === 'fixup') text = 'HEAD';
+  if (kind === 'fixup') {
+    const entry = selectedCommit(api);
+    text = entry ? entry.shortSha || entry.sha : 'HEAD';
+  }
   if (kind === 'amend' && options.repo().lastMessage) {
     text = options.repo().lastMessage(options.top()) ?? '';
   }
   options.composer.openCompose('commit', text);
 };
 
-const finishAsyncCommit = (options, kind, message, done, write) => {
-  const composer = options.composer;
-  composer.closeCompose();
+const onCommit = (api) => {
+  if (api.options.nav.pane !== 'commits') return void showCommits(api);
+  if (!canCommit(api.options)) return;
+  startGitCommit(api, 'commit');
+};
+
+const onAmend = (api) => {
+  if (api.options.nav.pane !== 'commits') return;
+  if (!canCommit(api.options)) return;
+  startGitCommit(api, 'amend');
+};
+
+const onFixup = (api) => {
+  if (api.options.nav.pane !== 'commits') return;
+  if (!canCommit(api.options)) return;
+  startGitCommit(api, 'fixup');
+};
+
+const cancelCommit = (api) => {
+  api.options.setMode('review');
+  api.options.composer.state.commitKind = null;
+  api.options.setStatus('');
+};
+
+const finishAsyncCommit = (api, kind, message, done, write) => {
+  const options = api.options;
+  options.composer.closeCompose();
   const run = (top) => write(top, kind, message);
-  const after = () => {
-    options.collection.clearDismissed();
-    options.refreshFromRepo({ doneStatus: done });
-  };
+  const after = () => refreshAfterWrite(api, { doneStatus: done });
   return void options.runner.runBusy('committing', done, run, after);
 };
 
-const finishSyncCommit = (options, kind, message, done) => {
+const finishSyncCommit = (api, kind, message, done) => {
+  const options = api.options;
   try {
     options.repo().commit(options.top(), kind, message);
   } catch (error) {
@@ -81,13 +158,14 @@ const finishSyncCommit = (options, kind, message, done) => {
   }
   options.composer.closeCompose();
   options.collection.clearDismissed();
-  options.refreshFromRepo();
+  refreshAfterWrite(api);
   if (!options.isDone() && !options.pendingExtras()) {
     options.setStatus(done);
   }
 };
 
-const finishGitCommit = (options) => {
+const finishGitCommit = (api) => {
+  const options = api.options;
   const kind = options.composer.state.commitKind;
   const editor = options.composer.state.editor;
   const message = editor ? editor.text : '';
@@ -104,19 +182,103 @@ const finishGitCommit = (options) => {
   const uiOpen = options.uiOpen();
   const picked = pickRepoWrite(options.repo(), 'commit', uiOpen);
   if (picked.async) {
-    finishAsyncCommit(options, kind, message, done, picked.write);
+    finishAsyncCommit(api, kind, message, done, picked.write);
+    return;
+  }
+  finishSyncCommit(api, kind, message, done);
+};
+
+const onDropCommit = (api) => {
+  if (api.options.nav.pane !== 'commits') return;
+  if (!canCommit(api.options)) return;
+  const entry = selectedCommit(api);
+  if (!entry) return;
+  api.state.dropName = entry.shortSha || entry.sha;
+  api.state.dropSha = entry.sha;
+  api.options.setMode('confirmDrop');
+  api.options.setStatus('');
+};
+
+const cancelDropCommit = (api) => {
+  api.options.setMode('review');
+  api.state.dropName = '';
+  api.state.dropSha = '';
+  api.options.setStatus('');
+};
+
+const dropAsync = (api, sha, done, write) => {
+  const run = (top) => write(top, sha);
+  const after = () => refreshAfterWrite(api, { doneStatus: done });
+  return void api.options.runner.runBusy('dropping', done, run, after);
+};
+
+const confirmDropCommit = (api) => {
+  const sha = api.state.dropSha;
+  const name = api.state.dropName;
+  api.options.setMode('review');
+  api.state.dropName = '';
+  api.state.dropSha = '';
+  if (!sha) return;
+  const done = `dropped ${name}`;
+  const repo = api.options.repo();
+  if (!repo.dropCommit) {
+    api.options.setStatus('read only');
+    return;
+  }
+  const uiOpen = api.options.uiOpen();
+  const picked = pickRepoWrite(repo, 'dropCommit', uiOpen);
+  if (picked.async) {
+    dropAsync(api, sha, done, picked.write);
     return;
   }
-  finishSyncCommit(options, kind, message, done);
+  const ok = api.options.runner.runRepo(done, (top) => {
+    repo.dropCommit(top, sha);
+  });
+  if (!ok) return;
+  refreshAfterWrite(api);
+  if (!api.options.getStatus()) api.options.setStatus(done);
+};
+
+const reset = (state) => {
+  state.commits = [];
+  state.dropName = '';
+  state.dropSha = '';
 };
 
-const createCommitController = (options) => ({
-  canCommit: () => canCommit(options),
-  onCommit: () => onCommit(options),
-  cancelCommit: () => cancelCommit(options),
-  startGitCommit: (kind) => startGitCommit(options, kind),
-  finishGitCommit: () => finishGitCommit(options),
-});
+const createCommitController = (options) => {
+  const state = {
+    commits: [],
+    dropName: '',
+    dropSha: '',
+  };
+  const api = { options, state };
+  return {
+    get commits() {
+      return state.commits;
+    },
+    set commits(value) {
+      state.commits = value;
+    },
+    get dropName() {
+      return state.dropName;
+    },
+    set dropName(value) {
+      state.dropName = value;
+    },
+    reset: () => reset(state),
+    canCommit: () => canCommit(options),
+    onCommit: () => onCommit(api),
+    onAmend: () => onAmend(api),
+    onFixup: () => onFixup(api),
+    onCommitMove: (delta) => onCommitMove(api, delta),
+    cancelCommit: () => cancelCommit(api),
+    startGitCommit: (kind) => startGitCommit(api, kind),
+    finishGitCommit: () => finishGitCommit(api),
+    onDropCommit: () => onDropCommit(api),
+    cancelDropCommit: () => cancelDropCommit(api),
+    confirmDropCommit: () => confirmDropCommit(api),
+  };
+};
 
 module.exports = {
   COMMIT_STATUS,

package/lib/session/dispatch.js

@@ -19,12 +19,19 @@ const createDispatcher = (options) => {
     code: options.composer.onCode,
     reload: options.onReload,
     commit: options.commits.onCommit,
+    amend: options.commits.onAmend,
+    fixup: options.commits.onFixup,
     branch: options.gitBranches.onBranch,
     pull: options.gitBranches.onPull,
     push: options.gitBranches.onPush,
     newBranch: options.gitBranches.onNewBranch,
     rebase: options.gitBranches.onRebaseBranch,
-    drop: options.gitBranches.onDropBranch,
+    drop: () => {
+      if (options.getPane() === 'commits') {
+        return void options.commits.onDropCommit();
+      }
+      options.gitBranches.onDropBranch();
+    },
     open: options.onOpenFile,
     removeTodo: options.composer.removeFocusedTodo,
     quit: options.onQuit,
@@ -54,6 +61,10 @@ const createDispatcher = (options) => {
       if (action === 'next') return void options.onBranchMove(1);
       if (action === 'prev') return void options.onBranchMove(-1);
     }
+    if (pane === 'commits') {
+      if (action === 'next') return void options.onCommitMove(1);
+      if (action === 'prev') return void options.onCommitMove(-1);
+    }
     const hidden = disabledActions(pane, options.currentTarget());
     if (hidden.includes(action)) return;
     const handler = handlers[action];
@@ -67,7 +78,6 @@ const createDispatcher = (options) => {
 const createInput = (options) => {
   const confirmations = {
     confirmQuit: options.quit,
-    confirmCommit: options.commit,
     confirmUpdate: options.update,
     confirmDrop: options.drop,
     confirmPush: options.push,

package/lib/session/files-pane.js

@@ -35,7 +35,7 @@ const showFiles = (options) => {
 };
 
 const onEscape = (options) => {
-  if (options.nav.pane === 'branches') {
+  if (options.nav.pane === 'branches' || options.nav.pane === 'commits') {
     showFiles(options);
     return;
   }
@@ -61,6 +61,7 @@ const onOpenFile = (options) => {
   if (options.nav.pane === 'branches') {
     return void options.onCheckoutBranch();
   }
+  if (options.nav.pane === 'commits') return;
   if (options.nav.pane !== 'files') {
     if (options.nav.todoOpen) options.composer.editFocusedTodo();
     return;
@@ -157,6 +158,9 @@ const onScroll = (options, delta) => {
   if (options.nav.pane === 'branches') {
     return void options.onBranchMove(delta);
   }
+  if (options.nav.pane === 'commits') {
+    return void options.onCommitMove(delta);
+  }
   if (options.nav.todoOpen && options.composer.todoRowCount() > 1) {
     return void options.composer.moveTodoFocus(delta);
   }
@@ -186,6 +190,11 @@ const onJump = (options, toEnd) => {
     options.onBranchMove(delta);
     return;
   }
+  if (options.nav.pane === 'commits') {
+    const delta = toEnd ? Number.MAX_SAFE_INTEGER : -Number.MAX_SAFE_INTEGER;
+    options.onCommitMove(delta);
+    return;
+  }
   if (options.nav.todoOpen && options.composer.todoRowCount() > 0) {
     const last = options.composer.todoRowCount() - 1;
     const target = toEnd ? last : 0;