Meta git (mgit)

 


Meta git (mgit) is a wrapper around magit, which is a wrapper around git.

If the output looks familiar, it's because it's the output from command git status -v. For the discerning eye, it uses the font-lock defaults from diff mode (notice the highlight on ;;). diff-mode uses repeated diff commands to highlight the refinements. Use diff-mode or diff-refine-hunk if you must have the eye-candy.


Motivation

Magit is a handy tool for working with git repository in GNU Emacs. However, if you work with a large enough repository, you'll hit a performance road-block. Here's an attempt to deconstruct the problem and find a solution.

Magit provides an information rich dashboard for git status. However, this comes with multiple calls to git command. If you run M-x magit-toggle-verbose-refresh and then run magit-status, you'll see the following output:

Refreshing buffer ‘magit: src<anand>’...
  magit-insert-error-header                          2.031e-06
  magit-insert-diff-filter-header                    3.0799e-05
  magit-insert-head-branch-header                    0.004475604
  magit-insert-upstream-branch-header                0.005282276
  magit-insert-push-branch-header                    3.5114e-05
  magit-insert-tags-header                           0.008421254
  magit-insert-status-headers                        0.021357499 !
  magit-insert-merge-log                             0.001540241
  magit-insert-rebase-sequence                       0.000193708
  magit-insert-am-sequence                           0.000190186
  magit-insert-sequencer-sequence                    0.000405629
  magit-insert-bisect-output                         0.000159796
  magit-insert-bisect-rest                           4.9848e-05
  magit-insert-bisect-log                            7.4688e-05
  magit-insert-untracked-files                       4.554816041 !!
  magit-insert-unstaged-changes                      3.27816181 !!
  magit-insert-staged-changes                        0.033723897 !!
  magit-insert-stashes                               0.009674576
  magit-insert-unpushed-to-pushremote                4.0493e-05
  magit-insert-unpushed-to-upstream-or-recent        0.014408128 !
  magit-insert-unpulled-from-pushremote              3.31e-06
  magit-insert-unpulled-from-upstream                0.004328423
Refreshing buffer ‘magit: src<anand>’...done (13.270s) 
 

In comparison, the output from git status -v provides pertinent information (see screenshot) in around 3-4s.


Lessons learnt

  1. Most git commands are fast except the ones which operate on tree level information. However, magit operations seem slower because of the refresh problem - it needs to refresh the complete dashboard.
  2. Performance bottleneck is not the number of files edited but the size of the repository (number of files in the repository).
     

Code (Work In Progress)

https://gitlab.com/atamariya/emacs/-/blob/mgit/lisp/vc/mgit.el

Patches for Magit

You need to apply following patches to magit files:
 
modified magit-diff.el
@@ -2324,6  +2327,11 @@
       (when orig
         (setq orig (magit-decode-git-path orig)))
-      (setq file (magit-decode-git-path file))
-      (setq header (nreverse header))
-      ;; KLUDGE `git-log' ignores `--no-prefix' when `-L' is used.
-      (when (and (derived-mode-p 'magit-log-mode)
-                 (seq-some (lambda (arg) (string-prefix-p "-L" arg))
-                           magit-buffer-log-args))
+      (when file
+    (setq file (magit-decode-git-path file)))
+      ;; KLUDGE `git-diff' ignores `--no-prefix' for new files and renames at
+      ;; least.  And `git-log' ignores `--no-prefix' when `-L' is used.
+      (when (or (and file (string-prefix-p "b/" file))
+        (and orig (string-prefix-p "a/" orig))
+                (and (derived-mode-p 'magit-log-mode)
+                     (--first (string-prefix-p "-L" it)
+                              magit-buffer-log-args)))
+        (when file
+      (setq file (substring file 2))) 
@@ -2341,5  +2327,8 @@
 (defun magit-diff-insert-file-section
    (file orig status modes rename header &optional long-status)
   (magit-insert-section section
-    (file file (or (equal status "deleted")
-                   (derived-mode-p 'magit-status-mode)))
+    (file (or file orig)
+      (or (equal status "deleted")
+              (derived-mode-p 'magit-status-mode)))
     (insert (propertize (format "%-10s %s" status
-                                (if (or (not orig) (equal orig file))
-                                    file
-                                  (format "%s -> %s" orig file)))
+                                (if (and orig file)
+                    (if (equal orig file)
+                    file
+                                      (format "%s -> %s" orig file))
+                  (or orig file)))
                         'font-lock-face 'magit-diff-file-heading))
 
 

 

Comments

Post a Comment

Popular posts from this blog

GNU Emacs as a Comic Book Reader

Image
  Comics are available in digital format as a collection of images in a compressed ZIP or RAR file (.cbz or .cbr file extension respectively). These can be enjoyed in GNU Emacs with full access to image viewing capabilities using keybindings.   # Make sure you have unrar installed for CBR files # apt install unrar   (require 'arc2-mode)   (setq archive-summarize-files-fn 'archive-summarize-files-as-thumb)     Note: The archive-mode is capable of displaying the list of files in an archive; though it depends on external tools for extraction. For JPG and PNG, Emacs can resize the image without external convertor (ie. imagemagick). However, some menu options for image transformations in image-mode might not be available. Use the following patch for image-mode.el . @@ -460,16 +460,16 @@ image-mode-map       :help "Show image as hex"]      "--"      ["Fit to Window Height" image-transform-fit-to-...
Read more

Mozilla Readability in GNU Emacs

Image
  Output using Readability (left) and original eww (right)   Mozilla Readability is a standalone version of the readability library used for Firefox Reader View . A simple hack to eww can bring the same feature in GNU Emacs. ( Note: eww already has a readable mode. This is just an alternative. Updated the post to reflect the same.)   - Install NodeJS   - Install npm modules. npm install @mozilla/readability jsdom   - Create a file readability.js with following content. Note the file location. var { Readability } = require('@mozilla/readability'); var { JSDOM } = require('jsdom'); var fs = require("fs"); var str = fs.readFileSync(process.stdin.fd).toString(); var doc = new JSDOM(str); var reader = new Readability(doc.window.document); var article = reader.parse(); console.log(article.content);     - Modify the following function to use the file location noted above . Evaluate the function. (defun mozilla-readability (start end)   (shell-command-o...
Read more

Data Visualization with GNU Emacs

Image
    GNU Emacs can be used for quick data visualization in combination with Gnuplot. When you have some data and you want to visualize what the correlation looks like, this command comes in handy. No need for any setup - no data file and no Gnuplot script. The command below uses some sensible defaults for trivial cases. If the first line contains string label, the same is used as a key label for the value and/or axes' names as appropriate. If there's a single column of data, it is used as Y value. If there's more than one column, first column is used as X value and other columns are plotted along Y-axis. Takes care of comma or whitespace separator. Note: The latest version of the code is available at the end of the post. Options available in latest version   - Install gnuplot executable and gnuplot Elisp package . - Evaluate the defun ( C-M-x ). - Select a data range using rectangle command copy-rectangle-as-kill (C-x r M-w). - Run M-x  gnuplot-rectangle. This open...
Read more