| %@ | ||
| %d | %d | ",l_line++,r_line++]]; + }else if([s isEqualToString:@"-"]){ + [res appendString:[NSString stringWithFormat:@"|
| %d | ",l_line++]]; + }else if([s isEqualToString:@"+"]){ + [res appendString:[NSString stringWithFormat:@" | |
| %d | ",r_line++]]; + } + [res appendString:[NSString stringWithFormat:@"%@ | |
"+txt+""; + $("blame").style.display = ""; + $("blame").innerHTML="
"+txt+""; + $("message").style.display = "none"; SyntaxHighlighter.defaults['toolbar'] = false; - SyntaxHighlighter.highlight(); return; } diff --git a/html/views/blame/index copy.html b/html/views/blame/index copy.html deleted file mode 100644 index af371b6..0000000 --- a/html/views/blame/index copy.html +++ /dev/null @@ -1,726 +0,0 @@ - - - - - - - - - - - - -
summary Add a Tree displayer |
-
-// - // PBGitTree.m - // GitTest - // - // Created by Pieter de Bie on 15-06-08. - // Copyright 2008 __MyCompanyName__. All rights reserved. - // - - #import "PBGitTree.h" - #import "PBGitCommit.h" - #import "NSFileHandleExt.h" - |
-
summary Allow double click to open file |
-
-#import "PBEasyPipe.h" - |
-
summary Delete temporary files when they are deallocated |
-
-#import "PBEasyFS.h" - |
-
summary Add a Tree displayer |
-
-
- @implementation PBGitTree
-
- @synthesize sha, path, repository, leaf, parent;
-
- + (PBGitTree*) rootForCommit:(id) commit
- {
- |
-
summary Add a Tree displayer |
-
-PBGitCommit* c = commit; - PBGitTree* tree = [[self alloc] init]; - tree.parent = nil; - tree.leaf = NO; - |
-
summary Include libgit2 as submodule and use it to store sha's |
-
-tree.sha = [c realSha]; - |
-
summary Add a Tree displayer |
-
- tree.repository = c.repository;
- tree.path = @"";
- return tree;
- }
-
- + (PBGitTree*) treeForTree: (PBGitTree*) prev andPath: (NSString*) path;
- {
- PBGitTree* tree = [[self alloc] init];
- tree.parent = prev;
- tree.sha = prev.sha;
- tree.repository = prev.repository;
- tree.path = path;
- return tree;
- }
-
- - init
- {
- children = nil;
- |
-
summary Delete temporary files when they are deallocated |
-
-localFileName = nil; - |
-
summary Add a Tree displayer |
-
-leaf = YES; - return self; - } - - |
-
summary Use unified interface and display tree contents |
-
- - (NSString*) refSpec
- {
- return [NSString stringWithFormat:@"%@:%@", self.sha, self.fullPath];
- }
-
- |
-
summary Delete temporary files when they are deallocated |
-
- - (BOOL) isLocallyCached
- {
- NSFileManager* fs = [NSFileManager defaultManager];
- if (localFileName && [fs fileExistsAtPath:localFileName])
- {
- NSDate* mtime = [[fs attributesOfItemAtPath:localFileName error: nil] objectForKey:NSFileModificationDate];
- if ([mtime compare:localMtime] == 0)
- return YES;
- }
- return NO;
- }
-
- |
-
summary PBGitTree: Improve binary-file decision |
-
-- (BOOL)hasBinaryHeader:(NSString*)contents - |
-
summary PBGitTree: Don't try to print binary-file contents |
-
- {
- |
-
summary PBGitTree: Improve binary-file decision |
-
-if(!contents) - |
-
summary PBGitTree: Don't try to print binary-file contents |
-
-return NO; - - |
-
summary PBGitTree: Improve binary-file decision |
-
-return [contents rangeOfString:@"\0" options:0 range:NSMakeRange(0, ([contents length] >= 8000) ? 7999 : [contents length])].location != NSNotFound; - |
-
summary PBGitTree: Don't try to print binary-file contents |
-
- }
-
- - (BOOL)hasBinaryAttributes
- {
- // First ask git check-attr if the file has a binary attribute custom set
- NSFileHandle *handle = [repository handleInWorkDirForArguments:[NSArray arrayWithObjects:@"check-attr", @"binary", [self fullPath], nil]];
- NSData *data = [handle readDataToEndOfFile];
- NSString *string = [[NSString alloc] initWithData:data encoding:NSISOLatin1StringEncoding];
-
- if (!string)
- return NO;
- string = [string stringByTrimmingCharactersInSet:[NSCharacterSet newlineCharacterSet]];
-
- if ([string hasSuffix:@"binary: set"])
- return YES;
-
- if ([string hasSuffix:@"binary: unset"])
- return NO;
-
- // Binary state unknown, do a check on common filename-extensions
- for (NSString *extension in [NSArray arrayWithObjects:@".pdf", @".jpg", @".jpeg", @".png", @".bmp", @".gif", @".o", nil]) {
- if ([[self fullPath] hasSuffix:extension])
- return YES;
- }
-
- return NO;
- }
-
- |
-
summary Use unified interface and display tree contents |
-
- - (NSString*) contents
- {
- if (!leaf)
- |
-
summary When selecting a folder in tree-view, display the |
-
-return [NSString stringWithFormat:@"This is a tree with path %@", [self fullPath]]; - |
-
summary initial blame functionality on tree view |
-
-- |
-
summary PBGitTree: Don't try to print binary-file contents |
-
- if ([self isLocallyCached]) {
- NSData *data = [NSData dataWithContentsOfFile:localFileName];
- NSString *string = [[NSString alloc] initWithData:data encoding:NSUTF8StringEncoding];
- if (!string)
- string = [[NSString alloc] initWithData:data encoding:NSISOLatin1StringEncoding];
- return string;
- |
-
summary Delete temporary files when they are deallocated |
-
-} - - |
-
summary initial blame functionality on tree view |
-
-//return [repository outputForArguments:[NSArray arrayWithObjects:@"show", [self refSpec], nil]]; - return [repository outputInWorkdirForArguments:[NSArray arrayWithObjects:@"blame", self.path, nil]]; - } - - |
-
summary HTML Blame |
-
-// XXX: create img tag for images. - |
-
summary initial blame functionality on tree view |
-
- - (NSString*) contents:(NSInteger)option
- {
- |
-
summary HTML Blame |
-
-NSString* contents; - - |
-
summary initial blame functionality on tree view |
-
-if (!leaf) - return [NSString stringWithFormat:@"This is a tree with path %@", [self fullPath]]; - - |
-
summary HTML Blame |
-
-if ([self hasBinaryAttributes]) - return [NSString stringWithFormat:@"%@ appears to be a binary file of %d bytes", [self fullPath], [self fileSize]]; - - if ([self fileSize] > 52428800) // ~50MB - return [NSString stringWithFormat:@"%@ is too big to be displayed (%d bytes)", [self fullPath], [self fileSize]]; - - |
-
summary initial blame functionality on tree view |
-
-if(option==0) - |
-
summary HTML Blame |
-
-contents= [repository outputForArguments:[NSArray arrayWithObjects:@"show", [self refSpec], nil]]; - |
-
summary initial blame functionality on tree view |
-
-else - |
-
summary HTML Blame |
-
-contents=[PBGitTree parseBlame:[repository outputInWorkdirForArguments:[NSArray arrayWithObjects:@"blame", @"-p", self.fullPath, nil]]]; - - if ([self hasBinaryHeader:contents]) - return [NSString stringWithFormat:@"%@ appears to be a binary file of %d bytes", [self fullPath], [self fileSize]]; - - return contents; - |
-
summary PBGitTree: Don't try to print binary-file contents |
-
- }
-
- - (long long)fileSize
- {
- if (_fileSize)
- return _fileSize;
-
- NSFileHandle *handle = [repository handleForArguments:[NSArray arrayWithObjects:@"cat-file", @"-s", [self refSpec], nil]];
- NSString *sizeString = [[NSString alloc] initWithData:[handle readDataToEndOfFile] encoding:NSISOLatin1StringEncoding];
-
- if (!sizeString)
- _fileSize = -1;
- else
- _fileSize = [sizeString longLongValue];
-
- return _fileSize;
- }
-
- - (NSString *)textContents
- {
- if (!leaf)
- return [NSString stringWithFormat:@"This is a tree with path %@", [self fullPath]];
-
- if ([self hasBinaryAttributes])
- return [NSString stringWithFormat:@"%@ appears to be a binary file of %d bytes", [self fullPath], [self fileSize]];
-
- |
-
summary PBGitTree: Improve binary-file decision |
-
-if ([self fileSize] > 52428800) // ~50MB - return [NSString stringWithFormat:@"%@ is too big to be displayed (%d bytes)", [self fullPath], [self fileSize]]; - |
-
summary PBGitTree: Don't try to print binary-file contents |
-
-- |
-
summary PBGitTree: Improve binary-file decision |
-
-NSString* contents = [self contents]; - |
-
summary PBGitTree: Don't try to print binary-file contents |
-
-- |
-
summary PBGitTree: Improve binary-file decision |
-
-if ([self hasBinaryHeader:contents]) - return [NSString stringWithFormat:@"%@ appears to be a binary file of %d bytes", [self fullPath], [self fileSize]]; - |
-
summary PBGitTree: Don't try to print binary-file contents |
-
-- return contents; - |
-
summary Use unified interface and display tree contents |
-
-} - - |
-
summary Delete temporary files when they are deallocated |
-
- - (void) saveToFolder: (NSString *) dir
- {
- NSString* newName = [dir stringByAppendingPathComponent:path];
-
- if (leaf) {
- NSFileHandle* handle = [repository handleForArguments:[NSArray arrayWithObjects:@"show", [self refSpec], nil]];
- NSData* data = [handle readDataToEndOfFile];
- [data writeToFile:newName atomically:YES];
- } else { // Directory
- [[NSFileManager defaultManager] createDirectoryAtPath:newName attributes:nil];
- |
-
summary Fix saving tree to folder |
-
-for (PBGitTree* child in [self children]) - |
-
summary Delete temporary files when they are deallocated |
-
- [child saveToFolder: newName];
- }
- }
-
- - (NSString*) tmpDirWithContents
- {
- if (leaf)
- return nil;
-
- if (!localFileName)
- localFileName = [PBEasyFS tmpDirWithPrefix: path];
-
- |
-
summary Delete temporary files when they are deallocated |
-
- for (PBGitTree* child in [self children]) {
- |
-
summary Delete temporary files when they are deallocated |
-
-[child saveToFolder: localFileName]; - } - - return localFileName; - } - - - - |
-
summary Allow double click to open file |
-
- - (NSString*) tmpFileNameForContents
- {
- if (!leaf)
- |
-
summary Delete temporary files when they are deallocated |
-
-return [self tmpDirWithContents]; - - if ([self isLocallyCached]) - return localFileName; - - if (!localFileName) - |
-
summary Prevent confusing filenames when quick-looking files. |
-
-localFileName = [[PBEasyFS tmpDirWithPrefix: sha] stringByAppendingPathComponent:path]; - |
-
summary Delete temporary files when they are deallocated |
-
-- |
-
summary Allow double click to open file |
-
-NSFileHandle* handle = [repository handleForArguments:[NSArray arrayWithObjects:@"show", [self refSpec], nil]]; - NSData* data = [handle readDataToEndOfFile]; - |
-
summary Delete temporary files when they are deallocated |
-
-[data writeToFile:localFileName atomically:YES]; - - NSFileManager* fs = [NSFileManager defaultManager]; - localMtime = [[fs attributesOfItemAtPath:localFileName error: nil] objectForKey:NSFileModificationDate]; - - return localFileName; - |
-
summary Allow double click to open file |
-
-} - - |
-
summary Add a Tree displayer |
-
- - (NSArray*) children
- {
- |
-
summary Use unified interface and display tree contents |
-
-if (children != nil) - |
-
summary Add a Tree displayer |
-
-return children; - - |
-
summary Use unified interface and display tree contents |
-
-NSString* ref = [self refSpec]; - |
-
summary Add a Tree displayer |
-
-
- NSFileHandle* handle = [repository handleForArguments:[NSArray arrayWithObjects:@"show", ref, nil]];
- [handle readLine];
- [handle readLine];
-
- NSMutableArray* c = [NSMutableArray array];
-
- NSString* p = [handle readLine];
- while (p.length > 0) {
- |
-
summary Bugfix: Avoid looping while parsing the children of a tree |
-
-if ([p isEqualToString:@"\r"]) - break; - - |
-
summary Add a Tree displayer |
-
- BOOL isLeaf = ([p characterAtIndex:p.length - 1] != '/');
- if (!isLeaf)
- p = [p substringToIndex:p.length -1];
-
- PBGitTree* child = [PBGitTree treeForTree:self andPath:p];
- child.leaf = isLeaf;
- [c addObject: child];
-
- p = [handle readLine];
- }
- children = c;
- return c;
- }
-
- - (NSString*) fullPath
- {
- if (!parent)
- return @"";
-
- if ([parent.fullPath isEqualToString:@""])
- return self.path;
-
- return [parent.fullPath stringByAppendingPathComponent: self.path];
- }
-
- |
-
summary Delete temporary files when they are deallocated |
-
- - (void) finalize
- {
- if (localFileName)
- [[NSFileManager defaultManager] removeFileAtPath:localFileName handler:nil];
- [super finalize];
- }
- |
-
summary HTML Blame |
-
-
- +(NSString *)parseBlame:(NSString *)string
- {
- string=[string stringByReplacingOccurrencesOfString:@"<" withString:@"<"];
- string=[string stringByReplacingOccurrencesOfString:@">" withString:@">"];
- |
-
summary HTML Blame |
-
-
- NSArray *lines = [string componentsSeparatedByString:@"\n"];
- NSString *line;
- NSMutableDictionary *headers=[NSMutableDictionary dictionary];
- NSMutableString *res=[NSMutableString string];
-
- [res appendString:@"<table class='blocks'>\n"];
- int i=0;
- while(i<[lines count]){
- line=[lines objectAtIndex:i];
- NSArray *header=[line componentsSeparatedByString:@" "];
- if([header count]==4){
- int nLines=[(NSString *)[header objectAtIndex:3] intValue];
- [res appendFormat:@"<tr class='block l%d'>\n",nLines];
- line=[lines objectAtIndex:++i];
- if([[[line componentsSeparatedByString:@" "] objectAtIndex:0] isEqual:@"author"]){
- NSString *author=line;
- NSString *summary=nil;
- while(summary==nil){
- line=[lines objectAtIndex:i++];
- if([[[line componentsSeparatedByString:@" "] objectAtIndex:0] isEqual:@"summary"]){
- summary=line;
- }
- }
- NSString *block=[NSString stringWithFormat:@"<td><p class='author'>%@</p><p class='summary'>%@</p></td>\n<td>\n",author,summary];
- [headers setObject:block forKey:[header objectAtIndex:0]];
- }
- [res appendString:[headers objectForKey:[header objectAtIndex:0]]];
-
- |
-
summary Version of PBGitTree.m from PBGitTree.m |
-
-NSMutableString *code=[NSMutableString string]; - |
-
summary HTML Blame |
-
- do{
- line=[lines objectAtIndex:i++];
- }while([line characterAtIndex:0]!='\t');
- line=[line stringByReplacingOccurrencesOfString:@"\t" withString:@" "];
- |
-
summary Version of PBGitTree.m from PBGitTree.m |
-
-[code appendString:line]; - [code appendString:@"\n"]; - |
-
summary HTML Blame |
-
-
- int n;
- for(n=1;n<nLines;n++){
- line=[lines objectAtIndex:i++];
- NSArray *h=[line componentsSeparatedByString:@" "];
- do{
- line=[lines objectAtIndex:i++];
- }while([line characterAtIndex:0]!='\t');
- line=[line stringByReplacingOccurrencesOfString:@"\t" withString:@" "];
- |
-
summary Version of PBGitTree.m from PBGitTree.m |
-
-[code appendString:line]; - [code appendString:@"\n"]; - |
-
summary HTML Blame |
-
-} - |
-
summary Version of PBGitTree.m from PBGitTree.m |
-
-[res appendFormat:@"<pre class='first-line: %@;brush: js'>%@</pre>",[header objectAtIndex:2],code]; - [res appendString:@"</td>\n"]; - |
-
summary HTML Blame |
-
- }else{
- break;
- }
- [res appendString:@"</tr>\n"];
- }
- [res appendString:@"</table>\n"];
- |
-
summary Version of PBGitTree.m from PBGitTree.m |
-
-NSLog(@"%@",res); - |
-
summary HTML Blame |
-
-- return (NSString *)res; - } - |
-
summary Add a Tree displayer |
-
-@end - |
-
" + txt + ""; - - SyntaxHighlighter.defaults['toolbar'] = false; - SyntaxHighlighter.highlight(); - - return; + $("source").style.display = ""; + var suffix_map = { + "m": "objc", + "h": "objc", + + "rb": "ruby", + "rbx": "ruby", + "rjs": "ruby", + "Rakefile": "ruby", + "rake": "ruby", + "gemspec": "ruby", + "irbrc": "ruby", + "capfile": "ruby", + + "xml": "xml", + "tld": "xml", + "jsp": "xml", + "pt": "xml", + "cpt": "xml", + "dtml": "xml", + "rss": "xml", + "opml": "xml", + "xsl": "xml", + "xslt": "xml", + + "js": "javascript", + "htc": "javascript", + "jsx": "javascript", + "jscript": "javascript", + "javascript": "javascript", + + "sql": "sql", + "ddl": "sql", + "dml": "sql", + + "sass": "sass", + "scss": "sass", + + "sh": "bash", + "bash": "bash", + "zsh": "bash", + "bashrc": "bash", + "bash_profile": "bash", + "bash_login": "bash", + "profile": "bash", + "bash_logout": "bash", + + "diff": "diff", + "patch": "diff", + + "java": "java", + "bsh": "java", + + "css": "css", + "css": "css.erb", + "pl": "perl", + "pm": "perl", + "pod": "perl", + "t": "perl", + "PL": "perl", + + "erl": "erlang", + "hrl": "erlang", + + "php": "php", + + "py": "python", + "rpy": "python", + "pyw": "python", + "cpy": "python", + "SConstruct": "python", + "Sconstruct": "python", + "sconstruct": "python", + "SConscript": "python", + + "cc": "cpp", + "cpp": "cpp", + "cp": "cpp", + "cxx": "cpp", + "c++":"cpp", + "C": "cpp", + "h": "cpp", + "hh": "cpp", + "hpp": "cpp", + "cpp": "h++", + "c": "cpp" + } + var brush = "objc"; + var suffix = ""; + if (fileName && fileName != '') { + suffix = fileName.substr(fileName.lastIndexOf('.') + 1); + } + + brush = suffix_map[suffix]; + + $("source").innerHTML="
" + txt + ""; + $("source").style.display = ""; + $("message").style.display = "none"; + + SyntaxHighlighter.defaults['toolbar'] = false; + SyntaxHighlighter.highlight(); + + return; } -var test=function(txt) { - SyntaxHighlighter.defaults['toolbar'] = false; - SyntaxHighlighter.highlight(); +var setMessage = function(message) { + $("message").style.display = ""; + $("message").innerHTML = message.escapeHTML(); + $("source").style.display = "none"; +} - return; + +var test=function(txt) { + SyntaxHighlighter.defaults['toolbar'] = false; + SyntaxHighlighter.highlight(); + + return; } var get_keys = function(obj) { - var keys = []; - for (var key in obj) { - keys.push(key); - } - return keys; + var keys = []; + for (var key in obj) { + keys.push(key); + } + return keys; } diff --git a/html/views/fileview/index.html b/html/views/fileview/index.html index 0edf8fb..a307f55 100644 --- a/html/views/fileview/index.html +++ b/html/views/fileview/index.html @@ -1,41 +1,43 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/html/views/fileview/index_test.html b/html/views/fileview/index_test.html deleted file mode 100644 index c49766e..0000000 --- a/html/views/fileview/index_test.html +++ /dev/null @@ -1,48 +0,0 @@ - - - - - - - - - - - -
-// -// AppController.h -// MGScopeBar -// -// Created by Matt Gemmell on 16/03/2008. -// - -/* dhfas fldsa */ - -/* -fjdsahf dsaf dlsaf jd;sa -fdjksal; fjhdsa -*/ - -#import <Cocoa/Cocoa.h> -#import "MGScopeBarDelegateProtocol.h" - - -/* dhfas fldsa */ - -@interface AppController : NSObject- -{ - IBOutlet NSTextField *labelField; - IBOutlet MGScopeBar *scopeBar; - IBOutlet NSView *accessoryView; - NSMutableArray *groups; -} - -@property(retain) NSMutableArray *groups; - -@end -
| Commit: | 703782163ddb653789c304e396eadb31f541864f |
| Author: | Pieter de Bie |
| Date: | 10 months ago |
| Commit: | 0d8ba8c2632e129fe7627f86d907c8b470c1bf20 |
| Author: | Pieter de Bie |
| Date: | 1 year, 1 month ago |
| Commit: | f9ff15cc6bf3c807425321581002f676985dd222 |
| Author: | Pieter de Bie |
| Date: | 1 year, 1 month ago |
| Commit: | 8d729dae4cc8d3b564d149d6c9bb96922ee1bafa |
| Author: | Pieter de Bie |
| Date: | 1 year, 6 months ago |
| Commit: | 0975426f2f5119335c00768006b1ede0252ac448 |
| Author: | Pieter de Bie |
| Date: | 2 years, 7 months ago |
| Commit: | 1d19bd64dfa83def18d5271c9afef9300ef0d65e |
| Author: | Pieter de Bie |
| Date: | 2 years, 8 months ago |
| Commit: | 472d36c7f970d9f3dbda3b9d7c8a7d51546bda56 |
| Author: | Pieter de Bie |
| Date: | 2 years, 8 months ago |
| Commit: | e659e63fc08ecd46cc1c26b6260126502ec656aa |
| Author: | Pieter de Bie |
| Date: | 2 years, 8 months ago |
| Commit: | 5010511bdb358ad376fd4668368bc5c12d9d8214 |
| Author: | Pieter de Bie |
| Date: | 2 years, 8 months ago |
| Commit: | a0f248ef9f50a3af0efebdfb29c706bd97011a97 |
| Author: | Pieter de Bie |
| Date: | 2 years, 8 months ago |
| Commit: | 001b6bf10eeaaf618971bc079e7415690c4c8d1a |
| Author: | Pieter de Bie |
| Date: | 2 years, 9 months ago |
| Commit: | aafc284eb8fbd69acf40acfef07e25f409a87a18 |
| Author: | Pieter de Bie |
| Date: | 2 years, 9 months ago |
| Commit: | 76e176e8b4ac59438340b129874ffbdfa7404ea3 |
| Author: | Pieter de Bie |
| Date: | 2 years, 9 months ago |
| Commit: | 9b3909e7592d3c8648accb67642a2b57a441f128 |
| Author: | Pieter de Bie |
| Date: | 2 years, 9 months ago |
| Commit: | 44009b6f3e7e6fc5b54910c2b2a9a54b13f95a14 |
| Author: | Pieter de Bie |
| Date: | 2 years, 9 months ago |
| Commit: | 252796ee26ce733c4a6d3044e3142f9ee5df005e |
| Author: | Pieter de Bie |
| Date: | 2 years, 9 months ago |