bug#28408: 26.0.50; support git rebase in vc-dir

bug#28408: 26.0.50; support git rebase in vc-dir

[Tom Tromey]

I've noticed that one of the few reasons I leave Emacs for the shell is
to run "git rebase".  It would be nice if vc-dir had rebase support.
(I realize magit exists, but I generally prefer vc-dir.)

Some ideas:

* vc-git already notices that a rebase is in progress.  It could have a
  command to "git rebase --continue".

* Initiating a rebase in Emacs could let one edit the rebase to-do list,
  like "git rebase -i".  Then when the rebase stops at some point, Emacs
  could auto-revert all the affected buffers.

* It would be very nice if I could rebase local changes to some other
  branch using "git rebase --onto".  Currently I always need to look up
  the syntax when doing this; but Emacs could walk through it more
  easily.

Tom



In GNU Emacs 26.0.50 (build 18, x86_64-pc-linux-gnu, GTK+ Version 3.22.17)
 of 2017-09-09 built on bapiya
Repository revision: 4131f9785e30f2a31745125c714e922892113c62
Windowing system distributor 'Fedora Project', version 11.0.11903000
System Description:	Fedora release 25 (Twenty Five)

Recent messages:
Mark set
Mark saved where search started [2 times]
Saving file /home/tromey/DotEmacs/.emacs...
Wrote /home/tromey/DotEmacs/.emacs
Save file /home/tromey/DotEmacs/.gnus.el? (y, n, !, ., q, C-r, d or C-h) 
Save file /home/tromey/DotEmacs/.gnus.el? (y, n, !, ., q, C-r, d or C-h) y
Saving file /home/tromey/DotEmacs/.gnus.el...
Wrote /home/tromey/DotEmacs/.gnus.el
Save file /home/tromey/Mail/drafts/*message*-20170910-121845? (y, n, !, ., q, C-r, d or C-h) 
Save file /home/tromey/Mail/drafts/*message*-20170910-121845? (y, n, !, ., q, C-r, d or C-h) n
Quit
Configured using:
 'configure --prefix=/home/tromey/Emacs/install'

Configured features:
XPM JPEG TIFF GIF PNG RSVG IMAGEMAGICK SOUND GPM DBUS GSETTINGS NOTIFY
LIBSELINUX GNUTLS LIBXML2 FREETYPE M17N_FLT LIBOTF XFT ZLIB
TOOLKIT_SCROLL_BARS GTK3 X11

Important settings:
  value of $LANG: en_US.utf8
  value of $XMODIFIERS: @im=ibus
  locale-coding-system: utf-8-unix

Major mode: Change Log

Minor modes in effect:
  shell-dirtrack-mode: t
  bug-reference-mode: t
  diff-auto-refine-mode: t
  flyspell-mode: t
  which-function-mode: t
  erc-services-mode: t
  erc-list-mode: t
  erc-menu-mode: t
  erc-autojoin-mode: t
  erc-ring-mode: t
  erc-networks-mode: t
  erc-pcomplete-mode: t
  erc-track-mode: t
  erc-match-mode: t
  erc-netsplit-mode: t
  erc-hl-nicks-mode: t
  erc-button-mode: t
  erc-fill-mode: t
  erc-stamp-mode: t
  erc-irccontrols-mode: t
  erc-noncommands-mode: t
  erc-move-to-prompt-mode: t
  erc-readonly-mode: t
  savehist-mode: t
  tooltip-mode: t
  global-eldoc-mode: t
  electric-indent-mode: t
  mouse-wheel-mode: t
  file-name-shadow-mode: t
  global-font-lock-mode: t
  font-lock-mode: t
  auto-composition-mode: t
  auto-encryption-mode: t
  auto-compression-mode: t
  column-number-mode: t
  line-number-mode: t
  auto-fill-function: do-auto-fill
  transient-mark-mode: t

Load-path shadows:
/home/tromey/.emacs.d/elpa/bubbles-0.5/bubbles hides /home/tromey/Emacs/install/share/emacs/26.0.50/lisp/play/bubbles

Features:
(cus-edit gnus-fun follow org-bullets org-rmail org-mhe org-irc org-info
org-gnus org-docview doc-view image-mode org-bibtex bibtex org-bbdb
org-w3m org-element avl-tree generator org org-macro org-footnote
org-pcomplete org-list org-faces org-entities noutline outline
org-version ob-emacs-lisp ob ob-tangle org-src ob-ref ob-lob ob-table
ob-keys ob-exp ob-comint ob-core ob-eval org-compat org-macs
org-loaddefs shadow emacsbug make-mode cc-awk texinfo log-edit cl-print
debug nndoc gnus-dup debbugs-gnu debbugs soap-client url-http url-auth
url-gw rng-xsd rng-dt rng-util xsd-regexp smerge-mode whitespace
gnus-html url-queue help-fns radix-tree url-cache mm-url url url-proxy
url-privacy url-expand url-methods url-history url-cookie url-domsuf
goto-addr log-view pcvs-util term/xterm xterm shell find-file copyright
pulse etags xref project vc-mtn vc-hg vc-bzr vc-src vc-sccs vc-svn
vc-cvs vc-rcs jka-compr shr-color url-util shr svg xml dom browse-url
find-dired add-log misearch multi-isearch bug-reference vc-git diff-mode
map cc-mode cc-fonts cc-guess cc-menus cc-cmds dabbrev supercite
easy-mmode regi mail-hist nnir flow-fill mm-archive mailalias sort
smiley gnus-cite gnus-async gnus-bcklg mail-extr gnus-ml disp-table
gnus-topic nndraft nnmh nnfolder utf-7 network-stream nsm starttls
gnus-agent gnus-srvr gnus-score score-mode nnvirtual gnus-msg nntp
gnus-cache gnus-registry registry ebdb-gnus gnus-art mm-uu mml2015
mm-view mml-smime smime dig mailcap gnus-sum gnus-group gnus-undo
smtpmail gnus-start gnus-cloud nnimap nnmail mail-source tls gnutls utf7
netrc nnoo parse-time gnus-spec gnus-int gnus-range gnus-win gnus
nnheader elec-pair flyspell ispell diminish edmacro kmacro projectile
grep compile ibuf-ext ibuffer ibuffer-loaddefs dash appt diary-lib
diary-loaddefs which-func imenu minimap autorevert filenotify cus-start
cus-load status erc-services erc-list erc-menu erc-join erc-ring
erc-networks erc-pcomplete pcomplete erc-track erc-match erc-netsplit
erc-hl-nicks color erc-button erc-fill erc-stamp wid-edit erc-goodies
erc erc-backend erc-compat thingatpt pp warnings advice vc-dir ewoc vc
vc-dispatcher cc-styles cc-align cc-engine cc-vars cc-defs ebdb-complete
ebdb-message sendmail message puny dired dired-loaddefs format-spec
rfc822 mml mml-sec epa derived epg gnus-util rmail rmail-loaddefs
mm-decode mm-bodies mm-encode mail-parse rfc2231 rfc2047 rfc2045 mm-util
ietf-drums mail-prsvr mail-utils gmm-utils mailheader ebdb-mua ebdb-com
crm mailabbrev ebdb-format qp ebdb cl-extra help-mode eieio-opt speedbar
sb-image ezimage dframe find-func eieio-base pcase subr-x cal-menu
calendar cal-loaddefs timezone ange-ftp comint ansi-color ring server
savehist finder-inf dwarf-mode-autoloads gdb-shell-autoloads
lisppaste-autoloads pydoc-info-autoloads info-look cl
weblogger-autoloads info package easymenu epg-config url-handlers
url-parse auth-source cl-seq eieio eieio-core cl-macs eieio-loaddefs
password-cache url-vars seq byte-opt gv bytecomp byte-compile cconv
cl-loaddefs cl-lib time-date mule-util tooltip eldoc electric uniquify
ediff-hook vc-hooks lisp-float-type mwheel term/x-win x-win
term/common-win x-dnd tool-bar dnd fontset image regexp-opt fringe
tabulated-list replace newcomment text-mode elisp-mode lisp-mode
prog-mode register page menu-bar rfn-eshadow isearch timer select
scroll-bar mouse jit-lock font-lock syntax facemenu font-core
term/tty-colors frame cl-generic cham georgian utf-8-lang misc-lang
vietnamese tibetan thai tai-viet lao korean japanese eucjp-ms cp51932
hebrew greek romanian slovak czech european ethiopic indian cyrillic
chinese composite charscript charprop case-table epa-hook jka-cmpr-hook
help simple abbrev obarray minibuffer cl-preloaded nadvice loaddefs
button faces cus-face macroexp files text-properties overlay sha1 md5
base64 format env code-pages mule custom widget hashtable-print-readable
backquote dbusbind inotify dynamic-setting system-font-setting
font-render-setting move-toolbar gtk x-toolkit x multi-tty
make-network-process emacs)

Memory information:
((conses 16 2470737 547891)
 (symbols 48 64391 49)
 (miscs 40 17553 8059)
 (strings 32 637391 150226)
 (string-bytes 1 16765213)
 (vectors 16 260426)
 (vector-slots 8 4036842 135793)
 (floats 8 6540 3198)
 (intervals 56 170892 2451)
 (buffers 992 220))

bug#28408: 26.0.50; support git rebase in vc-dir

[Lars Ingebrigtsen]

Tom Tromey <tom@tromey.com> writes:

> I've noticed that one of the few reasons I leave Emacs for the shell is
> to run "git rebase".  It would be nice if vc-dir had rebase support.
> (I realize magit exists, but I generally prefer vc-dir.)
>
> Some ideas:
>
> * vc-git already notices that a rebase is in progress.  It could have a
>   command to "git rebase --continue".
>
> * Initiating a rebase in Emacs could let one edit the rebase to-do list,
>   like "git rebase -i".  Then when the rebase stops at some point, Emacs
>   could auto-revert all the affected buffers.
>
> * It would be very nice if I could rebase local changes to some other
>   branch using "git rebase --onto".  Currently I always need to look up
>   the syntax when doing this; but Emacs could walk through it more
>   easily.

(I'm going through old bug reports that unfortunately weren't resolved
at the time.)

I have 

[pull]
	rebase = true

in ~/.gitconfig, and that makes all this work automatically in vc-dir, I
think?  That, is I don't think it would be necessary to add anything
further in this area.  Does anybody else have an opinion here?

-- 
(domestic pets only, the antidote for overdose, milk.)
   bloggy blog: http://lars.ingebrigtsen.no

bug#28408: 26.0.50; support git rebase in vc-dir

[Tom Tromey]

Lars> in ~/.gitconfig, and that makes all this work automatically in vc-dir, I
Lars> think?  That, is I don't think it would be necessary to add anything
Lars> further in this area.  Does anybody else have an opinion here?

This is a different thing.  It might be nice to have the option of
rebase on pull from Emacs, rather than merge on pull...

But what I was really asking for here was being able to do the
equivalent of typical "rebase -i" operations from inside emacs / vc-dir.

thanks,
Tom

bug#28408: 26.0.50; support git rebase in vc-dir

[Lars Ingebrigtsen]

Tom Tromey <tom@tromey.com> writes:

> This is a different thing.  It might be nice to have the option of
> rebase on pull from Emacs, rather than merge on pull...
>
> But what I was really asking for here was being able to do the
> equivalent of typical "rebase -i" operations from inside emacs / vc-dir.

Doesn't the normal vc flow take care of that without the user having to
know about anything?  Admittedly, I seldom see any conflicts while
rebasing, so I may be misremembering, but I think Emacs just lets you
fix the merge errors, commit, and then everything's fine?

-- 
(domestic pets only, the antidote for overdose, milk.)
   bloggy blog: http://lars.ingebrigtsen.no

bug#28408: 26.0.50; support git rebase in vc-dir

[Filipp Gunbin]

On 17/05/2022 16:25 -0600, Tom Tromey wrote:

> Lars> in ~/.gitconfig, and that makes all this work automatically in vc-dir, I
> Lars> think?  That, is I don't think it would be necessary to add anything
> Lars> further in this area.  Does anybody else have an opinion here?
>
> This is a different thing.  It might be nice to have the option of
> rebase on pull from Emacs, rather than merge on pull...
>
> But what I was really asking for here was being able to do the
> equivalent of typical "rebase -i" operations from inside emacs / vc-dir.

Yes, this would be great, I support this request.  The interactive
rebase conveniently allows to specify multiple operations, by editing a
file.  It could be integrated neatly into vc (which I also prefer over
magit).

For me the most frequent scenario is squashing commits.  Currently I
just make a temporary branch, then merge there with --squash, and
force-rename it back to original branch name.  This is more natural done
with interactive rebase.

Filipp

bug#28408: 26.0.50; support git rebase in vc-dir

[Tom Tromey]

Lars> Doesn't the normal vc flow take care of that without the user having to
Lars> know about anything?  Admittedly, I seldom see any conflicts while
Lars> rebasing, so I may be misremembering, but I think Emacs just lets you
Lars> fix the merge errors, commit, and then everything's fine?

"rebase -i" is a mode that lets you reorder commits, squash commits, or
stop in the middle and edit or add new commits mid-rebase... it's not
really about conflicts or pull.  It's the typical git thing where the
same command may mean wildly different things depending on the
arguments.

Tom

bug#28408: 26.0.50; support git rebase in vc-dir

[Lars Ingebrigtsen]

Tom Tromey <tom@tromey.com> writes:

> "rebase -i" is a mode that lets you reorder commits, squash commits, or
> stop in the middle and edit or add new commits mid-rebase... it's not
> really about conflicts or pull.  It's the typical git thing where the
> same command may mean wildly different things depending on the
> arguments.

Ah, OK -- I've never used "rebase -i" myself.

-- 
(domestic pets only, the antidote for overdose, milk.)
   bloggy blog: http://lars.ingebrigtsen.no