Commit Graph

56 Commits

Author SHA1 Message Date
German Laullon ac1019d5cc no libgit2 2011-05-20 00:46:13 +02:00
Romain Muller 12bb9623a4 NULL-safe escapeHTML: 2011-05-09 22:19:06 -07:00
Uwe Hees f02cdd8cfc Fix line numbering of plus lines from merge diffs. 2011-05-08 12:58:46 +02:00
Uwe Hees 2e3cdd2e05 Remove debug output of the hunk html. 2011-05-07 11:34:06 +02:00
Uwe Hees d36f441e38 Parse diff hunks from merge diffs, continued.
Show differences from all anecstors. Each ancestor is represented by a seperate line numer column.
2011-05-07 11:29:47 +02:00
Uwe Hees 62b6dba983 Parse diff hunks from merge diffs.
For now only the differences to the first parent are shown.
2011-05-07 09:07:04 +02:00
Uwe Hees a67e25c426 Parse merge diffs.
These diffs begin with "diff --cc" and have "@@@" as block sepeartors.
2011-05-06 10:17:32 +02:00
Romain Muller 7d82aa0761 Rename cleanupHTML: to escapeHTML: 2011-05-01 13:49:15 -07:00
Romain Muller 3f416bb8e7 Tidy up the commit message to ensure it won't break the diff view.
Renamed the GLFileView's +parseHTML into something more meaningful regarding what it actually does.

Also, the method might need to be moved to somewhere else...
2011-04-30 13:16:22 -07:00
German Laullon 5e9210d2c2 [laullon/gitx GH-41] Open in FileMerge link doesn't always work 2011-04-28 10:12:56 -07:00
German Laullon f6e69682d1 better hide/show splitviews 2011-04-22 15:48:19 -07:00
German Laullon 09011b82e9 avoid unnecessary reloads 2011-04-20 12:51:24 -07:00
German Laullon e109d03a4d Better file view search 2011-04-20 12:20:24 -07:00
German Laullon a54300f751 parseDiffChunk bug 2011-04-06 17:00:03 -07:00
German Laullon 656cb824a3 NSLog => Dlog (Log only on debug build) 2011-04-05 11:39:01 -07:00
German Laullon ac704f0d4c other diff parser bug 2011-04-04 12:10:05 -07:00
German Laullon 1e62b54914 diff parse bug 2011-04-01 00:58:44 -07:00
German Laullon bb4f5e3897 new Diff parser 2011-04-01 00:38:04 -07:00
German Laullon 571082a5d0 Merge branch 'refs/heads/apla-master'
Conflicts:
	GLFileView.m
2011-03-30 11:43:51 -07:00
German Laullon c0965e3770 basic search capability on FileVew 2011-03-30 00:17:14 -07:00
apla 816be194b5 diff can contain no changes, permissions only 2011-03-30 02:00:26 +04:00
German Laullon 1ec2ef2596 FileMerge.app on FileView diffs 2011-03-19 13:32:30 -07:00
German Laullon 95cb498e37 [14] The "blame", "history" and "diff" commands are broken
Related with tabs & spaces
2011-03-18 12:58:21 -07:00
German Laullon 6fe75b27ea Replace tab characters with 4 blanks in GLFileView.m. (flyingblackhat) 2011-03-10 16:45:13 -08:00
German Laullon f9ccf1fe8d Solved compilation warnings 2011-03-10 16:04:45 -08:00
German Laullon 82f69a7ec3 minor details 2011-03-08 17:59:37 -08:00
German Laullon 5f85c8269c diff parser refactoring 2011-03-04 23:54:34 -08:00
German Laullon 8896dc993c basic FileMerge support 2011-03-04 13:38:55 -08:00
German Laullom cb224cbcc5 Merge remote branch 'refs/remotes/kamal/experimental' 2011-02-15 10:44:42 -08:00
Kamal Fariz Mahyuddin 56a38e202a Put SHA on same line as author 2011-02-15 23:08:29 +08:00
Kamal Fariz Mahyuddin 3b38beb4c4 Add clickable commit SHAs in blame view 2011-02-15 22:47:22 +08:00
Aron Cedercrantz da2e81ebfb Removed two unused variables. 2011-01-19 14:05:19 +01:00
Aron Cedercrantz bb872a9cd1 Removed unused variable. 2011-01-19 14:02:48 +01:00
Aron Cedercrantz 0774e09bdd Fixed a bug where an uninitialized pointer would be used. 2011-01-19 14:01:16 +01:00
German Laullon bee812f85a only show images as images ;) 2011-01-05 21:46:12 -08:00
German Laullon 7007996c08 File names with whites spaces on history view 2011-01-05 21:06:51 -08:00
German Laullon 812c2ad079 images on diff 2011-01-04 00:36:57 -08:00
German Laullon ad90b3390a Initial file list stats on history view.
Based on kelan work
2010-12-30 23:54:44 -08:00
German Laullon 3f7a79c491 New History view
Less javascript
2010-12-29 01:08:23 -08:00
German Laullon 6959a157d7 some diff bug 2010-12-09 21:32:24 -08:00
German Laullon 77b843116e better diff process 2010-12-09 17:44:48 -08:00
German Laullon 875e7cfcfd new diff style 2010-12-09 13:59:22 -08:00
German Laullon da6a75c607 error control & and html/css/javascript reorder. 2010-12-09 13:12:52 -08:00
German Laullon 6a4f5bd679 better error control 2010-12-08 12:14:58 -08:00
German Laullon 4b85580e2f diff on file view 2010-12-07 22:26:33 -08:00
David Parry 14a1b611be Now passing the full file path to the Javascript "showFile" method, so
we can use the file suffix to determine which syntax highlighting to use.
2010-11-24 11:12:31 +11:00
Nathan Kinsinger b41da9e23e Fix the File/Tree view's vertical split view
It will now remember it's position and the divider will not move when the window resizes.
2010-11-17 19:53:25 -07:00
Nathan Kinsinger 515b66f09a Fix memory leaks 2010-11-14 17:58:48 -07:00
German Laullon a78a2c238c blame cosmetics
save the html for debug and CSS edit
2010-09-24 10:17:04 -07:00
German Laullon cbf7cd3fbf cosmetic 2010-09-19 13:18:40 -07:00