BBEdit & git/mercurial

[Lorin Rivers]

I searched the google group, did some googling, and basically came up empty.

I'm contemplating one of the DSVNs for a project and was wondering how people 
who use those AND BBEdit handle their workflows.
-- 
Lorin Rivers
Mosasaur: Killer Technical Marketing 

512/203.3198 (m)


-- 
You received this message because you are subscribed to the 
"BBEdit Talk" discussion group on Google Groups.
To post to this group, send email to bbedit@googlegroups.com
To unsubscribe from this group, send email to
bbedit+unsubscr...@googlegroups.com
For more options, visit this group at
http://groups.google.com/group/bbedit?hl=en
If you have a feature request or would like to report a problem, 
please email "supp...@barebones.com" rather than posting to the group.

To unsubscribe from this group, send email to 
bbedit+unsubscribegooglegroups.com or reply to this email with the words 
"REMOVE ME" as the subject.

Re: BBEdit & git/mercurial

[Steve deRosier]

Hi Lorin,

There's a git integration for BBEdit.  For some reason it's now within
the Rails stuff.  The original is at:
http://www.idolhands.com/application-and-web-development/source-control/basic-git-integration-with-bbedit

That said, I've never used it.  I use BBedit extensively, but I prefer
to use git (and frankly CVS and SVN too) on the command-line.  git's
basic command-line tools are very powerful and easy to use, and I
haven't seen an advantageous GUI for it yet.

- Steve

On Fri, Mar 19, 2010 at 11:09 AM, Lorin Rivers  wrote:
> I searched the google group, did some googling, and basically came up empty.
>
> I'm contemplating one of the DSVNs for a project and was wondering how people 
> who use those AND BBEdit handle their workflows.
> --
> Lorin Rivers
> Mosasaur: Killer Technical Marketing 
> 
> 512/203.3198 (m)
>
>
> --
> You received this message because you are subscribed to the
> "BBEdit Talk" discussion group on Google Groups.
> To post to this group, send email to bbedit@googlegroups.com
> To unsubscribe from this group, send email to
> bbedit+unsubscr...@googlegroups.com
> For more options, visit this group at
> http://groups.google.com/group/bbedit?hl=en
> If you have a feature request or would like to report a problem,
> please email "supp...@barebones.com" rather than posting to the group.
>
> To unsubscribe from this group, send email to 
> bbedit+unsubscribegooglegroups.com or reply to this email with the words 
> "REMOVE ME" as the subject.
>

-- 
You received this message because you are subscribed to the 
"BBEdit Talk" discussion group on Google Groups.
To post to this group, send email to bbedit@googlegroups.com
To unsubscribe from this group, send email to
bbedit+unsubscr...@googlegroups.com
For more options, visit this group at
http://groups.google.com/group/bbedit?hl=en
If you have a feature request or would like to report a problem, 
please email "supp...@barebones.com" rather than posting to the group.

To unsubscribe from this group, send email to 
bbedit+unsubscribegooglegroups.com or reply to this email with the words 
"REMOVE ME" as the subject.

Re: BBEdit & git/mercurial

[Jim Correia]

On Mar 19, 2010, at 2:09 PM, Lorin Rivers wrote:

> I searched the google group, did some googling, and basically came up empty.
> 
> I'm contemplating one of the DSVNs for a project and was wondering how people 
> who use those AND BBEdit handle their workflows.

I’ve used both git and hg for significant projects, in conjunction with BBEdit.

My typical workflow involves doing most operations from the command line (which 
isn’t all that different from the workflow I use when using p4 or svn), and 
using BBEdit (via $VISUAL=“bbedit —wait —resume”) as my EDITOR.

Where BBEdit is invaluable to me in this workflow is for reviewing diffs before 
committing.

For git, I have a script named git-diff-driver.sh with the contents:

#!/bin/sh

if [ -f "$1" ] && [ -f "$2" ]; then
bbdiff --wait --resume "$1" "$2"
fi
exit 0

and then set GIT_EXTERNAL_DIFF to point at this script. `git diff` will review 
the files one by one in BBEdit. You can specify —no-ext-diff to get the 
built-in behavior.

For hg, I’ve just added this to my hgrc file:

[extdiff]
cmd.bbdiff = bbdiff
opts.bbdiff = --reverse --wait —resume

and now `hg bbdiff` will do a single or multi-fill diff in BBEdit from the 
command line (depending upon args passed, and how many outstanding changes 
there are.)

- Jim

-- 
You received this message because you are subscribed to the 
"BBEdit Talk" discussion group on Google Groups.
To post to this group, send email to bbedit@googlegroups.com
To unsubscribe from this group, send email to
bbedit+unsubscr...@googlegroups.com
For more options, visit this group at
http://groups.google.com/group/bbedit?hl=en
If you have a feature request or would like to report a problem, 
please email "supp...@barebones.com" rather than posting to the group.

To unsubscribe from this group, send email to 
bbedit+unsubscribegooglegroups.com or reply to this email with the words 
"REMOVE ME" as the subject.

Re: BBEdit & git/mercurial

[Alex Satrapa]

