From patchwork Wed Jan 27 16:37:22 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johannes Schindelin X-Patchwork-Id: 12050567 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D1668C433E0 for ; Wed, 27 Jan 2021 16:40:19 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 8C54F64DA1 for ; Wed, 27 Jan 2021 16:40:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232048AbhA0QkB (ORCPT ); Wed, 27 Jan 2021 11:40:01 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44014 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236373AbhA0QiI (ORCPT ); Wed, 27 Jan 2021 11:38:08 -0500 Received: from mail-wr1-x434.google.com (mail-wr1-x434.google.com [IPv6:2a00:1450:4864:20::434]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A4849C0613D6 for ; Wed, 27 Jan 2021 08:37:28 -0800 (PST) Received: by mail-wr1-x434.google.com with SMTP id 6so2586504wri.3 for ; Wed, 27 Jan 2021 08:37:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=message-id:in-reply-to:references:from:date:subject:fcc :content-transfer-encoding:mime-version:to:cc; bh=BMf0eGh6RQVhJNMs3kyLeEL57vg6b92BtnERf3iL3P0=; b=TDRgQ5m3V3eSrM5aiGomQQ/To+a+2nxw1AxqHRy24DE9G8alkvUYDHOEsMhNSNC2RH k080M0PkUalRKGKINs6jQ17Epka1lieGget65wr/T5YH3xZ9LCkI+ffo0BSHq4Kvxhtc sBWtMw0/VRoCFZSF5uuv3p4m0jWe9AnO7vZlmRFvm/SgwvTxcFF1vr9NM+K1kNFrcSLn UF7P2QWEMNdZ4CSgd2Un5fWLCa99ptmfxb9e0YW/+E+lT5YtE/jcdRrcVrk7wbO7zSAd zX2fhhcGM3e+6qsKgxdYqBl3istD7GnMCdNkb9Rw3lxoPQOXXBK/lCBTt1F2CrKHTgCe ygWA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:message-id:in-reply-to:references:from:date :subject:fcc:content-transfer-encoding:mime-version:to:cc; bh=BMf0eGh6RQVhJNMs3kyLeEL57vg6b92BtnERf3iL3P0=; b=mOc8XGcWrykYsy1DBpKeVf45K3kGH8JhG9U3CrOD09uNlJyxi2GgB9/6cK6EvEW9Qu jn/y4SkLz477KeY+Yy3QnLd0ndtgz8roVQaQHY56jRvtlCgTienu89sjQir/L9HZZNQf BESxpqPvTmWM0cFXU1t1/J9larDEZ/uRViBneEzQeqh6tFDD18QzNkBBQN/qicSvRKL0 Kkt+pyiaEX1NXvLuFnYE34NKo83bXAvyDqc3mnIffiF5juoTUgrTKFg6C8q0UX/wvVs0 ThtNaqwNJEeBJdkATbXOEueDmMcUa56XxxbQ3tEl/uSkYDUDe2kWoSZQiWGoFbFrkUK3 W5Aw== X-Gm-Message-State: AOAM530Fg03JJqljZx/2GYwe5SCvKUHh8efTJfruj2y3+KOkhbf5sw94 48u+xduiHWGEid22va5vVlL8mJwhNNQ= X-Google-Smtp-Source: ABdhPJyA2jlOZTtUSYeBJgRqjpzuA35yWNroQkJWUwkZvZc6unJU4m/DTHZ7pNXihuhTbLguBtP9XA== X-Received: by 2002:adf:b78d:: with SMTP id s13mr12087388wre.344.1611765447254; Wed, 27 Jan 2021 08:37:27 -0800 (PST) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id g187sm3144731wmf.1.2021.01.27.08.37.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Jan 2021 08:37:26 -0800 (PST) Message-Id: In-Reply-To: References: Date: Wed, 27 Jan 2021 16:37:22 +0000 Subject: [PATCH v3 1/3] range-diff/format-patch: refactor check for commit range Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Uwe =?utf-8?q?Kleine-K=C3=B6nig?= , Eric Sunshine , Johannes Schindelin , Johannes Schindelin Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Johannes Schindelin From: Johannes Schindelin Currently, when called with exactly two arguments, `git range-diff` tests for a literal `..` in each of the two. Likewise, the argument provided via `--range-diff` to `git format-patch` is checked in the same manner. However, `^!` is a perfectly valid commit range, equivalent to `^..` according to the `SPECIFYING RANGES` section of gitrevisions[7]. In preparation for allowing more sophisticated ways to specify commit ranges, let's refactor the check into its own function. Signed-off-by: Johannes Schindelin --- builtin/log.c | 2 +- builtin/range-diff.c | 9 +++++---- range-diff.c | 5 +++++ range-diff.h | 8 ++++++++ 4 files changed, 19 insertions(+), 5 deletions(-) diff --git a/builtin/log.c b/builtin/log.c index bd6ff4f9f95..aeece57e86a 100644 --- a/builtin/log.c +++ b/builtin/log.c @@ -1680,7 +1680,7 @@ static void infer_range_diff_ranges(struct strbuf *r1, struct commit *head) { const char *head_oid = oid_to_hex(&head->object.oid); - int prev_is_range = !!strstr(prev, ".."); + int prev_is_range = is_range_diff_range(prev); if (prev_is_range) strbuf_addstr(r1, prev); diff --git a/builtin/range-diff.c b/builtin/range-diff.c index 24c4162f744..5b1f6326322 100644 --- a/builtin/range-diff.c +++ b/builtin/range-diff.c @@ -3,6 +3,7 @@ #include "parse-options.h" #include "range-diff.h" #include "config.h" +#include "revision.h" static const char * const builtin_range_diff_usage[] = { N_("git range-diff [] .. .."), @@ -46,12 +47,12 @@ int cmd_range_diff(int argc, const char **argv, const char *prefix) diffopt.use_color = 1; if (argc == 2) { - if (!strstr(argv[0], "..")) - die(_("no .. in range: '%s'"), argv[0]); + if (!is_range_diff_range(argv[0])) + die(_("not a commit range: '%s'"), argv[0]); strbuf_addstr(&range1, argv[0]); - if (!strstr(argv[1], "..")) - die(_("no .. in range: '%s'"), argv[1]); + if (!is_range_diff_range(argv[1])) + die(_("not a commit range: '%s'"), argv[1]); strbuf_addstr(&range2, argv[1]); } else if (argc == 3) { strbuf_addf(&range1, "%s..%s", argv[0], argv[1]); diff --git a/range-diff.c b/range-diff.c index b9950f10c8c..9b93e08e840 100644 --- a/range-diff.c +++ b/range-diff.c @@ -564,3 +564,8 @@ int show_range_diff(const char *range1, const char *range2, return res; } + +int is_range_diff_range(const char *arg) +{ + return !!strstr(arg, ".."); +} diff --git a/range-diff.h b/range-diff.h index 583ced2e8e7..c17dbc2e75a 100644 --- a/range-diff.h +++ b/range-diff.h @@ -16,4 +16,12 @@ int show_range_diff(const char *range1, const char *range2, const struct diff_options *diffopt, const struct strvec *other_arg); +/* + * Determine whether the given argument is usable as a range argument of `git + * range-diff`, e.g. A..B. Note that this only validates the format but does + * _not_ parse it, i.e. it does _not_ look up the specified commits in the + * local repository. + */ +int is_range_diff_range(const char *arg); + #endif From patchwork Wed Jan 27 16:37:23 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johannes Schindelin X-Patchwork-Id: 12050565 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3CADCC433E0 for ; Wed, 27 Jan 2021 16:40:16 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id F0D3564DA1 for ; Wed, 27 Jan 2021 16:40:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232235AbhA0QkD (ORCPT ); Wed, 27 Jan 2021 11:40:03 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44020 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236547AbhA0QiK (ORCPT ); Wed, 27 Jan 2021 11:38:10 -0500 Received: from mail-wm1-x335.google.com (mail-wm1-x335.google.com [IPv6:2a00:1450:4864:20::335]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F10AAC061786 for ; Wed, 27 Jan 2021 08:37:29 -0800 (PST) Received: by mail-wm1-x335.google.com with SMTP id e15so2243078wme.0 for ; Wed, 27 Jan 2021 08:37:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=message-id:in-reply-to:references:from:date:subject:fcc :content-transfer-encoding:mime-version:to:cc; bh=pisNovT6C10ETm6NcG5tg1QVupdeLMDbmISqKJUkms0=; b=SPCFPDYYdviGjyVjBmMLWwa+swyafzU+nL9XDLMUgapGHXbczAuMvEWJAlqifIaowN 9fFpV9Pc5y9WZHvRwlvJtI4drt0mW0zj0FMB7cp/+BW/dWJk6zqIk/B0exPYJXGKcyo0 LYJi99AEyeWNOvRefqQD5TK1UhhzaNlK5g0CJ8+uptFntNpPzjT8INo1z1zFZQhiPBWp J0SIx+wJMXFte63LBGFQHmZkjDrAQlCrfUaoHmnFrgw255DSmJl6iQ6uRNOP1HsAzGFJ CaDtTJ+kLpyJTJeIc7NoSxuefBl3r/LPP9AYEXvLBCNvhPGXCKwiHPZpyhnSA+K8HBec lvqg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:message-id:in-reply-to:references:from:date :subject:fcc:content-transfer-encoding:mime-version:to:cc; bh=pisNovT6C10ETm6NcG5tg1QVupdeLMDbmISqKJUkms0=; b=Ouwb03Xl5WNWBlhE1aelx0O4Mii9g34X5ccbugH8ugpuZeJiYWCNZd+cRbbQqKCKLy gNnCuYxSG9gqKV7vxTYbGIaTNFs64KA9Rkw204Fa7r3/krpE4ADbf9k+yusxAVf7hZtv rMx8lS8YOuXU0dicCqVu486t9AUNC5fkT5PCxMkcTJMd+Ackb91f2poaXU6U+UyrXdJh MLlIvEyDLqezp0IO6bqfNF0xHHud5qFTUl5YKJbxX1ofjgmkzdX6D2nCxYg8hppjbz/L YOjsdYYmJh7eO2Xd99pGTOcz271Grk3IR+5tHNTyDhDti8wP2+eBHF8WUpu9JQ0G3xfP cRtg== X-Gm-Message-State: AOAM530pX3tlPaaEoop/wLdm7tr5/dD08bhdimbdZWiutYoTkZJlDuDX xFhT9bvPYxA3Bjpz1+vooMfqw7ibEL0= X-Google-Smtp-Source: ABdhPJwqMch9Y5rG4F8Ibp1oxy0q3GKvi9uYWVG6plBQXndr7M1/pnVozLdBU63DejPINQmDJdI/9A== X-Received: by 2002:a1c:e443:: with SMTP id b64mr5026263wmh.136.1611765448587; Wed, 27 Jan 2021 08:37:28 -0800 (PST) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id e11sm3245059wrt.35.2021.01.27.08.37.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Jan 2021 08:37:27 -0800 (PST) Message-Id: <0880ca587e63b252dc24d98b2e7590b2c0fcd881.1611765444.git.gitgitgadget@gmail.com> In-Reply-To: References: Date: Wed, 27 Jan 2021 16:37:23 +0000 Subject: [PATCH v3 2/3] range-diff/format-patch: handle commit ranges other than A..B Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Uwe =?utf-8?q?Kleine-K=C3=B6nig?= , Eric Sunshine , Johannes Schindelin , Johannes Schindelin Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Johannes Schindelin From: Johannes Schindelin In the `SPECIFYING RANGES` section of gitrevisions[7], two ways are described to specify commit ranges that `range-diff` does not yet accept: "^!" and "^-". Let's accept them. Signed-off-by: Johannes Schindelin --- range-diff.c | 14 +++++++++++++- t/t3206-range-diff.sh | 8 ++++++++ 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/range-diff.c b/range-diff.c index 9b93e08e840..0c6ac4f954d 100644 --- a/range-diff.c +++ b/range-diff.c @@ -567,5 +567,17 @@ int show_range_diff(const char *range1, const char *range2, int is_range_diff_range(const char *arg) { - return !!strstr(arg, ".."); + static regex_t *regex; + + if (strstr(arg, "..")) + return 1; + + /* match `^!` and `^-` */ + if (!regex) { + regex = xmalloc(sizeof(*regex)); + if (regcomp(regex, "\\^(!|-[0-9]*)$", REG_EXTENDED) < 0) + BUG("could not compile range-diff regex"); + } + + return !regexec(regex, arg, 0, NULL, 0); } diff --git a/t/t3206-range-diff.sh b/t/t3206-range-diff.sh index 6eb344be031..e217cecac9e 100755 --- a/t/t3206-range-diff.sh +++ b/t/t3206-range-diff.sh @@ -150,6 +150,14 @@ test_expect_success 'simple A B C (unmodified)' ' test_cmp expect actual ' +test_expect_success 'A^! and A^- (unmodified)' ' + git range-diff --no-color topic^! unmodified^-1 >actual && + cat >expect <<-EOF && + 1: $(test_oid t4) = 1: $(test_oid u4) s/12/B/ + EOF + test_cmp expect actual +' + test_expect_success 'trivial reordering' ' git range-diff --no-color master topic reordered >actual && cat >expect <<-EOF && From patchwork Wed Jan 27 16:37:24 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johannes Schindelin X-Patchwork-Id: 12050563 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id DF78BC433DB for ; Wed, 27 Jan 2021 16:40:06 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 922DE64DA0 for ; Wed, 27 Jan 2021 16:40:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231591AbhA0QkE (ORCPT ); Wed, 27 Jan 2021 11:40:04 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44024 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236590AbhA0QiL (ORCPT ); Wed, 27 Jan 2021 11:38:11 -0500 Received: from mail-wm1-x335.google.com (mail-wm1-x335.google.com [IPv6:2a00:1450:4864:20::335]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E701BC061788 for ; Wed, 27 Jan 2021 08:37:30 -0800 (PST) Received: by mail-wm1-x335.google.com with SMTP id m187so2066637wme.2 for ; Wed, 27 Jan 2021 08:37:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=message-id:in-reply-to:references:from:date:subject:fcc :content-transfer-encoding:mime-version:to:cc; bh=4myo4TcamtlWWjUMi2KsBzOmibuHazva3oGSYdNTraQ=; b=XuAc44qXSuFD9wZS5u+E4JmbhLp3j8q27hKw+2eqoR6NCawMMIZ4/Uf8lSKxQEWxpO LNZzZU69k1GWozDXvGp2CU1NzJEgyWlx1FdvHHSRp9jKe3TakhadVHtH4ayuBOVlhFgn mTffdDjS1M3sn41XTV6lkWqMh94FFtK48SwGrPSXzt6iuImwhpM7b82GkLsje9IFDwOp Jcuh8BUK9fFdTyqORfw3wYtVZQ4qyq00B/BvILsRse0IOtpVl8vDtjACTss5pd7+tkHG XdvjMMtVSCJbC7sgm4endCHUEZsrxQ6eJQLLBFg/d4NCp3/xJktF5QOVH8J9TGqxrgE5 BGEQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:message-id:in-reply-to:references:from:date :subject:fcc:content-transfer-encoding:mime-version:to:cc; bh=4myo4TcamtlWWjUMi2KsBzOmibuHazva3oGSYdNTraQ=; b=Dt//VbXTMtCe46vh4FhjZyVy6BPSAkyRTGyeospsM980DGFbHoyIkIpsmEiLy5GvWt Ux3+NIgygm0SeAqwVnbm4/JT4OczR8BceDrV86U9sEiqi8854F3H2O1S8yVQ9ZEAq9bH QmHpcTewPvFkWYPRRpDPWhJQcy95odDyjNfuCDZt62oyc5YkJmPqNMyJ61DJGijWHRDb mrcHWlUOYPc/iea7rZCNx7d2hb2arQmWuhdDlzXoDMNMpH2GhsrOLh3xwi/959DSLPRb tQXFMgn9rPydwamS3Oia8Tpfjt83jPxiNJwSp8n1nwIvmIy8PQev7hyF6RKvTqr75ICV kbbw== X-Gm-Message-State: AOAM530VhK/QQplvrV1Ze+OgC/uPOc2B5hebQaLuxSk0dRqbnHUijEty q8OUdmwMVX+zt8kQNCf8pLs+z3kjXJU= X-Google-Smtp-Source: ABdhPJzWO2nrkKEcTDBoxF4vvDvsSOjoyHOTMA+Tu9svV6Ni0ARjjVje6NmIfWm7v76ZY/01nWSHCg== X-Received: by 2002:a7b:c8c3:: with SMTP id f3mr4992742wml.110.1611765449491; Wed, 27 Jan 2021 08:37:29 -0800 (PST) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id w20sm2948884wmm.12.2021.01.27.08.37.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Jan 2021 08:37:28 -0800 (PST) Message-Id: <5ab9321a34ca15b4f532022ad0bab431fb201b07.1611765444.git.gitgitgadget@gmail.com> In-Reply-To: References: Date: Wed, 27 Jan 2021 16:37:24 +0000 Subject: [PATCH v3 3/3] range-diff(docs): explain how to specify commit ranges Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Uwe =?utf-8?q?Kleine-K=C3=B6nig?= , Eric Sunshine , Johannes Schindelin , Johannes Schindelin Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Johannes Schindelin From: Johannes Schindelin There are three forms, depending whether the user specifies one, two or three non-option arguments. We've never actually explained how this works in the manual, so let's explain it. Signed-off-by: Johannes Schindelin --- Documentation/git-range-diff.txt | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/Documentation/git-range-diff.txt b/Documentation/git-range-diff.txt index 9701c1e5fdd..14bffb272a0 100644 --- a/Documentation/git-range-diff.txt +++ b/Documentation/git-range-diff.txt @@ -28,6 +28,18 @@ Finally, the list of matching commits is shown in the order of the second commit range, with unmatched commits being inserted just after all of their ancestors have been shown. +There are three ways to specify the commit ranges: + +- ` `: Either commit range can be of the form + `..`, `^!` or `^-`. See `SPECIFYING RANGES` + in linkgit:gitrevisions[7] for more details. + +- `...`. This resembles the symmetric ranges mentioned in + the `SPECIFYING RANGES` section of linkgit:gitrevisions[7], and is + equivalent to `.. ..`. + +- ` `: This is equivalent to `.. + ..`. OPTIONS -------