cd423c65c7
* Fix GitLab Merged MRs Not Displaying Fixes https://github.com/AndyMik90/Auto-Claude/issues/1521 - Added UseGitLabMRsOptions interface with stateFilter parameter - Updated hook signature to accept optional options parameter - Removed hardcoded useState for stateFilter - Defaults to 'opened' for backward compatibility - Pass stateFilter state to useGitLabMRs hook via options parameter - Enables proper filtering of MRs by state (opened/merged/closed/all) - Completes frontend implementation for GitLab MR state filtering Co-authored-by: Claude Sonnet 4.5 <noreply@anthropic.com> * GitLab Support for Create PR Button (#2) Title: feat: add GitLab support for Create PR button (#2) Fixes: https://github.com/AndyMik90/Auto-Claude/issues/1519 Body: Add automatic git remote detection to route GitLab repositories to the `glab` CLI for creating merge requests, while preserving existing GitHub functionality. ## Changes - Add `git_provider.py` for detecting GitHub vs GitLab from remote URLs - Supports SSH and HTTPS formats - Supports self-hosted GitLab instances (detects "gitlab" in hostname) - Add `glab_executable.py` for finding GitLab CLI with platform-specific fallbacks - Update `WorktreeManager.push_and_create_pr()` to detect provider and route to either `create_pull_request()` (GitHub) or `create_merge_request()` (GitLab) - Add `create_merge_request()` method for GitLab MR creation via glab CLI - Update error messages to include provider-specific installation instructions ## Testing - Unit tests for `git_provider.py` detection logic - Integration tests for WorktreeManager PR/MR creation - Manual E2E tests for GitLab remote repositories - Regression tests to ensure GitHub PR creation still works Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com> * Add GitLab CLI (glab) Path Configuration to Settings (#3) feat(frontend): add GitLab CLI (glab) path configuration to Settings Add support for configuring the GitLab CLI (glab) path in the Settings page, consistent with existing GitHub CLI (gh) path configuration. Changes: - Add 'glab' to CLITool type union and gitlabCLIPath to ToolConfig - Implement detectGitLabCLI() and validateGitLabCLI() with multi-level detection (user config, Homebrew, system PATH, Windows Program Files) - Implement async variants for non-blocking detection - Add gitlabCLIPath to AppSettings interface and DEFAULT_APP_SETTINGS - Add glab to getCliToolsInfo IPC handler return type - Add gitlabCLIPath to pathFields array and configureTools calls - Add English and French translation keys for GitLab CLI path - Add GitLab CLI path input field to GeneralSettings component - Fix glab version regex to match actual output format ("glab X.Y.Z" instead of "glab version X.Y.Z") - Add augmented env to all sync CLI validators (Python, Git, gh, glab) for consistency with validateClaude and async validators Co-authored-by: Claude Opus 4.5 <noreply@anthropic.com> * Fix GitLab bugs from CodeRabbitAI review comments Address actionable comments reported by CodeRabbitAI: - Fix SSH URL parsing in git_provider.py to support ssh:// URLs and arbitrary usernames (not just git@) - Fix Windows glab paths to use correct installation directory (glab\glab.exe instead of GitLab CLI\glab.exe) - Fix regex for GitLab MR URLs to correctly match both /merge_requests/ and /-/merge_requests/ patterns - Move inline json import to top-level in worktree.py - Fix incorrect mock paths in test_worktree_gitlab.py - Remove unused imports and f-strings without placeholders - Add WINDOWS_GLAB_PATHS constant to frontend for centralized path management - Replace fragile monkeypatch with unittest.mock.patch in manual tests Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com> * Consolidate GitLab test files and move tests to tests/ directory - Remove duplicate test_gitlab_pr_manual.py, consolidate into test_gitlab_e2e.py - Expand provider detection to test 8 URL patterns (GitHub/GitLab variants) - Add WorktreeManager method signature verification test - Improve error message test to use unittest.mock.patch - Move all GitLab test files from apps/backend/core/ to tests/ Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com> * Convert GitLab E2E tests to pytest-style assertions Rename test functions to _check_* helpers and create proper test_* pytest functions with assertions. This fixes PytestReturnNotNoneWarning warnings and ensures tests actually fail when checks return False. Fixes: https://github.com/AndyMik90/Auto-Claude/pull/1544#discussion_r2729260291 Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com> * Fix GitHub Enterprise detection in git_provider Broaden the hostname check in _classify_hostname to also detect GitHub Enterprise hostnames (e.g., github.company.com) by checking for "github" substring, matching the pattern already used for GitLab. Addresses CodeRabbitAI review comment on PR #1544. Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com> * Fix CI failures: Ruff formatting and test isolation issues - Split long regex line in worktree.py for Ruff compliance - Fix test isolation issue caused by worktree.py importlib shim - Convert patch() calls to patch.object() pattern in test files - Add fixtures to test_github_pr_regression.py for consistency The importlib shim in apps/backend/worktree.py causes module-level patches to fail when tests run after test_agent_flow.py. Using patch.object() on the imported module directly resolves this. Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com> * Skip glab detection test when glab CLI is not installed Address CodeRabbit recommendation: add pytest import and guard test_glab_detection with get_glab_executable() check, using pytest.skip() when glab is not available on the system. Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com> * Disable GPG signing in test git repos to prevent CI hangs Tests may hang if the runner has global GPG signing enabled. Explicitly disable commit.gpgsign in create_test_git_repo. Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com> * Fix glab CLI path not passed to backend subprocess The frontend detected glab but never set GITLAB_CLI_PATH env var. Added 'glab' to CliTool type and CLI_TOOL_ENV_MAP, and call detectAndSetCliPath('glab') in setupProcessEnvironment. This ensures GitLab MR creation works when the app is launched from Finder/Dock and glab is in a non-standard PATH location. Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com> * Fix glab CLI flags and JSON field name in _get_existing_mr_url glab uses --output json (not --json fieldName like gh CLI) and returns snake_case field names (web_url instead of webUrl). Verified with actual glab mr view command on lcoffice repo. Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com> * Extract shared test fixtures to conftest.py Move temp_project_dir and worktree_manager fixtures from test_gitlab_worktree.py and test_github_pr_regression.py to a shared conftest.py file. Also adds GPG signing disable to the shared fixture for CI. Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com> * Use throwaway variable for unused WorktreeManager instance Replace `manager` with `_` to indicate the variable is intentionally unused - the test only verifies the constructor doesn't raise. Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com> * Remove unused imports in test_gitlab_worktree.py Remove pytest and WorktreeManager imports that are not used in the file. Fixtures are provided by conftest.py which handles the imports. Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com> * Address PR review findings: cleanup and improve hostname matching - Remove unused MergeRequestResult TypedDict (dead code) - Rename GH_CLI_TIMEOUT/GH_QUERY_TIMEOUT to provider-neutral CLI_TIMEOUT/CLI_QUERY_TIMEOUT - Improve hostname classification to use precise domain segment matching (rejects edge cases like attacker-github.com while still matching github-enterprise.local) - Add test coverage for GitHub/GitLab hostname detection edge cases Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com> * Revert "Extract shared test fixtures to conftest.py" This reverts commit 22ab6662ee2710b86651dd630ee613e2d73ce395. * Extract shared test fixtures to conftest.py - Move temp_project_dir and worktree_manager fixtures to conftest.py (shared across GitLab and GitHub test suites) - Remove duplicate fixtures from test_github_pr_regression.py and test_gitlab_worktree.py - Remove unused subprocess import from test_gitlab_worktree.py Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com> * Use consistent shim imports in GitLab/GitHub tests Switch to shim imports (worktree instead of core.worktree) to match other test files and avoid module aliasing issues caused by Python's module caching when tests use different import paths for the same module. Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com> * Isolate git environment in temp_project_dir fixture Pass sanitized environment to subprocess.run calls to prevent git operations from leaking into parent repos when tests run inside git worktrees (e.g., during pre-commit hooks). Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com> * Fix CodeQL findings in test files - Remove URL substring check that triggered py/incomplete-url-substring-sanitization (redundant - error message check is sufficient) - Remove unused pytest import in test_gitlab_worktree.py Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com> * fix: use pushed remote for provider detection in multi-remote repos detect_git_provider() now accepts an optional remote_name parameter so push_and_create_pr() can pass the actual pushed remote instead of always checking 'origin'. This fixes incorrect PR/MR creation when repos have multiple remotes pointing to different providers. Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com> --------- Co-authored-by: Claude Sonnet 4.5 <noreply@anthropic.com> Co-authored-by: StillKnotKnown <192589389+StillKnotKnown@users.noreply.github.com>
116 lines
3.8 KiB
Python
116 lines
3.8 KiB
Python
#!/usr/bin/env python3
|
|
"""
|
|
Git Provider Detection
|
|
======================
|
|
|
|
Utility to detect git hosting provider (GitHub, GitLab, or unknown) from git remote URLs.
|
|
Supports both SSH and HTTPS remote formats, and self-hosted GitLab instances.
|
|
"""
|
|
|
|
import re
|
|
from pathlib import Path
|
|
|
|
from .git_executable import run_git
|
|
|
|
|
|
def detect_git_provider(project_dir: str | Path, remote_name: str | None = None) -> str:
|
|
"""Detect the git hosting provider from the git remote URL.
|
|
|
|
Args:
|
|
project_dir: Path to the git repository
|
|
remote_name: Name of the remote to check (defaults to "origin")
|
|
|
|
Returns:
|
|
'github' if GitHub remote detected
|
|
'gitlab' if GitLab remote detected (cloud or self-hosted)
|
|
'unknown' if no remote or unsupported provider
|
|
|
|
Examples:
|
|
>>> detect_git_provider('/path/to/repo')
|
|
'github' # for git@github.com:user/repo.git
|
|
'gitlab' # for git@gitlab.com:user/repo.git
|
|
'gitlab' # for https://gitlab.company.com/user/repo.git
|
|
'unknown' # for no remote or other providers
|
|
"""
|
|
try:
|
|
# Get the remote URL (use specified remote or default to origin)
|
|
remote = remote_name if remote_name else "origin"
|
|
result = run_git(
|
|
["remote", "get-url", remote],
|
|
cwd=project_dir,
|
|
timeout=5,
|
|
)
|
|
|
|
# If command failed or no output, return unknown
|
|
if result.returncode != 0 or not result.stdout.strip():
|
|
return "unknown"
|
|
|
|
remote_url = result.stdout.strip()
|
|
|
|
# Parse ssh:// URL format: ssh://[user@]host[:port]/path
|
|
ssh_url_match = re.match(r"^ssh://(?:[^@]+@)?([^:/]+)(?::\d+)?/", remote_url)
|
|
if ssh_url_match:
|
|
hostname = ssh_url_match.group(1)
|
|
return _classify_hostname(hostname)
|
|
|
|
# Parse HTTPS/HTTP format: https://host/path or http://host/path
|
|
# Must check before scp-like format to avoid matching "https" as hostname
|
|
https_match = re.match(r"^https?://([^/]+)/", remote_url)
|
|
if https_match:
|
|
hostname = https_match.group(1)
|
|
return _classify_hostname(hostname)
|
|
|
|
# Parse scp-like format: [user@]host:path (any username, not just 'git')
|
|
# This handles git@github.com:user/repo.git and similar formats
|
|
scp_match = re.match(r"^(?:[^@]+@)?([^:]+):", remote_url)
|
|
if scp_match:
|
|
hostname = scp_match.group(1)
|
|
# Exclude paths that look like Windows drives (e.g., C:)
|
|
if len(hostname) > 1:
|
|
return _classify_hostname(hostname)
|
|
|
|
# Unrecognized URL format
|
|
return "unknown"
|
|
|
|
except Exception:
|
|
# Any error (subprocess issues, etc.) -> unknown
|
|
return "unknown"
|
|
|
|
|
|
def _classify_hostname(hostname: str) -> str:
|
|
"""Classify a hostname as github, gitlab, or unknown.
|
|
|
|
Args:
|
|
hostname: The git remote hostname (e.g., 'github.com', 'gitlab.example.com')
|
|
|
|
Returns:
|
|
'github', 'gitlab', or 'unknown'
|
|
"""
|
|
hostname_lower = hostname.lower()
|
|
|
|
# Check for GitHub (cloud and self-hosted/enterprise)
|
|
# Match github.com, *.github.com, or domains where a segment is or starts with 'github'
|
|
hostname_parts = hostname_lower.split(".")
|
|
if (
|
|
hostname_lower == "github.com"
|
|
or hostname_lower.endswith(".github.com")
|
|
or any(
|
|
part == "github" or part.startswith("github-") for part in hostname_parts
|
|
)
|
|
):
|
|
return "github"
|
|
|
|
# Check for GitLab (cloud and self-hosted)
|
|
# Match gitlab.com, *.gitlab.com, or domains where a segment is or starts with 'gitlab'
|
|
if (
|
|
hostname_lower == "gitlab.com"
|
|
or hostname_lower.endswith(".gitlab.com")
|
|
or any(
|
|
part == "gitlab" or part.startswith("gitlab-") for part in hostname_parts
|
|
)
|
|
):
|
|
return "gitlab"
|
|
|
|
# Unknown provider
|
|
return "unknown"
|