all messages for Emacs-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: joaotavora@gmail.com (João Távora)
To: Stefan Monnier <monnier@IRO.UMontreal.CA>
Cc: Juri Linkov <juri@linkov.net>, emacs-devel <emacs-devel@gnu.org>,
	Dmitry Gutov <dgutov@yandex.ru>
Subject: Re: Merge-base alias for git vc-diff
Date: Thu, 03 Jan 2019 13:30:17 +0000	[thread overview]
Message-ID: <jjb1s5tamxi.fsf@gmail.com> (raw)
In-Reply-To: <jwvftuas9yb.fsf-monnier+emacs@gnu.org> (Stefan Monnier's message of "Wed, 02 Jan 2019 22:22:59 -0500")

Stefan Monnier <monnier@IRO.UMontreal.CA> writes:

> FWIW, my minibuffer has 1 line and can't grow because it's in
> a minibuffer-only frame.

Kinky :) I don't think a rigid minibuffer is a great idea, but scratch
the multi-line minibuffer approach, just add a C-h shortcut that
displays some contextual help like `save-some-buffers'.

Or add some hint to the beginning of the line, there's plenty of space.

Here's two other ideas:

1. Isn't merge-base suitable for a toggle switch?  Could sth like
   vc-git-prefer-merge-base be useful?  Maybe I'd set that to t, and it
   shows nicely in a checkbox in the VC menu for discoverability.  But I
   like the next idea better.

2. A diff is always a comparison of two revisions, right?  For vc-dir,
   isn't a UI like query-replace's suitable here?  You know, that thing
   where you type the pattern and the replacement interactively in the
   same minibuffer prompt, separated by the arrow.  You can M-p, C-r,
   etc, flawlessly. I really like that UI, it's really intuitive (kudos
   to whoever participated, btw).
    
   So here, instead of pattern and replacement, two revisions.  All one
   would need, apparently, is to turn the arrow into a ".." and make it
   toggleable to "..." with say, C-M-y.  I think it would simplify the
   completion problem: on both sides of the ".." or "..." you just
   complete a revision using whatever system we presumably already have
   in place for that.

João





  reply	other threads:[~2019-01-03 13:30 UTC|newest]

Thread overview: 27+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-12-26 22:32 Merge-base alias for git vc-diff Juri Linkov
2018-12-27  1:07 ` Dmitry Gutov
2018-12-27 20:02   ` Juri Linkov
2018-12-27 20:42     ` Dmitry Gutov
2018-12-28 17:53     ` Stefan Monnier
2018-12-29 21:39       ` Juri Linkov
2019-01-02  0:14     ` Juri Linkov
2019-01-02  1:55       ` Stefan Monnier
2019-01-02 15:34         ` João Távora
2019-01-02 22:25           ` Dmitry Gutov
2019-01-02 22:48             ` João Távora
2019-01-02 23:07               ` Dmitry Gutov
2019-01-03  3:22               ` Stefan Monnier
2019-01-03 13:30                 ` João Távora [this message]
2019-01-03 20:38                   ` Juri Linkov
2019-01-03 21:44                     ` João Távora
2019-01-05 22:28                       ` Juri Linkov
2019-01-07 22:33                       ` Juri Linkov
2019-01-08 14:58                         ` Stefan Monnier
2019-01-09  0:05                           ` Juri Linkov
2019-01-02 21:29         ` Juri Linkov
2019-01-03  3:40           ` Stefan Monnier
2019-01-10 21:25             ` Juri Linkov
2019-01-10 22:14               ` Dmitry Gutov
2019-01-10 23:25                 ` Juri Linkov
2019-01-10 22:41               ` Stefan Monnier
2019-01-10 23:18                 ` Juri Linkov

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=jjb1s5tamxi.fsf@gmail.com \
    --to=joaotavora@gmail.com \
    --cc=dgutov@yandex.ru \
    --cc=emacs-devel@gnu.org \
    --cc=juri@linkov.net \
    --cc=monnier@IRO.UMontreal.CA \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/emacs.git
	https://git.savannah.gnu.org/cgit/emacs/org-mode.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.