Git - Tools Integration

# Common IDE Git features:
# - Visual diff and merge tools
# - Commit history browser
# - Branch management
# - Conflict resolution
# - Blame annotations
# - Interactive staging

# VS Code Git shortcuts:
Ctrl+Shift+G     # Open Source Control panel
Ctrl+Shift+P     # Command palette → Git commands
Ctrl+K Ctrl+O    # Open folder/repository
Ctrl+`           # Open integrated terminal

# Git commands in Command Palette:
Git: Clone
Git: Initialize Repository
Git: Stage Changes
Git: Commit
Git: Push
Git: Pull
Git: Create Branch
Git: Merge Branch

# Configure VS Code as Git editor
git config --global core.editor "code --wait"

# Configure as merge tool
git config --global merge.tool vscode
git config --global mergetool.vscode.cmd 'code --wait $MERGED'

# Configure as diff tool
git config --global diff.tool vscode
git config --global difftool.vscode.cmd 'code --wait --diff $LOCAL $REMOTE'

# GitLens - Supercharge Git capabilities
# Features: blame annotations, history, repository insights

# Git Graph - Visual branch graph
# Features: Interactive commit graph, branch visualization

# GitHub Pull Requests and Issues
# Features: PR management, issue tracking

# Git History
# Features: File history, diff viewer, branch comparison

# Install via command line:
code --install-extension eamodio.gitlens
code --install-extension mhutchie.git-graph
code --install-extension github.vscode-pull-request-github

# JetBrains Git features:
# VCS → Git menu for all Git operations
# Built-in visual merge tool
# Local History backup
# Shelf for temporary changes
# Interactive rebase dialog

# Key shortcuts:
Ctrl+K          # Commit dialog
Ctrl+Shift+K    # Push dialog  
Alt+`           # VCS operations popup
Ctrl+Alt+Z      # Rollback changes
Ctrl+D          # Show diff

# Configure JetBrains as Git tools
git config --global merge.tool intellij
git config --global mergetool.intellij.cmd 'idea merge $(cd $(dirname "$LOCAL") && pwd)/$(basename "$LOCAL") $(cd $(dirname "$REMOTE") && pwd)/$(basename "$REMOTE") $(cd $(dirname "$BASE") && pwd)/$(basename "$BASE") $(cd $(dirname "$MERGED") && pwd)/$(basename "$MERGED")'

# For WebStorm:
git config --global merge.tool webstorm
git config --global mergetool.webstorm.cmd 'webstorm merge $LOCAL $REMOTE $BASE $MERGED'

# GitKraken - Cross-platform GUI
# Features: Visual branch graph, drag-drop operations, GitHub integration
# Installation: Download from gitkraken.com

# SourceTree - Free Atlassian tool  
# Features: Visual workflow, Bitbucket integration, Git-flow support
# Installation: Download from sourcetreeapp.com

# GitHub Desktop - Simple GitHub integration
# Features: Easy GitHub workflow, conflict resolution, branch management
# Installation: Download from desktop.github.com

# Tower - Premium Mac/Windows client
# Features: Advanced merge conflict resolution, drag-drop interface
# Installation: Download from git-tower.com

# Configure external GUI tool
git config --global gui.tool gitk

# Launch configured GUI
git gui

# Alternative GUI launchers
gitk --all          # Visual history browser
git-cola            # Cross-platform GUI
tig                 # Terminal-based interface

# Install Oh My Zsh
sh -c "$(curl -fsSL https://raw.github.com/ohmyzsh/ohmyzsh/master/tools/install.sh)"

# Enable Git plugin in ~/.zshrc
plugins=(git)

# Useful aliases provided:
gst     # git status
gco     # git checkout  
gcm     # git checkout main
gp      # git push
gl      # git pull
glog    # git log --oneline --decorate --graph
gaa     # git add --all
gcmsg   # git commit -m

# Install git-prompt for Bash
curl -o ~/.git-prompt.sh https://raw.githubusercontent.com/git/git/master/contrib/completion/git-prompt.sh

# Add to ~/.bashrc
source ~/.git-prompt.sh
export GIT_PS1_SHOWDIRTYSTATE=1
export GIT_PS1_SHOWUNTRACKEDFILES=1
export GIT_PS1_SHOWSTASHSTATE=1
export GIT_PS1_SHOWUPSTREAM="auto"
export PS1='\u@\h:\w$(__git_ps1 " (%s)")\$ '

# Tig - Text-mode interface for Git
brew install tig        # macOS
apt install tig          # Ubuntu/Debian
# Usage: tig, tig blame file.js, tig log

# Delta - Enhanced diff viewer
cargo install git-delta
git config --global core.pager delta
git config --global interactive.diffFilter 'delta --color-only'

