From: Dan Nicolaescu <dann@ics.uci.edu>
To: Bernhard Herzog <bernhard.herzog@intevation.de>
Cc: Stefan Monnier <monnier@iro.umontreal.ca>, emacs-devel@gnu.org
Subject: Re: Patch to make vc-hg.el work with remote files
Date: Mon, 2 Nov 2009 13:58:07 -0800 (PST) [thread overview]
Message-ID: <200911022158.nA2Lw7eG018645@godzilla.ics.uci.edu> (raw)
In-Reply-To: <200911022234.46656.bernhard.herzog@intevation.de> (Bernhard Herzog's message of "Mon, 2 Nov 2009 22:34:46 +0100")
Bernhard Herzog <bernhard.herzog@intevation.de> writes:
> On 28.10.2009, Bernhard Herzog wrote:
> > I've looked a bit closer at it now and AFAICT vc-hg-diff can be made even
> > simpler and probably more correct by passing files unmodified to
> > vc-hg-command. I don't have the time right now to test and produce a
> > better patch, though. I hope to get around to that tomorrow.
>
> It took a while longer, but here's the new patch:
Was this tested with filesets that contain: multiple files, multiple
directories and a mix of files and directories. And starting
from a subdirectory of the Hg root?
The previous change caused this regression:
http://permalink.gmane.org/gmane.emacs.devel/116585
does this patch fix it?
> Index: lisp/vc-hg.el
> ===================================================================
> RCS file: /sources/emacs/emacs/lisp/vc-hg.el,v
> retrieving revision 1.105
> diff -u -r1.105 vc-hg.el
> --- lisp/vc-hg.el 28 Oct 2009 02:05:50 -0000 1.105
> +++ lisp/vc-hg.el 2 Nov 2009 21:16:15 -0000
> @@ -279,16 +279,12 @@
> (defun vc-hg-diff (files &optional oldvers newvers buffer)
> "Get a difference report using hg between two revisions of FILES."
> (let* ((firstfile (car files))
> - (cwd (if firstfile (file-name-directory firstfile)
> - (expand-file-name default-directory)))
> (working (and firstfile (vc-working-revision firstfile))))
> (when (and (equal oldvers working) (not newvers))
> (setq oldvers nil))
> (when (and (not oldvers) newvers)
> (setq oldvers working))
> - (apply #'vc-hg-command (or buffer "*vc-diff*") nil
> - (mapcar (lambda (file) (file-relative-name file cwd)) files)
> - "diff"
> + (apply #'vc-hg-command (or buffer "*vc-diff*") nil files "diff"
> (append
> (vc-switches 'hg 'diff)
> (when oldvers
>
> regards
>
> Bernhard
next prev parent reply other threads:[~2009-11-02 21:58 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-10-25 17:56 Patch to make vc-hg.el work with remote files Bernhard Herzog
2009-10-26 2:00 ` Stefan Monnier
2009-10-27 12:01 ` Bernhard Herzog
2009-10-28 2:07 ` Stefan Monnier
2009-10-28 18:05 ` Bernhard Herzog
2009-11-02 21:34 ` Bernhard Herzog
2009-11-02 21:58 ` Dan Nicolaescu [this message]
2009-11-02 23:52 ` Bernhard Herzog
2009-11-02 22:00 ` Sam Steingold
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=200911022158.nA2Lw7eG018645@godzilla.ics.uci.edu \
--to=dann@ics.uci.edu \
--cc=bernhard.herzog@intevation.de \
--cc=emacs-devel@gnu.org \
--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.