* [PATCH v3] log: forbid log --graph --no-walk
[not found] <md5:DbynqDqKsm8mpedJ3B12rw==>
@ 2015-03-15 0:43 ` Manos Pitsidianakis
2015-03-15 1:08 ` Dongcan Jiang
0 siblings, 1 reply; 7+ messages in thread
From: Manos Pitsidianakis @ 2015-03-15 0:43 UTC (permalink / raw)
To: git; +Cc: me, sandals, gitster, peff
In git-log, --graph shows a graphical representation of a continuous
commit history, and --no-walk shows discrete specified commits without
continuity. Using both doesn't make sense, so we forbid the combined use
of these flags.
Signed-off-by: Manos Pitsidianakis <epilys@norn.io>
---
This is a microproject intended to complement my GSoC application.
builtin/log.c | 2 ++
t/t4202-log.sh | 4 ++++
2 files changed, 6 insertions(+)
diff --git a/builtin/log.c b/builtin/log.c
index dd8f3fc..5aaf964 100644
--- a/builtin/log.c
+++ b/builtin/log.c
@@ -155,6 +155,8 @@ static void cmd_log_init_finish(int argc, const char **argv, const char *prefix,
memset(&w, 0, sizeof(w));
userformat_find_requirements(NULL, &w);
+ if (rev->graph && rev->no_walk)
+ die("--graph and --no-walk are incompatible");
if (!rev->show_notes_given && (!rev->pretty_given || w.notes))
rev->show_notes = 1;
if (rev->show_notes)
diff --git a/t/t4202-log.sh b/t/t4202-log.sh
index 5f2b290..5d72713 100755
--- a/t/t4202-log.sh
+++ b/t/t4202-log.sh
@@ -887,4 +887,8 @@ test_expect_success GPG 'log --graph --show-signature for merged tag' '
grep "^| | gpg: Good signature" actual
'
+test_expect_success 'forbid log --graph --no-walk' '
+ test_must_fail git log --graph --no-walk
+'
+
test_done
--
2.1.4
^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH v3] log: forbid log --graph --no-walk
2015-03-15 0:43 ` [PATCH v3] log: forbid log --graph --no-walk Manos Pitsidianakis
@ 2015-03-15 1:08 ` Dongcan Jiang
2015-03-15 1:24 ` Manos Pitsidianakis
0 siblings, 1 reply; 7+ messages in thread
From: Dongcan Jiang @ 2015-03-15 1:08 UTC (permalink / raw)
To: Manos Pitsidianakis; +Cc: Git List, me, sandals, Junio C Hamano, peff
it seems that your patch could not pass t4052-stat-output.sh.
I think it would be better if you could improve the specification for
this change in Document/rev-list-options.txt
2015-03-15 8:43 GMT+08:00 Manos Pitsidianakis <epilys@norn.io>:
> In git-log, --graph shows a graphical representation of a continuous
> commit history, and --no-walk shows discrete specified commits without
> continuity. Using both doesn't make sense, so we forbid the combined use
> of these flags.
>
> Signed-off-by: Manos Pitsidianakis <epilys@norn.io>
> ---
> This is a microproject intended to complement my GSoC application.
> builtin/log.c | 2 ++
> t/t4202-log.sh | 4 ++++
> 2 files changed, 6 insertions(+)
>
> diff --git a/builtin/log.c b/builtin/log.c
> index dd8f3fc..5aaf964 100644
> --- a/builtin/log.c
> +++ b/builtin/log.c
> @@ -155,6 +155,8 @@ static void cmd_log_init_finish(int argc, const char **argv, const char *prefix,
> memset(&w, 0, sizeof(w));
> userformat_find_requirements(NULL, &w);
>
> + if (rev->graph && rev->no_walk)
> + die("--graph and --no-walk are incompatible");
> if (!rev->show_notes_given && (!rev->pretty_given || w.notes))
> rev->show_notes = 1;
> if (rev->show_notes)
> diff --git a/t/t4202-log.sh b/t/t4202-log.sh
> index 5f2b290..5d72713 100755
> --- a/t/t4202-log.sh
> +++ b/t/t4202-log.sh
> @@ -887,4 +887,8 @@ test_expect_success GPG 'log --graph --show-signature for merged tag' '
> grep "^| | gpg: Good signature" actual
> '
>
> +test_expect_success 'forbid log --graph --no-walk' '
> + test_must_fail git log --graph --no-walk
> +'
> +
> test_done
> --
> 2.1.4
>
>
>
> --
> 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
--
江东灿(Dongcan Jiang)
Team of Search Engine & Web Mining
School of Electronic Engineering & Computer Science
Peking University, Beijing, 100871, P.R.China
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH v3] log: forbid log --graph --no-walk
2015-03-15 1:08 ` Dongcan Jiang
@ 2015-03-15 1:24 ` Manos Pitsidianakis
2015-03-15 1:39 ` Dongcan Jiang
0 siblings, 1 reply; 7+ messages in thread
From: Manos Pitsidianakis @ 2015-03-15 1:24 UTC (permalink / raw)
To: Dongcan Jiang; +Cc: Git List, me, sandals, Junio C Hamano, peff
On 03/15/2015 03:08 AM, Dongcan Jiang wrote:
> it seems that your patch could not pass t4052-stat-output.sh.
>
> I think it would be better if you could improve the specification for
> this change in Document/rev-list-options.txt
Can't grok why this happens. What exactly is happening in
t4052-stat-output.sh? Is it testing every possible combination of git
commands and arguments?
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH v3] log: forbid log --graph --no-walk
2015-03-15 1:24 ` Manos Pitsidianakis
@ 2015-03-15 1:39 ` Dongcan Jiang
2015-03-16 19:00 ` Manos Pitsidianakis
0 siblings, 1 reply; 7+ messages in thread
From: Dongcan Jiang @ 2015-03-15 1:39 UTC (permalink / raw)
To: Manos Pitsidianakis
Cc: Git List, me, brian m. carlson, Junio C Hamano, Jeff King
Because "revs->no_walk" gets set when it comes to "git show". You can
find more information on [1].
[1] http://article.gmane.org/gmane.comp.version-control.git/264921
2015-03-15 9:24 GMT+08:00 Manos Pitsidianakis <epilys@norn.io>:
> On 03/15/2015 03:08 AM, Dongcan Jiang wrote:
>> it seems that your patch could not pass t4052-stat-output.sh.
>>
>> I think it would be better if you could improve the specification for
>> this change in Document/rev-list-options.txt
>
> Can't grok why this happens. What exactly is happening in
> t4052-stat-output.sh? Is it testing every possible combination of git
> commands and arguments?
--
江东灿(Dongcan Jiang)
Team of Search Engine & Web Mining
School of Electronic Engineering & Computer Science
Peking University, Beijing, 100871, P.R.China
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH v3] log: forbid log --graph --no-walk
2015-03-15 1:39 ` Dongcan Jiang
@ 2015-03-16 19:00 ` Manos Pitsidianakis
2015-03-16 19:08 ` Junio C Hamano
0 siblings, 1 reply; 7+ messages in thread
From: Manos Pitsidianakis @ 2015-03-16 19:00 UTC (permalink / raw)
To: Dongcan Jiang; +Cc: Git List, me, brian m. carlson, Junio C Hamano, Jeff King
On 03/15/2015 03:39 AM, Dongcan Jiang wrote:
> Because "revs->no_walk" gets set when it comes to "git show".
So basically rewriting t4052-stat-output.sh to exclude git show --graph
cases (or similar) is not enough. If rewriting git-show code is what is
needed, is that in the scope of a microproject?
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH v3] log: forbid log --graph --no-walk
2015-03-16 19:00 ` Manos Pitsidianakis
@ 2015-03-16 19:08 ` Junio C Hamano
2015-03-16 19:15 ` Manos Pitsidianakis
0 siblings, 1 reply; 7+ messages in thread
From: Junio C Hamano @ 2015-03-16 19:08 UTC (permalink / raw)
To: Manos Pitsidianakis
Cc: Dongcan Jiang, Git List, me, brian m. carlson, Jeff King
Manos Pitsidianakis <epilys@norn.io> writes:
> On 03/15/2015 03:39 AM, Dongcan Jiang wrote:
>> Because "revs->no_walk" gets set when it comes to "git show".
>
> So basically rewriting t4052-stat-output.sh to exclude git show --graph
> cases (or similar) is not enough. If rewriting git-show code is what is
> needed, is that in the scope of a microproject?
Perhaps 13b25381 (revision: forbid combining --graph and --no-walk,
2015-03-11) that is queued on 'pu' would be a good answer to this
question?
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH v3] log: forbid log --graph --no-walk
2015-03-16 19:08 ` Junio C Hamano
@ 2015-03-16 19:15 ` Manos Pitsidianakis
0 siblings, 0 replies; 7+ messages in thread
From: Manos Pitsidianakis @ 2015-03-16 19:15 UTC (permalink / raw)
To: Junio C Hamano; +Cc: Git List
On 03/16/2015 09:08 PM, Junio C Hamano wrote:
> Perhaps 13b25381 (revision: forbid combining --graph and --no-walk,
> 2015-03-11) that is queued on 'pu' would be a good answer to this
> question?
Didn't notice a patch was queued on 'pu', thanks.
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2015-03-16 19:14 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
[not found] <md5:DbynqDqKsm8mpedJ3B12rw==>
2015-03-15 0:43 ` [PATCH v3] log: forbid log --graph --no-walk Manos Pitsidianakis
2015-03-15 1:08 ` Dongcan Jiang
2015-03-15 1:24 ` Manos Pitsidianakis
2015-03-15 1:39 ` Dongcan Jiang
2015-03-16 19:00 ` Manos Pitsidianakis
2015-03-16 19:08 ` Junio C Hamano
2015-03-16 19:15 ` Manos Pitsidianakis
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 NNTP newsgroup(s).