From: Karthik Nayak <karthik.188@gmail.com>
To: git@vger.kernel.org
Cc: jacob.keller@gmail.com, gitster@pobox.com, jnareb@gmail.com,
Karthik Nayak <Karthik.188@gmail.com>
Subject: [PATCH v8 14/19] ref-filter: modify the 'lstrip=<N>' option to work with negative '<N>'
Date: Wed, 7 Dec 2016 21:06:22 +0530 [thread overview]
Message-ID: <20161207153627.1468-15-Karthik.188@gmail.com> (raw)
In-Reply-To: <20161207153627.1468-1-Karthik.188@gmail.com>
Currently the 'lstrip=<N>' option only takes a positive value '<N>'
and strips '<N>' slash-separated path components from the left. Modify
the 'lstrip' option to also take a negative number '<N>' which would
only _leave_ behind 'N' slash-separated path components from the left.
Add documentation and tests for the same.
Signed-off-by: Karthik Nayak <Karthik.188@gmail.com>
---
Documentation/git-for-each-ref.txt | 5 +++--
ref-filter.c | 26 +++++++++++++++++++++-----
t/t6300-for-each-ref.sh | 15 ++++++++-------
3 files changed, 32 insertions(+), 14 deletions(-)
diff --git a/Documentation/git-for-each-ref.txt b/Documentation/git-for-each-ref.txt
index f85ccff..ad9b243 100644
--- a/Documentation/git-for-each-ref.txt
+++ b/Documentation/git-for-each-ref.txt
@@ -95,8 +95,9 @@ refname::
abbreviation mode. If `lstrip=<N>` is appended, strips `<N>`
slash-separated path components from the front of the refname
(e.g., `%(refname:lstrip=2)` turns `refs/tags/foo` into `foo`.
- `<N>` must be a positive integer. If a displayed ref has fewer
- components than `<N>`, the command aborts with an error.
+ if `<N>` is a negative number, then only `<N>` path components
+ are left behind. If a displayed ref has fewer components than
+ `<N>`, the command aborts with an error.
objecttype::
The type of the object (`blob`, `tree`, `commit`, `tag`).
diff --git a/ref-filter.c b/ref-filter.c
index c74b08d..deb2b29 100644
--- a/ref-filter.c
+++ b/ref-filter.c
@@ -33,7 +33,7 @@ struct if_then_else {
struct refname_atom {
enum { R_NORMAL, R_SHORT, R_LSTRIP } option;
- unsigned int lstrip;
+ int lstrip;
};
/*
@@ -92,8 +92,8 @@ static void refname_atom_parser_internal(struct refname_atom *atom,
atom->option = R_SHORT;
else if (skip_prefix(arg, "lstrip=", &arg)) {
atom->option = R_LSTRIP;
- if (strtoul_ui(arg, 10, &atom->lstrip) || atom->lstrip <= 0)
- die(_("positive value expected refname:lstrip=%s"), arg);
+ if (strtol_i(arg, 10, &atom->lstrip))
+ die(_("Integer value expected refname:lstrip=%s"), arg);
} else
die(_("unrecognized %%(%s) argument: %s"), name, arg);
}
@@ -1071,21 +1071,37 @@ static inline char *copy_advance(char *dst, const char *src)
return dst;
}
-static const char *lstrip_ref_components(const char *refname, unsigned int len)
+static const char *lstrip_ref_components(const char *refname, int len)
{
long remaining = len;
const char *start = refname;
+ if (len < 0) {
+ int i;
+ const char *p = refname;
+
+ /* Find total no of '/' separated path-components */
+ for (i = 0; p[i]; p[i] == '/' ? i++ : *p++);
+ /*
+ * The number of components we need to strip is now
+ * the total minus the components to be left (Plus one
+ * because we count the number of '/', but the number
+ * of components is one more than the no of '/').
+ */
+ remaining = i + len + 1;
+ }
+
while (remaining) {
switch (*start++) {
case '\0':
- die(_("ref '%s' does not have %ud components to :lstrip"),
+ die(_("ref '%s' does not have %d components to :lstrip"),
refname, len);
case '/':
remaining--;
break;
}
}
+
return start;
}
diff --git a/t/t6300-for-each-ref.sh b/t/t6300-for-each-ref.sh
index 2b1af9c..26adca8 100755
--- a/t/t6300-for-each-ref.sh
+++ b/t/t6300-for-each-ref.sh
@@ -53,12 +53,16 @@ test_atom head refname refs/heads/master
test_atom head refname:short master
test_atom head refname:lstrip=1 heads/master
test_atom head refname:lstrip=2 master
+test_atom head refname:lstrip=-1 master
+test_atom head refname:lstrip=-2 heads/master
test_atom head upstream refs/remotes/origin/master
test_atom head upstream:short origin/master
test_atom head upstream:lstrip=2 origin/master
+test_atom head upstream:lstrip=-2 origin/master
test_atom head push refs/remotes/myfork/master
test_atom head push:short myfork/master
test_atom head push:lstrip=1 remotes/myfork/master
+test_atom head push:lstrip=-1 master
test_atom head objecttype commit
test_atom head objectsize 171
test_atom head objectname $(git rev-parse refs/heads/master)
@@ -141,14 +145,9 @@ test_expect_success 'Check invalid atoms names are errors' '
test_must_fail git for-each-ref --format="%(INVALID)" refs/heads
'
-test_expect_success 'arguments to :lstrip must be positive integers' '
- test_must_fail git for-each-ref --format="%(refname:lstrip=0)" &&
- test_must_fail git for-each-ref --format="%(refname:lstrip=-1)" &&
- test_must_fail git for-each-ref --format="%(refname:lstrip=foo)"
-'
-
test_expect_success 'stripping refnames too far gives an error' '
- test_must_fail git for-each-ref --format="%(refname:lstrip=3)"
+ test_must_fail git for-each-ref --format="%(refname:lstrip=3)" &&
+ test_must_fail git for-each-ref --format="%(refname:lstrip=-4)"
'
test_expect_success 'Check format specifiers are ignored in naming date atoms' '
@@ -603,10 +602,12 @@ test_expect_success 'Verify usage of %(symref:short) atom' '
cat >expected <<EOF
master
+heads/master
EOF
test_expect_success 'Verify usage of %(symref:lstrip) atom' '
git for-each-ref --format="%(symref:lstrip=2)" refs/heads/sym > actual &&
+ git for-each-ref --format="%(symref:lstrip=-2)" refs/heads/sym >> actual &&
test_cmp expected actual
'
--
2.10.2
next prev parent reply other threads:[~2016-12-07 15:37 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-12-07 15:36 [PATCH v8 00/19] port branch.c to use ref-filter's printing options Karthik Nayak
2016-12-07 15:36 ` [PATCH v8 01/19] ref-filter: implement %(if), %(then), and %(else) atoms Karthik Nayak
2016-12-07 15:36 ` [PATCH v8 02/19] ref-filter: include reference to 'used_atom' within 'atom_value' Karthik Nayak
2016-12-07 15:36 ` [PATCH v8 03/19] ref-filter: implement %(if:equals=<string>) and %(if:notequals=<string>) Karthik Nayak
2016-12-07 15:36 ` [PATCH v8 04/19] ref-filter: modify "%(objectname:short)" to take length Karthik Nayak
2016-12-07 15:36 ` [PATCH v8 05/19] ref-filter: move get_head_description() from branch.c Karthik Nayak
2016-12-07 15:36 ` [PATCH v8 06/19] ref-filter: introduce format_ref_array_item() Karthik Nayak
2016-12-07 15:36 ` [PATCH v8 07/19] ref-filter: make %(upstream:track) prints "[gone]" for invalid upstreams Karthik Nayak
2016-12-07 15:36 ` [PATCH v8 08/19] ref-filter: add support for %(upstream:track,nobracket) Karthik Nayak
2016-12-07 15:36 ` [PATCH v8 09/19] ref-filter: make "%(symref)" atom work with the ':short' modifier Karthik Nayak
2016-12-07 15:36 ` [PATCH v8 10/19] ref-filter: introduce refname_atom_parser_internal() Karthik Nayak
2016-12-07 15:36 ` [PATCH v8 11/19] ref-filter: introduce refname_atom_parser() Karthik Nayak
2016-12-07 15:36 ` [PATCH v8 12/19] ref-filter: make remote_ref_atom_parser() use refname_atom_parser_internal() Karthik Nayak
2016-12-07 15:36 ` [PATCH v8 13/19] ref-filter: rename the 'strip' option to 'lstrip' Karthik Nayak
2016-12-07 15:36 ` Karthik Nayak [this message]
2016-12-07 15:36 ` [PATCH v8 15/19] ref-filter: add an 'rstrip=<N>' option to atoms which deal with refnames Karthik Nayak
2016-12-07 15:36 ` [PATCH v8 16/19] ref-filter: allow porcelain to translate messages in the output Karthik Nayak
2016-12-07 15:36 ` [PATCH v8 17/19] branch, tag: use porcelain output Karthik Nayak
2016-12-07 15:36 ` [PATCH v8 18/19] branch: use ref-filter printing APIs Karthik Nayak
2016-12-09 14:03 ` Jeff King
2016-12-12 11:20 ` Karthik Nayak
2016-12-12 12:15 ` Jeff King
2016-12-12 16:29 ` Karthik Nayak
2016-12-12 16:40 ` Jeff King
2016-12-12 17:18 ` Karthik Nayak
2016-12-07 15:36 ` [PATCH v8 19/19] branch: implement '--format' option Karthik Nayak
2016-12-08 0:01 ` [PATCH v8 00/19] port branch.c to use ref-filter's printing options Jacob Keller
2016-12-08 18:58 ` Junio C Hamano
2016-12-09 1:45 ` Jacob Keller
2016-12-12 10:42 ` Karthik Nayak
2016-12-08 23:58 ` Junio C Hamano
2016-12-12 10:43 ` Karthik Nayak
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=20161207153627.1468-15-Karthik.188@gmail.com \
--to=karthik.188@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jacob.keller@gmail.com \
--cc=jnareb@gmail.com \
/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).