better-git-of-theseus 0.5.1__tar.gz → 0.6.0__tar.gz

{better_git_of_theseus-0.5.1 → better_git_of_theseus-0.6.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: better-git-of-theseus
-Version: 0.5.1
+Version: 0.6.0
 Summary: Plot stats on Git repositories with interactive Plotly charts
 Home-page: https://github.com/onewesong/better-git-of-theseus
 Author: Erik Bernhardsson

{better_git_of_theseus-0.5.1 → better_git_of_theseus-0.6.0}/better_git_of_theseus.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: better-git-of-theseus
-Version: 0.5.1
+Version: 0.6.0
 Summary: Plot stats on Git repositories with interactive Plotly charts
 Home-page: https://github.com/onewesong/better-git-of-theseus
 Author: Erik Bernhardsson

{better_git_of_theseus-0.5.1 → better_git_of_theseus-0.6.0}/git_of_theseus/analyze.py

@@ -256,6 +256,7 @@ def analyze(
     procs=2,
     quiet=False,
     opt=False,
+    progress_callback=None,
 ):
     use_mailmap = (Path(repo_dir) / ".mailmap").exists()
     repo = git.Repo(repo_dir)
@@ -304,9 +305,11 @@ def analyze(
         )  # repo.git.commit_graph('write --changed-paths') doesn't work for some reason
 
     desc = "{:<55s}".format("Listing all commits")
-    for commit in tqdm(
+    for i, commit in enumerate(tqdm(
         repo.iter_commits(branch), desc=desc, unit=" Commits", **tqdm_args
-    ):
+    )):
+        if progress_callback:
+            progress_callback(0, f"Listing commits: {i}")
         cohort = datetime.datetime.utcfromtimestamp(commit.committed_date).strftime(
             cohortfm
         )
@@ -330,6 +333,8 @@ def analyze(
                 master_commits.append(commit)
                 last_date = commit.committed_date
             bar.update()
+            if progress_callback:
+                progress_callback(0, f"Backtracking branch: {len(master_commits)} commits found")
             if not commit.parents:
                 break
             commit = commit.parents[0]
@@ -388,6 +393,8 @@ def analyze(
                 curve_key_tuples.add(("ext", ext))
                 curve_key_tuples.add(("dir", get_top_dir(entry.path)))
                 bar.update()
+                if progress_callback:
+                    progress_callback(0, f"Discovering entries: {entries_total}")
             master_commits[i] = MiniCommit(
                 commit
             )  # Might have cached the entries, we don't want that
@@ -465,7 +472,9 @@ def analyze(
         **tqdm_args,
     ) as bar:
         cbar = tqdm(master_commits, desc=desc, unit=" Commits", position=0, **tqdm_args)
-        for commit in cbar:
+        for i, commit in enumerate(cbar):
+            if progress_callback:
+                progress_callback(i / len(master_commits), f"Analyzing commit {i+1}/{len(master_commits)}")
             t = datetime.datetime.utcfromtimestamp(commit.committed_date)
             ts.append(t)  # x axis
 

{better_git_of_theseus-0.5.1 → better_git_of_theseus-0.6.0}/git_of_theseus/app.py

@@ -51,7 +51,8 @@ if len(sys.argv) > 1:
     default_repo = sys.argv[1]
 
 repo_path = default_repo
-# Path display removed as per user request
+repo_name = os.path.basename(os.path.abspath(repo_path))
+st.sidebar.markdown(f"**Repo:** {repo_name}")
 
 # Fetch branches for the selectbox
 try:
@@ -106,6 +107,9 @@ with st.sidebar.expander("Analysis Parameters"):
 
 @st.cache_data(show_spinner=False)
 def run_analysis(repo_path, branch, cohortfm, interval, procs, ignore):
+    # This is a dummy wrapper for the cached function
+    # Because we need the callback to update the UI, we can't easily cache the callback-enabled version
+    # However, we can cache the final result.
     return analyze(
         repo_path,
         cohortfm=cohortfm,
@@ -117,20 +121,43 @@ def run_analysis(repo_path, branch, cohortfm, interval, procs, ignore):
         quiet=True
     )
 
+def run_analysis_with_progress(repo_path, branch, cohortfm, interval, procs, ignore):
+    progress_bar = st.progress(0)
+    status_text = st.empty()
+    
+    def progress_callback(progress, text):
+        progress_bar.progress(progress)
+        status_text.text(text)
+    
+    results = analyze(
+        repo_path,
+        cohortfm=cohortfm,
+        interval=interval,
+        ignore=ignore,
+        outdir=None,
+        branch=branch,
+        procs=procs,
+        quiet=True,
+        progress_callback=progress_callback
+    )
+    
+    progress_bar.empty()
+    status_text.empty()
+    return results
+
 # State management for analysis results
 if 'analysis_results' not in st.session_state:
     st.session_state.analysis_results = None
 
 if st.sidebar.button("🚀 Run Analysis") or (len(sys.argv) > 1 and st.session_state.analysis_results is None):
-    with st.spinner("Analyzing repository... this may take a while."):
-        try:
-            st.session_state.analysis_results = run_analysis(
-                repo_path, branch, cohortfm, interval, procs, ignore
-            )
-            st.success("Analysis completed!")
-        except Exception as e:
-            st.error(f"Analysis failed: {e}")
-            st.session_state.analysis_results = None
+    try:
+        st.session_state.analysis_results = run_analysis_with_progress(
+            repo_path, branch, cohortfm, interval, procs, ignore
+        )
+        st.success("Analysis completed!")
+    except Exception as e:
+        st.error(f"Analysis failed: {e}")
+        st.session_state.analysis_results = None
 
 # Main View
 if st.session_state.analysis_results:

{better_git_of_theseus-0.5.1 → better_git_of_theseus-0.6.0}/git_of_theseus/cmd.py

@@ -12,12 +12,16 @@ def main():
     
     # Run streamlit
     # We pass the repo_path as an argument to the streamlit script
-    subprocess.run([
-        sys.executable, "-m", "streamlit", "run", 
-        app_path, 
-        "--browser.gatherUsageStats", "false",
-        "--", repo_path
-    ])
+    try:
+        subprocess.run([
+            sys.executable, "-m", "streamlit", "run", 
+            app_path, 
+            "--browser.gatherUsageStats", "false",
+            "--", repo_path
+        ])
+    except KeyboardInterrupt:
+        # Exit gracefully on Ctrl+C
+        sys.exit(0)
 
 if __name__ == "__main__":
     main()

{better_git_of_theseus-0.5.1 → better_git_of_theseus-0.6.0}/git_of_theseus/plotly_plots.py

@@ -68,8 +68,8 @@ def plotly_stack_plot(data, max_n=20, normalize=False, title=None):
         ),
         xaxis=dict(title="Date", gridcolor='rgba(128,128,128,0.2)'),
         hovermode="x unified",
-        margin=dict(l=20, r=20, t=60, b=100),
-        legend=dict(orientation="h", yanchor="top", y=-0.15, xanchor="center", x=0.5),
+        margin=dict(l=20, r=20, t=60, b=120),
+        legend=dict(orientation="h", yanchor="top", y=-0.25, xanchor="center", x=0.5),
         plot_bgcolor='rgba(0,0,0,0)',
         paper_bgcolor='rgba(0,0,0,0)'
     )
@@ -97,8 +97,8 @@ def plotly_line_plot(data, max_n=20, normalize=False, title=None):
         ),
         xaxis=dict(title="Date", gridcolor='rgba(128,128,128,0.2)'),
         hovermode="x unified",
