git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Thomas Rast <trast@inf.ethz.ch>
To: Jonathan Nieder <jrnieder@gmail.com>
Cc: git@vger.kernel.org, "Ralf Thielow" <ralf.thielow@gmail.com>,
	"Jan Krüger" <jk@jk.gs>, "Christian Stimming" <stimming@tuhh.de>
Subject: Re: [PATCH 2/2] show-branch: fix description of --date-order
Date: Tue, 16 Jul 2013 22:11:23 +0200	[thread overview]
Message-ID: <87ehayqn84.fsf@hexa.v.cablecom.net> (raw)
In-Reply-To: <20130716182254.GL14690@google.com> (Jonathan Nieder's message of "Tue, 16 Jul 2013 11:22:54 -0700")

Jonathan Nieder <jrnieder@gmail.com> writes:

> Thomas Rast wrote:
>
>> The existing description reads as if it somehow applies a filter.
>> Change it to explain that it is merely about the ordering.
> [...]
>>  		OPT_SET_INT(0, "date-order", &sort_order,
>> -			    N_("show commits where no parent comes before its "
>> +			    N_("sort commits such that no parent comes before its "
>>  			       "children"),
>>  			    REV_SORT_BY_COMMIT_DATE),
>
> I fear this wording tweak doesn't go far enough.  The above
> description seems to describe --topo-order just as well as
> --date-order.
>
> How about something like
>
> 		N_("topologically sort, maintaining date order where possible"),
>
> ?  I haven't checked the code to see if that's accurate, though.

Same laziness here, as I never actually use show-branch.  However,
you're right, I missed that it also has --topo-order (with a much saner
message).  So I think we can safely assume that it's the same meaning as
for git-log:

>  - by default, commits are listed in commit date order (newest first)
>
>  - with --topo-order, they are topologically sorted in such a way as
>    to ensure that in cases like
>
> 	---1---2---4---7
> 	    \           \
> 	     3---5---6---8
>
>    (from git-log(1)), parallel tracks are not interleaved
>
>  - with --date-order, they are topologically sorted but less
>    aggressively, in particular matching commit date order in the
>    usual case that that is already topologically sorted.
> 
> That would make --topo-order stronger than "show commits in
> topological order" --- it should say something like "sort trying to
> avoid breaking up lines of development".

Depending on how you look at it, the lines of development are kept
together purely by coincidence or algorithmic convenience...

-- 
Thomas Rast
trast@{inf,student}.ethz.ch

  reply	other threads:[~2013-07-16 20:11 UTC|newest]

Thread overview: 35+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-06-12 17:15 [PATCH 0/3] Switch German translation from pure German to German+English Ralf Thielow
2013-06-12 17:15 ` [PATCH 1/3] l10n: de.po: switch from pure German to German+English (part 1) Ralf Thielow
2013-06-12 17:15   ` [PATCH 2/3] l10n: de.po: switch from pure German to German+English (part 2) Ralf Thielow
2013-06-12 17:15     ` [PATCH 3/3] l10n: de.po: switch from pure German to German+English (part 3) Ralf Thielow
2013-07-10 17:54 ` [PATCHv2 0/3] Switch German translation to G+E Ralf Thielow
2013-07-10 17:54   ` [PATCHv2 1/3] l10n: de.po: switch from pure German to German+English (part 1) Ralf Thielow
2013-07-10 17:54     ` [PATCHv2 2/3] l10n: de.po: switch from pure German to German+English (part 2) Ralf Thielow
2013-07-10 17:54       ` [PATCHv2 3/3] l10n: de.po: switch from pure German to German+English (part 3) Ralf Thielow
2013-07-15 21:53         ` Thomas Rast
2013-07-15 21:53       ` [PATCHv2 2/3] l10n: de.po: switch from pure German to German+English (part 2) Thomas Rast
2013-07-15 21:53     ` [PATCHv2 1/3] l10n: de.po: switch from pure German to German+English (part 1) Thomas Rast
2013-07-15 21:53   ` [PATCHv2 0/3] Switch German translation to G+E Thomas Rast
2013-07-16  9:21     ` [PATCH 1/2] apply, entry: speak of submodules instead of subprojects Thomas Rast
2013-07-16  9:22       ` [PATCH 2/2] show-branch: fix description of --date-order Thomas Rast
2013-07-16 18:22         ` Jonathan Nieder
2013-07-16 20:11           ` Thomas Rast [this message]
2013-07-16 18:07       ` [PATCH 1/2] apply, entry: speak of submodules instead of subprojects Jonathan Nieder
2013-07-16 19:05         ` Jens Lehmann
2013-07-16 20:07           ` Thomas Rast
2013-07-17 20:34             ` Junio C Hamano
2013-07-17  5:51     ` [PATCHv3 0/3] Switch German translation to G+E Ralf Thielow
2013-07-17  5:51       ` [PATCHv3 1/3] l10n: de.po: switch from pure German to German+English (part 1) Ralf Thielow
2013-07-17  5:51         ` [PATCHv3 2/3] l10n: de.po: switch from pure German to German+English (part 2) Ralf Thielow
2013-07-17  5:51           ` [PATCHv3 3/3] l10n: de.po: switch from pure German to German+English (part 3) Ralf Thielow
2013-07-17  9:35         ` [PATCHv3 1/3] l10n: de.po: switch from pure German to German+English (part 1) Thomas Rast
2013-07-17 16:24       ` [PATCH v3 0/3] Switch German translation to G+E Ralf Thielow
2013-07-17 16:24         ` [PATCH v3 1/3] l10n: de.po: switch from pure German to German+English (part 1) Ralf Thielow
2013-07-17 16:24           ` [PATCH v3 2/3] l10n: de.po: switch from pure German to German+English (part 2) Ralf Thielow
2013-07-17 16:24             ` [PATCH v3 3/3] l10n: de.po: switch from pure German to German+English (part 3) Ralf Thielow
2013-07-19 16:45           ` [PATCH v3 1/3] l10n: de.po: switch from pure German to German+English (part 1) Ralf Thielow
2013-07-18 12:09         ` [PATCH v3 0/3] Switch German translation to G+E Thomas Rast
2013-07-18 19:37           ` Junio C Hamano
2013-07-21 13:53             ` Jiang Xin
2013-07-18 12:26     ` [PATCH v2 1/2] apply, entry: speak of submodules instead of subprojects Thomas Rast
2013-07-18 12:26       ` [PATCH v2 2/2] show-branch: fix description of --date-order Thomas Rast

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=87ehayqn84.fsf@hexa.v.cablecom.net \
    --to=trast@inf.ethz.ch \
    --cc=git@vger.kernel.org \
    --cc=jk@jk.gs \
    --cc=jrnieder@gmail.com \
    --cc=ralf.thielow@gmail.com \
    --cc=stimming@tuhh.de \
    /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).