On 21/03/2010, at 02:31 , Jim Correia wrote:

> On Mar 19, 2010, at 2:09 PM, Lorin Rivers wrote:
> 
>> I'm contemplating one of the DSVNs for a project and was wondering how 
>> people who use those AND BBEdit handle their workflows.
> 
> I’ve used both git and hg for significant projects, in conjunction with 
> BBEdit.
> 
> My typical workflow involves doing most operations from the command line 
> (which isn’t all that different from the workflow I use when using p4 or 
> svn), and using BBEdit (via $VISUAL=“bbedit —wait —resume”) as my EDITOR.

Same here - I have a terminal from which I invoke the git commands, along with 
"bb[TAB] [filename]" to start editing my files.

I've only recently started using the BBEdit "Projects" functionality. It's 
growing on me, but somewhere deep inside I'm still addicted to Mac OS X 
"Exposé".

> Where BBEdit is invaluable to me in this workflow is for reviewing diffs 
> before committing.

Ohh! Nice tips there. I've been using "git diff" and simply scanning through 
the output in Terminal to see that there are no glaring mistakes (such as 
Python files that accidentally conform to PEP8).

Regards
Alex

-- 
You received this message because you are subscribed to the 
"BBEdit Talk" discussion group on Google Groups.
To post to this group, send email to bbedit@googlegroups.com
To unsubscribe from this group, send email to
bbedit+unsubscr...@googlegroups.com
For more options, visit this group at
http://groups.google.com/group/bbedit?hl=en
If you have a feature request or would like to report a problem, 
please email "supp...@barebones.com" rather than posting to the group.

To unsubscribe from this group, send email to 
bbedit+unsubscribegooglegroups.com or reply to this email with the words 
"REMOVE ME" as the subject.

Re: BBEdit & git/mercurial

[jeetsukuma...@frogweb.org]

Nice tip!

Extending this, by adding the following line to "~/.gitconfig":

bbdiff = !"sh -c \"if [ -f '$1' ] && [ -f '$2' ]; then bbdiff --wait --
resume '$1' '$2' fi exit 0 \""

you can then "git bbdiff" to invoke the BBEdit diff viewer.

And yes, terminal-based workflow is the (only) way I do things as
well.

On Mar 20, 10:31 am, Jim Correia  wrote:
> On Mar 19, 2010, at 2:09 PM, Lorin Rivers wrote:
>
> > I searched the google group, did some googling, and basically came up empty.
>
> > I'm contemplating one of the DSVNs for a project and was wondering how 
> > people who use those AND BBEdit handle their workflows.
>
> I’ve used both git and hg for significant projects, in conjunction with 
> BBEdit.
>
> My typical workflow involves doing most operations from the command line 
> (which isn’t all that different from the workflow I use when using p4 or 
> svn), and using BBEdit (via $VISUAL=“bbedit —wait —resume”) as my EDITOR.
>
> Where BBEdit is invaluable to me in this workflow is for reviewing diffs 
> before committing.
>
> For git, I have a script named git-diff-driver.sh with the contents:
>
>         #!/bin/sh
>
>         if [ -f "$1" ] && [ -f "$2" ]; then
>                 bbdiff --wait --resume "$1" "$2"
>         fi
>         exit 0
>
> and then set GIT_EXTERNAL_DIFF to point at this script. `git diff` will 
> review the files one by one in BBEdit. You can specify —no-ext-diff to get 
> the built-in behavior.
>
> For hg, I’ve just added this to my hgrc file:
>
>         [extdiff]
>         cmd.bbdiff = bbdiff
>         opts.bbdiff = --reverse --wait —resume
>
> and now `hg bbdiff` will do a single or multi-fill diff in BBEdit from the 
> command line (depending upon args passed, and how many outstanding changes 
> there are.)
>
> - Jim

-- 
You received this message because you are subscribed to the 
"BBEdit Talk" discussion group on Google Groups.
To post to this group, send email to bbedit@googlegroups.com
To unsubscribe from this group, send email to
bbedit+unsubscr...@googlegroups.com
For more options, visit this group at
http://groups.google.com/group/bbedit?hl=en
If you have a feature request or would like to report a problem, 
please email "supp...@barebones.com" rather than posting to the group.

To unsubscribe from this group, send email to 
bbedit+unsubscribegooglegroups.com or reply to this email with the words 
"REMOVE ME" as the subject.

Re: BBEdit & git/mercurial

[Roddie Grant]

Nice tip too, but I keep getting
"sh: -c: line 2: syntax error: unexpected end of file"

This is the line straight from the .gitconfig file (it is on one line):
bbdiff = !"sh -c \"if [ -f '$1' ] && [ -f '$2' ]; then bbdiff --wait
--resume '$1' '$2' fi exit 0 \""

I got Jim's git-diff-driver.sh working, but decided I prefer the + and -
lines as shown in Terminal. But it would be great to have an easy option to
use BBEdit when the differences are a bit more significant that usual.

Thanks

Roddie Grant


On 22/3/10 14:04, "jeetsukuma...@frogweb.org" 
wrote:

