Hey,
On Sun, Sep 6, 2009 at 5:28 PM, Johannes Gilger<[email protected]> wrote:
>> I don't think this feature is ready yet. I'm not sure how to fix it,
>> but we could do something by making sure the refresh doesn't use any
>> index operations. I think at least we should disable the commit
>> refresh part. Because of the intrusiveness of the autorefresh stuff, I
>> think we should delay it for the next version. We can put it in master
>> once 0.7 hits, and then see if we can fix it. If we aren't able to do
>> that for the 0.8 timeframe, we can disable it again.
> Another possibility would be to make the watcher a development-only
> option. The problem is that if stuff isn't on your branches it is much
> less likely to be worked on (and one can never be sure if one's changes
> don't get thrown away).
Yes, that's why I want to merge it as soon as 0.7 is out. One thing
I'd suggest is putting the development stuff in its own .xib, so that
we can mess that one up without affecting the normal preferences. It
should also make it easier to merge real features.
> If I take it out I need to know what else goes in, since I likely
> will have to redo a few of the changes which depended on other commits
> which had to do with the FSEvents. Right now it looks like I'd exclude
> the 3 commits from Dave + 1 commit from me (prefs for watcher) and would
> have to rewrite the last 2 commits on top of that (the "Development tab"
> thing and the small fix for the "Show open dialog" thing.
>
> So, to recapitulate, the patches with - shouldn't go in but the patches
> with + will (my dg/fsevents) while I have to rewrite the +~:
>
> +~ Preferences: Remove description for "Open" pref (Johannes Gilger)
> +~ Preferences: Add "Development" tab and use it (Johannes Gilger)
> - PBGitRepoWatcher: Add preference and use it (Johannes Gilger)
> - PBGitCommit/HistoryController: Use PBGitRepoWatcher (Dave Grijalva)
> - PBGitRepository: Init PBGitRepositoryWatcher (Dave Grijalva)
> - Add PBGitRepositoryWatcher with FSEvents (Dave Grijalva)
> + Add preferences for opening things at launch. (Stonewall Ballard)
> + PBGitTree: Don't try to print binary-file contents (Johannes Gilger)
> + Add short SHA to history view (Gerd Knops)
>
> If so I can make that happen this afternoon.
I think we should include just the "Show Open screen" preference, and
let the other preference (including the development view) be for after
0.7.
I redid the SHA version myself, to show the full sha and not the short
SHA, as I had suggested earlier. This is already merged in.
The showBinary thing looks good now, but I think the two -[isBinary]
and -[isBinary:] methods are a bit confusing. I'd suggest something
like -[hasBinaryAttributes] and -[hasBinaryHeader:]. Also, I think it
would be nicer to keep the -[contents] method as it is, and create a
new methods -[textContents] or similar, which basically does
-(NSString *)textContents
{
if ([self hasBinaryAttributes])
return nil;
NSString *contents = [self contents];
if ([self hasBinaryHeader:contents])
return @"File has binary contents"; // Or nil? That might be more
appropriate
return contents;
}
That way the binary contents are still available for other users of the method.
I've uploaded my branches so far. I think if you can rewrite my
sb/openPrefs to only do the one preference, we should be OK for 0.7.
Then right after 0.7 we can add in the development view and the
preferences for that. We can also merge in a (limited to historyview)
version of the watcher immediately after 0.7, so that we won't have to
merge the annoying nibs.