# Lazygit - Terminal UI for Git
brew install lazygit     # macOS
# Usage: lazygit

# Git-extras - Additional Git utilities
brew install git-extras
# Provides: git-summary, git-effort, git-authors, etc.

# Install pre-commit framework
pip install pre-commit

# Create .pre-commit-config.yaml
repos:
  - repo: https://github.com/pre-commit/pre-commit-hooks
    rev: v4.0.1
    hooks:
      - id: trailing-whitespace
      - id: end-of-file-fixer
      - id: check-merge-conflict
      - id: check-yaml
      - id: check-json
  - repo: https://github.com/psf/black
    rev: 21.9b0
    hooks:
      - id: black
  - repo: https://github.com/pycqa/flake8
    rev: 3.9.2
    hooks:
      - id: flake8

# Install hooks
pre-commit install

# Install Husky
npm install --save-dev husky

# Enable Git hooks
npx husky install

# Add hooks
npx husky add .husky/pre-commit "npm run lint"
npx husky add .husky/pre-push "npm run test"
npx husky add .husky/commit-msg "npx commitlint --edit $1"

# Package.json script
{
  "scripts": {
    "prepare": "husky install"
  }
}

# .github/workflows/ci.yml
name: CI
on: [push, pull_request]

jobs:
  test:
    runs-on: ubuntu-latest
    steps:
      - uses: actions/checkout@v3
        with:
          fetch-depth: 0  # Full history for proper Git operations
      
      - name: Setup Node.js
        uses: actions/setup-node@v3
        with:
          node-version: '16'
      
      - name: Get changed files
        id: changes
        run: |
          echo "files=$(git diff --name-only ${{ github.event.before }} ${{ github.sha }} | xargs)" >> $GITHUB_OUTPUT
      
      - name: Run tests on changed files
        run: npm test -- ${{ steps.changes.outputs.files }}

# .gitlab-ci.yml
variables:
  GIT_STRATEGY: clone
  GIT_DEPTH: 0

stages:
  - test
  - deploy

test:
  stage: test
  script:
    - git diff --name-only $CI_COMMIT_BEFORE_SHA $CI_COMMIT_SHA
    - npm ci
    - npm run test
  only:
    changes:
      - "src/**/*"
      - "tests/**/*"

# Git hooks for database migrations
#!/bin/bash
# .git/hooks/post-merge

# Check if database migrations were added
if git diff-tree -r --name-only --no-commit-id HEAD@{1} HEAD | grep -q "migrations/"; then
    echo "New migrations detected, running database update..."
    npm run migrate
fi

# Check for schema changes
if git diff-tree -r --name-only --no-commit-id HEAD@{1} HEAD | grep -q "schema.sql"; then
    echo "Schema changes detected, please review database compatibility"
fi

# Git-crypt for sensitive configuration
# Install git-crypt
brew install git-crypt

# Initialize in repository
git-crypt init

# Add GPG key
git-crypt add-gpg-user [email protected]

# Configure .gitattributes
*.env filter=git-crypt diff=git-crypt
config/secrets.yml filter=git-crypt diff=git-crypt

# Encrypted files are automatically handled
git add config/secrets.yml
git commit -m "Add encrypted configuration"

# Git hook to update documentation
#!/bin/bash
# .git/hooks/pre-commit

# Generate API documentation from code comments
if git diff --cached --name-only | grep -q "\.js$"; then
    echo "Updating API documentation..."
    npm run docs:generate
    git add docs/api/
fi

# Update changelog
if [ -f "CHANGELOG.md" ]; then
    git-chglog --output CHANGELOG.md
    git add CHANGELOG.md
fi

# Auto-update README with Git statistics
#!/bin/bash
# update-readme.sh

# Generate contributor list
echo "## Contributors" > contributors.md
git shortlog -sn --all --no-merges >> contributors.md

# Generate activity summary  
echo "## Recent Activity" > activity.md
git log --oneline --since="1 month ago" --pretty=format:"- %s (%an)" >> activity.md

# Insert into README template
envsubst < README.template.md > README.md

# Run tests only on changed files
#!/bin/bash
# test-changed.sh

# Get changed files in current branch
CHANGED_FILES=$(git diff --name-only main...HEAD)

# Filter for test-relevant files
TEST_FILES=$(echo "$CHANGED_FILES" | grep -E "\.(js|ts|py)$")

if [ -n "$TEST_FILES" ]; then
    echo "Running tests for changed files: $TEST_FILES"
    npm test -- --testPathPattern="$(echo $TEST_FILES | tr ' ' '|')"
else
    echo "No testable files changed"
fi