> Nice tip!
> 
> Extending this, by adding the following line to "~/.gitconfig":
> 
> bbdiff = !"sh -c \"if [ -f '$1' ] && [ -f '$2' ]; then bbdiff --wait --
> resume '$1' '$2' fi exit 0 \""
> 
> you can then "git bbdiff" to invoke the BBEdit diff viewer.
> 


-- 
You received this message because you are subscribed to the 
"BBEdit Talk" discussion group on Google Groups.
To post to this group, send email to bbedit@googlegroups.com
To unsubscribe from this group, send email to
bbedit+unsubscr...@googlegroups.com
For more options, visit this group at
http://groups.google.com/group/bbedit?hl=en
If you have a feature request or would like to report a problem, 
please email "supp...@barebones.com" rather than posting to the group.

To unsubscribe from this group, send email to 
bbedit+unsubscribegooglegroups.com or reply to this email with the words 
"REMOVE ME" as the subject.

Re: BBEdit & git/mercurial

[Alex Satrapa]

On 23/03/2010, at 03:27 , Roddie Grant wrote:

> This is the line straight from the .gitconfig file (it is on one line):
> bbdiff = !"sh -c \"if [ -f '$1' ] && [ -f '$2' ]; then bbdiff --wait
> --resume '$1' '$2' fi exit 0 \""

If I add semicolons, I avoid the "unexpected end of file" problem, but get no 
bbdiff happening :\

>From my ~/.gitconfig:
> [alias]
>bbdiff = !"sh -c \"if [ -f '$1' ] && [ -f '$2' ]; then /usr/bin/bbdiff 
> --wait --resume '$1' '$2'; fi; exit 0\""


If I restore the GIT_EXTERNAL_DIFF, I get diffs presented through BBEdit. I'm 
guessing the alias isn't doing what I expected it would be doing. Such as 
nothing actually feeding the parameters in, for example ;)

I've resorted to using another script (which I guess could be converted to a 
shell function):
> #!/bin/sh
> git status
> GIT_EXTERNAL_DIFF='bbedit-diff-driver' git diff

so I run that script, it shows me the list of files I'm about to view diffs 
for, then off it goes opening up BBEdit.

Some discussion of similar problems using vimdiff over at 
http://technotales.wordpress.com/2009/05/17/git-diff-with-vimdiff/

Hope this helps someone.
Alex

-- 
You received this message because you are subscribed to the 
"BBEdit Talk" discussion group on Google Groups.
To post to this group, send email to bbedit@googlegroups.com
To unsubscribe from this group, send email to
bbedit+unsubscr...@googlegroups.com
For more options, visit this group at
http://groups.google.com/group/bbedit?hl=en
If you have a feature request or would like to report a problem, 
please email "supp...@barebones.com" rather than posting to the group.

To unsubscribe from this group, send email to 
bbedit+unsubscribegooglegroups.com or reply to this email with the words 
"REMOVE ME" as the subject.

Re: BBEdit & git/mercurial

[jeetsukuma...@frogweb.org]

Hmm. Your line looks identical to mine. What shell are you using? Mine
is Bash:

$ sh --version
GNU bash, version 3.2.48(1)-release (x86_64-apple-darwin10.0)
Copyright (C) 2007 Free Software Foundation, Inc.

-- jeet

On Mar 22, 11:27 am, Roddie Grant  wrote:
> Nice tip too, but I keep getting
> "sh: -c: line 2: syntax error: unexpected end of file"
>
> This is the line straight from the .gitconfig file (it is on one line):
> bbdiff = !"sh -c \"if [ -f '$1' ] && [ -f '$2' ]; then bbdiff --wait
> --resume '$1' '$2' fi exit 0 \""
>
> I got Jim's git-diff-driver.sh working, but decided I prefer the + and -
> lines as shown in Terminal. But it would be great to have an easy option to
> use BBEdit when the differences are a bit more significant that usual.
>
> Thanks
>
> Roddie Grant
>
> On 22/3/10 14:04, "jeetsukuma...@frogweb.org" 
> wrote:
>
> > Nice tip!
>
> > Extending this, by adding the following line to "~/.gitconfig":
>
> > bbdiff = !"sh -c \"if [ -f '$1' ] && [ -f '$2' ]; then bbdiff --wait --
> > resume '$1' '$2' fi exit 0 \""
>
> > you can then "git bbdiff" to invoke the BBEdit diff viewer.

-- 
You received this message because you are subscribed to the 
"BBEdit Talk" discussion group on Google Groups.
To post to this group, send email to bbedit@googlegroups.com
To unsubscribe from this group, send email to
bbedit+unsubscr...@googlegroups.com
For more options, visit this group at
http://groups.google.com/group/bbedit?hl=en
If you have a feature request or would like to report a problem, 
please email "supp...@barebones.com" rather than posting to the group.

To unsubscribe from this group, send email to 
bbedit+unsubscribegooglegroups.com or reply to this email with the words 
"REMOVE ME" as the subject.

Re: BBEdit & git/mercurial

[jeetsukuma...@frogweb.org]

See my reply to Roddie above. What shell are you using?

