bitp 1.3.1__tar.gz → 1.3.2__tar.gz

{bitp-1.3.1 → bitp-1.3.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: bitp
-Version: 1.3.1
+Version: 1.3.2
 Summary: Tools for BitBake/Yocto projects
 Author-email: Bruce Ashfield <bruce.ashfield@gmail.com>
 License: GPL-2.0-only

{bitp-1.3.1 → bitp-1.3.2}/bitbake_project/commands/explore.py

@@ -471,6 +471,7 @@ def _build_explore_menu_lines(
     branch_priorities: Optional[List[str]] = None,
     branch_excludes: Optional[List[str]] = None,
     branch_stale_days: int = 365,
+    all_layers_repos: Optional[Set[str]] = None,
 ) -> str:
     """Build fzf menu input for explore repo/layers list. Returns newline-joined string."""
     menu_lines = []
@@ -479,6 +480,7 @@ def _build_explore_menu_lines(
     expanded_repos = expanded_repos or set()
     configured_layers = configured_layers or set()
     branch_expanded_repos = branch_expanded_repos or set()
+    all_layers_repos = all_layers_repos or set()
 
     # Layers mode: show individual layers instead of repos
     if layers_mode:
@@ -999,7 +1001,7 @@ def fzf_explore_repo_list(
         prompt = "Select layer: "
     else:
         prefix = get_project_header_prefix()
-        header = f"{prefix}{Colors.cyan('REPOS VIEW')} | Enter=explore | q=quit | L=layers view\n{Colors.cyan('Update:')} u=single | U=all | m=merge | r=refresh | R=refresh all | b=branches | B=branch all\n{Colors.cyan('View:')} v=verbose | Enter/←/→/\\=fold | t=history | S=shell | M=messages\n{Colors.cyan('Manage:')} a/d=add/remove | +/-=track/hide | c=config | A=discover | P=pull patches | X=prune backups"
+        header = f"{prefix}{Colors.cyan('REPOS VIEW')} | Enter=explore | q=quit | L=layers view\n{Colors.cyan('Update:')} u=single | U=all | m=merge | r=refresh | R=refresh all | b=branches | B=branch all\n{Colors.cyan('View:')} v=verbose | Enter/←/→/\\=fold | t=history | S=shell | M=messages | *=all layers\n{Colors.cyan('Manage:')} a/d=add/remove | +/-=track/hide | c=config | A=discover | P=pull patches | X=prune backups"
         if is_yocto:
             header += f"\n{Colors.cyan('Yocto:')} i=info | ctrl-r=recipes | D=deps | f=fragments"
         prompt = "Select repo: "
@@ -1124,6 +1126,7 @@ def fzf_explore_repo_list(
             fzf_cmd.extend(get_action_binding("L", "LAYERS_TOGGLE"))
             fzf_cmd.extend(get_action_binding("c", "CONFIG {1}"))
             fzf_cmd.extend(get_action_binding("A", "DISCOVER_TOGGLE"))
+            fzf_cmd.extend(get_action_binding("*", "ALL_LAYERS {1}"))  # per-repo all layers toggle
             fzf_cmd.extend(get_action_binding("U", "UPDATE_ALL"))
             fzf_cmd.extend(get_action_binding("b", "BRANCH_TOGGLE {1}"))
             fzf_cmd.extend(get_action_binding("B", "BRANCH_ALL"))
@@ -1392,6 +1395,16 @@ def fzf_explore_repo_list(
         return "layers_toggle", None, query
     elif output == "DISCOVER_TOGGLE":
         return "discover_toggle", None, query
+    elif output.startswith("ALL_LAYERS "):
+        repo_path = output[11:].strip()
+        if repo_path.startswith("LAYER:"):
+            # Resolve parent repo from layer path
+            layer_path = repo_path[6:]
+            from .common import git_toplevel
+            repo_path = git_toplevel(layer_path) or layer_path
+        if repo_path in ("HEADER", "PROJECT") or repo_path.startswith("SEPARATOR") or repo_path.startswith("BRANCH:"):
+            return "cancelled", None, query
+        return "all_layers_toggle", repo_path, query
     elif output == "UPDATE_ALL":
         return "update_all", None, query
     elif output.startswith("BRANCH_TOGGLE "):
@@ -4492,6 +4505,8 @@ def run_explore(args) -> int:
     explore_verbose_mode = False
     explore_layers_mode = False
     expanded_repos: Set[str] = set()
+    all_layers_repos: Set[str] = set()  # repos showing all layers (not just tracked)
+    all_layers_saved: Dict[str, List[str]] = {}  # original repo_layers before all-layers merge
     branch_expanded_repos: Set[str] = set()
     branch_priorities: List[str] = defaults.get("__branch_priorities__", [])
     branch_excludes: List[str] = defaults.get("__branch_excludes__", [])
@@ -5247,6 +5262,51 @@ def run_explore(args) -> int:
             if selected_repo:
                 next_selection = selected_repo
             continue
+        elif list_action == "all_layers_toggle" and selected_repo:
+            # Toggle showing all layers (including untracked) for a repo
+            if selected_repo in ("HEADER", "PROJECT", "SETTINGS") or selected_repo.startswith("SEPARATOR") or selected_repo.startswith("BRANCH:"):
+                continue
+            if selected_repo in all_layers_repos:
+                # Toggle off: restore original tracked layers
+                all_layers_repos.discard(selected_repo)
+                if selected_repo in all_layers_saved:
+                    repo_layers[selected_repo] = all_layers_saved.pop(selected_repo)
+                    # Recompute layer upstream counts for tracked layers only
+                    info = repo_info[selected_repo]
+                    branch = info["branch"]
+                    layers = repo_layers.get(selected_repo, [])
+                    if len(layers) > 1 and branch != "(detached)":
+                        try:
+                            info["layer_upstream_counts"] = get_upstream_layer_counts(selected_repo, branch, layers)
+                        except Exception:
+                            info["layer_upstream_counts"] = {}
+                    else:
+                        info["layer_upstream_counts"] = {}
+            else:
+                # Toggle on: scan repo for all layers, merge with tracked
+                from .query import _scan_repo_layers
+                all_layers_saved[selected_repo] = list(repo_layers.get(selected_repo, []))
+                scanned = _scan_repo_layers(selected_repo)
+                tracked = set(repo_layers.get(selected_repo, []))
+                # Merge: tracked first, then untracked
+                merged = list(repo_layers.get(selected_repo, []))
+                for lp in scanned:
+                    if lp not in tracked:
+                        merged.append(lp)
+                repo_layers[selected_repo] = merged
+                all_layers_repos.add(selected_repo)
+                # Auto-expand to show the layers
+                expanded_repos.add(selected_repo)
+                # Compute upstream counts for all layers
+                info = repo_info[selected_repo]
+                branch = info["branch"]
+                if branch != "(detached)" and len(merged) > 1:
+                    try:
+                        info["layer_upstream_counts"] = get_upstream_layer_counts(selected_repo, branch, merged)
+                    except Exception:
+                        info["layer_upstream_counts"] = {}
+            next_selection = selected_repo
+            continue
         elif list_action == "prune_backups" and selected_repo:
             is_special = (selected_repo in ("HEADER", "PROJECT", "PROJECT_CONFIG",
                           "PROJECT_INFO", "PROJECT_DEPS", "SETTINGS", "INFO")

{bitp-1.3.1 → bitp-1.3.2}/bitbake_project/commands/projects.py

@@ -1105,6 +1105,15 @@ def _background_fetch_remote_summaries(remote_projects: list) -> None:
     log_message(f"Remote status updated ({', '.join(sorted(hosts))})")
 
 
+def _count_subdirs(repo: str) -> int:
+    """Count immediate subdirectories in a repo (quick layer-count heuristic)."""
+    try:
+        return sum(1 for e in os.scandir(repo)
+                   if e.is_dir(follow_symlinks=False) and not e.name.startswith("."))
+    except OSError:
+        return 0
+
+
 def _get_project_git_repos(path: str) -> List[str]:
     """Find all git repos in a project directory, up to 2 levels deep."""
     git_repos: list = []
@@ -1155,6 +1164,7 @@ def _get_dashboard_summary(path: str, project_info: Optional[dict] = None) -> di
         "dirty_count": 0,
         "ahead": 0,
         "behind": 0,
+        "tracked_behind": None,  # None = no layer info, int = filtered count
         "branch": "",
         "needs_setup": False,
     }
@@ -1179,18 +1189,20 @@ def _get_dashboard_summary(path: str, project_info: Optional[dict] = None) -> di
 
     # Gather per-repo stats
     branches: dict = {}  # branch_name -> count
+    repos_behind: dict = {}  # repo_path -> (behind_count, branch)
 
     for repo in git_repos:
         # Branch
+        repo_branch = ""
         try:
             r = subprocess.run(
                 ["git", "-C", repo, "rev-parse", "--abbrev-ref", "HEAD"],
                 capture_output=True, text=True, timeout=3,
             )
             if r.returncode == 0:
-                b = r.stdout.strip()
-                if b:
-                    branches[b] = branches.get(b, 0) + 1
+                repo_branch = r.stdout.strip()
+                if repo_branch:
+                    branches[repo_branch] = branches.get(repo_branch, 0) + 1
         except Exception:
             pass
 
@@ -1214,8 +1226,12 @@ def _get_dashboard_summary(path: str, project_info: Optional[dict] = None) -> di
             if r.returncode == 0:
                 parts = r.stdout.strip().split()
                 if len(parts) == 2:
-                    summary["ahead"] += int(parts[0])
-                    summary["behind"] += int(parts[1])
+                    ahead = int(parts[0])
+                    behind = int(parts[1])
+                    summary["ahead"] += ahead
+                    summary["behind"] += behind
+                    if behind > 0:
+                        repos_behind[repo] = (behind, repo_branch)
         except Exception:
             pass
 
@@ -1223,6 +1239,47 @@ def _get_dashboard_summary(path: str, project_info: Optional[dict] = None) -> di
     if branches:
         summary["branch"] = max(branches, key=branches.get)
 
+    # Compute tracked-layer behind count for multi-layer repos
+    if repos_behind:
+        try:
+            from ..personas.yocto.bblayers import extract_layer_paths
+            from ..personas.yocto.layers import git_toplevel
+            # Find bblayers.conf
+            bblayers_path = None
+            for cand in ["conf/bblayers.conf", "build/conf/bblayers.conf"]:
+                full = os.path.join(path, cand)
+                if os.path.isfile(full):
+                    bblayers_path = full
+                    break
+            if bblayers_path:
+                layers = extract_layer_paths(bblayers_path)
+                # Map repo -> list of tracked layer paths
+                repo_layers: dict = {}
+                for layer in layers:
+                    layer = os.path.realpath(layer)
+                    repo = git_toplevel(layer)
+                    if repo:
+                        repo_layers.setdefault(repo, []).append(layer)
+                # For repos that are behind and have tracked layers,
+                # compute per-layer filtered counts
+                tracked_total = 0
+                has_layer_info = False
+                for repo, (behind, rbranch) in repos_behind.items():
+                    tracked = repo_layers.get(repo)
+                    if tracked and len(tracked) < _count_subdirs(repo):
+                        # Multi-layer repo with partial tracking
+                        has_layer_info = True
+                        from ..personas.yocto.layers import get_upstream_layer_counts
+                        lcounts = get_upstream_layer_counts(repo, rbranch, tracked)
+                        tracked_total += sum(lcounts.values())
+                    else:
+                        # Single-layer or all layers tracked — full count applies
+                        tracked_total += behind
+                if has_layer_info:
+                    summary["tracked_behind"] = tracked_total
+        except Exception:
+            pass
+
     # Last updated — most recent HEAD reflog mtime across repos
     latest_reflog = 0.0
     for repo in git_repos:

{bitp-1.3.1 → bitp-1.3.2}/bitbake_project/commands/query.py

@@ -138,6 +138,22 @@ def _find_repo(repos, repo_name, defaults):
     return find_repo_by_identifier(repos, repo_name, defaults)
 
 
+def _scan_repo_layers(repo: str) -> list:
+    """Scan a repo for all directories containing conf/layer.conf."""
+    layers = []
+    try:
+        for entry in os.scandir(repo):
+            if entry.is_dir(follow_symlinks=False) and not entry.name.startswith("."):
+                if os.path.isfile(os.path.join(entry.path, "conf", "layer.conf")):
+                    layers.append(entry.path)
+    except OSError:
+        pass
+    # Also check the repo root itself
+    if os.path.isfile(os.path.join(repo, "conf", "layer.conf")):
+        layers.insert(0, repo)
+    return layers
+
+
 def query_repos(project: str, discover: bool = False,
                 include_hidden: bool = False) -> dict:
     """Return list of repo dicts (same shape as /api/repos)."""
@@ -1223,19 +1239,39 @@ def query_prune_backups(repo_name: str, project: str) -> dict:
 
 
 def query_repo_layers(repo_name: str, project: str) -> dict:
-    """Return layers for a repo."""
+    """Return layers for a repo (including untracked layers with upstream counts)."""
     repos, defaults, repo_layers_map, configured, *_ = _resolve_repos(project)
     repo = _find_repo(repos, repo_name, defaults)
     if not repo:
         return {"error": f"Repo not found: {repo_name}"}
 
-    layers = repo_layers_map.get(repo, [])
+    # Merge tracked and scanned layers
+    tracked = repo_layers_map.get(repo, [])
+    all_layers = _scan_repo_layers(repo) if repo else []
+    tracked_set = set(os.path.realpath(l) for l in tracked)
+    merged = list(tracked)
+    for l in all_layers:
+        if os.path.realpath(l) not in tracked_set:
+            merged.append(l)
+
+    # Compute per-layer upstream counts
+    from .explore import current_branch
+    from ..personas.yocto.layers import get_upstream_layer_counts
+    branch = current_branch(repo) if repo else ""
+    layer_counts = {}
+    if branch and branch != "(detached)" and merged:
+        try:
+            layer_counts = get_upstream_layer_counts(repo, branch, merged)
+        except Exception:
+            pass
+
     result = []
-    for lp in layers:
+    for lp in merged:
         result.append({
             "name": os.path.basename(lp),
             "path": lp,
             "configured": lp in configured,
+            "upstream_count": layer_counts.get(lp, 0),
         })
     return {"layers": result}
 

{bitp-1.3.1 → bitp-1.3.2}/bitbake_project/web/static/js/views/dashboard.js

@@ -583,7 +583,13 @@ const DashboardView = {
     const parts = [`${s.repo_count} repos`];
     if (s.dirty_count) parts.push(`<span style="color:var(--red)">\u270e${s.dirty_count}</span>`);
     if (s.ahead) parts.push(`<span style="color:var(--accent)">\u2191${s.ahead}</span>`);
-    if (s.behind) parts.push(`<span style="color:var(--yellow)">\u2193${s.behind}</span>`);
+    if (s.behind) {
+      let behindStr = '\u2193' + s.behind;
+      if (s.tracked_behind != null && s.tracked_behind < s.behind) {
+        behindStr += ' <span style="color:var(--text-muted);font-size:var(--font-size-xs)">(' + s.tracked_behind + ' tracked)</span>';
+      }
+      parts.push('<span style="color:var(--yellow)">' + behindStr + '</span>');
+    }
     if (!s.dirty_count && !s.ahead && !s.behind) parts.push(`<span style="color:var(--green)">\u2713</span>`);
     return parts.join(' ');
   },

{bitp-1.3.1 → bitp-1.3.2}/bitbake_project/web/static/js/views/explore.js

@@ -19,6 +19,8 @@ const ExploreView = {
   _discoverMode: false,
   _hiddenMode: false,
   _configuredLayers: new Set(),
+  _allLayersRepos: new Set(),   // repos toggled to show all layers
+  _allLayersCache: {},           // repo name -> [{name, path, configured}]
 
   keyBindings: [
     {key: 'j/k', desc: 'Navigate rows'},
@@ -246,10 +248,35 @@ const ExploreView = {
       // Layer child rows (if expanded and has layers)
       const hasBranchChildren = this._branchesMode && isExpanded && this._branchCache[name] && this._branchCache[name].length > 0;
       if (hasLayers && isExpanded) {
-        const layerCounts = repo.layer_upstream_counts || {};
-        layers.forEach((layer, li) => {
+        const layerCounts = Object.assign({}, repo.layer_upstream_counts || {});
+        const showingAll = this._allLayersRepos.has(name);
+        const allLayers = showingAll ? (this._allLayersCache[name] || []) : null;
+
+        // Merge upstream counts from all-layers fetch
+        if (allLayers) {
+          allLayers.forEach(al => {
+            if (al.upstream_count > 0 && !layerCounts[al.path]) {
+              layerCounts[al.path] = al.upstream_count;
+            }
+          });
+        }
+
+        // Build display list: tracked layers, then untracked if toggled
+        const displayLayers = [];
+        layers.forEach(l => displayLayers.push({ path: l, fromAll: false }));
+        if (allLayers) {
+          const trackedSet = new Set(layers);
+          allLayers.forEach(al => {
+            if (!trackedSet.has(al.path)) {
+              displayLayers.push({ path: al.path, fromAll: true });
+            }
+          });
+        }
+
+        displayLayers.forEach((entry, li) => {
+          const layer = entry.path;
           const layerName = layer.split('/').pop();
-          const isLast = li === layers.length - 1 && !hasBranchChildren;
+          const isLast = li === displayLayers.length - 1 && !hasBranchChildren;
           const lcount = layerCounts[layer] || 0;
           const lcountHtml = lcount > 0
             ? `<span style="color:var(--yellow)">\u2193${lcount}</span>`
@@ -259,8 +286,8 @@ const ExploreView = {
             ? `<button class="btn-icon" data-action="remove-layer" data-layer-path="${esc(layer)}" title="Remove layer" style="color:var(--text-muted)">&minus;</button>`
             : `<button class="btn-icon" data-action="add-layer" data-layer-path="${esc(layer)}" title="Add layer" style="color:var(--green)">+</button>`;
           const configDot = isConfigured
-            ? '<span style="color:var(--green)" title="Configured">\u25cf</span>'
-            : '<span style="color:var(--text-muted)" title="Not configured">\u25cb</span>';
+            ? '<span style="color:var(--green)" title="In bblayers.conf">\u25cf</span>'
+            : '<span style="color:var(--text-muted)" title="Not in bblayers.conf">\u25cb</span>';
           const layerTr = document.createElement('tr');
           layerTr.className = 'explore-layer-row' + (isLast ? ' tree-last' : '');
           layerTr.dataset.parentRepo = name;
@@ -277,7 +304,6 @@ const ExploreView = {
           layerTr.addEventListener('click', (e) => {
             if (e.target.closest('[data-action]')) return;
             App.state.selectedRepo = name;
-            // Store relative layer path (e.g. "meta-core") for the API
             const repoPath = repo.path || '';
             App.state.selectedLayer = (repoPath && layer.startsWith(repoPath + '/'))
               ? layer.substring(repoPath.length + 1)
@@ -307,6 +333,33 @@ const ExploreView = {
             });
           }
         });
+
+        // "Show all layers" / "Show tracked only" toggle row
+        if (!this._discoverMode) {
+          const toggleTr = document.createElement('tr');
+          toggleTr.className = 'explore-layer-row tree-last';
+          toggleTr.style.cursor = 'pointer';
+          const toggleLabel = showingAll ? 'Show tracked only' : 'Show all layers';
+          const toggleIcon = showingAll ? '\u25b4' : '\u25be';
+          const vEmpty = this._verboseMode ? '<td></td>' : '';
+          toggleTr.innerHTML = `<td class="tree-line"></td><td colspan="1"><span class="explore-all-layers-toggle" data-repo="${esc(name)}" style="color:var(--accent);font-size:var(--font-size-sm)">${toggleIcon} ${toggleLabel}</span></td>${vEmpty}<td></td><td></td><td></td><td></td>`;
+          tbody.appendChild(toggleTr);
+          toggleTr.querySelector('.explore-all-layers-toggle').addEventListener('click', (e) => {
+            e.stopPropagation();
+            const rn = e.target.dataset.repo;
+            if (this._allLayersRepos.has(rn)) {
+              this._allLayersRepos.delete(rn);
+              this._renderRepos(this._repoData);
+            } else {
+              // Fetch all layers for this repo
+              API.getRepoLayers(rn, this._project()).then(data => {
+                this._allLayersCache[rn] = data.layers || [];
+                this._allLayersRepos.add(rn);
+                this._renderRepos(this._repoData);
+              }).catch(err => App.showToast(err.message, 'error'));
+            }
+          });
+        }
       }
 
       // Branch child rows (if expanded in branches mode)

{bitp-1.3.1 → bitp-1.3.2}/bitp.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: bitp
-Version: 1.3.1
+Version: 1.3.2
 Summary: Tools for BitBake/Yocto projects
 Author-email: Bruce Ashfield <bruce.ashfield@gmail.com>
 License: GPL-2.0-only