Does @Panic’s Coda cache files?

Please someone tell me I’m wrong, PLEASE! Because if this is the issue it has cost me 10s if not 100s of man hours in lost work trying to chase down why files fuck-up between Git pulls.

The Situation

I have a file, we will call example.py which lives on my development VM. I access this file by mounting it’s folder as a disk using Transmit & sFTP. I edit the file and push it into our Git repo. A colleague then adds some lines to the file and I pull down his changes.

The next time I open the file it appears that Coda opens a cached version of the file!? I do not see the changes my colleague has made. So when I then edit and commit the file it wipes all his code! What. The. Fuck?

I’ve been noticing this happening a lot recently but had put it down to botched merges, but here is an example; I have a file models.py which at present in my master branch has 129 lines. When I SSH into the server I can check this;

Which matches what I see in Coda. However if I then checkout a previous version of the file (before Coda lost a bunch of changes) the line count changes;

If I close and reopen the file in Coda, the line count remains the same. The file has not changed!! If this is what is happening this is a HUGE flaw, rendering the editor completely worthless. I seriously hope that someone at @Panic can explain what is happening here?

UPDATE

Looks like it is not Coda, it’s Transmit. Same sickness, different disease, but the same carrier. Still on you @Panic. Why does it cache files like this? That is seriously broken.

todo.sh add “Make this real”

If you’re filling this in, you’re doing it wrong.

Dev machine backups.

After accidentally deleting a rather important file I was reminded about why backups are so important, especially for work files. So here is my setup, what’s yours?

• All projects under Git.
  • Pushing to a bare repo either on Github or internal-server in office.
  • Each day a cron runs which tars/gzips projects folder and copies to Dropbox
• Remote backups of entire machine via BackBlaze
• Local backups via Time Machine to external Harddrive*

* My Time Machine drive died recently so am actually on the look-out for another. My last was USB which was not very convenient. Anyone recommend a good NAS device or should I just go with Time Capsule (which seems very expensive for what it is)

Why Git kicks ass!

I’m in the middle of building a new piece of functionality for a client-site. My local development copy is a mess of half finished, broken and untested pages. But the client has just spotted a bug on the live site.

I can’t very well fix it in my current copy and push it live as it will push all my work in progress stuff as well. But before I started on this new functionality I created a new branch. This means that I can simply do ‘git checkout master’, which will put the project back to the same state as is live. Then I can fix the bug and push my changes live before doing ‘git checkout foobar’ to return to the code I was working on.

No muss, no fuss. And no fucking about trying to revert changes or taking new copies of the production site, etc, etc.

git commit —idiot

I do this way too often. Our folder structure for projects is something like:

Where www.primary-domain-name.com/ is the containing folder which holds all files relevant to the build (templates, media, db, etc) and /project-name/ is the Django project folder. Our git repo is obviously in the root folder www.primary-domain-name.com/.git

In order to work with Django I need to be in its project folder. This is where I run startapp, runserver, etc. So I spend most of my time in Terminal in this folder. Which also means I forget and run git from this folder as well.

Ok so it there doesn’t seem to be a problem. I had a look to see what changes I had made, added all files to my commit (git add .) and then committed them. Didn’t I? Well no actually I didn’t.

Huh? None of those files got added to the commit? But I did a “git add .”!? Well the “add .” basically means add all files in the current folder and any sub-folders, but notice the “../” in the status message above, those files/folders are siblings of the folder I am executing commands in, not children. Fuck.

But it’s ok, we can fix it without too much trouble and without mucking up our logs.

Up a folder, add all files (for real this time!), and then amend our last commit. I do this so often I should have an alias for it “git commit —idiot”

Commit & Push hooks

Been trying to workout my ideal process for using Git to automate my tests etc. Anything I’ve missed, or anything you would change?

Those marked with (B) will block the action from continuing if they fail. All others will show a message in the Terminal but let the user continue.

Commit Message

• Check message is in present tense
• If more than 6 files have modifications check for multiline commit message

Pre Commit

• (B) Is the author a generic account (admin, root, etc)?

Post Commit

• Do all Python files pass pep8?
• Do all Javascript files pass JSLint?
• Are there any “TODO:”s in the source?

Pre Push

• (B) Do all tests pass?

The pre-push will have to be a custom script which is aliased as “git push” as I don’t think it has a hook. Plus I would like a way of opting-out from running the tests on individual pushes.

So output would be something like:

Suggestions welcome :)

Project deployment for small teams using Git & Phing.

This coming Wednesday (14th July 2010) I’ll be giving a talk at Techmeetup in Edinburgh on using Git + Phing for deployment. Here is my blurb about it;

Manual deployment can be time consuming and error prone. Learn how you can manage your source code, automate deployments, create your own build process and feel like a development ninja using just Git and Phing.

Everything kicks off around 6:30pm, it’s a free event with everyone welcome. As well as my quick talk Tagorize and Geogoer will be presenting their startups. And if it is like the Glasgow TMU there will be free beer and pizza with plenty of time to consume both while talking to other techies.

If anyone is travelling through from Glasgow let me know, I’ll likely be getting the train around 5:45pm

Spot what I did wrong?

Was wondering why it seemed to take forever…

Not helpful, at all.

This is why I hate applications which produce binary source files:

But how do they differ? What changes have been made? Is it safe to commit the file? Arggg!

My Git Hooks →

I’ve taken to writing quite a few little git hook scripts. So it only makes sense to ensure they are under version control as well. I’ve got a couple of others I’ve written. Once I’ve tidied them up I’ll add them to the repo as well.