On Mar 22, 7:00 pm, Alex Satrapa  wrote:
> On 23/03/2010, at 03:27 , Roddie Grant wrote:
>
> > This is the line straight from the .gitconfig file (it is on one line):
> > bbdiff = !"sh -c \"if [ -f '$1' ] && [ -f '$2' ]; then bbdiff --wait
> > --resume '$1' '$2' fi exit 0 \""
>
> If I add semicolons, I avoid the "unexpected end of file" problem, but get no 
> bbdiff happening :\
>
> From my ~/.gitconfig:
>
> > [alias]
> >    bbdiff = !"sh -c \"if [ -f '$1' ] && [ -f '$2' ]; then /usr/bin/bbdiff 
> > --wait --resume '$1' '$2'; fi; exit 0\""
>
> If I restore the GIT_EXTERNAL_DIFF, I get diffs presented through BBEdit. I'm 
> guessing the alias isn't doing what I expected it would be doing. Such as 
> nothing actually feeding the parameters in, for example ;)
>
> I've resorted to using another script (which I guess could be converted to a 
> shell function):
>
> > #!/bin/sh
> > git status
> > GIT_EXTERNAL_DIFF='bbedit-diff-driver' git diff
>
> so I run that script, it shows me the list of files I'm about to view diffs 
> for, then off it goes opening up BBEdit.
>
> Some discussion of similar problems using vimdiff over 
> athttp://technotales.wordpress.com/2009/05/17/git-diff-with-vimdiff/
>
> Hope this helps someone.
> Alex

-- 
You received this message because you are subscribed to the 
"BBEdit Talk" discussion group on Google Groups.
To post to this group, send email to bbedit@googlegroups.com
To unsubscribe from this group, send email to
bbedit+unsubscr...@googlegroups.com
For more options, visit this group at
http://groups.google.com/group/bbedit?hl=en
If you have a feature request or would like to report a problem, 
please email "supp...@barebones.com" rather than posting to the group.

To unsubscribe from this group, send email to 
bbedit+unsubscribegooglegroups.com or reply to this email with the words 
"REMOVE ME" as the subject.

Re: BBEdit & git/mercurial

[Roddie Grant]

Thanks for following up. sh --version returns:
GNU bash, version 2.05b.0(1)-release (powerpc-apple-darwin8.0)
Copyright (C) 2002 Free Software Foundation, Inc.

So a bit older than yours. I'll look into updating.

Thanks

Roddie


On 23/3/10 06:48, "jeetsukuma...@frogweb.org" 
wrote:

> Hmm. Your line looks identical to mine. What shell are you using? Mine
> is Bash:
> 
> $ sh --version
> GNU bash, version 3.2.48(1)-release (x86_64-apple-darwin10.0)
> Copyright (C) 2007 Free Software Foundation, Inc.
> 
> -- jeet
> 
> On Mar 22, 11:27 am, Roddie Grant  wrote:
>> Nice tip too, but I keep getting
>> "sh: -c: line 2: syntax error: unexpected end of file"
>> 
>> This is the line straight from the .gitconfig file (it is on one line):
>> bbdiff = !"sh -c \"if [ -f '$1' ] && [ -f '$2' ]; then bbdiff --wait
>> --resume '$1' '$2' fi exit 0 \""
>> 
>> I got Jim's git-diff-driver.sh working, but decided I prefer the + and -
>> lines as shown in Terminal. But it would be great to have an easy option to
>> use BBEdit when the differences are a bit more significant that usual.
>> 
>> Thanks
>> 
>> Roddie Grant
>> 
>> On 22/3/10 14:04, "jeetsukuma...@frogweb.org" 
>> wrote:
>> 
>>> Nice tip!
>> 
>>> Extending this, by adding the following line to "~/.gitconfig":
>> 
>>> bbdiff = !"sh -c \"if [ -f '$1' ] && [ -f '$2' ]; then bbdiff --wait --
>>> resume '$1' '$2' fi exit 0 \""
>> 
>>> you can then "git bbdiff" to invoke the BBEdit diff viewer.


-- 
You received this message because you are subscribed to the 
"BBEdit Talk" discussion group on Google Groups.
To post to this group, send email to bbedit@googlegroups.com
To unsubscribe from this group, send email to
bbedit+unsubscr...@googlegroups.com
For more options, visit this group at
http://groups.google.com/group/bbedit?hl=en
If you have a feature request or would like to report a problem, 
please email "supp...@barebones.com" rather than posting to the group.

To unsubscribe from this group, send email to 
bbedit+unsubscribegooglegroups.com or reply to this email with the words 
"REMOVE ME" as the subject.

Re: BBEdit & git/mercurial

[Tim Gray]

On Mar 19, 2010 at 01:09 PM -0500, Lorin Rivers wrote:
I searched the google group, did some googling, and basically came up 
empty.


I'm contemplating one of the DSVNs for a project and was wondering how 
people who use those AND BBEdit handle their workflows.


I've been using git with BBEdit for about a year and think it's great.  Much 
better than SVN.  You can get the git installer from Google.  Just google 
'git os x'.  A couple of things:


Gitx is a nice little graphical utility to review things when you want.  You 
can call it from the command line. 