# Git blame with test coverage
#!/bin/bash
# coverage-blame.sh

FILE=$1
COVERAGE_FILE="coverage/lcov.info"

# Generate coverage data
npm run test:coverage

# Parse coverage and blame data
node -e "
const fs = require('fs');
const { execSync } = require('child_process');

const blame = execSync(\`git blame --porcelain $FILE\`).toString();
const coverage = fs.readFileSync('$COVERAGE_FILE', 'utf8');

// Combine blame and coverage information
// Implementation details...
"

# Post-receive hook for automatic deployment
#!/bin/bash
# hooks/post-receive

while read oldrev newrev refname; do
    branch=$(git rev-parse --symbolic --abbrev-ref $refname)
    
    if [ "$branch" = "main" ]; then
        echo "Deploying main branch..."
        
        # Checkout files to deployment directory
        git --git-dir=/var/repo/project.git --work-tree=/var/www/project checkout -f
        
        # Run deployment tasks
        cd /var/www/project
        npm ci --production
        npm run build
        pm2 restart project
        
        echo "Deployment completed"
    fi
done

# Deploy feature branches to staging
#!/bin/bash
# deploy-feature.sh

BRANCH=$1
if [[ $BRANCH =~ ^feature/ ]]; then
    SUBDOMAIN=$(echo $BRANCH | sed 's/feature\///' | sed 's/[^a-zA-Z0-9]/-/g')
    
    echo "Deploying $BRANCH to $SUBDOMAIN.staging.example.com"
    
    # Create deployment
    docker build -t project:$SUBDOMAIN .
    docker run -d --name project-$SUBDOMAIN -p 0:3000 project:$SUBDOMAIN
    
    # Update DNS/proxy configuration
    echo "$SUBDOMAIN.staging.example.com -> container_ip" >> /etc/nginx/sites-available/staging
    nginx -s reload
fi

# Collect development metrics
#!/bin/bash
# git-metrics.sh

# Commit frequency
git log --format="%ad" --date=short --since="1 month ago" | sort | uniq -c

# Code churn analysis
git log --stat --since="1 month ago" --pretty=format: | awk '/^ / { files++; inserted += $4; deleted += $6 } END { print "Files:", files, "Inserted:", inserted, "Deleted:", deleted }'

# Author productivity
git shortlog -sn --since="1 month ago" --no-merges

# Branch lifecycle
git for-each-ref --format='%(refname:short) %(committerdate)' refs/heads | sort -k2

# Repository health check
#!/bin/bash
# repo-health.sh

echo "Repository Health Report"
echo "========================"

# Repository size
echo "Repository size: $(du -sh .git | cut -f1)"

# Object count
git count-objects -v

# Largest files
git rev-list --objects --all | git cat-file --batch-check='%(objecttype) %(objectname) %(objectsize) %(rest)' | sed -n 's/^blob //p' | sort --numeric-sort --key=2 | tail -10

# Commit activity
echo "Commits in last 30 days: $(git log --since='30 days ago' --oneline | wc -l)"

# Branch analysis
echo "Active branches: $(git for-each-ref --format='%(refname:short)' refs/heads | wc -l)"
echo "Stale branches: $(git for-each-ref --format='%(refname:short) %(committerdate)' refs/heads | awk '$2 < "'$(date -d '30 days ago' +%Y-%m-%d)'"' | wc -l)"

# Pre-commit secret scanning
#!/bin/bash
# .git/hooks/pre-commit

# Check for potential secrets
if git diff --cached --name-only | xargs grep -l -E "(password|secret|key|token)" --include="*.js" --include="*.py" --include="*.yml"; then
    echo "Potential secrets found in staged files:"
    git diff --cached | grep -E "(password|secret|key|token)"
    echo "Please review and remove any secrets before committing."
    exit 1
fi

# Use tools like truffleHog, git-secrets, or detect-secrets
truffleHog --regex --entropy=False .

# Team setup script
#!/bin/bash
# setup-dev-tools.sh

echo "Setting up development tools for the team..."

# Git configuration
git config --global user.name "${GIT_USER_NAME:-$(whoami)}"
git config --global user.email "${GIT_USER_EMAIL}"
git config --global init.defaultBranch main
git config --global pull.rebase true

# IDE integration
if command -v code &> /dev/null; then
    git config --global core.editor "code --wait"
    git config --global merge.tool vscode
fi

# Install useful aliases
git config --global alias.st status
git config --global alias.co checkout
git config --global alias.br branch
git config --global alias.lg 'log --oneline --graph --decorate'

# Install pre-commit if available
if command -v pre-commit &> /dev/null; then
    pre-commit install
fi

echo "Development tools setup completed!"