git-chopstick-core 0.1.2 → 0.1.3

package/src/git/commit.ts

@@ -1,136 +0,0 @@
-import { git, HookCallbackOptions, parseCommitSHA } from './core.js'
-import { stageFiles } from './update-index.js'
-import { Repository } from '../models/repository.js'
-import { WorkingDirectoryFileChange } from '../models/status.js'
-import { unstageAll } from './reset.js'
-import { ManualConflictResolution } from '../models/manual-conflict-resolution.js'
-import { stageManualConflictResolution } from './stage.js'
-
-/**
- * @param repository repository to execute merge in
- * @param message commit message
- * @param files files to commit
- * @returns the commit SHA
- */
-export async function createCommit(
-  repository: Repository,
-  message: string,
-  files: ReadonlyArray<WorkingDirectoryFileChange>,
-  options?: {
-    amend?: boolean
-    noVerify?: boolean
-    signOff?: boolean
-    allowEmpty?: boolean
-  } & HookCallbackOptions
-): Promise<string> {
-  // Clear the staging area, our diffs reflect the difference between the
-  // working directory and the last commit (if any) so our commits should
-  // do the same thing.
-  await unstageAll(repository)
-
-  await stageFiles(repository, files)
-
-  const args = ['-F', '-']
-
-  if (options?.amend) {
-    args.push('--amend')
-  }
-
-  if (options?.noVerify) {
-    args.push('--no-verify')
-  }
-
-  if (options?.signOff) {
-    args.push('--signoff')
-  }
-
-  if (options?.allowEmpty) {
-    args.push('--allow-empty')
-  }
-
-  const result = await git(
-    ['commit', ...args],
-    repository.path,
-    'createCommit',
-    {
-      stdin: message,
-      // https://git-scm.com/docs/githooks/2.46.1
-      interceptHooks: [
-        'pre-commit',
-        'prepare-commit-msg',
-        'commit-msg',
-        'post-commit',
-        ...(options?.amend ? ['post-rewrite'] : []),
-        'pre-auto-gc',
-      ],
-      onHookProgress: options?.onHookProgress,
-      onHookFailure: options?.onHookFailure,
-      onTerminalOutputAvailable: options?.onTerminalOutputAvailable,
-    }
-  )
-  return parseCommitSHA(result)
-}
-
-/**
- * Creates a commit to finish an in-progress merge
- * assumes that all conflicts have already been resolved
- * *Warning:* Does _not_ clear staged files before it commits!
- *
- * @param repository repository to execute merge in
- * @param files files to commit
- */
-export async function createMergeCommit(
-  repository: Repository,
-  files: ReadonlyArray<WorkingDirectoryFileChange>,
-  manualResolutions: ReadonlyMap<string, ManualConflictResolution> = new Map()
-): Promise<string> {
-  // apply manual conflict resolutions
-  for (const [path, resolution] of manualResolutions) {
-    const file = files.find(f => f.path === path)
-    if (file !== undefined) {
-      await stageManualConflictResolution(repository, file, resolution)
-    } else {
-      console.error(
-        `couldn't find file ${path} even though there's a manual resolution for it`
-      )
-    }
-  }
-
-  const otherFiles = files.filter(f => !manualResolutions.has(f.path))
-
-  await stageFiles(repository, otherFiles)
-  const result = await git(
-    [
-      'commit',
-      // no-edit here ensures the app does not accidentally invoke the user's editor
-      '--no-edit',
-      // By default Git merge commits do not contain any commentary (which
-      // are lines prefixed with `#`). This works because the Git CLI will
-      // prompt the user to edit the file in `.git/COMMIT_MSG` before
-      // committing, and then it will run `--cleanup=strip`.
-      //
-      // This clashes with our use of `--no-edit` above as Git will now change
-      // it's behavior to invoke `--cleanup=whitespace` as it did not ask
-      // the user to edit the COMMIT_MSG as part of creating a commit.
-      //
-      // From the docs on git-commit (https://git-scm.com/docs/git-commit) I'll
-      // quote the relevant section:
-      // --cleanup=<mode>
-      //     strip
-      //        Strip leading and trailing empty lines, trailing whitespace,
-      //        commentary and collapse consecutive empty lines.
-      //     whitespace
-      //        Same as `strip` except #commentary is not removed.
-      //     default
-      //        Same as `strip` if the message is to be edited. Otherwise `whitespace`.
-      //
-      // We should emulate the behavior in this situation because we don't
-      // let the user view or change the commit message before making the
-      // commit.
-      '--cleanup=strip',
-    ],
-    repository.path,
-    'createMergeCommit'
-  )
-  return parseCommitSHA(result)
-}