If you add the following to your .bashrc, you can get some useful indication 
as to when you are in a git repository and what branch is checked out.  The 
color stuff is abbreviated from a larger set of color definitions.  I think 
I got all the important bits.  I didn't come up with this; it was something 
I saw a while ago somewhere:


# color stuff
DULL=0
FG_CYAN=36
ESC="\033"
NORMAL="\[$ESC[m\]"
CYAN="\[$ESC[${DULL};${FG_CYAN}m\]"

# prompt
PS1="[${NORMAL}\u:\w] ${CYAN}\$(parse_git_branch)${NORMAL}\$ "

function parse_git_branch {
  ref=$(git symbolic-ref HEAD 2> /dev/null) || return
  echo "("${ref#refs/heads/}")" 
}




Here's parts of my .gitconfig that might help.  Some shortcuts to make git a 
little easier to use ('co' instead of 'checkout') and some definitions for 
use with bbedit:


[diff]
tool = "bbdiff"
[merge]
tool = opendiff
summary = true
keepBackup = false;
[color]
diff = auto
status = auto
branch = auto
interactive = auto
[alias]
st = status
ci = commit
co = checkout
br = branch
[core]
excludesfile = /Users/tgray/.gitignore
editor = bbedit --wait --resume
[mergetool]
keepBackup = False
[difftool]
prompt = NO
[difftool "bbdiff"]
cmd = /usr/bin/bbdiff --wait --resume "$LOCAL" "$REMOTE"




There are different ways you can set this up.  One is to use a shell script 
wrapper around BBEdit, which works, but I no longer use for reasons 
forgotten.  The way I have it set up now is that if you call 'git diff' on a 
changed file, it spits the results out on the command line.  If you call 
'git difftool' on a changed file, it comes up in BBEdit as expected.  It 
will also process several diffs properly, one after the other.


There are a set of scripts for using BBEdit with git; I think they are part 
of some ruby package.  It was called 'gittools' and one of the scripts was 
'git-bbdiff'.  I think this might be the master copy, but I'm not sure:



To be honest, they are nice, but I'm not sure they are super useful to me.

If I think of anything else, I'll write later.

--
You received this message because you are subscribed to the 
"BBEdit Talk" discussion group on Google Groups.

To post to this group, send email to bbedit@googlegroups.com
To unsubscribe from this group, send email to
bbedit+unsubscr...@googlegroups.com
For more options, visit this group at
http://groups.google.com/group/bbedit?hl=en
If you have a feature request or would like to report a problem, 
please email "supp...@barebones.com" rather than posting to the group.


To unsubscribe from this group, send email to bbedit+unsubscribegooglegroups.com or reply 
to this email with the words "REMOVE ME" as the subject.

Re: BBEdit & git/mercurial

[Alex Satrapa]

On 23/03/2010, at 17:48 , jeetsukuma...@frogweb.org wrote:

> See my reply to Roddie above. What shell are you using?

I'm using ZSH, the only shell!

> [alias]

>bbdiff = !"sh -c \"if [ -f '$1' ] && [ -f '$2' ]; then /usr/bin/bbdiff 
> --wait --resume '$1' '$2'; fi; exit 0\""

What section is your "bbdiff" line in?


-- 
You received this message because you are subscribed to the 
"BBEdit Talk" discussion group on Google Groups.
To post to this group, send email to bbedit@googlegroups.com
To unsubscribe from this group, send email to
bbedit+unsubscr...@googlegroups.com
For more options, visit this group at
http://groups.google.com/group/bbedit?hl=en
If you have a feature request or would like to report a problem, 
please email "supp...@barebones.com" rather than posting to the group.

To unsubscribe from this group, send email to 
bbedit+unsubscribegooglegroups.com or reply to this email with the words 
"REMOVE ME" as the subject.

Re: BBEdit & git/mercurial

[jeetsukuma...@frogweb.org]

It is in the '[alias]' section, exactly like yours.

One difference I can see is that you have no space between the 0 and
the escape character at the end of the line, but I don't think this is
significant.

Maybe you might want to experiment with a simpler construct, such as:

[alias]
 foo = !"sh -c 'echo hello' "

and see if that works. Then slowly expand this to the full invocation
by adding the bits and pieces one at time (e.g., the conditional, then
the exit, etc.).

-- jeet

On Mar 23, 4:55 pm, Alex Satrapa  wrote:
> On 23/03/2010, at 17:48 , jeetsukuma...@frogweb.org wrote:
>
> > See my reply to Roddie above. What shell are you using?
>
> I'm using ZSH, the only shell!
>
> > [alias]
> >    bbdiff = !"sh -c \"if [ -f '$1' ] && [ -f '$2' ]; then /usr/bin/bbdiff 
> > --wait --resume '$1' '$2'; fi; exit 0\""
>
> What section is your "bbdiff" line in?

-- 
You received this message because you are subscribed to the 
"BBEdit Talk" discussion group on Google Groups.
To post to this group, send email to bbedit@googlegroups.com
To unsubscribe from this group, send email to
bbedit+unsubscr...@googlegroups.com
For more options, visit this group at
http://groups.google.com/group/bbedit?hl=en
If you have a feature request or would like to report a problem, 
please email "supp...@barebones.com" rather than posting to the group.

To unsubscribe from this group, send email to 
bbedit+unsubscribegooglegroups.com or reply to this email with the words 
"REMOVE ME" as the subject.

Re: BBEdit & git/mercurial

[jeetsukuma...@frogweb.org]

Lorin,

As I mention below, I use BBEdit + Git extensively, and have done so
for a long time. I love them both, and both are (IMHO) the best in
their respective categories (i.e., text editor, VCS), but I use them
independentally.

I've got a post describing my workflow here:

   http://jeetworks.org/node/55

with scripts to facilitate that workflow given here:

   http://jeetworks.org/node/58

Also, almost 2 years of an evolving/improving ecosystem incorporating
daily (hourly? 10-minutely?) Git usage has resulting in the following
shell prompt:

   http://jeetworks.org/node/10

-- jeet


On Mar 19, 1:09 pm, Lorin Rivers  wrote:
> I searched the google group, did some googling, and basically came up empty.
>
> I'm contemplating one of the DSVNs for a project and was wondering how people 
> who use those AND BBEdit handle their workflows.
> --
> Lorin Rivers
> Mosasaur: Killer Technical Marketing 
> 
> 512/203.3198 (m)

-- 
You received this message because you are subscribed to the 
"BBEdit Talk" discussion group on Google Groups.
To post to this group, send email to bbedit@googlegroups.com
To unsubscribe from this group, send email to
bbedit+unsubscr...@googlegroups.com
For more options, visit this group at
http://groups.google.com/group/bbedit?hl=en
If you have a feature request or would like to report a problem, 
please email "supp...@barebones.com" rather than posting to the group.

To unsubscribe from this group, send email to 
bbedit+unsubscribegooglegroups.com or reply to this email with the words 
"REMOVE ME" as the subject.

Re: BBEdit & git/mercurial

[jeetsukuma...@frogweb.org]

p.s. Alex and Roddie --

It also occurs to me that you should verify that your version of Git
supports the "!sh" construct. I'm currently using Git 1.6.6, which
obviously certainly supports this, but I don't know which version of
Git first introduced this feature.

-- jwwr

On Mar 23, 4:55 pm, Alex Satrapa  wrote:
> On 23/03/2010, at 17:48 , jeetsukuma...@frogweb.org wrote:
>
> > See my reply to Roddie above. What shell are you using?
>
> I'm using ZSH, the only shell!
>
> > [alias]
> >    bbdiff = !"sh -c \"if [ -f '$1' ] && [ -f '$2' ]; then /usr/bin/bbdiff 
> > --wait --resume '$1' '$2'; fi; exit 0\""
>
> What section is your "bbdiff" line in?

-- 
You received this message because you are subscribed to the 
"BBEdit Talk" discussion group on Google Groups.
To post to this group, send email to bbedit@googlegroups.com
To unsubscribe from this group, send email to
bbedit+unsubscr...@googlegroups.com
For more options, visit this group at
http://groups.google.com/group/bbedit?hl=en
If you have a feature request or would like to report a problem, 
please email "supp...@barebones.com" rather than posting to the group.

To unsubscribe from this group, send email to 
bbedit+unsubscribegooglegroups.com or reply to this email with the words 
"REMOVE ME" as the subject.

Re: BBEdit & git/mercurial

[Alex Satrapa]

On 24/03/2010, at 10:05 , jeetsukuma...@frogweb.org wrote:

> Then slowly expand this to the full invocation
> by adding the bits and pieces one at time (e.g., the conditional, then
> the exit, etc.).

The bbdiff alias is working exactly as I expect it to:

[a...@here]# git bbdiff

returns no results, because there are no arguments being passed into the bbdiff 
alias to fill $1 and $2.

If you pass arguments to the command line, you may as well be using bbdiff's 
existing functionality:

[a...@here]# git bbdiff dir1 dir2

So no doubt I'm invoking it the wrong way and someone on list can set me 
straight :)

