OPC # 0006: OPC Git Trunk-Based management
This commit is contained in:
amadzarak
@@ -19,13 +19,19 @@ public static class GitEndpoints
|
||||
// All responses include a repoKey field so the caller knows which repo each commit came from.
|
||||
// GET /api/git/log?grep=...&limit=25&page=1&repo=all
|
||||
// page is 1-based. Each repo contributes up to limit*page commits before merge-sort+skip/take.
|
||||
// branch filters to commits reachable from the named local branch; requires a specific repo (not "all").
|
||||
// Each result includes a branches[] array listing local branches that contain that commit.
|
||||
private static IResult GetLog(
|
||||
IConfiguration config,
|
||||
string? grep = null,
|
||||
int limit = 25,
|
||||
int page = 1,
|
||||
string repo = "all")
|
||||
string repo = "all",
|
||||
string? branch = null)
|
||||
{
|
||||
if (!string.IsNullOrWhiteSpace(branch) && repo == "all")
|
||||
return Results.BadRequest("'branch' filter requires a specific 'repo' parameter.");
|
||||
|
||||
var repos = repo == "all"
|
||||
? ResolveAllRepos(config)
|
||||
: ResolveNamedRepo(config, repo) is { } p
|
||||
@@ -43,16 +49,30 @@ public static class GitEndpoints
|
||||
|
||||
using var r = new Repository(repoPath);
|
||||
|
||||
CommitFilter filter;
|
||||
if (!string.IsNullOrWhiteSpace(branch))
|
||||
{
|
||||
var branchRef = r.Branches[branch];
|
||||
if (branchRef?.Tip is null)
|
||||
return Results.BadRequest($"Branch '{branch}' not found in repo '{repoKey}'.");
|
||||
filter = new CommitFilter
|
||||
{
|
||||
SortBy = CommitSortStrategies.Topological | CommitSortStrategies.Time,
|
||||
IncludeReachableFrom = branchRef.Tip,
|
||||
};
|
||||
}
|
||||
else
|
||||
{
|
||||
var tips = r.Branches
|
||||
.Where(b => b.Tip != null)
|
||||
.Select(b => (GitObject)b.Tip)
|
||||
.ToList();
|
||||
|
||||
var filter = new CommitFilter
|
||||
filter = new CommitFilter
|
||||
{
|
||||
SortBy = CommitSortStrategies.Topological | CommitSortStrategies.Time,
|
||||
IncludeReachableFrom = tips.Count > 0 ? tips : (object)r.Head,
|
||||
};
|
||||
}
|
||||
|
||||
IEnumerable<Commit> query = r.Commits.QueryBy(filter);
|
||||
|
||||
@@ -63,11 +83,31 @@ public static class GitEndpoints
|
||||
bucket.Add((c.Author.When, repoKey, ToGitCommit(r, c)));
|
||||
}
|
||||
|
||||
var commits = bucket
|
||||
var pageEntries = bucket
|
||||
.OrderByDescending(x => x.When)
|
||||
.Skip((page - 1) * limit)
|
||||
.Take(limit)
|
||||
.Select(x => new
|
||||
.ToList();
|
||||
|
||||
// Annotate each commit with the local branches whose tip is a descendant of that commit.
|
||||
var branchMap = new Dictionary<string, List<string>>(StringComparer.Ordinal);
|
||||
foreach (var grp in pageEntries.GroupBy(x => x.RepoKey))
|
||||
{
|
||||
if (!repos.TryGetValue(grp.Key, out var rPath) || !Directory.Exists(rPath)) continue;
|
||||
using var annotRepo = new Repository(rPath);
|
||||
var localBranches = annotRepo.Branches.Where(b => !b.IsRemote && b.Tip != null).ToList();
|
||||
foreach (var (_, _, c) in grp)
|
||||
{
|
||||
var target = annotRepo.Lookup<Commit>(c.Hash);
|
||||
if (target is null) { branchMap[c.Hash] = []; continue; }
|
||||
branchMap[c.Hash] = localBranches
|
||||
.Where(b => annotRepo.ObjectDatabase.FindMergeBase(b.Tip, target)?.Sha == target.Sha)
|
||||
.Select(b => b.FriendlyName)
|
||||
.ToList();
|
||||
}
|
||||
}
|
||||
|
||||
var commits = pageEntries.Select(x => new
|
||||
{
|
||||
repoKey = x.RepoKey,
|
||||
hash = x.Commit.Hash,
|
||||
@@ -76,8 +116,8 @@ public static class GitEndpoints
|
||||
date = x.Commit.Date,
|
||||
subject = x.Commit.Subject,
|
||||
files = x.Commit.Files,
|
||||
})
|
||||
.ToList();
|
||||
branches = branchMap.TryGetValue(x.Commit.Hash, out var br) ? (IReadOnlyList<string>)br : Array.Empty<string>(),
|
||||
}).ToList();
|
||||
|
||||
return Results.Ok(commits);
|
||||
}
|
||||
@@ -127,18 +167,55 @@ public static class GitEndpoints
|
||||
return Results.NotFound();
|
||||
}
|
||||
|
||||
// GET /api/git/branches
|
||||
private static IResult GetBranches(IConfiguration config)
|
||||
// GET /api/git/branches?repo=all
|
||||
// repo defaults to "default" (single configured repo). Pass "all" to get branches from all
|
||||
// registered repos. Each result includes repoKey so the caller can group branches by repo.
|
||||
private static IResult GetBranches(IConfiguration config, string repo = "default")
|
||||
{
|
||||
var repoPath = ResolveRepo(config);
|
||||
if (repo == "all")
|
||||
{
|
||||
var allRepos = ResolveAllRepos(config);
|
||||
if (allRepos.Count == 0)
|
||||
return Results.Problem("Could not locate any git repositories.");
|
||||
|
||||
var allBranches = new List<object>();
|
||||
foreach (var (repoKey, rPath) in allRepos)
|
||||
{
|
||||
if (!Directory.Exists(rPath)) continue;
|
||||
using var gitRepo = new Repository(rPath);
|
||||
allBranches.AddRange(gitRepo.Branches
|
||||
.Where(b => !b.IsRemote && b.Tip != null)
|
||||
.OrderBy(b => b.FriendlyName)
|
||||
.Select(b => (object)new
|
||||
{
|
||||
repoKey,
|
||||
name = b.FriendlyName,
|
||||
hash = b.Tip.Sha,
|
||||
shortHash = b.Tip.Sha[..7],
|
||||
subject = b.Tip.MessageShort,
|
||||
author = b.Tip.Author.Name,
|
||||
date = b.Tip.Author.When.ToString("yyyy-MM-dd HH:mm:ss zzz"),
|
||||
isHead = b.IsCurrentRepositoryHead,
|
||||
}));
|
||||
}
|
||||
return Results.Ok(allBranches);
|
||||
}
|
||||
|
||||
var repoPath = repo == "default"
|
||||
? ResolveRepo(config)
|
||||
: ResolveNamedRepo(config, repo) ?? ResolveRepo(config);
|
||||
|
||||
if (repoPath is null)
|
||||
return Results.Problem("Could not locate a git repository.");
|
||||
|
||||
using var repo = new Repository(repoPath);
|
||||
var branches = repo.Branches
|
||||
var repoLabel = repo == "default" ? "default" : repo;
|
||||
using var singleRepo = new Repository(repoPath);
|
||||
var branches = singleRepo.Branches
|
||||
.Where(b => !b.IsRemote && b.Tip != null)
|
||||
.OrderBy(b => b.FriendlyName)
|
||||
.Select(b => new
|
||||
{
|
||||
repoKey = repoLabel,
|
||||
name = b.FriendlyName,
|
||||
hash = b.Tip.Sha,
|
||||
shortHash = b.Tip.Sha[..7],
|
||||
@@ -147,7 +224,6 @@ public static class GitEndpoints
|
||||
date = b.Tip.Author.When.ToString("yyyy-MM-dd HH:mm:ss zzz"),
|
||||
isHead = b.IsCurrentRepositoryHead,
|
||||
})
|
||||
.OrderBy(b => b.name)
|
||||
.ToList();
|
||||
|
||||
return Results.Ok(branches);
|
||||
|
||||
@@ -121,6 +121,7 @@ export interface LinkedCommit {
|
||||
date: string;
|
||||
subject: string;
|
||||
files: string[];
|
||||
branches: string[];
|
||||
}
|
||||
|
||||
export async function getLinkedCommits(opcNumber: string): Promise<LinkedCommit[]> {
|
||||
@@ -212,14 +213,31 @@ export async function getChangesets(
|
||||
limit = 25,
|
||||
repo = 'all',
|
||||
grep?: string,
|
||||
branch?: string,
|
||||
): Promise<LinkedCommit[]> {
|
||||
const params = new URLSearchParams({ page: String(page), limit: String(limit), repo });
|
||||
if (grep) params.set('grep', grep);
|
||||
if (branch) params.set('branch', branch);
|
||||
const res = await fetch(`${BASE_URL}/api/git/log?${params}`);
|
||||
if (!res.ok) throw new Error(`Failed to load changesets: ${res.statusText}`);
|
||||
return res.json();
|
||||
}
|
||||
|
||||
// ── Local git branches (from LibGit2 repos) ───────────────────────────────────
|
||||
|
||||
export interface RepoBranchInfo {
|
||||
repoKey: string;
|
||||
name: string;
|
||||
hash: string;
|
||||
isHead: boolean;
|
||||
}
|
||||
|
||||
export async function getBranches(repo = 'all'): Promise<RepoBranchInfo[]> {
|
||||
const res = await fetch(`${BASE_URL}/api/git/branches?repo=${encodeURIComponent(repo)}`);
|
||||
if (!res.ok) throw new Error(`Failed to load branches: ${res.statusText}`);
|
||||
return res.json();
|
||||
}
|
||||
|
||||
// ── Commit detail (full diff) ─────────────────────────────────────────────────
|
||||
|
||||
export interface CommitFile {
|
||||
|
||||
@@ -1292,3 +1292,50 @@ body {
|
||||
min-width: 60px;
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
.cs-page-with-tree {
|
||||
display: flex;
|
||||
gap: 1.5rem;
|
||||
align-items: flex-start;
|
||||
}
|
||||
|
||||
.cs-branch-tree {
|
||||
width: 200px;
|
||||
flex-shrink: 0;
|
||||
position: sticky;
|
||||
top: 1rem;
|
||||
border: 1px solid #dce0e6;
|
||||
border-radius: 8px;
|
||||
overflow: hidden;
|
||||
padding: 0.25rem 0;
|
||||
max-height: calc(100vh - 8rem);
|
||||
overflow-y: auto;
|
||||
}
|
||||
|
||||
.cs-branch-tree .bp6-tree-node-content {
|
||||
font-size: 0.82rem;
|
||||
height: 28px;
|
||||
}
|
||||
|
||||
.cs-branch-tree .bp6-tree-node-content:hover {
|
||||
background: #f6f7f9;
|
||||
}
|
||||
|
||||
.cs-branch-tree .bp6-tree-node.bp6-tree-node-selected > .bp6-tree-node-content {
|
||||
background: #e8f0fb;
|
||||
color: #215db0;
|
||||
}
|
||||
|
||||
.cs-content-area {
|
||||
flex: 1;
|
||||
min-width: 0;
|
||||
}
|
||||
|
||||
.cs-branch-badge {
|
||||
font-size: 0.67rem;
|
||||
letter-spacing: 0.01em;
|
||||
white-space: nowrap;
|
||||
margin-left: 0.5rem;
|
||||
opacity: 0.85;
|
||||
vertical-align: middle;
|
||||
}
|
||||
|
||||
@@ -1,7 +1,8 @@
|
||||
import { useState, useEffect, useCallback } from 'react';
|
||||
import { Button, HTMLSelect, InputGroup, Intent, NonIdealState, Spinner, Tag, Tooltip } from '@blueprintjs/core';
|
||||
import { useState, useEffect, useCallback, useMemo } from 'react';
|
||||
import { Button, HTMLSelect, InputGroup, Intent, NonIdealState, Spinner, Tag, Tooltip, Tree } from '@blueprintjs/core';
|
||||
import type { TreeNodeInfo } from '@blueprintjs/core';
|
||||
import { GitCommitDrawer } from '../components/GitCommitDrawer';
|
||||
import { getChangesets } from '../api/opcApi';
|
||||
import { getChangesets, getBranches } from '../api/opcApi';
|
||||
import type { LinkedCommit } from '../api/opcApi';
|
||||
|
||||
const PAGE_SIZE = 25;
|
||||
@@ -19,6 +20,29 @@ const REPO_INTENT: Record<string, Intent> = {
|
||||
Gateway: Intent.SUCCESS,
|
||||
};
|
||||
|
||||
const REPO_COLOR: Record<string, string> = {
|
||||
Clarity: '#215db0',
|
||||
OPC: '#935610',
|
||||
Gateway: '#1c6e42',
|
||||
};
|
||||
|
||||
const SDLC_ORDER = ['develop', 'staging', 'uat', 'main'] as const;
|
||||
|
||||
function getBranchLabel(branches: string[]): string | null {
|
||||
if (branches.length === 0) return null;
|
||||
const sdlc = branches.filter(b => (SDLC_ORDER as readonly string[]).includes(b));
|
||||
if (sdlc.length === 0) return branches[0];
|
||||
const highest = sdlc.reduce((a, b) =>
|
||||
SDLC_ORDER.indexOf(b as typeof SDLC_ORDER[number]) > SDLC_ORDER.indexOf(a as typeof SDLC_ORDER[number]) ? b : a,
|
||||
);
|
||||
const idx = SDLC_ORDER.indexOf(highest as typeof SDLC_ORDER[number]);
|
||||
if (idx > 0) {
|
||||
const prev = SDLC_ORDER[idx - 1];
|
||||
if (branches.includes(prev)) return `${prev} → ${highest}`;
|
||||
}
|
||||
return highest;
|
||||
}
|
||||
|
||||
export default function ChangesetsPage() {
|
||||
const [commits, setCommits] = useState<LinkedCommit[]>([]);
|
||||
const [loading, setLoading] = useState(true);
|
||||
@@ -29,13 +53,29 @@ export default function ChangesetsPage() {
|
||||
const [grepFilter, setGrepFilter] = useState('');
|
||||
const [grepInput, setGrepInput] = useState('');
|
||||
const [viewingHash, setViewingHash] = useState<string | null>(null);
|
||||
const [branchMap, setBranchMap] = useState<Record<string, string[]>>({});
|
||||
const [selectedBranch, setSelectedBranch] = useState<{ repoKey: string; branch: string } | null>(null);
|
||||
const [expandedRepos, setExpandedRepos] = useState<Set<string>>(new Set());
|
||||
|
||||
const load = useCallback(async (p: number, repo: string, grep: string) => {
|
||||
// Load branches for the tree once on mount
|
||||
useEffect(() => {
|
||||
getBranches('all')
|
||||
.then(data => {
|
||||
const map: Record<string, string[]> = {};
|
||||
for (const b of data) {
|
||||
if (!map[b.repoKey]) map[b.repoKey] = [];
|
||||
map[b.repoKey].push(b.name);
|
||||
}
|
||||
setBranchMap(map);
|
||||
})
|
||||
.catch(() => { /* branch tree is non-critical */ });
|
||||
}, []);
|
||||
|
||||
const load = useCallback(async (p: number, repo: string, grep: string, branch?: string) => {
|
||||
setLoading(true);
|
||||
setError(null);
|
||||
try {
|
||||
// Fetch one extra to detect whether there's a next page
|
||||
const rows = await getChangesets(p, PAGE_SIZE + 1, repo, grep || undefined);
|
||||
const rows = await getChangesets(p, PAGE_SIZE + 1, repo, grep || undefined, branch);
|
||||
setHasMore(rows.length > PAGE_SIZE);
|
||||
setCommits(rows.slice(0, PAGE_SIZE));
|
||||
} catch (e) {
|
||||
@@ -47,25 +87,77 @@ export default function ChangesetsPage() {
|
||||
}, []);
|
||||
|
||||
useEffect(() => {
|
||||
load(page, repoFilter, grepFilter);
|
||||
}, [load, page, repoFilter, grepFilter]);
|
||||
const effectiveRepo = selectedBranch ? selectedBranch.repoKey : repoFilter;
|
||||
const effectiveBranch = selectedBranch?.branch;
|
||||
load(page, effectiveRepo, grepFilter, effectiveBranch);
|
||||
}, [load, page, repoFilter, grepFilter, selectedBranch]);
|
||||
|
||||
const applySearch = () => {
|
||||
setPage(1);
|
||||
setGrepFilter(grepInput);
|
||||
};
|
||||
|
||||
const clearSearch = () => {
|
||||
setGrepInput('');
|
||||
setGrepFilter('');
|
||||
setPage(1);
|
||||
};
|
||||
const applySearch = () => { setPage(1); setGrepFilter(grepInput); };
|
||||
const clearSearch = () => { setGrepInput(''); setGrepFilter(''); setPage(1); };
|
||||
|
||||
const handleRepoChange = (repo: string) => {
|
||||
setPage(1);
|
||||
setSelectedBranch(null);
|
||||
setRepoFilter(repo);
|
||||
};
|
||||
|
||||
const treeNodes = useMemo((): TreeNodeInfo[] => [
|
||||
{
|
||||
id: 'all',
|
||||
label: 'All Branches',
|
||||
icon: 'git-branch',
|
||||
isSelected: selectedBranch === null,
|
||||
},
|
||||
...Object.keys(branchMap).map(repoKey => ({
|
||||
id: `repo|${repoKey}`,
|
||||
label: <span style={{ color: REPO_COLOR[repoKey] ?? 'inherit', fontWeight: 500 }}>{repoKey}</span>,
|
||||
icon: (expandedRepos.has(repoKey) ? 'folder-open' : 'folder-close') as TreeNodeInfo['icon'],
|
||||
isExpanded: expandedRepos.has(repoKey),
|
||||
isSelected: false,
|
||||
childNodes: branchMap[repoKey].map(name => ({
|
||||
id: `branch|${repoKey}|${name}`,
|
||||
label: name,
|
||||
icon: 'git-commit' as TreeNodeInfo['icon'],
|
||||
isSelected: selectedBranch?.repoKey === repoKey && selectedBranch?.branch === name,
|
||||
})),
|
||||
})),
|
||||
], [branchMap, expandedRepos, selectedBranch]);
|
||||
|
||||
const handleNodeClick = (node: TreeNodeInfo) => {
|
||||
const id = String(node.id);
|
||||
if (id === 'all') {
|
||||
setPage(1);
|
||||
setSelectedBranch(null);
|
||||
} else if (id.startsWith('branch|')) {
|
||||
const [, repoKey, ...rest] = id.split('|');
|
||||
setPage(1);
|
||||
setSelectedBranch({ repoKey, branch: rest.join('|') });
|
||||
} else if (id.startsWith('repo|')) {
|
||||
const repoKey = id.slice(5);
|
||||
setExpandedRepos(s => {
|
||||
const next = new Set(s);
|
||||
next.has(repoKey) ? next.delete(repoKey) : next.add(repoKey);
|
||||
return next;
|
||||
});
|
||||
}
|
||||
};
|
||||
|
||||
const handleNodeExpand = (node: TreeNodeInfo) => {
|
||||
const id = String(node.id);
|
||||
if (id.startsWith('repo|')) setExpandedRepos(s => new Set([...s, id.slice(5)]));
|
||||
};
|
||||
|
||||
const handleNodeCollapse = (node: TreeNodeInfo) => {
|
||||
const id = String(node.id);
|
||||
if (id.startsWith('repo|')) setExpandedRepos(s => { const n = new Set(s); n.delete(id.slice(5)); return n; });
|
||||
};
|
||||
|
||||
const doRefresh = () => {
|
||||
const effectiveRepo = selectedBranch ? selectedBranch.repoKey : repoFilter;
|
||||
const effectiveBranch = selectedBranch?.branch;
|
||||
load(page, effectiveRepo, grepFilter, effectiveBranch);
|
||||
};
|
||||
|
||||
return (
|
||||
<div>
|
||||
<div className="page-header">
|
||||
@@ -73,15 +165,29 @@ export default function ChangesetsPage() {
|
||||
<h1>Changesets</h1>
|
||||
<p>Chronological commit timeline across all three repos.</p>
|
||||
</div>
|
||||
<Button icon="refresh" minimal onClick={() => load(page, repoFilter, grepFilter)} />
|
||||
<Button icon="refresh" minimal onClick={doRefresh} />
|
||||
</div>
|
||||
|
||||
<div className="cs-page-with-tree">
|
||||
{/* Branch tree */}
|
||||
<div className="cs-branch-tree">
|
||||
<Tree
|
||||
contents={treeNodes}
|
||||
onNodeClick={handleNodeClick}
|
||||
onNodeExpand={handleNodeExpand}
|
||||
onNodeCollapse={handleNodeCollapse}
|
||||
/>
|
||||
</div>
|
||||
|
||||
{/* Main content */}
|
||||
<div className="cs-content-area">
|
||||
{/* Filter bar */}
|
||||
<div className="opc-filter-bar">
|
||||
<HTMLSelect
|
||||
value={repoFilter}
|
||||
onChange={e => handleRepoChange(e.target.value)}
|
||||
options={REPO_OPTIONS}
|
||||
disabled={!!selectedBranch}
|
||||
/>
|
||||
<InputGroup
|
||||
leftIcon="search"
|
||||
@@ -98,6 +204,16 @@ export default function ChangesetsPage() {
|
||||
{grepFilter && (
|
||||
<Button minimal small icon="cross" text="Clear" onClick={clearSearch} />
|
||||
)}
|
||||
{selectedBranch && (
|
||||
<Tag
|
||||
minimal
|
||||
intent={REPO_INTENT[selectedBranch.repoKey] ?? Intent.NONE}
|
||||
icon="git-branch"
|
||||
onRemove={() => { setPage(1); setSelectedBranch(null); }}
|
||||
>
|
||||
{selectedBranch.repoKey} / {selectedBranch.branch}
|
||||
</Tag>
|
||||
)}
|
||||
<span className="opc-count-badge">{loading ? '…' : `${commits.length} shown`}</span>
|
||||
</div>
|
||||
|
||||
@@ -106,13 +222,15 @@ export default function ChangesetsPage() {
|
||||
<NonIdealState icon={<Spinner />} title="Loading changesets…" />
|
||||
) : error ? (
|
||||
<NonIdealState icon="warning-sign" title="Could not load commits"
|
||||
description={error} intent={Intent.DANGER} />
|
||||
description={error} />
|
||||
) : commits.length === 0 ? (
|
||||
<NonIdealState icon="git-commit" title="No commits found"
|
||||
description="Try changing the repo filter or clearing the search." />
|
||||
) : (
|
||||
<div className="cs-timeline">
|
||||
{commits.map(c => (
|
||||
{commits.map(c => {
|
||||
const branchLabel = getBranchLabel(c.branches ?? []);
|
||||
return (
|
||||
<div
|
||||
key={`${c.repoKey}-${c.hash}`}
|
||||
className="cs-row"
|
||||
@@ -140,10 +258,14 @@ export default function ChangesetsPage() {
|
||||
{c.files.length > 0 && (
|
||||
<span className="cs-file-count"> · {c.files.length} file{c.files.length !== 1 ? 's' : ''}</span>
|
||||
)}
|
||||
{branchLabel && (
|
||||
<Tag minimal className="cs-branch-badge">{branchLabel}</Tag>
|
||||
)}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
))}
|
||||
);
|
||||
})}
|
||||
</div>
|
||||
)}
|
||||
|
||||
@@ -167,6 +289,8 @@ export default function ChangesetsPage() {
|
||||
/>
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<GitCommitDrawer hash={viewingHash} onClose={() => setViewingHash(null)} />
|
||||
</div>
|
||||
|
||||
Reference in New Issue
Block a user