I sent an incomplete fix for the "R" rebase method recently:

    http://github.com/philjackson/magit/pull/59

But Phil pulled it in as-is:

    
http://github.com/philjackson/magit/commit/81bb2ba2d32fb3bbbc2baaba60b492afe372d831

Anyway, it needs a small fixup, this:

    (length (magit-file-lines ".git/rebase-merge/git-rebase-todo.backup"))

Will be way off, because it'll count the (length) of lines like:

    ("pick cb925f0 check message..." "pick 2f811b6 take done length"
"pick 29332e6 use backup" "" "# Rebase 19e2dd7..29332e6 onto 19e2dd7"
"#" ...

What it should do instead so we can get the correct count is to only
count up until the "" (uninclusive) so the above example would return
3.

I couldn't find an idiomatic way of doing this in elisp, I could with
the (loop) macro, but that'd require cl.el.

Any suggestions for that? Maybe once we get this fixed I should fix
upstream git.git so it creates "done-count" and "todo-count" files so
this would be easier.

Suggestions on how the UI should look like during a rebase would also
be welcome. Currently it just shows the commit message and $done/$todo
numbers. It used to show the ref you were rebasing from before my
patch, maybe I should add that in too somewhere?

And maybe rebase-mode.el should be worked into magit core, does anyone
use it but me?

Reply via email to