Alex


-- 
You received this message because you are subscribed to the 
"BBEdit Talk" discussion group on Google Groups.
To post to this group, send email to bbedit@googlegroups.com
To unsubscribe from this group, send email to
bbedit+unsubscr...@googlegroups.com
For more options, visit this group at
http://groups.google.com/group/bbedit?hl=en
If you have a feature request or would like to report a problem, 
please email "supp...@barebones.com" rather than posting to the group.

To unsubscribe from this group, send email to 
bbedit+unsubscribegooglegroups.com or reply to this email with the words 
"REMOVE ME" as the subject.

Re: BBEdit & git/mercurial

[Johan Solve]

Wow, awesome resource. Thanks for sharing, Jeet!

Love the quote "Git is to Subversion as cell phones are to landlines"

At 16.12 -0700 2010-03-23, jeetsukuma...@frogweb.org wrote:
>Lorin,
>
>As I mention below, I use BBEdit + Git extensively, and have done so
>for a long time. I love them both, and both are (IMHO) the best in
>their respective categories (i.e., text editor, VCS), but I use them
>independentally.
>
>I've got a post describing my workflow here:
>
>   http://jeetworks.org/node/55
>
>with scripts to facilitate that workflow given here:
>
>   http://jeetworks.org/node/58
>
>Also, almost 2 years of an evolving/improving ecosystem incorporating
>daily (hourly? 10-minutely?) Git usage has resulting in the following
>shell prompt:
>
>   http://jeetworks.org/node/10
>
>-- jeet
>
>
>On Mar 19, 1:09 pm, Lorin Rivers  wrote:
>> I searched the google group, did some googling, and basically came up empty.
>>
>> I'm contemplating one of the DSVNs for a project and was wondering how 
>> people who use those AND BBEdit handle their workflows.
>> --
>> Lorin Rivers
>> Mosasaur: Killer Technical Marketing 
>> 
>> 512/203.3198 (m)
>
>--
>You received this message because you are subscribed to the
>"BBEdit Talk" discussion group on Google Groups.
>To post to this group, send email to bbedit@googlegroups.com
>To unsubscribe from this group, send email to
>bbedit+unsubscr...@googlegroups.com
>For more options, visit this group at
>http://groups.google.com/group/bbedit?hl=en
>If you have a feature request or would like to report a problem,
>please email "supp...@barebones.com" rather than posting to the group.
>
>To unsubscribe from this group, send email to 
>bbedit+unsubscribegooglegroups.com or reply to this email with the words 
>"REMOVE ME" as the subject.


