From: Mark Allen <hidden> Date: 2016-06-15 22:41:58
Here're a couple of pretty simple patches against cg-log and cg-status (two cogito
commands I use a lot) for the non-GNU (or at least older, forked GNU) tools on Darwin.
There's also a non-GNU sed problem in cg-commit, but I haven't quite figured a good way
to tackle this issue yet. (The problem is in the regex stripping leading and trailing
newlines from $LOGMSG at line 170. Darwin's sed does not like the embedded curly braces,
but there's not a good simple way to rewrite this and retain the meaning of the "sedlet"
that tracks whether its seen any text yet.)
Cheers,
--Mark
From: Petr Baudis <hidden> Date: 2016-06-15 22:41:58
Dear diary, on Mon, May 30, 2005 at 01:00:10AM CEST, I got a letter
where Mark Allen [off-list ref] told me that...
Here're a couple of pretty simple patches against cg-log and cg-status (two cogito
commands I use a lot) for the non-GNU (or at least older, forked GNU) tools on Darwin.
Hmm, coudlnt' showdate be fixed instead then? And $date is not a file so
-r $date makes no sense to me - what am I missing?
if [ "$pdate" ]; then
- echo -n $color$key $rest | sed "s/>.*/> $pdate/"
- echo $coldefault
+ echo -n $color$key $rest | sed "s/>.*/> $pdate/"
+ echo -n $coldefault
I'm lost on this one too. Why do you introduce the -n?
quoted hunk
else
echo $color$key $rest $coldefault
fi
@@ -168,11 +168,8 @@ if [ -n "$list_files" ]; then list_commit_files "$tree1" "$tree2" fi- echo; sed -re '- / *Signed-off-by:.*/Is//'$colsignoff'&'$coldefault'/- / *Acked-by:.*/Is//'$colsignoff'&'$coldefault'/- s/./ &/- '+ echo; sed -e "/ *Signed-off-by:.*/s/ *Signed-off-by:.*/$colsignoff&$coldefault/" -e"/+*Acked-by:.*/s/ *Acked-by:.*/$colsignoff&$coldefault/" -e "s/./ &/"+
Is it necessary to take away the newlines? What is the real problem,
actually? Just the I flag?
Could you please sign the patch off, and send it as text/plain or inline the
message body?
Thanks,
--
Petr "Pasky" Baudis
Stuff: http://pasky.or.cz/
C++: an octopus made by nailing extra legs onto a dog. -- Steve Taylor
Hmm, coudlnt' showdate be fixed instead then? And $date is not a file so
-r $date makes no sense to me - what am I missing?
There is no showdate(1) command on Darwin. On Darwin, the date(1) command flags are
-u (show UTC)
-r seconds
So `date -u -r $date` gives output like "Sun May 29 12:07:55 GMT 2005" instead of
1117336545
I'm lost on this one too. Why do you introduce the -n?
Since I used date(1) above, I get an extra newline now when the date string is printed
out. Using echo -n on the second echo stops that behavior. (This is perhaps a matter of
taste; some people like lots of whitespace in headers, and some don't.)
Is it necessary to take away the newlines? What is the real problem,
actually? Just the I flag?
Is it strictly necessary to take away the newlines? I don't know. To be honest, I didn't
experiment too much with alternate implementations. But the I flag in the sed script,
yes that is not understood by non-GNU sed. And the "-r" to sed itself is also
problematic.
Could you please sign the patch off, and send it as text/plain or inline the
message body?
Modify cg-log and cg-status to work with non-GNU sed, sort and date
Signed-off-by: Mark Allen <redacted>
---
commit 7e8fbf87acead0ee83afc4647228efdad0bbae2e
tree 50acf8ce23fee4ca6c9493b5f5959093e7579c74
parent d36ed1fd011d349ea2adc00456750b5b3da3a9cd
author Mark Allen [off-list ref] 1117409841 -0500
committer Mark Allen [off-list ref] 1117409841 -0500
cg-log | 15 +++++++--------
cg-status | 2 +-
2 files changed, 8 insertions(+), 9 deletions(-)
Index: cg-log
===================================================================
Is it necessary to take away the newlines? What is the real problem,
actually? Just the I flag?
Is it strictly necessary to take away the newlines? I don't know. To be honest, I didn't
experiment too much with alternate implementations. But the I flag in the sed script,
yes that is not understood by non-GNU sed. And the "-r" to sed itself is also
problematic.
I think we don't really need -r anyway. Could you please try with the
'i' flag instead of 'I'? (The manpage is somewhat unclear on the
difference and portability.) Also, could you try if it works with the
newlines?
--
Petr "Pasky" Baudis
Stuff: http://pasky.or.cz/
C++: an octopus made by nailing extra legs onto a dog. -- Steve Taylor
Is it necessary to take away the newlines? What is the real
problem,
actually? Just the I flag?
Is it strictly necessary to take away the newlines? I don't know. To
be honest, I didn't
experiment too much with alternate implementations. But the I flag
in the sed script,
yes that is not understood by non-GNU sed. And the "-r" to sed
itself is also
problematic.
I think we don't really need -r anyway. Could you please try with the
'i' flag instead of 'I'? (The manpage is somewhat unclear on the
difference and portability.) Also, could you try if it works with the
newlines?
-r here is for the 'I' (same as 'i') modifier, which means case
insensitive. non-GNU sed might not have the '-r' option or the 'I'
('i') modifier.
I dunno about the strict rules of 'Signed-off-by' things but what i have
seen are all _exactly_ of this form. I have never seen something like
'SIGNED-OFF-BY' or 'sIGneD-oFf-bY'.
If only the exact case sensitive form is allowed, then we can safely
remove the '-r' and 'I'.
Also, to Mark, as a quick alternative to work around these sed issues,
you can install the gsed port. IIRC, opendarwin has this port.
Speaking of other portability issues, i made up a patch to make cogito
properly work under fbsd (without hurting others hopefully) weeks ago:
1) expr would regard a negative $dtz as an option (-xx).
2) coloring for both terminfo & termcap terminal.
Index: cg-Xlib
===================================================================
From: Mark Allen <hidden> Date: 2016-06-15 22:41:59
--- Petr Baudis <pasky@ucw.cz> wrote:
I think we don't really need -r anyway. Could you please try with the
'i' flag instead of 'I'? (The manpage is somewhat unclear on the
difference and portability.) Also, could you try if it works with the
newlines?
I tried with an i\ which is what the sed on Darwin wants, and it didn't work very well...
so, I just removed the I and i\ and that worked pretty nicely. I shaved off the -r and
made for a simpler patch.
I also added $has_gnudate to cg-Xlib and modified the logic in showdate to use the
appropriate command depending on whether $has_gnudate is true or false.
Finally, I stripped the -z from sort because it seems to do the right thing anyway
without it and it makes the sort on Darwin unhappy.
Anyway, here's another try, this against the tip of the most recent cogito tree.
---
Modify cg-log, cg-Xlib and cg-status for non-GNU sed, sort and date.
Signed-off-by: Mark Allen <redacted>
@@ -190,8 +190,7 @@ $revls | $revsort | while read time comm date=(${rest#*> }) pdate="$(showdate $date)" if [ "$pdate" ]; then- echo -n $color$key $rest | sed "s/>.*/>
$pdate/"
- echo $coldefault
+ echo -n $color$key $rest | sed "s/>.*/>
$pdate$coldefault/"
else
echo $color$key $rest $coldefault
fi
@@ -208,9 +207,9 @@ $revls | $revsort | while read time comm if [ -n "$list_files" ]; then list_commit_files "$tree1" "$tree2" fi- echo; sed -re '- / *Signed-off-by:.*/Is//'$colsignoff'&'$