-        margin=dict(l=20, r=20, t=60, b=100),
-        legend=dict(orientation="h", yanchor="top", y=-0.15, xanchor="center", x=0.5),
+        margin=dict(l=20, r=20, t=60, b=120),
+        legend=dict(orientation="h", yanchor="top", y=-0.25, xanchor="center", x=0.5),
         plot_bgcolor='rgba(0,0,0,0)',
         paper_bgcolor='rgba(0,0,0,0)'
     )
@@ -169,8 +169,8 @@ def plotly_survival_plot(commit_history, exp_fit=False, years=5, title=None):
         yaxis=dict(title="Lines still present (%)", range=[0, 105], gridcolor='rgba(128,128,128,0.2)'),
         xaxis=dict(title="Years", range=[0, years], gridcolor='rgba(128,128,128,0.2)'),
         hovermode="x unified",
-        margin=dict(l=20, r=20, t=50, b=100),
-        legend=dict(orientation="h", yanchor="top", y=-0.15, xanchor="center", x=0.5),
+        margin=dict(l=20, r=20, t=50, b=120),
+        legend=dict(orientation="h", yanchor="top", y=-0.25, xanchor="center", x=0.5),
         plot_bgcolor='rgba(0,0,0,0)',
         paper_bgcolor='rgba(0,0,0,0)'
     )

{better_git_of_theseus-0.5.1 → better_git_of_theseus-0.6.0}/setup.py

@@ -5,7 +5,7 @@ with open("README.md", "r", encoding="utf-8") as fh:
 
 setup(
     name="better-git-of-theseus",
-    version="0.5.1",
+    version="0.6.0",
     description="Plot stats on Git repositories with interactive Plotly charts",
     long_description=long_description,
     long_description_content_type="text/markdown",