-- 
 Johan Sölve[FSA Member, Lasso Partner]
 Web Application/Lasso/FileMaker Developer
 MONTANIA SOFTWARE & SOLUTIONS
http://www.montania.se   mailto:jo...@montania.se
 (spam-safe email address, replace '-' with 'a')

-- 
You received this message because you are subscribed to the 
"BBEdit Talk" discussion group on Google Groups.
To post to this group, send email to bbedit@googlegroups.com
To unsubscribe from this group, send email to
bbedit+unsubscr...@googlegroups.com
For more options, visit this group at
http://groups.google.com/group/bbedit?hl=en
If you have a feature request or would like to report a problem, 
please email "supp...@barebones.com" rather than posting to the group.

To unsubscribe from this group, send email to 
bbedit+unsubscribegooglegroups.com or reply to this email with the words 
"REMOVE ME" as the subject.

Re: BBEdit & git/mercurial

[Roddie Grant]

Hi Jeet

I'm grateful for your help with this; I'm at the edge of my experience with
shells. We're a little off topic, so don't feel obliged to reply.

>foo = !"sh -c 'echo hello' "
works fine, but when I try various permutations of
>foo = !"sh -c 'echo $#' "
with "git foo bar" I get "0" returned. I can't work out if I'm doing
something wrong with the argument, or if something else is wrong.

Advice appreciated!

Roddie


On 23/3/10 23:05, "jeetsukuma...@frogweb.org" 
wrote:

> It is in the '[alias]' section, exactly like yours.
> 
> One difference I can see is that you have no space between the 0 and
> the escape character at the end of the line, but I don't think this is
> significant.
> 
> Maybe you might want to experiment with a simpler construct, such as:
> 
> [alias]
>  foo = !"sh -c 'echo hello' "
> 
> and see if that works. Then slowly expand this to the full invocation
> by adding the bits and pieces one at time (e.g., the conditional, then
> the exit, etc.).
> 
> -- jeet
> 
> On Mar 23, 4:55 pm, Alex Satrapa  wrote:
>> On 23/03/2010, at 17:48 , jeetsukuma...@frogweb.org wrote:
>> 
>>> See my reply to Roddie above. What shell are you using?
>> 
>> I'm using ZSH, the only shell!
>> 
>>> [alias]
>>>    bbdiff = !"sh -c \"if [ -f '$1' ] && [ -f '$2' ]; then /usr/bin/bbdiff
>>> --wait --resume '$1' '$2'; fi; exit 0\""
>> 
>> What section is your "bbdiff" line in?


-- 
You received this message because you are subscribed to the 
"BBEdit Talk" discussion group on Google Groups.
To post to this group, send email to bbedit@googlegroups.com
To unsubscribe from this group, send email to
bbedit+unsubscr...@googlegroups.com
For more options, visit this group at
http://groups.google.com/group/bbedit?hl=en
If you have a feature request or would like to report a problem, 
please email "supp...@barebones.com" rather than posting to the group.

To unsubscribe from this group, send email to 
bbedit+unsubscribegooglegroups.com or reply to this email with the words 
"REMOVE ME" as the subject.

Re: BBEdit & git/mercurial

[J. Gregg Thomason]

On Mar 20, 11:31 am, Jim Correia  wrote:
> For git, I have a script named git-diff-driver.sh with the contents:
>
>         #!/bin/sh
>
>         if [ -f "$1" ] && [ -f "$2" ]; then
>                 bbdiff --wait --resume "$1" "$2"
>         fi
>         exit 0
>
> and then set GIT_EXTERNAL_DIFF to point at this script. `git diff` will 
> review the files one by one in BBEdit. You can specify —no-ext-diff to get 
> the built-in behavior.