package/src/git/config.ts

@@ -1,392 +0,0 @@
-import { git } from './core.js'
-import { Repository } from '../models/repository.js'
-import { normalize } from 'path'
-
-/**
- * Look up a config value by name in the repository.
- *
- * @param onlyLocal Whether or not the value to be retrieved should stick to
- *                  the local repository settings. It is false by default. This
- *                  is equivalent to using the `--local` argument in the
- *                  `git config` invocation.
- */
-export function getConfigValue(
-  repository: Repository,
-  name: string,
-  onlyLocal: boolean = false
-): Promise<string | null> {
-  return getConfigValueInPath(name, repository.path, onlyLocal)
-}
-
-/** Look up a global config value by name. */
-export function getGlobalConfigValue(
-  name: string,
-  env?: {
-    HOME: string
-  }
-): Promise<string | null> {
-  return getConfigValueInPath(name, null, false, undefined, env)
-}
-
-/**
- * Look up a config value by name.
- *
- * Treats the returned value as a boolean as per Git's
- * own definition of a boolean configuration value (i.e.
- * 0 -> false, "off" -> false, "yes" -> true etc)
- */
-export async function getBooleanConfigValue(
-  repository: Repository,
-  name: string,
-  onlyLocal: boolean = false,
-  env?: {
-    HOME: string
-  }
-): Promise<boolean | null> {
-  const value = await getConfigValueInPath(
-    name,
-    repository.path,
-    onlyLocal,
-    'bool',
-    env
-  )
-  return value === null ? null : value !== 'false'
-}
-
-/**
- * Look up a global config value by name.
- *
- * Treats the returned value as a boolean as per Git's
- * own definition of a boolean configuration value (i.e.
- * 0 -> false, "off" -> false, "yes" -> true etc)
- */
-export async function getGlobalBooleanConfigValue(
-  name: string,
-  env?: {
-    HOME: string
-  }
-): Promise<boolean | null> {
-  const value = await getConfigValueInPath(name, null, false, 'bool', env)
-  return value === null ? null : value !== 'false'
-}
-
-/**
- * Look up a config value by name
- *
- * @param path      The path to execute the `git` command in. If null
- *                  we'll use the global configuration (i.e. --global)
- *                  and execute the Git call from the same location that
- *                  GitHub Desktop is installed in.
- * @param onlyLocal Whether or not the value to be retrieved should stick to
- *                  the local repository settings (if a path is specified). It
- *                  is false by default. It is equivalent to using the `--local`
- *                  argument in the `git config` invocation.
- * @param type      Canonicalize configuration values according to the
- *                  expected type (i.e. 0 -> false, "on" -> true etc).
- *                  See `--type` documentation in `git config`
- */
-async function getConfigValueInPath(
-  name: string,
-  path: string | null,
-  onlyLocal: boolean = false,
-  type?: 'bool' | 'int' | 'bool-or-int' | 'path' | 'expiry-date' | 'color',
-  env?: {
-    HOME: string
-  }
-): Promise<string | null> {
-  const flags = ['config', '-z']
-  if (!path) {
-    flags.push('--global')
-  } else if (onlyLocal) {
-    flags.push('--local')
-  }
-
-  if (type !== undefined) {
-    flags.push('--type', type)
-  }
-
-  flags.push(name)
-
-  const result = await git(flags, path || __dirname, 'getConfigValueInPath', {
-    successExitCodes: new Set([0, 1]),
-    env,
-  })
-
-  // Git exits with 1 if the value isn't found. That's OK.
-  if (result.exitCode === 1) {
-    return null
-  }
-
-  const output = result.stdout
-  const pieces = output.split('\0')
-  return pieces[0]
-}
-
-/**
- * Get the path to the global git config
- *
- * Note: this uses git config --edit which will automatically create the global
- * config file if it doesn't exist yet. The primary purpose behind this method
- * is to support opening the global git config for editing.
- */
-export const getGlobalConfigPath = (env?: { HOME: string }) =>
-  git(['config', '--edit', '--global'], __dirname, 'getGlobalConfigPath', {
-    // We're using printf instead of echo because echo could attempt to decode
-    // escape sequences like \n which would be bad in a case like
-    // c:\Users\niik\.gitconfig
-    //         ^^
-    env: { ...env, GIT_EDITOR: 'printf %s' },
-  }).then(x => normalize(x.stdout))
-
-/** Set the local config value by name. */
-export async function setConfigValue(
-  repository: Repository,
-  name: string,
-  value: string,
-  env?: {
-    HOME: string
-  }
-): Promise<void> {
-  return setConfigValueInPath(name, value, repository.path, env)
-}
-
-/** Set the global config value by name. */
-export async function setGlobalConfigValue(
-  name: string,
-  value: string,
-  env?: {
-    HOME: string
-  }
-): Promise<void> {
-  return setConfigValueInPath(name, value, null, env)
-}
-
-/** Set the global config value by name. */
-export async function addGlobalConfigValue(
-  name: string,
-  value: string
-): Promise<void> {
-  await git(
-    ['config', '--global', '--add', name, value],
-    __dirname,
-    'addGlobalConfigValue'
-  )
-}
-
-/**
- * Adds a path to the `safe.directories` configuration variable if it's not
- * already present. Adding a path to `safe.directory` will cause Git to ignore
- * if the path is owner by a different user than the current.
- */
-export async function addSafeDirectory(path: string) {
-  // UNC-paths on Windows need to be prefixed with `%(prefix)/`, see
-  // https://github.com/git-for-windows/git/commit/e394a16023cbb62784e380f70ad8a833fb960d68
-  if (process.platform === 'win32' && path[0] === '/') {
-    path = `%(prefix)/${path}`
-  }
-
-  await addGlobalConfigValueIfMissing('safe.directory', path)
-}
-
-/** Set the global config value by name. */
-export async function addGlobalConfigValueIfMissing(
-  name: string,
-  value: string
-): Promise<void> {
-  const { stdout, exitCode } = await git(
-    ['config', '--global', '-z', '--get-all', name, value],
-    __dirname,
-    'addGlobalConfigValue',
-    { successExitCodes: new Set([0, 1]) }
-  )
-
-  if (exitCode === 1 || !stdout.split('\0').includes(value)) {
-    await addGlobalConfigValue(name, value)
-  }
-}
-
-/**
- * Set config value by name
- *
- * @param path The path to execute the `git` command in. If null
- *             we'll use the global configuration (i.e. --global)
- *             and execute the Git call from the same location that
- *             GitHub Desktop is installed in.
- */
-async function setConfigValueInPath(
-  name: string,
-  value: string,
-  path: string | null,
-  env?: {
-    HOME: string
-  }
-): Promise<void> {
-  const options = env ? { env } : undefined
-
-  const flags = ['config']
-
-  if (!path) {
-    flags.push('--global')
-  }
-
-  flags.push('--replace-all', name, value)
-
-  await git(flags, path || __dirname, 'setConfigValueInPath', options)
-}
-
-/** Remove the local config value by name. */
-export async function removeConfigValue(
-  repository: Repository,
-  name: string,
-  env?: {
-    HOME: string
-  }
-): Promise<void> {
-  return removeConfigValueInPath(name, repository.path, env)
-}
-
-/** Remove the global config value by name. */
-export async function removeGlobalConfigValue(
-  name: string,
-  env?: {
-    HOME: string
-  }
-): Promise<void> {
-  return removeConfigValueInPath(name, null, env)
-}
-
-/**
- * Remove config value by name
- *
- * @param path The path to execute the `git` command in. If null
- *             we'll use the global configuration (i.e. --global)
- *             and execute the Git call from the same location that
- *             GitHub Desktop is installed in.
- */
-async function removeConfigValueInPath(
-  name: string,
-  path: string | null,
-  env?: {
-    HOME: string
-  }
-): Promise<void> {
-  const options = env ? { env } : undefined
-
-  const flags = ['config']
-
-  if (!path) {
-    flags.push('--global')
-  }
-
-  flags.push('--unset-all', name)
-
-  await git(flags, path || __dirname, 'removeConfigValueInPath', options)
-}
-
-export interface IConfigValueOrigin {
-  readonly value: string
-  readonly scope: string
-  readonly origin: string
-}
-
-/**
- * Look up a config value along with its source file and scope.
- * Requires Git 2.26+ for --show-scope.
- */
-export async function getConfigValueWithOrigin(
-  repository: Repository,
-  name: string
-): Promise<IConfigValueOrigin | null> {
-  const result = await git(
-    ['config', '--show-origin', '--show-scope', '-z', name],
-    repository.path,
-    'getConfigValueWithOrigin',
-    // 0 = found, 1 = key not set, 128 = not a git repo or git error
-    { successExitCodes: new Set([0, 1, 128]) }
-  )
-
-  if (result.exitCode !== 0) {
-    return null
-  }
-
-  const parts = result.stdout.split('\0')
-  if (parts.length >= 3) {
-    return {
-      scope: parts[0],
-      origin: parts[1],
-      value: parts[2],
-    }
-  }
-
-  return null
-}
-
-/**
- * Extract the file path from a config value origin, stripping the `file:` prefix.
- * When repositoryPath is provided, relative paths (e.g. `.git/config` for local
- * scope) are resolved to absolute paths.
- */
-export function getOriginFilePath(
-  origin: IConfigValueOrigin,
-  repositoryPath?: string
-): string {
-  const filePath = origin.origin.replace(/^file:/, '')
-  // Git returns relative paths for local/worktree scope (e.g. `.git/config`)
-  if (repositoryPath && !/^([a-zA-Z]:|[/\\])/.test(filePath)) {
-    const base = repositoryPath.replace(/[\\/]+$/, '')
-    return `${base}/${filePath}`
-  }
-  return filePath
-}
-
-/**
- * Check whether a global-scoped config value comes from a conditionally
- * included file (via includeIf directive) rather than a standard location.
- */
-export function isConditionalInclude(origin: IConfigValueOrigin): boolean {
-  if (origin.scope !== 'global') {
-    return false
-  }
-  const filePath = getOriginFilePath(origin)
-  return (
-    !/[/\\]\.gitconfig$/i.test(filePath) &&
-    !/[/\\]\.config[/\\]git[/\\]config$/i.test(filePath)
-  )
-}
-
-/** Format a human-readable scope description for a config value origin. */
-export function formatConfigScope(origin: IConfigValueOrigin): string {
-  if (origin.scope === 'local') {
-    return 'local'
-  } else if (origin.scope === 'system') {
-    return 'system'
-  } else if (origin.scope === 'worktree') {
-    return 'worktree'
-  } else if (origin.scope === 'global') {
-    return isConditionalInclude(origin) ? 'global, via [includeIf]' : 'global'
-  }
-  return origin.scope
-}
-
-/**
- * Format the file path for a config value origin.
- * For local/worktree scope, displays the path with a `<repo>` prefix.
- */
-export function formatConfigPath(
-  origin: IConfigValueOrigin,
-  repositoryPath: string
-): string {
-  const rawPath = origin.origin.replace(/^file:/, '')
-  if (origin.scope === 'local' || origin.scope === 'worktree') {
-    // Git returns relative paths for local scope (e.g. `.git/config`)
-    if (!/^([a-zA-Z]:|[/\\])/.test(rawPath)) {
-      return '<repo>/' + rawPath
-    }
-    // Absolute path — strip repo prefix
-    const normalized = repositoryPath.replace(/[\\/]+$/, '')
-    if (rawPath.toLowerCase().startsWith(normalized.toLowerCase())) {
-      return '<repo>' + rawPath.slice(normalized.length)
-    }
-  }
-  return rawPath
-}