Re: [PATCH] userdiff: add support for Fountain documents

[Zoë Blade]

Hi again!

Where's this at?  Your last regex looks perfect to me:

^((\\.[^.]|(int|ext|est|int\\.?/ext|i/e)[. ]).*)$

Do you need anything else from me?

Thanks,
Zoë.--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH] userdiff: add support for Fountain documents

[Zoë Blade]

Hi again Junio!

Yes, your more elegant and accurate regex sounds much better than the way I was 
trying it. :)  Please, go ahead and use yours instead.  Thank you for your help!

Thanks,
Zoë.--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH] userdiff: add support for Fountain documents

[Zoë Blade]

On 20 Jul 2015, at 22:17, Junio C Hamano  wrote:

>> +PATTERNS("fountain", 
>> "^((\\.|(([Ii][Nn][Tt]|[Ee][Ss][Tt]|[Ee][Xx][Tt])?\\.?|[Ii]([Nn][Tt])?\\.?/[Ee]([Xx][Tt])?\\.?)
>>  ).+)$",
>> + "[^ \t-]+"),
> 
> Wouldn't IPATTERN() be a better choice here?

Good point, thank you!  Much better:

IPATTERN("fountain", "^((\\.|((int|est|ext)?\\.?|i(nt)?\\.?/e(xt)?\\.?) ).+)$", 
"[^ \t-]+"),

It looks like some of the others might benefit from being case insensitive too, 
but I'm not sure, and at any rate it would warrant a separate patch.

I'll send another revision next... :)

Thanks,
Zoë.--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH] userdiff: add support for Fountain documents

[Zoë Blade]

On 17 Jul 2015, at 23:43, Junio C Hamano  wrote:

> * Although uppercase is recommended for Scene Headings to increase
>   readability, it is not required.
> 
> * A line beginning with any of the following, followed by either a
>   dot or a space, is considered a Scene Heading (unless the line is
>   preceded by an exclamation point !). Case insensitive.
> 
>  INT
>  EXT
>  EST
>  INT./EXT
>  INT/EXT
>  I/E
> 
> * You can "force" a Scene Heading by starting the line with a
>   single period.
> 
> * Scene Headings can optionally be appended with Scene
>   Numbers. Scene numbers are any alphanumerics (plus dashes and
>   periods), wrapped in #.
> 
> So, it appears wrong to insist on capital letters in the patterns.
> The pattern in the patch does not even accept punctuations on the
> line other than apostrophe.  I won't judge if it is OK to limit to
> US-ASCII ;-)
> 
> IPATTERNS("fountain",
>"^([.][^.]|(INT|EXT|EST|INT./EXT|INT/EXT|I/E)[. ]",
>"[^ \t-]+"),
> 
> or something like this, perhaps?

Good points, thanks!

This regex should be a bit sturdier:

$ cat scenes.txt 
int. yes - day
INT. YES - DAY #1A#
EXT. YES - DAY
.YES TOO
!EXT. NO
INT/EXT YES - DAY
INT./EXT YES - DAY
I/E YES - DAY
no
NO
NO.
!.NO.
int yes - day
est yes - day
!EXT. NO - DAY

$ grep -E 
"^((\.|(([Ii][Nn][Tt]|[Ee][Ss][Tt]|[Ee][Xx][Tt])?\\.?|[Ii]([Nn][Tt])?\.?/[Ee]([Xx][Tt])?\.?)
 ).+)$" scenes.txt 
int. yes - day
INT. YES - DAY #1A#
EXT. YES - DAY
.YES TOO
INT/EXT YES - DAY
INT./EXT YES - DAY
I/E YES - DAY
int yes - day
est yes - day

Revised version of patch incoming...--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: Problem with architecture git.

[Zoë Blade]

On 17 Jul 2015, at 16:12, Alexander  wrote:

> Hello,
> 
> I have problem with architecure of my project, help me to resolve problem 
> . I want to do in my remote repo two branches with two different working 
> folders (master , dev ) to check it . How can I do it ?
> 
> Thank you. 

You'll probably want something like this in your remote (presumably bare) 
repo's post receive hook:

#!/bin/sh

GIT_WORK_TREE=/var/www/html/www.foo.com git checkout master -f
GIT_WORK_TREE=/var/www/html/www.foo.com git clean -f
GIT_WORK_TREE=/var/www/html/dev.foo.com git checkout dev -f
GIT_WORK_TREE=/var/www/html/dev.foo.com git clean -f

It's one-way, from Git to the directories only, but should do the trick.

Hope that helps,
Zoë.--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH] userdiff: add support for Fountain documents

[Zoë Blade]

On 17 Jul 2015, at 14:03, Johannes Schindelin  
wrote:

> Maybe you want to add a paragraph explaining a bit more about Fountain, or at 
> least link to http://fountain.io/?
> 
> In any case, you will need to sign off on your patch:
> 
>
> https://github.com/git/git/blob/v2.4.6/Documentation/SubmittingPatches#L234-L286

Thanks, I'll amend it accordingly.  I originally mentioned the Fountain site in 
my rough draft of the commit message, but then removed it again after reading 
more of the patch submitting documentation and not spotting the nuance about 
when is and isn't a good time to include URLs.  No bother, I managed the commit 
message in another repo... :D  I'll bring it back and tidy it up a bit, then 
sign it off.

Thanks,
Zoë.--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html