git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: "Benoît Person" <benoit.person@ensimag.fr>
To: Matthieu Moy <Matthieu.Moy@grenoble-inp.fr>
Cc: "Jeff King" <peff@peff.net>,
	git@vger.kernel.org, "Célestin Matte" <celestin.matte@ensimag.fr>
Subject: Re: [PATCH/RFC] git-remote-mediawiki: new tool to preview local changes without pushing
Date: Sun, 9 Jun 2013 14:18:58 +0200	[thread overview]
Message-ID: <CAETqRCjO1Md1PFmFO46KQ6eaEHbHW+RA7+Fh8ku6s7UwfhrPvQ@mail.gmail.com> (raw)
In-Reply-To: <vpq38srtun7.fsf@anie.imag.fr>

Matthieu Moy <Matthieu.Moy@grenoble-inp.fr> writes:
> Same question here. I'd expect "git mw preview" in a mediawiki workflow
> to do what "pdflatex foo && evince foo.pdf" do in a latex workflow: see
> in rendered form what I've been doing.
>
> In a latex flow, if I want to see how my local changes merge with the
> remote ones, I do "git merge && pdflatex", and I'd do the same with "git
> mw".

In fact, I should not have used "merge" to describe how the two contents
(page template + new parsed content) are combined together. For
now, the code simply replaces the template page's text content (the one
retrieved from the remote) with the new one. It does not really care if
the remote has changes or not. (And, to be honest, I did not thought
about that issue ;) ).

But, like both of you said : in a typical workflow, the merging would be
left to the user so the current behavior is fine I think ?

>> I also wonder if it would be useful to be able to specify not only files
>> in the filesystem, but also arbitrary blobs. So in 4b above, you could
>> "git mw preview origin:page.mw" to see the rendered version of what
>> upstream has done.
> Next step could even be "git mw diff $from $to", using the wiki to
> render the diff. Not a priority, but could be funny.

I searched in the Mediawiki API if there was a way to diff from a stored
revision and raw text content but I've found nothing :/ . We could make
a little "hack" to do that by saving as a new revision the local content,
and use the "DeleteRevision"-thingy from Mediawiki [1] to hide this
useless revision but it would floods the remote DB and usually users
to not have the permission to use that tool. So, for now I would say
it's a no-go :/ .

[1] http://www.mediawiki.org/wiki/Manual:RevisionDelete

Benoit Person

> --
> To unsubscribe from this list: send the line "unsubscribe git" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html

  reply	other threads:[~2013-06-09 12:19 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-06-07 21:50 [PATCH/RFC] git-remote-mediawiki: new tool to preview local changes without pushing benoit.person
2013-06-08 19:00 ` Matthieu Moy
2013-06-09  6:12   ` Jeff King
2013-06-09  6:08 ` Jeff King
2013-06-09 11:01   ` Matthieu Moy
2013-06-09 12:18     ` Benoît Person [this message]
2013-06-09 18:13     ` Jeff King
2013-06-09 12:35   ` Benoît Person
2013-06-09 14:37     ` Matthieu Moy
2013-06-09 18:32     ` Jeff King
2013-06-11 21:31   ` Benoît Person
2013-06-11 21:37     ` Jeff King
2013-06-12  6:55       ` Matthieu Moy
2013-06-12  8:55         ` Jeff King

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

  List information: http://vger.kernel.org/majordomo-info.html

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

  git send-email \
    --in-reply-to=CAETqRCjO1Md1PFmFO46KQ6eaEHbHW+RA7+Fh8ku6s7UwfhrPvQ@mail.gmail.com \
    --to=benoit.person@ensimag.fr \
    --cc=Matthieu.Moy@grenoble-inp.fr \
    --cc=celestin.matte@ensimag.fr \
    --cc=git@vger.kernel.org \
    --cc=peff@peff.net \
    /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 public inbox

	https://80x24.org/mirrors/git.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).