From mboxrd@z Thu Jan 1 00:00:00 1970 From: =?UTF-8?q?C=C3=A9lestin=20Matte?= Subject: [PATCH v6 24/31] git-remote-mediawiki: Replace "unless" statements with negated "if" statements Date: Fri, 14 Jun 2013 15:50:32 +0200 Message-ID: <1371217839-23017-25-git-send-email-celestin.matte@ensimag.fr> References: <1371217839-23017-1-git-send-email-celestin.matte@ensimag.fr> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: QUOTED-PRINTABLE Cc: benoit.person@ensimag.fr, matthieu.moy@grenoble-inp.fr, =?UTF-8?q?C=C3=A9lestin=20Matte?= To: git@vger.kernel.org X-From: git-owner@vger.kernel.org Fri Jun 14 15:52:09 2013 Return-path: Envelope-to: gcvg-git-2@plane.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1UnUQA-0001n8-LO for gcvg-git-2@plane.gmane.org; Fri, 14 Jun 2013 15:52:07 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753149Ab3FNNvw convert rfc822-to-quoted-printable (ORCPT ); Fri, 14 Jun 2013 09:51:52 -0400 Received: from mx1.imag.fr ([129.88.30.5]:44583 "EHLO shiva.imag.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752971Ab3FNNvE (ORCPT ); Fri, 14 Jun 2013 09:51:04 -0400 Received: from ensimag.imag.fr (ensimag.imag.fr [195.221.228.12]) by shiva.imag.fr (8.13.8/8.13.8) with ESMTP id r5EDp13R020725 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Fri, 14 Jun 2013 15:51:01 +0200 Received: from ensibm.imag.fr (ensibm.imag.fr [195.221.228.8]) by ensimag.imag.fr (8.13.8/8.13.8/ImagV2.1.r_ens) with ESMTP id r5EDp2Ts013433; Fri, 14 Jun 2013 15:51:02 +0200 Received: from tohwi-K50IE.imag.fr (ensibm [195.221.228.8]) by ensibm.imag.fr (8.13.8/8.13.8/ImagV2.1.sb_ens.pm) with ESMTP id r5EDoqgG016142; Fri, 14 Jun 2013 15:51:02 +0200 X-Mailer: git-send-email 1.8.3.1.491.g8a51f1c In-Reply-To: <1371217839-23017-1-git-send-email-celestin.matte@ensimag.fr> X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.0.1 (shiva.imag.fr [129.88.30.5]); Fri, 14 Jun 2013 15:51:01 +0200 (CEST) Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: =46rom: C=C3=A9lestin Matte Signed-off-by: C=C3=A9lestin Matte Signed-off-by: Matthieu Moy --- contrib/mw-to-git/git-remote-mediawiki.perl | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/contrib/mw-to-git/git-remote-mediawiki.perl b/contrib/mw-t= o-git/git-remote-mediawiki.perl index 9e828ab..f0c313f 100755 --- a/contrib/mw-to-git/git-remote-mediawiki.perl +++ b/contrib/mw-to-git/git-remote-mediawiki.perl @@ -82,11 +82,11 @@ $shallow_import =3D ($shallow_import eq 'true'); # - by_rev: perform one query per new revision on the remote wiki # - by_page: query each tracked page for new revision my $fetch_strategy =3D run_git("config --get remote.${remotename}.fetc= hStrategy"); -unless ($fetch_strategy) { +if (!$fetch_strategy) { $fetch_strategy =3D run_git('config --get mediawiki.fetchStrategy'); } chomp($fetch_strategy); -unless ($fetch_strategy) { +if (!$fetch_strategy) { $fetch_strategy =3D 'by_page'; } =20 @@ -108,7 +108,7 @@ my %basetimestamps; # deterministic, this means everybody gets the same sha1 for each # MediaWiki revision. my $dumb_push =3D run_git("config --get --bool remote.${remotename}.du= mbPush"); -unless ($dumb_push) { +if (!$dumb_push) { $dumb_push =3D run_git('config --get --bool mediawiki.dumbPush'); } chomp($dumb_push); @@ -667,7 +667,7 @@ sub fetch_mw_revisions_for_page { push(@page_revs, $page_rev_ids); $revnum++; } - last unless $result->{'query-continue'}; + last if (!$result->{'query-continue'}); $query->{rvstartid} =3D $result->{'query-continue'}->{revisions}->{r= vstartid}; } if ($shallow_import && @page_revs) { @@ -1239,7 +1239,7 @@ sub mw_push_revision { die("Unknown error from mw_push_file()\n"); } } - unless ($dumb_push) { + if (!$dumb_push) { run_git(qq(notes --ref=3D${remotename}/mediawiki add -f -m "mediawi= ki_revision: ${mw_revision}" ${sha1_commit})); run_git(qq(update-ref -m "Git-MediaWiki push" refs/mediawiki/${remo= tename}/master ${sha1_commit} ${sha1_child})); } @@ -1320,7 +1320,7 @@ sub get_mw_namespace_id { my $ns =3D $namespace_id{$name}; my $id; =20 - unless (defined $ns) { + if (!defined $ns) { print {*STDERR} "No such namespace ${name} on MediaWiki.\n"; $ns =3D {is_namespace =3D> 0}; $namespace_id{$name} =3D $ns; --=20 1.8.3.rc3.49.g4e74807