I always end up with 'bbedit: Warning: no data available on standard
in' when using this to do git diff, eg
[gr...@tardis: Dir] (master)$ git diff bin/something.rb
bbedit: Warning: no data available on standard in
[gr...@tardis: Dir] (master)$

Hints?

-- 
You received this message because you are subscribed to the 
"BBEdit Talk" discussion group on Google Groups.
To post to this group, send email to bbedit@googlegroups.com
To unsubscribe from this group, send email to
bbedit+unsubscr...@googlegroups.com
For more options, visit this group at
http://groups.google.com/group/bbedit?hl=en
If you have a feature request or would like to report a problem, 
please email "supp...@barebones.com" rather than posting to the group.

To unsubscribe from this group, send email to 
bbedit+unsubscribegooglegroups.com or reply to this email with the words 
"REMOVE ME" as the subject.

Re: BBEdit & git/mercurial

[jeetsukuma...@frogweb.org]

Roddie,

OT, as you say, so I'll keep it brief. I do not think that the shelled-
out alias commands take arguments --- they should be self-contained.

Here is another approach ...

Clone the following repo:

git clone git://github.com/farktronix/gittools.git

There is a script there called 'git bbdiff'.

Placing any executable file called 'git-' on your system path
will cause Git to run that file when invoked via "git NAME". So, if
"git-bbdiff" is on your path, then:

   git bbdiff

will run it.

-- jeet

On Mar 25, 8:49 am, Roddie Grant  wrote:
> Hi Jeet
>
> I'm grateful for your help with this; I'm at the edge of my experience with
> shells. We're a little off topic, so don't feel obliged to reply.
>
> >foo = !"sh -c 'echo hello' "
>
> works fine, but when I try various permutations of>foo = !"sh -c 'echo $#' "
>
> with "git foo bar" I get "0" returned. I can't work out if I'm doing
> something wrong with the argument, or if something else is wrong.
>
> Advice appreciated!
>
> Roddie
>
> On 23/3/10 23:05, "jeetsukuma...@frogweb.org" 
> wrote:
>
> > It is in the '[alias]' section, exactly like yours.
>
> > One difference I can see is that you have no space between the 0 and
> > the escape character at the end of the line, but I don't think this is
> > significant.
>
> > Maybe you might want to experiment with a simpler construct, such as:
>
> > [alias]
> >      foo = !"sh -c 'echo hello' "
>
> > and see if that works. Then slowly expand this to the full invocation
> > by adding the bits and pieces one at time (e.g., the conditional, then
> > the exit, etc.).
>
> > -- jeet
>
> > On Mar 23, 4:55 pm, Alex Satrapa  wrote:
> >> On 23/03/2010, at 17:48 , jeetsukuma...@frogweb.org wrote:
>
> >>> See my reply to Roddie above. What shell are you using?
>
> >> I'm using ZSH, the only shell!
>
> >>> [alias]
> >>>    bbdiff = !"sh -c \"if [ -f '$1' ] && [ -f '$2' ]; then /usr/bin/bbdiff
> >>> --wait --resume '$1' '$2'; fi; exit 0\""
>
> >> What section is your "bbdiff" line in?

-- 
You received this message because you are subscribed to the 
"BBEdit Talk" discussion group on Google Groups.
To post to this group, send email to bbedit@googlegroups.com
To unsubscribe from this group, send email to
bbedit+unsubscr...@googlegroups.com
For more options, visit this group at
http://groups.google.com/group/bbedit?hl=en
If you have a feature request or would like to report a problem, 
please email "supp...@barebones.com" rather than posting to the group.

To unsubscribe from this group, send email to 
bbedit+unsubscribegooglegroups.com or reply to this email with the words 
"REMOVE ME" as the subject.

[OT] command-line prompts (was Re: BBEdit & git/mercurial)

[Alex Satrapa]

On 24/03/2010, at 10:12 , jeetsukuma...@frogweb.org wrote:

> Also, almost 2 years of an evolving/improving ecosystem incorporating
> daily (hourly? 10-minutely?) Git usage has resulting in the following
> shell prompt:
> 
>   http://jeetworks.org/node/10

Mine is more like the one presented by J Corbin: 
http://github.com/jcorbin/zsh-git - my command line looks like this:

[a...@lancelot:~/.zsh.d]
11:20 [0|2014]%   master []

The right-hand-side prompt disappears when the text I'm typing catches up to it 
(it's a ZSH-ism, but I think BASH has a similar feature).

Everyone marches to a different drum, and all that :)

Alex

-- 
You received this message because you are subscribed to the 
"BBEdit Talk" discussion group on Google Groups.
To post to this group, send email to bbedit@googlegroups.com
To unsubscribe from this group, send email to
bbedit+unsubscr...@googlegroups.com
For more options, visit this group at
http://groups.google.com/group/bbedit?hl=en
If you have a feature request or would like to report a problem, 
please email "supp...@barebones.com" rather than posting to the group.

To unsubscribe from this group, send email to 
bbedit+unsubscribegooglegroups.com or reply to this email with the words 
"REMOVE ME" as the subject.