553129 - Switch to .hgignore

Status: RESOLVED FIXED

(Camino Graveyard :: General, defect)

Description

[Smokey Ardisson (offline for a while; not following bugs - do not email)]

We need to move our ignore patterns to .hgignore.  

This sucks for two reasons:

1) One .hgignore per repo

2) We use rsync -C to leverage directory-specific .cvsignore files to keep additional things from being rsynced to the objdir (bug 408498 comment 6), e.g. clobbering your project display settings.

In practice, this means we need an .hgignore that includes all the rules currently in our three .cvsignore files, and yet we still need to keep our three .cvsignore files and keep them in sync with the .hgignore when we change any of them, OR we have to clutter up the Makefile with a list of patterns to exclude in RSYNC_ALL.

(Note we didn't add .cvsignore files when we added growl or breakpad, so in practice we've been clobbering objdir project settings for those during rsync, their their various build/ dirs have been showing up as ? in srcdir builds, but neither of those cases are really as critical.)

Thoughts on what's the best course of action?

Comment 1

[Stuart Morgan]

Keeping .cvsignore around when we aren't using CVS any more seems needlessly confusing. We should just embed the project setting exclusions into the Makefile.

In practice the directory-specific-ness of the files wasn't buying us anything with the project settings files; in fact it was more maintenance work (which we weren't doing, as you pointed out). We just want to exclude *.xcodeproj/<foo>, where <foo> is each of the three extensions.

Comment 2

[Smokey Ardisson (offline for a while; not following bugs - do not email)]

Attachment: Fix

The moves and deletions aren't very clear in these git-style diffs :(

Comment 3

[Stuart Morgan]

Comment on attachment 433758 [details] [diff] [review]
Fix

>+RSYNC_ALL = rsync -aC --exclude .cvsignore --exclude *.pbxuser --exclude *.mode?v? --delete

This doesn't exclude mode1 files. It also doesn't restrict to xcodeproj, which we should do just to be on the safe side. Also, we shouldn't need to worry about .cvsignore any more, right?

So this should probably be:
RSYNC_ALL = rsync -aC  --exclude '*.xcodeproj/*.mode*' --exclude '*.xcodeproj/*.pbxuser' 

(I'm fine with being a bit overly broad on the "mode" extensions, since they are restricted to the project folder.)

Comment 4

[Smokey Ardisson (offline for a while; not following bugs - do not email)]

Attachment: Now with more paying attention

Oops.  This should be better.

Comment 5

[Stuart Morgan]

Comment on attachment 433761 [details] [diff] [review]
Now with more paying attention

sr=smorgan

Comment 6

[Smokey Ardisson (offline for a while; not following bugs - do not email)]

Landed in the test repo: http://hg.mozilla.org/users/alqahira_ardisson.org/camino-1.9.2-test/rev/63b3e6d07450

Comment 7

[Smokey Ardisson (offline for a while; not following bugs - do not email)]

http://hg.mozilla.org/camino/rev/c04330137859