Re: [PATCH 2/8] git-remote-mediawiki: actually send empty comment when they're empty
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Jul 16, 2012, 18:13 UTC
- Message-ID
- <7vd33v377x.fsf@alter.siamese.dyndns.org>
- In-Reply-To
- <1342440053-3058-3-git-send-email-Matthieu.Moy@imag.fr>
Matthieu Moy <Matthieu.Moy@imag.fr> writes:
Show 16 quoted lines
> Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> > --- > contrib/mw-to-git/git-remote-mediawiki | 9 ++++++++- > 1 file changed, 8 insertions(+), 1 deletion(-) > > diff --git a/contrib/mw-to-git/git-remote-mediawiki b/contrib/mw-to-git/git-remote-mediawiki > index a6ad8cf..a2da52f 100755 > --- a/contrib/mw-to-git/git-remote-mediawiki > +++ b/contrib/mw-to-git/git-remote-mediawiki > @@ -51,6 +51,9 @@ use constant EMPTY_CONTENT => "<!-- empty page -->\n"; > # used to reflect file creation or deletion in diff. > use constant NULL_SHA1 => "0000000000000000000000000000000000000000"; > > +# Used on Git's side to reflect empty edit messages on the wiki > +use constant EMPTY_MESSAGE => '*Empty MediaWiki Message*'; > +
Is there a reason why this sentinel value cannot be a real empty string?
Not that I am complaining, as I find it highly unlikely for a message stored in mw to be exactly "*Empty MediaWiki Message*", but just wondering.
Show 23 quoted lines
> my $remotename = $ARGV[0];
> my $url = $ARGV[1];
>
> @@ -935,7 +938,7 @@ sub mw_import_revids {
>
> my %commit;
> $commit{author} = $rev->{user} || 'Anonymous';
> - $commit{comment} = $rev->{comment} || '*Empty MediaWiki Message*';
> + $commit{comment} = $rev->{comment} || EMPTY_MESSAGE;
> $commit{title} = mediawiki_smudge_filename($page_title);
> $commit{mw_revision} = $rev->{revid};
> $commit{content} = mediawiki_smudge($rev->{'*'});
> @@ -1050,6 +1053,10 @@ sub mw_push_file {
> my $oldrevid = shift;
> my $newrevid;
>
> + if ($summary eq EMPTY_MESSAGE) {
> + $summary = '';
> + }
> +
> my $new_sha1 = $diff_info_split[3];
> my $old_sha1 = $diff_info_split[2];
> my $page_created = ($old_sha1 eq NULL_SHA1);