| blob | 8d9be6dc771a294e0261bed0dc037ec6a16eb5a9 |
1 <html>
2 <head>
4 <link rel="stylesheet" href="css/GitX.css" type="text/css" media="screen" title="no title" charset="utf-8">
5 <link rel="stylesheet" href="css/diff.css" type="text/css" media="screen" title="no title" charset="utf-8">
11 var newFile = function(name, id) {
12 var link = document.createElement("a");
14 link.appendChild(document.createTextNode(name));
15 $("filelist").appendChild(link);
17 }
18 newFile.displayName = "newFileCallback";
20 var doeHet = function() {
21 var start = Date.now();
22 console.profile();
23 highlightDiff($("orig_diff").value,
24 $("diff"),
25 { "newfile" : newFile }
26 );
27 console.profileEnd();
28 var end = Date.now();
31 }
32 </script>
33 </head>
38 diff --git a/.gitignore b/.gitignore
40 --- a/.gitignore
41 +++ b/.gitignore
43 build
44 +build/revision
45 *.xcodeproj/*.pbxuser
46 *.xcodeproj/*.perspectivev3
47 *.xcodeproj/*.mode1v3
48 diff --git a/ApplicationController.m b/ApplicationController.m
50 --- a/ApplicationController.m
51 +++ b/ApplicationController.m
54 - (ApplicationController*)init
55 {
56 -#ifndef NDEBUG
57 +#ifdef DEBUG_BUILD
58 [NSApp activateIgnoringOtherApps:YES];
59 #endif
62 - (IBAction)installCliTool:(id)sender;
63 {
64 BOOL success = NO;
65 - NSString* installationPath = @"/usr/local/bin/gitx";
66 + NSString* installationPath = @"/usr/local/bin/";
67 + NSString* installationName = @"gitx";
69 if (toolPath) {
70 AuthorizationRef auth;
71 if (AuthorizationCreate(NULL, kAuthorizationEmptyEnvironment, kAuthorizationFlagDefaults, &auth) == errAuthorizationSuccess) {
72 - char const* arguments[] = { "-f", "-s", [toolPath UTF8String], [installationPath UTF8String], NULL };
73 + char const* mkdir_arg[] = { "-p", [installationPath UTF8String], NULL};
74 + char const* mkdir = "/bin/mkdir";
75 + AuthorizationExecuteWithPrivileges(auth, mkdir, kAuthorizationFlagDefaults, (char**)mkdir_arg, NULL);
76 + char const* arguments[] = { "-f", "-s", [toolPath UTF8String], [[installationPath stringByAppendingString: installationName] UTF8String], NULL };
77 char const* helperTool = "/bin/ln";
78 if (AuthorizationExecuteWithPrivileges(auth, helperTool, kAuthorizationFlagDefaults, (char**)arguments, NULL) == errAuthorizationSuccess) {
79 int status;
80 diff --git a/Documentation/ReleaseNotes.txt b/Documentation/ReleaseNotes.txt
81 deleted file mode 100644
83 --- a/Documentation/ReleaseNotes.txt
84 +++ /dev/null
86 -GitX Release Notes
87 -
88 -v0.6.1
89 -===
90 -
91 -This is a bugfix release. The following bugs have been fixed:
92 -
93 -* The commit view shows new files with linebreaks
95 -* Reloading the detailed view in the History no longer causes an empty page
96 -
97 -v0.6
98 -===
99 -
100 -This release has the following new features and enhancements:
101 -* The diff display now looks much nicer, using boxes to segment files
102 -* The toolbar can now me customized
103 -* Images that have been changed or added in a commit can now be viewed
104 - inline in GitX
105 -* GitX has gained a preference pane which allows you to specify a git path
106 - and disable the Gist and Gravatar integration
107 -* The commit interface is now more intuitive. Particularly, you can now
108 - select multiple files and use drag and drop to stage / unstage files
109 -* You can now drag and drop files out of the commit view
110 -* The files in the commit view have gained a context menu that allows you
111 - to revert changes / open the file / ignore the file
112 -* It is now possible to adjust the amount of context lines in the commit view.
113 - Using a smaller context size allows you to do more fine-grained commits
114 -* The branch menu is now organized in branches/remotes/tags
115 -* The view switch button now uses icons rather than words
118 -* Listing commits has become much faster
119 -* GitX no longer spawns zombie processes
120 -* GitX now shows a list of files that have been changed in a commit
121 -
122 -* GitX now uses libgit2 to store object id's, reducing it's memory footprint
123 -
124 -In addition many bugs were fixed, including the correct calculation of a
125 -gravatar MD5 hash.
126 -
127 -
128 -v0.5
129 -====
130 -
131 -This feature release has several new smaller or larger features:
132 -* The current branch is now highlighted
133 -* In the commit view, there is an option to amend commits
134 -* The "Gist it" button now respects github.user/token
135 -* Display a gravatar of the committer
136 -* The commit message view now displays a vertical line at 50 characters
137 -* It is now possible to revert changes by using the context menu in the
138 - commit view
139 -* You can now stage only parts of a file by using the "Stage Hunk" buttons
140 - in the commit view
141 -* You can now use GitX to show a diff of anything, for example by using
142 - 'gitx --diff HEAD^^' or 'git diff HEAD~3 | gitx --diff'
143 -* You can now drag and drop refs to move them and also create branches
144 -
145 -In addition, the following bugs have been fixed:
146 -* Better detection of git version
147 -* Branch lines are no longer interspersed with half a pixel of whitespace
148 -* The toolbar keeps its state when switching views
149 -
150 -v0.4.1
151 -==
152 -
153 -This is a maintenance release. Most important fixes:
154 -
155 -* The diff display is now much faster
156 -* More locations are now searched for a default git
157 -* Code pasted online is now private
158 -
159 -v0.4: Changes since v0.3.1
160 -===
161 -* A new commitview, allowing you to selectively add changes and commit them.
162 -* You can now upload a commit as a patch to gist.github.com
163 -* GitX now searches for your git binary in more directories and is smarter
164 - about reporting errors regarding git paths.
165 -* You can now remove branches by right-clicking on them in the detailed view
166 -* GitX now comes with a spicy new icon
167 -* The diff view has become prettier and now also highlights trailing
168 - whitespace.
169 -* Various little changes and stability improvement
170 -
171 -v0.3.1
172 -===
173 -* Fixed a serious crasher
174 -
175 -V0.3: Changes since v0.2.1
176 -====
177 -* You can now pass on command-line arguments just like you can with 'git log'
178 -* The program has an icon
179 -* Also displays remote branches in the branch list
180 -* Is better in determining if a directory is a bare git repository
181 -* Support for --left-right: use 'gitx --left-right HEAD..origin/master'
182 - to see which commits are only on your branch or on their branch
183 -* Navigate through changed hunks by using j/k keys
184 -* Scroll down in webview by using space / shift-space
185 -
186 -V0.2.1
187 -===
188 -* Added Sparkle update system
189 -
190 -V0.2: Changes since v0.1
191 -====
192 -* The graph now has colors
193 -* There are now lables attached to commits
194 \ No newline at end of file
196 new file mode 100644
198 --- /dev/null
199 +++ b/Documentation/ReleaseNotes/v0.2.1.txt
201 +V0.2.1
202 +===
203 +* Added Sparkle update system
204 diff --git a/Documentation/ReleaseNotes/v0.2.txt b/Documentation/ReleaseNotes/v0.2.txt
205 new file mode 100644
207 --- /dev/null
208 +++ b/Documentation/ReleaseNotes/v0.2.txt
210 +V0.2: Changes since v0.1
211 +====
212 +* The graph now has colors
213 +* There are now lables attached to commits
214 \ No newline at end of file
216 new file mode 100644
218 --- /dev/null
219 +++ b/Documentation/ReleaseNotes/v0.3.1.txt
221 +v0.3.1
222 +===
223 +* Fixed a serious crasher
224 diff --git a/Documentation/ReleaseNotes/v0.3.txt b/Documentation/ReleaseNotes/v0.3.txt
225 new file mode 100644
226 index 0000000..d46ea1d
227 --- /dev/null
228 +++ b/Documentation/ReleaseNotes/v0.3.txt
230 +V0.3: Changes since v0.2.1
231 +====
232 +* You can now pass on command-line arguments just like you can with 'git log'
233 +* The program has an icon
234 +* Also displays remote branches in the branch list
235 +* Is better in determining if a directory is a bare git repository
236 +* Support for --left-right: use 'gitx --left-right HEAD..origin/master'
237 + to see which commits are only on your branch or on their branch
238 +* Navigate through changed hunks by using j/k keys
239 +* Scroll down in webview by using space / shift-space
241 new file mode 100644
242 index 0000000..b8e6a93
243 --- /dev/null
244 +++ b/Documentation/ReleaseNotes/v0.4.1.txt
246 +v0.4.1
247 +==
248 +
249 +This is a maintenance release. Most important fixes:
250 +
251 +* The diff display is now much faster
252 +* More locations are now searched for a default git
253 +* Code pasted online is now private
254 diff --git a/Documentation/ReleaseNotes/v0.4.txt b/Documentation/ReleaseNotes/v0.4.txt
255 new file mode 100644
257 --- /dev/null
258 +++ b/Documentation/ReleaseNotes/v0.4.txt
260 +v0.4: Changes since v0.3.1
261 +===
262 +* A new commitview, allowing you to selectively add changes and commit them.
263 +* You can now upload a commit as a patch to gist.github.com
264 +* GitX now searches for your git binary in more directories and is smarter
265 + about reporting errors regarding git paths.
266 +* You can now remove branches by right-clicking on them in the detailed view
267 +* GitX now comes with a spicy new icon
268 +* The diff view has become prettier and now also highlights trailing
269 + whitespace.
270 +* Various little changes and stability improvement
271 diff --git a/Documentation/ReleaseNotes/v0.5.txt b/Documentation/ReleaseNotes/v0.5.txt
272 new file mode 100644
274 --- /dev/null
275 +++ b/Documentation/ReleaseNotes/v0.5.txt
277 +v0.5
278 +====
279 +
280 +This feature release has several new smaller or larger features:
281 +
282 +* The current branch is now highlighted
283 +* In the commit view, there is an option to amend commits
284 +* The "Gist it" button now respects github.user/token
285 +* Display a gravatar of the committer
286 +* The commit message view now displays a vertical line at 50 characters
287 +* It is now possible to revert changes by using the context menu in the
288 + commit view
289 +* You can now stage only parts of a file by using the "Stage Hunk" buttons
290 + in the commit view
291 +* You can now use GitX to show a diff of anything, for example by using
292 + 'gitx --diff HEAD^^' or 'git diff HEAD~3 | gitx --diff'
293 +* You can now drag and drop refs to move them and also create branches
294 +
295 +In addition, the following bugs have been fixed:
296 +
297 +* Better detection of git version
298 +* Branch lines are no longer interspersed with half a pixel of whitespace
299 +* The toolbar keeps its state when switching views
301 new file mode 100644
302 index 0000000..c77a31b
303 --- /dev/null
304 +++ b/Documentation/ReleaseNotes/v0.6.1.txt
306 +v0.6.1
307 +===
308 +
309 +This is a bugfix release. The following bugs have been fixed:
310 +
311 +* The commit view shows new files with linebreaks
313 +* Reloading the detailed view in the History no longer causes an empty page
315 new file mode 100644
317 --- /dev/null
318 +++ b/Documentation/ReleaseNotes/v0.6.2.txt
320 +v0.6.2
321 +===
322 +
323 +This is a maintenance release. The following bugs have been fixed:
324 +
325 +* Fix many display bugs in the history view (Thanks to Johannes Gilger)
326 +* Fix moving of refs
327 +* GitX no longer stalls if you have a large amount of untracked files
328 +* GitX now asks for confirmation before deleting a branch
329 +* GitX no longer shows ghost files after staging a hunk
330 +* Dragging and dropping a tree now correctly copies all files
331 +
332 +In addition, the following features have been added:
333 +
334 +* There is now a 'New…' option to create a new repository
335 +* The 'Gist It' feature now asks for confirmation by default. This can be changed in the preferences
336 +* GitX can now open any directory by dragging it on the icon
337 +* GitX now asks for confirmation before deleting a branch
338 \ No newline at end of file
339 diff --git a/Documentation/ReleaseNotes/v0.6.txt b/Documentation/ReleaseNotes/v0.6.txt
340 new file mode 100644
341 index 0000000..d152d89
342 --- /dev/null
343 +++ b/Documentation/ReleaseNotes/v0.6.txt
345 +v0.6
346 +===
347 +
348 +This release has the following new features and enhancements:
349 +
350 +* The diff display now looks much nicer, using boxes to segment files
351 +* The toolbar can now me customized
352 +* Images that have been changed or added in a commit can now be viewed
353 + inline in GitX
354 +* GitX has gained a preference pane which allows you to specify a git path
355 + and disable the Gist and Gravatar integration
356 +* The commit interface is now more intuitive. Particularly, you can now
357 + select multiple files and use drag and drop to stage / unstage files
358 +* You can now drag and drop files out of the commit view
359 +* The files in the commit view have gained a context menu that allows you
360 + to revert changes / open the file / ignore the file
361 +* It is now possible to adjust the amount of context lines in the commit view.
362 + Using a smaller context size allows you to do more fine-grained commits
363 +* The branch menu is now organized in branches/remotes/tags
364 +* The view switch button now uses icons rather than words
367 +* Listing commits has become much faster
368 +* GitX no longer spawns zombie processes
369 +* GitX now shows a list of files that have been changed in a commit
370 +* GitX now uses libgit2 to store object id's, reducing it's memory footprint
371 +
372 +In addition many bugs were fixed, including the correct calculation of a
373 +gravatar MD5 hash.
374 diff --git a/English.lproj/MainMenu.xib b/English.lproj/MainMenu.xib
376 --- a/English.lproj/MainMenu.xib
377 +++ b/English.lproj/MainMenu.xib
384 </object>
397 </object>
406 </object>
408 </object>
414 + </object>
416 + </object>
417 </object>
421 </object>
422 </object>
426 </object>
429 diff --git a/English.lproj/Preferences.xib b/English.lproj/Preferences.xib
431 --- a/English.lproj/Preferences.xib
432 +++ b/English.lproj/Preferences.xib
437 <data>
454 </object>
459 </object>
464 + </object>
467 + </object>
468 + </object>
481 </object>
483 </object>
513 </object>
514 </object>
540 + </object>
541 + </object>
562 + </object>
563 + </object>
580 </object>
581 </object>
582 </object>
587 </object>
594 </object>
597 </object>
612 </object>
613 </object>
616 </object>
631 </object>
632 </object>
635 + </object>
648 + </object>
649 + </object>
651 + </object>
664 + </object>
665 + </object>
667 + </object>
680 + </object>
681 + </object>
683 + </object>
696 + </object>
697 + </object>
699 </object>
700 </object>
704 </object>
718 </object>
721 </object>
731 </object>
734 + </object>
741 + </object>
743 + </object>
748 </object>
755 </object>
765 </object>
768 </object>
776 + </object>
783 + </object>
785 + </object>
790 </object>
791 </object>
792 </object>
818 </object>
849 </object>
850 </object>
854 </object>
857 diff --git a/GitX.xcodeproj/project.pbxproj b/GitX.xcodeproj/project.pbxproj
859 --- a/GitX.xcodeproj/project.pbxproj
860 +++ b/GitX.xcodeproj/project.pbxproj
862 objectVersion = 45;
863 objects = {
865 +/* Begin PBXAggregateTarget section */
866 + F56439F70F792B2100A579C2 /* Generate PList Prefix */ = {
867 + isa = PBXAggregateTarget;
868 + buildConfigurationList = F56439FD0F792B3600A579C2 /* Build configuration list for PBXAggregateTarget "Generate PList Prefix" */;
869 + buildPhases = (
870 + F56439F60F792B2100A579C2 /* ShellScript */,
871 + );
872 + dependencies = (
873 + );
874 + name = "Generate PList Prefix";
875 + productName = "Generate PList Prefix";
876 + };
877 +/* End PBXAggregateTarget section */
878 +
879 /* Begin PBXBuildFile section */
880 056438B70ED0C40B00985397 /* DetailViewTemplate.png in Resources */ = {isa = PBXBuildFile; fileRef = 056438B60ED0C40B00985397 /* DetailViewTemplate.png */; };
881 3BC07F4C0ED5A5C5009A7768 /* HistoryViewTemplate.png in Resources */ = {isa = PBXBuildFile; fileRef = 3BC07F4A0ED5A5C5009A7768 /* HistoryViewTemplate.png */; };
883 F523CEB60ED3399200DDD714 /* PBGitIndexController.m in Sources */ = {isa = PBXBuildFile; fileRef = F523CEB50ED3399200DDD714 /* PBGitIndexController.m */; };
884 F52BCE030E84208300AA3741 /* PBGitHistoryView.xib in Resources */ = {isa = PBXBuildFile; fileRef = F52BCE020E84208300AA3741 /* PBGitHistoryView.xib */; };
885 F52BCE070E84211300AA3741 /* PBGitHistoryController.m in Sources */ = {isa = PBXBuildFile; fileRef = F52BCE060E84211300AA3741 /* PBGitHistoryController.m */; };
886 + F53B61790F7FC9D3000E13FA /* PBGitRevPool.mm in Sources */ = {isa = PBXBuildFile; fileRef = F53B61780F7FC9D3000E13FA /* PBGitRevPool.mm */; };
887 + F53B617A0F7FC9D3000E13FA /* PBGitRevPool.mm in Sources */ = {isa = PBXBuildFile; fileRef = F53B61780F7FC9D3000E13FA /* PBGitRevPool.mm */; };
888 F53C4DF70E97FC630022AD59 /* PBGitBinary.m in Sources */ = {isa = PBXBuildFile; fileRef = F53C4DF60E97FC630022AD59 /* PBGitBinary.m */; };
889 F53C4DF80E97FCA70022AD59 /* PBGitBinary.m in Sources */ = {isa = PBXBuildFile; fileRef = F53C4DF60E97FC630022AD59 /* PBGitBinary.m */; };
890 F53C4DF90E97FCAD0022AD59 /* PBEasyPipe.m in Sources */ = {isa = PBXBuildFile; fileRef = F57CC3900E05DDF2000472E2 /* PBEasyPipe.m */; };
892 remoteGlobalIDString = 913D5E480E55644600CECEA2;
893 remoteInfo = "cli tool";
894 };
895 + F5643A010F792B4900A579C2 /* PBXContainerItemProxy */ = {
896 + isa = PBXContainerItemProxy;
897 + containerPortal = 29B97313FDCFA39411CA2CEA /* Project object */;
898 + proxyType = 1;
899 + remoteGlobalIDString = F56439F70F792B2100A579C2;
900 + remoteInfo = "Generate PList Prefix";
901 + };
902 /* End PBXContainerItemProxy section */
904 /* Begin PBXCopyFilesBuildPhase section */
906 F52BCE020E84208300AA3741 /* PBGitHistoryView.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = PBGitHistoryView.xib; sourceTree = "<group>"; };
907 F52BCE050E84211300AA3741 /* PBGitHistoryController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PBGitHistoryController.h; sourceTree = "<group>"; };
908 F52BCE060E84211300AA3741 /* PBGitHistoryController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PBGitHistoryController.m; sourceTree = "<group>"; };
909 + F53B61770F7FC9D3000E13FA /* PBGitRevPool.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PBGitRevPool.h; sourceTree = "<group>"; };
910 + F53B61780F7FC9D3000E13FA /* PBGitRevPool.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = PBGitRevPool.mm; sourceTree = "<group>"; };
911 + F53B64030F7FF5DC000E13FA /* PBRevPoolDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PBRevPoolDelegate.h; sourceTree = "<group>"; };
912 F53C4DF50E97FC630022AD59 /* PBGitBinary.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PBGitBinary.h; sourceTree = "<group>"; };
913 F53C4DF60E97FC630022AD59 /* PBGitBinary.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PBGitBinary.m; sourceTree = "<group>"; };
914 F53EE3590E06BBA00022B925 /* CWQuickLook.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CWQuickLook.h; sourceTree = "<group>"; };
916 name = Widgets;
917 sourceTree = "<group>";
918 };
919 + F53B61750F7FC9B9000E13FA /* RevLoading */ = {
920 + isa = PBXGroup;
921 + children = (
922 + F53FF2030E7ABB5300389171 /* PBGitRevSpecifier.h */,
923 + F53FF2040E7ABB5300389171 /* PBGitRevSpecifier.m */,
924 + F5FF4E160E0829C20006317A /* PBGitRevList.h */,
925 + F5FF4E170E0829C20006317A /* PBGitRevList.mm */,
926 + F53B61770F7FC9D3000E13FA /* PBGitRevPool.h */,
927 + F53B61780F7FC9D3000E13FA /* PBGitRevPool.mm */,
928 + F53B64030F7FF5DC000E13FA /* PBRevPoolDelegate.h */,
929 + );
930 + name = RevLoading;
931 + sourceTree = "<group>";
932 + };
933 F56174540E05887E001DCD79 /* Git */ = {
934 isa = PBXGroup;
935 children = (
936 + F53B61750F7FC9B9000E13FA /* RevLoading */,
937 F5E927E30E883D6800056E75 /* Commit */,
938 F5E927E10E883D2E00056E75 /* History */,
939 F5945E150E02B0C200706420 /* PBGitRepository.h */,
941 F56524EF0E02D45200F03B52 /* PBGitCommit.m */,
942 F5C007730E731B48007B84B2 /* PBGitRef.h */,
943 F5C007740E731B48007B84B2 /* PBGitRef.m */,
944 - F5FF4E160E0829C20006317A /* PBGitRevList.h */,
945 - F5FF4E170E0829C20006317A /* PBGitRevList.mm */,
946 - F53FF2030E7ABB5300389171 /* PBGitRevSpecifier.h */,
947 - F53FF2040E7ABB5300389171 /* PBGitRevSpecifier.m */,
948 F56174550E058893001DCD79 /* PBGitTree.h */,
949 F56174560E058893001DCD79 /* PBGitTree.m */,
950 F5FC43C30EBD050800191D80 /* PBRefContextDelegate.h */,
952 isa = PBXNativeTarget;
953 buildConfigurationList = 26FC0A840875C7B200E6366F /* Build configuration list for PBXNativeTarget "GitX" */;
954 buildPhases = (
955 - F5792DFB0EDB570C001B0C31 /* Compilie libgit2 */,
956 + F5792DFB0EDB570C001B0C31 /* Compile libgit2 */,
957 8D1107290486CEB800E47090 /* Resources */,
958 8D11072C0486CEB800E47090 /* Sources */,
959 8D11072E0486CEB800E47090 /* Frameworks */,
961 );
962 dependencies = (
963 913D5E5A0E5564F400CECEA2 /* PBXTargetDependency */,
964 + F5643A020F792B4900A579C2 /* PBXTargetDependency */,
965 );
966 name = GitX;
967 productInstallPath = "$(HOME)/Applications";
969 8D1107260486CEB800E47090 /* GitX */,
970 913D5E480E55644600CECEA2 /* cli tool */,
971 F5886A0F0ED5D33D0066E74C /* SpeedTest */,
972 + F56439F70F792B2100A579C2 /* Generate PList Prefix */,
973 );
974 };
975 /* End PBXProject section */
977 /* End PBXResourcesBuildPhase section */
979 /* Begin PBXShellScriptBuildPhase section */
980 - F5792DFB0EDB570C001B0C31 /* Compilie libgit2 */ = {
981 + F56439F60F792B2100A579C2 /* ShellScript */ = {
982 + isa = PBXShellScriptBuildPhase;
983 + buildActionMask = 2147483647;
984 + files = (
985 + );
986 + inputPaths = (
987 + );
988 + outputPaths = (
989 + );
990 + runOnlyForDeploymentPostprocessing = 0;
991 + shellPath = /bin/sh;
992 + shellScript = "export PATH=$PATH:$HOME/bin:$HOME/local/bin:/sw/bin:/opt/local/bin:`$TARGET_BUILD_DIR/gitx --git-path`\nVERSION=$(git describe)\nLONG_VERSION=$(echo $VERSION | sed -e \"s/\\-/\\./\" -e \"s/^v//\" -e \"s/-.*//\")\nSHORT_VERSION=$(echo $VERSION | sed -e \"s/\\-.*//\" -e \"s/^v//\")\n\necho -n \"#define LONG_VERSION $LONG_VERSION\n#define SHORT_VERSION $SHORT_VERSION\" > build/revision\ntouch Info.plist";
993 + };
994 + F5792DFB0EDB570C001B0C31 /* Compile libgit2 */ = {
995 isa = PBXShellScriptBuildPhase;
996 buildActionMask = 2147483647;
997 files = (
998 );
999 inputPaths = (
1000 );
1001 - name = "Compilie libgit2";
1002 + name = "Compile libgit2";
1003 outputPaths = (
1004 );
1005 runOnlyForDeploymentPostprocessing = 0;
1006 shellPath = /bin/sh;
1007 - shellScript = "git submodule init\ngit submodule update\ncd libgit2\nrm -f libgit2.a\nmake CFLAGS=\"-arch i386 -arch ppc\"\nranlib libgit2.a";
1008 + shellScript = "export PATH=$PATH:$HOME/bin:$HOME/local/bin:/sw/bin:/opt/local/bin:`$TARGET_BUILD_DIR/gitx --git-path`\ngit submodule init\ngit submodule update\ncd libgit2\nrm -f libgit2.a\nmake CFLAGS=\"-arch i386 -arch ppc\"\nranlib libgit2.a";
1009 };
1010 F5CF04A20EAE696C00D75C81 /* Copy HTML files */ = {
1011 isa = PBXShellScriptBuildPhase;
1013 47DBDB580E94EDE700671A1E /* DBPrefsWindowController.m in Sources */,
1014 47DBDB670E94EE8B00671A1E /* PBPrefsWindowController.m in Sources */,
1015 47DBDBCA0E95016F00671A1E /* PBNSURLPathUserDefaultsTransfomer.m in Sources */,
1016 + F53B61790F7FC9D3000E13FA /* PBGitRevPool.mm in Sources */,
1017 );
1018 runOnlyForDeploymentPostprocessing = 0;
1019 };
1021 F5886A170ED5D34F0066E74C /* PBGitRepository.m in Sources */,
1022 F5886A190ED5D3560066E74C /* PBGitRef.m in Sources */,
1023 F5886A160ED5D3490066E74C /* speedtest.m in Sources */,
1024 + F53B617A0F7FC9D3000E13FA /* PBGitRevPool.mm in Sources */,
1025 );
1026 runOnlyForDeploymentPostprocessing = 0;
1027 };
1029 target = 913D5E480E55644600CECEA2 /* cli tool */;
1030 targetProxy = 913D5E590E5564F400CECEA2 /* PBXContainerItemProxy */;
1031 };
1032 + F5643A020F792B4900A579C2 /* PBXTargetDependency */ = {
1033 + isa = PBXTargetDependency;
1034 + target = F56439F70F792B2100A579C2 /* Generate PList Prefix */;
1035 + targetProxy = F5643A010F792B4900A579C2 /* PBXContainerItemProxy */;
1036 + };
1037 /* End PBXTargetDependency section */
1039 /* Begin PBXVariantGroup section */
1041 GCC_PREFIX_HEADER = GitX_Prefix.pch;
1042 HEADER_SEARCH_PATHS = libgit2/src;
1043 INFOPLIST_FILE = Info.plist;
1044 + INFOPLIST_OTHER_PREPROCESSOR_FLAGS = "-traditional";
1045 + INFOPLIST_PREFIX_HEADER = build/revision;
1046 + INFOPLIST_PREPROCESS = YES;
1047 INSTALL_PATH = "$(HOME)/Applications";
1048 LIBRARY_SEARCH_PATHS = libgit2;
1049 PRODUCT_NAME = GitX;
1051 26FC0A860875C7B200E6366F /* Release */ = {
1052 isa = XCBuildConfiguration;
1053 buildSettings = {
1054 - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
1055 + DEBUG_INFORMATION_FORMAT = dwarf;
1056 FRAMEWORK_SEARCH_PATHS = (
1057 "$(inherited)",
1060 GCC_MODEL_TUNING = G5;
1061 GCC_PRECOMPILE_PREFIX_HEADER = YES;
1062 GCC_PREFIX_HEADER = GitX_Prefix.pch;
1063 + GCC_PREPROCESSOR_DEFINITIONS_NOT_USED_IN_PRECOMPS = "";
1064 HEADER_SEARCH_PATHS = libgit2/src;
1065 INFOPLIST_FILE = Info.plist;
1066 + INFOPLIST_OTHER_PREPROCESSOR_FLAGS = "-traditional";
1067 + INFOPLIST_PREFIX_HEADER = build/revision;
1068 + INFOPLIST_PREPROCESS = YES;
1069 INSTALL_PATH = "$(HOME)/Applications";
1070 LIBRARY_SEARCH_PATHS = libgit2;
1071 PRODUCT_NAME = GitX;
1073 isa = XCBuildConfiguration;
1074 buildSettings = {
1075 GCC_ENABLE_OBJC_GC = required;
1076 + GCC_PREPROCESSOR_DEFINITIONS_NOT_USED_IN_PRECOMPS = DEBUG_BUILD;
1077 GCC_WARN_ABOUT_RETURN_TYPE = YES;
1078 GCC_WARN_UNUSED_VARIABLE = YES;
1079 PREBINDING = NO;
1081 };
1082 name = Release;
1083 };
1084 + F56439F80F792B2100A579C2 /* Debug */ = {
1085 + isa = XCBuildConfiguration;
1086 + buildSettings = {
1087 + COPY_PHASE_STRIP = NO;
1088 + GCC_DYNAMIC_NO_PIC = NO;
1089 + GCC_OPTIMIZATION_LEVEL = 0;
1090 + PRODUCT_NAME = "Generate PList Prefix";
1091 + };
1092 + name = Debug;
1093 + };
1094 + F56439F90F792B2100A579C2 /* Release */ = {
1095 + isa = XCBuildConfiguration;
1096 + buildSettings = {
1097 + COPY_PHASE_STRIP = YES;
1098 + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
1099 + GCC_ENABLE_FIX_AND_CONTINUE = NO;
1100 + PRODUCT_NAME = "Generate PList Prefix";
1101 + ZERO_LINK = NO;
1102 + };
1103 + name = Release;
1104 + };
1105 F5886A130ED5D33E0066E74C /* Debug */ = {
1106 isa = XCBuildConfiguration;
1107 buildSettings = {
1109 GCC_OPTIMIZATION_LEVEL = 2;
1110 GCC_PRECOMPILE_PREFIX_HEADER = YES;
1111 GCC_PREFIX_HEADER = GitX_Prefix.pch;
1112 + GCC_VERSION = "";
1113 HEADER_SEARCH_PATHS = libgit2/src;
1114 INFOPLIST_FILE = "SpeedTest-Info.plist";
1115 INSTALL_PATH = "$(HOME)/Applications";
1117 defaultConfigurationIsVisible = 0;
1118 defaultConfigurationName = Release;
1119 };
1120 + F56439FD0F792B3600A579C2 /* Build configuration list for PBXAggregateTarget "Generate PList Prefix" */ = {
1121 + isa = XCConfigurationList;
1122 + buildConfigurations = (
1123 + F56439F80F792B2100A579C2 /* Debug */,
1124 + F56439F90F792B2100A579C2 /* Release */,
1125 + );
1126 + defaultConfigurationIsVisible = 0;
1127 + defaultConfigurationName = Release;
1128 + };
1129 F5886A150ED5D33E0066E74C /* Build configuration list for PBXNativeTarget "SpeedTest" */ = {
1130 isa = XCConfigurationList;
1131 buildConfigurations = (
1132 diff --git a/Info.plist b/Info.plist
1134 --- a/Info.plist
1135 +++ b/Info.plist
1137 <dict>
1139 <array>
1141 + </array>
1146 + </dict>
1147 + <dict>
1149 + <array>
1151 <string></string>
1152 </array>
1165 diff --git a/PBGitCommit.h b/PBGitCommit.h
1167 --- a/PBGitCommit.h
1168 +++ b/PBGitCommit.h
1170 #include "git/oid.h"
1172 @interface PBGitCommit : NSObject {
1173 - git_oid sha;
1174 - git_oid *parentShas;
1175 + git_oid *sha;
1176 + git_oid **parentShas;
1177 int nParents;
1179 NSString* subject;
1181 int timestamp;
1182 char sign;
1183 id lineInfo;
1184 - PBGitRepository* repository;
1185 + PBGitRepository *repository;
1186 }
1188 -- initWithRepository:(PBGitRepository *)repo andSha:(git_oid)sha;
1189 +- initWithRepository:(PBGitRepository *)repo andSha:(git_oid *)sha;
1191 -- (void)addRef:(id)ref;
1192 +- (void)addRef:(PBGitRef *)ref;
1193 - (void)removeRef:(id)ref;
1195 - (NSString *)realSha;
1197 @property (copy) NSString* author;
1198 @property (readonly) NSArray* parents; // TODO: remove this and its uses
1200 -@property (assign) git_oid *parentShas;
1201 +@property (assign) git_oid **parentShas;
1202 @property (assign) int nParents, timestamp;
1204 @property (retain) NSMutableArray* refs;
1205 diff --git a/PBGitCommit.m b/PBGitCommit.m
1207 --- a/PBGitCommit.m
1208 +++ b/PBGitCommit.m
1210 NSMutableArray *p = [NSMutableArray arrayWithCapacity:nParents];
1211 for (i = 0; i < nParents; ++i)
1212 {
1213 - char *s = git_oid_mkhex(parentShas + i);
1214 + char *s = git_oid_mkhex(parentShas[i]);
1215 [p addObject:[NSString stringWithUTF8String:s]];
1216 free(s);
1217 }
1220 - (git_oid *)sha
1221 {
1222 - return &sha;
1223 + return sha;
1224 }
1226 -- initWithRepository:(PBGitRepository*) repo andSha:(git_oid)newSha
1227 +- initWithRepository:(PBGitRepository*) repo andSha:(git_oid *)newSha
1228 {
1229 details = nil;
1230 repository = repo;
1233 - (NSString *)realSha
1234 {
1235 - char *hex = git_oid_mkhex(&sha);
1236 + char *hex = git_oid_mkhex(sha);
1237 NSString *str = [NSString stringWithUTF8String:hex];
1238 free(hex);
1239 return str;
1241 return [PBGitTree rootForCommit: self];
1242 }
1244 -- (void)addRef:(id)ref
1245 +- (void)addRef:(PBGitRef *)ref
1246 {
1247 if (!self.refs)
1248 self.refs = [NSMutableArray arrayWithObject:ref];
1250 return;
1252 [self.refs removeObject:ref];
1253 - if ([self.refs count] == 0)
1254 - self.refs = NULL;
1255 }
1257 - (NSMutableArray *)refs
1260 - (void) setRefs:(NSMutableArray *)refs
1261 {
1262 - [[repository refs] setObject:[self realSha] forKey:[self realSha]];
1263 + [[repository refs] setObject:refs forKey:[self realSha]];
1264 }
1266 - (void)finalize
1267 diff --git a/PBGitCommitController.m b/PBGitCommitController.m
1269 --- a/PBGitCommitController.m
1270 +++ b/PBGitCommitController.m
1272 file.shouldBeDeleted = YES;
1274 self.status = @"Refreshing index…";
1275 + if (![repository workingDirectory]) {
1276 + //if ([[repository outputForCommand:@"rev-parse --is-inside-work-tree"] isEqualToString:@"false"]) {
1277 + return;
1278 + }
1279 +
1280 self.busy++;
1282 [repository outputInWorkdirForArguments:[NSArray arrayWithObjects:@"update-index", @"-q", @"--unmerged", @"--ignore-missing", @"--refresh", nil]];
1285 - (void) readOtherFiles:(NSNotification *)notification;
1286 {
1287 + [unstagedFilesController setAutomaticallyRearrangesObjects:NO];
1288 NSArray *lines = [self linesFromNotification:notification];
1289 for (NSString *line in lines) {
1290 if ([line length] == 0)
1292 file.status = NEW;
1293 file.hasCachedChanges = NO;
1294 file.hasUnstagedChanges = YES;
1295 - continue;
1296 + break;
1297 }
1298 }
1301 file.hasUnstagedChanges = YES;
1302 [files addObject: file];
1303 }
1304 -
1305 + [unstagedFilesController setAutomaticallyRearrangesObjects:YES];
1306 + [unstagedFilesController rearrangeObjects];
1307 [self doneProcessingIndex];
1308 }
1311 // but rather update it to incorporate our changes
1312 for (PBChangedFile *file in files) {
1313 if ([file.path isEqualToString:line]) {
1314 - file.shouldBeDeleted = NO;
1315 - if (cached) {
1316 - file.commitBlobSHA = sha;
1317 + if (cached && file.hasCachedChanges) { // if we're listing cached files
1318 + file.shouldBeDeleted = NO; // and the matching file in files had cached changes
1319 + file.commitBlobSHA = sha; // we don't delete it
1320 file.commitBlobMode = mode;
1321 - file.hasCachedChanges = YES;
1322 + isNew = NO;
1323 + break;
1324 + } else if ((!cached) && file.hasUnstagedChanges) { // if we're listing unstaged files and the
1325 + file.shouldBeDeleted = NO; // matching file in files had unstaged changes
1326 + isNew = NO; // we don't delete it
1327 + break;
1328 }
1329 - else
1330 - file.hasUnstagedChanges = YES;
1331 -
1332 - isNew = NO;
1333 - break;
1334 }
1335 }
1337 diff --git a/PBGitConfig.h b/PBGitConfig.h
1339 --- a/PBGitConfig.h
1340 +++ b/PBGitConfig.h
1342 }
1344 - init;
1345 -- initWithRepository:(NSString *)path;
1346 +- initWithRepositoryPath:(NSString *)path;
1347 @end
1348 diff --git a/PBGitConfig.m b/PBGitConfig.m
1350 --- a/PBGitConfig.m
1351 +++ b/PBGitConfig.m
1353 return self;
1354 }
1356 -- initWithRepository:(NSString *)path
1357 +- initWithRepositoryPath:(NSString *)path
1358 {
1359 repositoryPath = path;
1360 return self;
1361 diff --git a/PBGitDefaults.h b/PBGitDefaults.h
1363 --- a/PBGitDefaults.h
1364 +++ b/PBGitDefaults.h
1366 + (int) commitMessageViewVerticalLineLength;
1367 + (BOOL) isGistEnabled;
1368 + (BOOL) isGravatarEnabled;
1369 ++ (BOOL) confirmPublicGists;
1370 ++ (BOOL) isGistPublic;
1372 @end
1373 diff --git a/PBGitDefaults.m b/PBGitDefaults.m
1375 --- a/PBGitDefaults.m
1376 +++ b/PBGitDefaults.m
1378 #define kCommitMessageViewVerticalLineLength @"PBCommitMessageViewVerticalLineLength"
1379 #define kEnableGist @"PBEnableGist"
1380 #define kEnableGravatar @"PBEnableGravatar"
1381 +#define kConfirmPublicGists @"PBConfirmPublicGists"
1382 +#define kPublicGist @"PBGistPublic"
1384 @implementation PBGitDefaults
1387 forKey:kEnableGist];
1388 [defaultValues setObject:[NSNumber numberWithBool:YES]
1389 forKey:kEnableGravatar];
1390 + [defaultValues setObject:[NSNumber numberWithBool:YES]
1391 + forKey:kConfirmPublicGists];
1392 + [defaultValues setObject:[NSNumber numberWithBool:NO]
1393 + forKey:kPublicGist];
1394 [[NSUserDefaults standardUserDefaults] registerDefaults:defaultValues];
1395 }
1398 return [[NSUserDefaults standardUserDefaults] boolForKey:kEnableGravatar];
1399 }
1401 ++ (BOOL) confirmPublicGists
1402 +{
1403 + return [[NSUserDefaults standardUserDefaults] boolForKey:kConfirmPublicGists];
1404 +}
1405 +
1406 ++ (BOOL) isGistPublic
1407 +{
1408 + return [[NSUserDefaults standardUserDefaults] boolForKey:kPublicGist];
1409 +}
1410 @end
1411 diff --git a/PBGitGrapher.h b/PBGitGrapher.h
1413 --- a/PBGitGrapher.h
1414 +++ b/PBGitGrapher.h
1416 //
1419 +
1420 #import "PBGitCommit.h"
1421 #import "PBGitGraphLine.h"
1422 #import "PBGraphCellInfo.h"
1424 +@class PBGitRepository;
1425 +
1426 @interface PBGitGrapher : NSObject {
1427 PBGraphCellInfo *previous;
1428 void *pl;
1429 int curLane;
1430 }
1432 -- (id) initWithRepository:(PBGitRepository *)repo;
1433 -- (void) decorateCommit:(PBGitCommit *)commit;
1434 +- initWithRepository:(PBGitRepository *)repo;
1435 +- (void)decorateCommit:(PBGitCommit *)commit;
1436 @end
1437 diff --git a/PBGitGrapher.mm b/PBGitGrapher.mm
1439 --- a/PBGitGrapher.mm
1440 +++ b/PBGitGrapher.mm
1442 #import "PBGitCommit.h"
1443 #import "PBGitLane.h"
1444 #import "PBGitGraphLine.h"
1445 +#import "PBGitRepository.h"
1446 #import <list>
1447 #import "git/oid.h"
1451 #define MAX_LANES 32
1453 -- (id) initWithRepository: (PBGitRepository*) repo
1454 +- initWithRepository:(PBGitRepository *)repo
1455 {
1460 // If we already did the first parent, don't do so again
1461 if (!didFirst && currentLanes->size() < MAX_LANES && commit.nParents) {
1462 - PBGitLane *newLane = new PBGitLane(commit.parentShas);
1463 + PBGitLane *newLane = new PBGitLane(*commit.parentShas);
1464 currentLanes->push_back(newLane);
1465 newPos = currentLanes->size();
1469 int parentIndex;
1470 for (parentIndex = 1; parentIndex < commit.nParents; ++parentIndex) {
1471 - git_oid *parent = commit.parentShas + parentIndex;
1472 + git_oid *parent = commit.parentShas[parentIndex];
1473 int i = 0;
1474 BOOL was_displayed = NO;
1478 // Update the current lane to point to the new parent
1482 else
1483 currentLanes->remove(currentLane);
1485 diff --git a/PBGitHistoryController.m b/PBGitHistoryController.m
1487 --- a/PBGitHistoryController.m
1488 +++ b/PBGitHistoryController.m
1490 #import "PBGitHistoryController.h"
1491 #import "CWQuickLook.h"
1492 #import "PBGitGrapher.h"
1493 +#import "PBGitRevList.h"
1494 #import "PBGitRevisionCell.h"
1495 #import "PBCommitList.h"
1496 #define QLPreviewPanel NSClassFromString(@"QLPreviewPanel")
1497 diff --git a/PBGitIndexController.m b/PBGitIndexController.m
1498 index d5dbb91..a89d70f 100644
1499 --- a/PBGitIndexController.m
1500 +++ b/PBGitIndexController.m
1502 return contents;
1503 }
1505 - return [commitController.repository outputInWorkdirForArguments:[NSArray arrayWithObjects:@"diff", [self contextParameter], @"--", file.path, nil]];
1506 + return [commitController.repository outputInWorkdirForArguments:[NSArray arrayWithObjects:@"diff-files", [self contextParameter], @"--", file.path, nil]];
1507 }
1509 - (void) forceRevertChangesForFiles:(NSArray *)files
1510 diff --git a/PBGitLane.h b/PBGitLane.h
1512 --- a/PBGitLane.h
1513 +++ b/PBGitLane.h
1515 d_index = s_colorIndex++;
1516 }
1518 - bool PBGitLane::isCommit(git_oid *sha) const
1519 + bool isCommit(git_oid *sha) const
1520 {
1521 return !git_oid_cmp(&d_sha, sha);
1522 }
1523 diff --git a/PBGitRepository.h b/PBGitRepository.h
1525 --- a/PBGitRepository.h
1526 +++ b/PBGitRepository.h
1528 //
1531 -#import "PBGitRevList.h"
1532 -#import "PBGitRevSpecifier.h"
1533 -#import "PBGitConfig.h"
1534 +
1535 +@class PBGitConfig;
1536 +@class PBGitRevList;
1537 +@class PBGitRevSpecifier;
1538 +@class PBGitRef;
1540 extern NSString* PBGitRepositoryErrorDomain;
1542 @interface PBGitRepository : NSDocument {
1543 - PBGitRevList* revisionList;
1544 + PBGitRevList *revisionList;
1545 PBGitConfig *config;
1547 BOOL hasChanged;
1550 - (NSString *)workingDirectory;
1551 - (NSString *)gitIgnoreFilename;
1552 +- (BOOL)isBareRepository;
1554 - (BOOL) reloadRefs;
1555 - (void) addRef:(PBGitRef *)ref fromParameters:(NSArray *)params;
1557 @property (assign) BOOL hasChanged;
1558 @property (readonly) NSWindowController *windowController;
1559 @property (readonly) PBGitConfig *config;
1560 -@property (retain) PBGitRevList* revisionList;
1561 -@property (assign) NSMutableArray* branches;
1562 +@property (retain) PBGitRevList *revisionList;
1563 +@property (assign) NSMutableArray *branches;
1564 @property (assign) PBGitRevSpecifier *currentBranch;
1565 -@property (retain) NSMutableDictionary* refs;
1566 +@property (retain) NSMutableDictionary *refs;
1567 @end
1568 diff --git a/PBGitRepository.m b/PBGitRepository.m
1570 --- a/PBGitRepository.m
1571 +++ b/PBGitRepository.m
1573 #import "PBGitCommit.h"
1574 #import "PBGitWindowController.h"
1575 #import "PBGitBinary.h"
1576 -
1577 +#import "PBGitRevSpecifier.h"
1578 #import "NSFileHandleExt.h"
1579 #import "PBEasyPipe.h"
1580 #import "PBGitRef.h"
1581 #import "PBGitRevSpecifier.h"
1583 +#import "PBGitConfig.h"
1584 +#import "PBGitRevList.h"
1585 +
1586 NSString* PBGitRepositoryErrorDomain = @"GitXErrorDomain";
1588 @implementation PBGitRepository
1589 @@ -114,7 +117,7 @@ - (BOOL)readFromFileWrapper:(NSFileWrapper *)fileWrapper ofType:(NSString *)type
1591 - (void) setup
1592 {
1593 - config = [[PBGitConfig alloc] initWithRepository:self.fileURL.path];
1594 + config = [[PBGitConfig alloc] initWithRepositoryPath:self.fileURL.path];
1595 self.branches = [NSMutableArray array];
1596 [self reloadRefs];
1597 revisionList = [[PBGitRevList alloc] initWithRepository:self];
1599 return [[self workingDirectory] stringByAppendingPathComponent:@".gitignore"];
1600 }
1602 +- (BOOL)isBareRepository
1603 +{
1604 + return [PBGitRepository isBareRepository:[self fileURL].path];
1605 +}
1606 +
1607 // Overridden to create our custom window controller
1608 - (void)makeWindowControllers
1609 {
1610 diff --git a/PBGitRevList.h b/PBGitRevList.h
1612 --- a/PBGitRevList.h
1613 +++ b/PBGitRevList.h
1618 +@class PBGitRepository;
1619 +@class PBGitGrapher;
1621 @interface PBGitRevList : NSObject {
1622 - NSArray* commits;
1623 - id repository;
1624 + NSMutableArray *commits;
1625 + PBGitRepository *repository;
1626 + PBGitGrapher *grapher;
1627 NSString* lastSha;
1628 }
1630 -- initWithRepository:(id)repo;
1631 -- (void) readCommitsForce: (BOOL) force;
1632 -- (void) reload;
1633 +- initWithRepository:(PBGitRepository *)repo;
1634 +- (void)readCommitsForce:(BOOL)force;
1635 +- (void)reload;
1637 -@property(retain) NSArray* commits;
1638 +@property (retain) NSMutableArray *commits;
1640 @end
1641 diff --git a/PBGitRevList.mm b/PBGitRevList.mm
1643 --- a/PBGitRevList.mm
1644 +++ b/PBGitRevList.mm
1646 //
1648 #import "PBGitRevList.h"
1649 +#import "PBGitGrapher.h"
1650 +
1651 +#import "PBRevPoolDelegate.h"
1652 +
1653 #import "PBGitRepository.h"
1654 #import "PBGitCommit.h"
1655 -#import "PBGitGrapher.h"
1656 #import "PBGitRevSpecifier.h"
1657 +#import "PBGitRevPool.h"
1658 +#import "PBGitRepository.h"
1660 #include "git/oid.h"
1662 #include <iostream>
1663 #include <string>
1664 -
1665 using namespace std;
1667 @implementation PBGitRevList
1669 @synthesize commits;
1670 -- initWithRepository: (id) repo
1671 +- initWithRepository:(PBGitRepository *)repo
1672 {
1673 repository = repo;
1676 [self readCommitsForce: NO];
1677 }
1679 -- (void) walkRevisionListWithSpecifier: (PBGitRevSpecifier*) rev
1680 +- (void) walkRevisionListWithSpecifier:(PBGitRevSpecifier *)rev
1681 {
1682 - NSDate *start = [NSDate date];
1683 - NSMutableArray* revisions = [NSMutableArray array];
1684 - PBGitGrapher* g = [[PBGitGrapher alloc] initWithRepository: repository];
1685 -
1686 - NSMutableArray* arguments;
1687 - BOOL showSign = [rev hasLeftRight];
1688 -
1689 - if (showSign)
1690 - arguments = [NSMutableArray arrayWithObjects:@"log", @"-z", @"--early-output", @"--topo-order", @"--pretty=format:%H\01%an\01%s\01%P\01%at\01%m", nil];
1691 - else
1692 - arguments = [NSMutableArray arrayWithObjects:@"log", @"-z", @"--early-output", @"--topo-order", @"--pretty=format:%H\01%an\01%s\01%P\01%at", nil];
1693 -
1694 - if (!rev)
1695 - [arguments addObject:@"HEAD"];
1696 - else
1697 - [arguments addObjectsFromArray:[rev parameters]];
1698 -
1699 - if ([rev hasPathLimiter])
1701 -
1702 - NSTask *task = [PBEasyPipe taskForCommand:[PBGitBinary path] withArgs:arguments inDir:[repository fileURL].path];
1703 - [task launch];
1704 - NSFileHandle* handle = [task.standardOutput fileHandleForReading];
1705 -
1706 - int fd = [handle fileDescriptor];
1707 - __gnu_cxx::stdio_filebuf<char> buf(fd, std::ios::in);
1708 - std::istream stream(&buf);
1709 -
1710 - int num = 0;
1711 - while (true) {
1712 - string sha;
1713 - if (!getline(stream, sha, '\1'))
1714 - break;
1715 -
1716 - // We reached the end of some temporary output. Show what we have
1717 - // until now, and then start again. The sha of the next thing is still
1718 - // in this buffer. So, we use a substring of current input.
1719 - if (sha[1] == 'i') // Matches 'Final output'
1720 - {
1721 - num = 0;
1722 - [self performSelectorOnMainThread:@selector(setCommits:) withObject:revisions waitUntilDone:NO];
1723 - g = [[PBGitGrapher alloc] initWithRepository: repository];
1724 - revisions = [NSMutableArray array];
1725 -
1727 - }
1728 -
1729 - // From now on, 1.2 seconds
1730 - git_oid oid;
1731 - git_oid_mkstr(&oid, sha.c_str());
1732 - PBGitCommit* newCommit = [[PBGitCommit alloc] initWithRepository:repository andSha:oid];
1733 -
1734 - string author;
1735 - getline(stream, author, '\1');
1736 -
1737 - string subject;
1738 - getline(stream, subject, '\1');
1739 -
1740 - string parentString;
1741 - getline(stream, parentString, '\1');
1742 - if (parentString.size() != 0)
1743 - {
1745 - NSLog(@"invalid parents: %i", parentString.size());
1746 - continue;
1747 - }
1749 - git_oid *parents = (git_oid *)malloc(sizeof(git_oid) * nParents);
1750 - int parentIndex;
1751 - for (parentIndex = 0; parentIndex < nParents; ++parentIndex)
1753 -
1754 - newCommit.parentShas = parents;
1755 - newCommit.nParents = nParents;
1756 - }
1757 -
1758 - int time;
1759 - stream >> time;
1760 -
1761 -
1762 - [newCommit setSubject:[NSString stringWithUTF8String:subject.c_str()]];
1763 - [newCommit setAuthor:[NSString stringWithUTF8String:author.c_str()]];
1764 - [newCommit setTimestamp:time];
1765 -
1766 - if (showSign)
1767 - {
1768 - char c;
1769 - stream >> c; // Remove separator
1770 - stream >> c;
1771 - if (c != '>' && c != '<' && c != '^' && c != '-')
1772 - NSLog(@"Error loading commits: sign not correct");
1773 - [newCommit setSign: c];
1774 - }
1775 -
1776 - char c;
1777 - stream >> c;
1778 - if (c != '\0')
1779 - cout << "Error" << endl;
1780 -
1781 - [revisions addObject: newCommit];
1782 - [g decorateCommit: newCommit];
1783 -
1785 - [self performSelectorOnMainThread:@selector(setCommits:) withObject:revisions waitUntilDone:NO];
1786 - }
1787 -
1788 - NSTimeInterval duration = [[NSDate date] timeIntervalSinceDate:start];
1789 - NSLog(@"Loaded %i commits in %f seconds", num, duration);
1790 - // Make sure the commits are stored before exiting.
1791 - [self performSelectorOnMainThread:@selector(setCommits:) withObject:revisions waitUntilDone:YES];
1792 - [task waitUntilExit];
1793 + commits = [NSMutableArray array];
1794 + grapher = [[PBGitGrapher alloc] initWithRepository:repository];
1795 + PBGitRevPool *pool = [[PBGitRevPool alloc] initWithRepository:repository];
1796 + pool.delegate = self;
1797 + [pool loadRevisions:rev];
1798 + [self performSelectorOnMainThread:@selector(setCommits:) withObject:commits waitUntilDone:YES];
1799 +}
1800 +
1801 +
1802 +- (void)revPool:(PBGitRevPool *)pool encounteredCommit:(PBGitCommit *)commit
1803 +{
1804 + [commits addObject: commit];
1805 + [grapher decorateCommit: commit];
1806 }
1808 @end
1809 diff --git a/PBGitRevPool.h b/PBGitRevPool.h
1810 new file mode 100644
1812 --- /dev/null
1813 +++ b/PBGitRevPool.h
1815 +//
1816 +// PBGitRevPool.h
1817 +// GitX
1818 +//
1820 +// Copyright 2009 Pieter de Bie. All rights reserved.
1821 +//
1822 +
1824 +#include "git/oid.h"
1825 +
1826 +@class PBGitRepository;
1827 +@class PBGitCommit;
1828 +@class PBGitRevSpecifier;
1829 +
1830 +@interface PBGitRevPool : NSObject {
1831 + PBGitRepository *repository;
1832 + __weak id delegate;
1833 + NSMapTable *revisions;
1834 +}
1835 +
1836 +@property (assign) __weak id delegate;
1837 +
1838 +- initWithRepository:(PBGitRepository *)repo;
1839 +- (void)loadRevisions:(PBGitRevSpecifier *)revisions;
1840 +
1841 +- (PBGitCommit *)commitWithSha:(NSString *)sha;
1842 +- (PBGitCommit *)commitWithOid:(git_oid *)oid;
1843 +@end
1844 +
1845 +@interface NSObject(PBRevPoolDelegate)
1846 +
1847 +- (void)revPool:(PBGitRevPool *)pool encounteredCommit:(PBGitCommit *)commit;
1848 +
1849 +@end
1850 diff --git a/PBGitRevPool.mm b/PBGitRevPool.mm
1851 new file mode 100644
1853 --- /dev/null
1854 +++ b/PBGitRevPool.mm
1856 +//
1857 +// PBGitRevPool.m
1858 +// GitX
1859 +//
1861 +// Copyright 2009 Pieter de Bie. All rights reserved.
1862 +//
1863 +
1864 +#import "PBGitRevSpecifier.h"
1865 +#import "PBGitRevPool.h"
1866 +#import "PBGitCommit.h"
1867 +#import "PBGitRepository.h"
1868 +#import "PBEasyPipe.h"
1869 +#import "PBGitBinary.h"
1870 +#import "PBRevPoolDelegate.h"
1871 +
1872 +#include "git/oid.h"
1874 +#include <iostream>
1875 +#include <string>
1876 +
1877 +using namespace std;
1878 +
1879 +@implementation PBGitRevPool
1880 +
1881 +@synthesize delegate;
1882 +
1883 +NSUInteger git_oid_size(const void *item)
1884 +{
1885 + git_oid *oid = (git_oid *)item;
1886 + return sizeof(*oid);
1887 +}
1888 +
1889 +- initWithRepository:(PBGitRepository *)repo
1890 +{
1891 + if (![super init])
1892 + return nil;
1893 +
1894 + repository = repo;
1895 + NSPointerFunctions *keyFunctions = [NSPointerFunctions pointerFunctionsWithOptions:NSPointerFunctionsOpaqueMemory|NSPointerFunctionsStructPersonality];
1896 + keyFunctions.sizeFunction = git_oid_size;
1897 + NSPointerFunctions *valueFunction = [NSPointerFunctions pointerFunctionsWithOptions:NSPointerFunctionsStrongMemory|NSPointerFunctionsObjectPersonality];
1898 + revisions = [[NSMapTable alloc] initWithKeyPointerFunctions:keyFunctions valuePointerFunctions:valueFunction capacity:100];
1899 + return self;
1900 +}
1901 +
1902 +- (void)loadRevisions:(PBGitRevSpecifier *)rev
1903 +{
1904 + NSDate *start = [NSDate date];
1905 +
1906 + NSMutableArray* arguments = [NSMutableArray arrayWithObjects:@"log", @"-z", @"--pretty=format:%H\01%an\01%s\01%P\01%at", nil];
1907 +
1908 + if (!rev)
1909 + [arguments addObject:@"HEAD"];
1910 + else
1911 + [arguments addObjectsFromArray:[rev parameters]];
1912 +
1913 + NSTask *task = [PBEasyPipe taskForCommand:[PBGitBinary path] withArgs:arguments inDir:[repository fileURL].path];
1914 + [task launch];
1915 + NSFileHandle *handle = [task.standardOutput fileHandleForReading];
1916 + int fd = [handle fileDescriptor];
1917 + __gnu_cxx::stdio_filebuf<char> buf(fd, std::ios::in);
1918 + std::istream stream(&buf);
1919 +
1920 + int num = 0;
1921 + while (true) {
1922 + string sha;
1923 + if (!getline(stream, sha, '\1'))
1924 + break;
1925 +
1926 + // From now on, 1.2 seconds
1927 + git_oid *oid = (git_oid *)malloc(sizeof(git_oid));
1928 + CFRetain(oid);
1929 + git_oid_mkstr(oid, sha.c_str());
1930 + PBGitCommit *newCommit = [[PBGitCommit alloc] initWithRepository:repository andSha:oid];
1931 +
1932 + string author;
1933 + getline(stream, author, '\1');
1934 +
1935 + string subject;
1936 + getline(stream, subject, '\1');
1937 +
1938 + string parentString;
1939 + getline(stream, parentString, '\1');
1940 + if (parentString.size() != 0)
1941 + {
1943 + NSLog(@"invalid parents: %i", parentString.size());
1944 + continue;
1945 + }
1947 + git_oid **parents = (git_oid **)malloc(sizeof(git_oid *) * nParents);
1948 + int parentIndex;
1949 + for (parentIndex = 0; parentIndex < nParents; ++parentIndex) {
1950 + git_oid *p_id = (git_oid *)malloc(sizeof(git_oid));
1952 + git_oid *existingKey;
1953 + void *a;
1954 + if (NSMapMember(revisions, p_id, (void **)&existingKey, &a))
1955 + {
1956 + parents[parentIndex] = existingKey;
1957 + free(p_id);
1958 + } else {
1959 + NSMapInsertKnownAbsent(revisions, p_id, NULL);
1960 + parents[parentIndex] = p_id;
1961 + }
1962 +
1963 + //NSLog(@"Parent: %i", parents[parentIndex]);
1964 +
1965 + }
1966 +
1967 + newCommit.parentShas = parents;
1968 + newCommit.nParents = nParents;
1969 + }
1970 +
1971 + int time;
1972 + stream >> time;
1973 +
1974 +
1975 + [newCommit setSubject:[NSString stringWithUTF8String:subject.c_str()]];
1976 + [newCommit setAuthor:[NSString stringWithUTF8String:author.c_str()]];
1977 + [newCommit setTimestamp:time];
1978 +
1979 + char c;
1980 + stream >> c;
1981 + if (c != '\0')
1982 + cout << "Error" << endl;
1983 +
1984 + ++num;
1985 + NSMapInsert(revisions, oid, newCommit);
1986 + if (delegate)
1987 + [delegate revPool:self encounteredCommit:newCommit];
1988 + }
1989 +
1990 + NSTimeInterval duration = [[NSDate date] timeIntervalSinceDate:start];
1991 + NSLog(@"Loaded %i commits in %f seconds", num, duration);
1992 +
1993 + [task waitUntilExit];
1994 +}
1995 +
1996 +- (void)listCommits
1997 +{
1998 + NSEnumerator *enumerator = [revisions objectEnumerator];
1999 + id value;
2000 + int i = 0;
2001 + while ((value = [enumerator nextObject])) {
2002 + i++;
2003 + NSLog(@"Commit: %@", [value realSha]);
2004 + }
2005 +}
2006 +
2007 +- (PBGitCommit *)commitWithSha:(NSString *)sha
2008 +{
2009 + git_oid oid;
2010 + git_oid_mkstr(&oid, [sha UTF8String]);
2011 + return (PBGitCommit *)NSMapGet(revisions, &oid);
2012 +}
2013 +
2014 +- (PBGitCommit *)commitWithOid:(git_oid *)oid
2015 +{
2016 + NSAssert(oid, @"We need a parent");
2017 +
2018 + return (PBGitCommit *)NSMapGet(revisions, oid);
2019 +}
2020 +@end
2021 diff --git a/PBGitRevisionCell.m b/PBGitRevisionCell.m
2023 --- a/PBGitRevisionCell.m
2024 +++ b/PBGitRevisionCell.m
2026 //
2028 #import "PBGitRevisionCell.h"
2029 +#import "PBGitRevSpecifier.h"
2030 #import "PBGitRef.h"
2031 #import "RoundedRectangle.h"
2034 }
2037 - if ([self.objectValue refs])
2038 + if ([self.objectValue refs] && [[self.objectValue refs] count])
2039 [self drawRefsInRect:&rect];
2041 // Still use this superclass because of hilighting differences
2042 diff --git a/PBGitTree.m b/PBGitTree.m
2043 index be0011e..d871d55 100644
2044 --- a/PBGitTree.m
2045 +++ b/PBGitTree.m
2047 [data writeToFile:newName atomically:YES];
2048 } else { // Directory
2049 [[NSFileManager defaultManager] createDirectoryAtPath:newName attributes:nil];
2050 - for (PBGitTree* child in children)
2051 + for (PBGitTree* child in [self children])
2052 [child saveToFolder: newName];
2053 }
2054 }
2055 diff --git a/PBGitWindowController.m b/PBGitWindowController.m
2057 --- a/PBGitWindowController.m
2058 +++ b/PBGitWindowController.m
2060 [commitViewController removeView];
2061 }
2063 +- (BOOL)validateMenuItem:(NSMenuItem *)menuItem
2064 +{
2065 + if ([menuItem action] == @selector(showCommitView:) || [menuItem action] == @selector(showHistoryView:)) {
2066 + return ![repository isBareRepository];
2067 + }
2068 + return YES;
2069 +}
2070 +
2071 - (void) setSelectedViewIndex: (int) i
2072 {
2073 - selectedViewIndex = i;
2074 - [[NSUserDefaults standardUserDefaults] setInteger:i forKey:@"selectedViewIndex"];
2075 [self changeViewController: i];
2076 }
2079 if (viewController != nil)
2080 [[viewController view] removeFromSuperview];
2082 + if ([repository isBareRepository]) { // in bare repository we don't want to view commit
2083 + whichViewTag = 0; // even if it was selected by default
2084 + }
2085 +
2086 + // Set our default here because we might have changed it (based on bare repo) before
2087 + selectedViewIndex = whichViewTag;
2088 + [[NSUserDefaults standardUserDefaults] setInteger:whichViewTag forKey:@"selectedViewIndex"];
2089 +
2090 switch (whichViewTag)
2091 {
2094 // Allow the viewcontroller to catch actions
2095 [self setNextResponder: viewController];
2096 [self didChangeValueForKey:@"viewController"]; // this will trigger the NSTextField's value binding to change
2097 +
2098 }
2100 - (void)awakeFromNib
2103 - (void) useToolbar:(NSToolbar *)toolbar
2104 {
2105 - NSSegmentedControl *item = (NSSegmentedControl *)[[[toolbar items] objectAtIndex:0] view];
2106 + NSSegmentedControl *item = nil;
2107 + for (NSToolbarItem *toolbarItem in [toolbar items]) {
2108 + if ([[toolbarItem view] isKindOfClass:[NSSegmentedControl class]]) {
2109 + item = (NSSegmentedControl *)[toolbarItem view];
2110 + break;
2111 + }
2112 + }
2114 + [item setEnabled: ![repository isBareRepository]];
2116 [self.window setToolbar:toolbar];
2117 }
2118 diff --git a/PBRefController.m b/PBRefController.m
2120 --- a/PBRefController.m
2121 +++ b/PBRefController.m
2123 #import "PBRefController.h"
2124 #import "PBGitRevisionCell.h"
2125 #import "PBRefMenuItem.h"
2126 +#import "PBGitRevSpecifier.h"
2128 @implementation PBRefController
2130 @@ -37,15 +38,22 @@ - (void) observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(
2132 - (void) removeRef:(PBRefMenuItem *) sender
2133 {
2134 - int ret = 1;
2135 - [historyController.repository outputForArguments:[NSArray arrayWithObjects:@"update-ref", @"-d", [[sender ref] ref], nil] retValue: &ret];
2136 - if (ret) {
2137 - NSLog(@"Removing ref failed!");
2138 - return;
2139 - }
2140 + NSString *ref_desc = [NSString stringWithFormat:@"%@ %@", [[sender ref] type], [[sender ref] shortName]];
2141 + NSString *question = [NSString stringWithFormat:@"Are you sure you want to remove the %@?", ref_desc];
2142 + int choice = NSRunAlertPanel([NSString stringWithFormat:@"Delete %@?", ref_desc], question, @"Delete", @"Cancel", nil);
2143 + // TODO: Use a non-modal alert here, so we don't block all the GitX windows
2144 +
2145 + if(choice) {
2146 + int ret = 1;
2147 + [historyController.repository outputForArguments:[NSArray arrayWithObjects:@"update-ref", @"-d", [[sender ref] ref], nil] retValue: &ret];
2148 + if (ret) {
2149 + NSLog(@"Removing ref failed!");
2150 + return;
2151 + }
2153 - [[sender commit] removeRef:[sender ref]];
2154 - [commitController rearrangeObjects];
2155 + [[sender commit] removeRef:[sender ref]];
2156 + [commitController rearrangeObjects];
2157 + }
2158 }
2160 - (void) checkoutRef:(PBRefMenuItem *)sender
2161 diff --git a/PBRepositoryDocumentController.m b/PBRepositoryDocumentController.m
2163 --- a/PBRepositoryDocumentController.m
2164 +++ b/PBRepositoryDocumentController.m
2166 #import "PBRepositoryDocumentController.h"
2167 #import "PBGitRepository.h"
2168 #import "PBGitRevList.h"
2169 +#import "PBEasyPipe.h"
2170 +#import "PBGitBinary.h"
2172 @implementation PBRepositoryDocumentController
2173 // This method is overridden to configure the open panel to only allow
2176 return document;
2177 }
2178 +
2179 +
2180 +- (IBAction)newDocument:(id)sender
2181 +{
2182 + NSOpenPanel *op = [NSOpenPanel openPanel];
2183 +
2184 + [op setCanChooseFiles:NO];
2185 + [op setCanChooseDirectories:YES];
2186 + [op setAllowsMultipleSelection:NO];
2187 + [op setMessage:@"Initialize a repository here:"];
2188 + [op setTitle:@"New Repository"];
2189 + if ([op runModal] == NSFileHandlingPanelOKButton)
2190 + {
2191 + NSString *path = [op filename];
2192 + NSInteger terminationStatus;
2193 + NSString *result = [PBEasyPipe outputForCommand:[PBGitBinary path] withArgs:[NSArray arrayWithObjects:@"init", @"-q", nil] inDir:path inputString:nil retValue:&terminationStatus];
2194 +
2195 + if (terminationStatus == 0)
2196 + [self openDocumentWithContentsOfURL:[op URL] display:YES error:NULL];
2197 + else
2198 + NSRunAlertPanel(@"Failed to create new Git repository", @"Git returned the following error when trying to create the repository: %@", nil, nil, nil, result);
2199 + }
2200 +}
2201 +
2202 +
2203 +- (BOOL)validateMenuItem:(NSMenuItem *)item
2204 +{
2205 + if ([item action] == @selector(newDocument:))
2206 + return ([PBGitBinary path] != nil);
2207 + return [super validateMenuItem:item];
2208 +}
2209 +
2210 @end
2211 diff --git a/PBWebController.m b/PBWebController.m
2212 index b9d472d..d185593 100644
2213 --- a/PBWebController.m
2214 +++ b/PBWebController.m
2216 return [PBGitDefaults isGravatarEnabled];
2217 else if([feature isEqualToString:@"gist"])
2218 return [PBGitDefaults isGistEnabled];
2219 + else if([feature isEqualToString:@"confirmGist"])
2220 + return [PBGitDefaults confirmPublicGists];
2221 + else if([feature isEqualToString:@"publicGist"])
2222 + return [PBGitDefaults isGistPublic];
2223 else
2224 return YES;
2225 }
2226 diff --git a/PBWebHistoryController.m b/PBWebHistoryController.m
2228 --- a/PBWebHistoryController.m
2229 +++ b/PBWebHistoryController.m
2231 //
2233 #import "PBWebHistoryController.h"
2234 +#import "PBGitRevSpecifier.h"
2236 @implementation PBWebHistoryController
2238 diff --git a/Site/Rakefile b/Site/Rakefile
2239 index cbad8c3..b225469 100644
2240 --- a/Site/Rakefile
2241 +++ b/Site/Rakefile
2244 task :generate => [:generate_usermanual] do
2245 require 'rdiscount'
2246 + require 'lib/release_notes'
2247 +
2248 `rm -rf output`
2249 FileUtils.mkdir("output")
2250 `cat text/*.markdown > output/UserManual.markdown`
2251 `cp -r assets/* output`
2253 - template = ERB.new(File.read("template.html"))
2254 + template = ERB.new(File.read("templates/site.html"))
2256 - source = Dir.glob("text/*.markdown").each do |file|
2257 + Dir.glob("text/*.markdown").each do |file|
2258 contents = File.read(file)
2259 @body = Markdown.new(ERB.new(contents).result(binding)).to_html
2260 @filename = File.basename(file).gsub(/markdown$/,"html")
2262 end
2263 end
2265 +task :generate_appcast do
2266 + require 'lib/release_notes.rb'
2267 + require 'rdiscount'
2268 + FileUtils.mkdir_p("output/Downloads")
2269 + template = ERB.new(File.read("templates/sparkle.xml"))
2270 +
2273 + f.puts template.result(binding)
2274 + end
2275 +end
2276 +
2277 task :upload do
2278 `rsync -a output/ sydney:public_html/gitx/`
2279 end
2280 \ No newline at end of file
2281 diff --git a/Site/UserManual/text/03 - Committing.markdown b/Site/UserManual/text/03 - Committing.markdown
2283 --- a/Site/UserManual/text/03 - Committing.markdown
2284 +++ b/Site/UserManual/text/03 - Committing.markdown
2285 @@ -30,3 +30,4 @@ If the hunk isn't specific enough, you can decrease the context size by manipula
2286 #### Committing
2288 Once you have staged all your changes, you can commit them. Enter a commit message in the center pane, but remember to use proper commit messages: your first line should be a short description of what you have changed, on which you can elaborate below that. Make sure the subject of your commit is short enough to fit in GitX's history view! Pressing the commit button will hopefully convey to you that the commit was successful, and also give you the commit hash.
2289 +The 'Amend' checkbox does what `git commit --amend` does: It enables you to amend the commit on the tip of the current branch. Checking 'Amend' will give you the commit-message of mentioned commit and also will display all of the changes the commit introduced as staged in the right-hand pane. You may then stage/unstage further changes, change the commit-message and hit 'Commit'.
2290 diff --git a/Site/assets/Downloads/appcast.xml b/Site/assets/Downloads/appcast.xml
2291 deleted file mode 100644
2293 --- a/Site/assets/Downloads/appcast.xml
2294 +++ /dev/null
2297 -<rss xmlns:atom="http://www.w3.org/2005/Atom" xmlns:sparkle="http://www.andymatuschak.org/xml-namespaces/sparkle" version="2.0">
2298 - <channel>
2302 -
2303 -
2304 - <item>
2307 - <enclosure url="http://frim.frim.nl/GitXStable.app.zip" length="1531595" type="application/octet-stream" sparkle:version="0.6.1"/>
2308 - <description>
2309 - <![CDATA[
2313 -
2314 - <ul>
2318 - </ul>
2319 -
2321 -
2322 - <ul>
2325 - <li>Images that have been changed or added in a commit can now be viewed
2326 - inline in GitX</li>
2327 - <li>GitX has gained a preference pane which allows you to specify a git path
2328 - and disable the Gist and Gravatar integration</li>
2329 - <li>The commit interface is now more intuitive. Particularly, you can now
2330 - select multiple files and use drag and drop to stage / unstage files</li>
2332 - <li>The files in the commit view have gained a context menu that allows you
2333 - to revert changes / open the file / ignore the file</li>
2334 - <li>It is now possible to adjust the amount of context lines in the commit view.
2335 - Using a smaller context size allows you to do more fine-grained commits</li>
2343 - <li>GitX now uses libgit2 to store object id’s, reducing it’s memory footprint</li>
2344 - </ul>
2345 -
2346 - <p>In addition many bugs were fixed, including the correct calculation of a
2347 - gravatar MD5 hash.</p>
2348 - </div>
2349 - ]]>
2350 - </description>
2351 - </item>
2352 -
2353 - </channel>
2354 -</rss>
2355 diff --git a/Site/lib/release_notes.rb b/Site/lib/release_notes.rb
2356 new file mode 100644
2358 --- /dev/null
2359 +++ b/Site/lib/release_notes.rb
2361 +#!/usr/bin/ruby
2362 +
2363 +RELEASE_NOTES_PATH = File.join(File.dirname(__FILE__), "..", "..", "Documentation", "ReleaseNotes")
2364 +
2365 +module ReleaseNotes
2366 +
2368 +
2369 + # Find all release not files
2370 + def self.release_files
2371 + notes = Dir.glob(File.join(RELEASE_NOTES_PATH, "v*.txt"))
2372 +
2373 + # Sort files by version number
2374 + notes.sort do |x,y|
2375 + x = x.match VERSION_MATCH
2376 + y = y.match VERSION_MATCH
2377 + # Puts nonmatching files at the bottom
2378 + if !x && y
2379 + 1
2380 + elsif !y && x
2381 + -1
2382 + else
2383 + # compare version strings, newest at the top
2385 + end
2386 + end
2387 + end
2388 +
2389 + # Aggregate all release notes in a string
2390 + def self.aggregate_notes
2391 + file = ""
2392 + release_files.each do |x|
2393 + file << File.read(x)
2394 + file << "\n"
2395 + end
2396 + file
2397 + end
2398 +
2399 + def self.last_version
2400 + last_file = release_files.first
2401 + if last_file =~ VERSION_MATCH
2402 + return $1
2403 + end
2404 + nil
2405 + end
2406 +
2407 + def self.last_notes
2408 + File.read(release_files.first)
2409 + end
2410 +end
2411 \ No newline at end of file
2412 diff --git a/Site/template.html b/Site/template.html
2413 deleted file mode 100644
2414 index c1001b6..0000000
2415 --- a/Site/template.html
2416 +++ /dev/null
2418 -<%
2419 -def create_link(name, description)
2420 - "<a href='#{name}.html' class='#{name == @filename.gsub(".html", "") ? 'here' : ''}'>#{description}</a>"
2421 -end
2422 - %>
2424 -<html>
2425 - <head>
2426 - <title>
2427 - GitX - <%= @title %>
2428 - </title>
2429 - <link rel="stylesheet" href="css/master.css" type="text/css" media="screen" title="Main Style" charset="utf-8" />
2431 - <link href="http://gitx.frim.nl/Downloads/appcast.xml" rel="alternate" type="application/rss+xml" title="GitX Application Update Feed" />
2432 -
2434 - </head>
2435 - <body>
2438 - GitX
2439 - </div>
2448 - </div>
2449 - <!-- <div id="subnav">
2450 - <a href="#">Home</a>
2451 - <a href="#">Screenshots</a>
2452 - <a href="#">Movies</a>
2453 - <a href="#">Open Source</a>
2454 - <a href="#">About</a>
2455 - </div> -->
2457 - <%= @body %>
2458 - </div>
2460 - © Some rights reserved. <a href="http://github.com/pieter/gitx/tree/master/COPYING" title="GPL">GPL v2</a>. <a href="mailto:frimmirf+gitx@gmail.com">Pieter de Bie</a> is the GitX maintainer. Website design by <a href="http://www.ai.rug.nl/~kdoes/index.php?id=webdesign">Kim Does</a>.
2461 - </div>
2462 - </div>
2465 - document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
2471 - </body>
2472 -</html>
2473 diff --git a/Site/templates/site.html b/Site/templates/site.html
2474 new file mode 100644
2475 index 0000000..c1001b6
2476 --- /dev/null
2477 +++ b/Site/templates/site.html
2479 +<%
2480 +def create_link(name, description)
2481 + "<a href='#{name}.html' class='#{name == @filename.gsub(".html", "") ? 'here' : ''}'>#{description}</a>"
2482 +end
2483 + %>
2485 +<html>
2486 + <head>
2487 + <title>
2488 + GitX - <%= @title %>
2489 + </title>
2490 + <link rel="stylesheet" href="css/master.css" type="text/css" media="screen" title="Main Style" charset="utf-8" />
2492 + <link href="http://gitx.frim.nl/Downloads/appcast.xml" rel="alternate" type="application/rss+xml" title="GitX Application Update Feed" />
2493 +
2495 + </head>
2496 + <body>
2499 + GitX
2500 + </div>
2509 + </div>
2510 + <!-- <div id="subnav">
2511 + <a href="#">Home</a>
2512 + <a href="#">Screenshots</a>
2513 + <a href="#">Movies</a>
2514 + <a href="#">Open Source</a>
2515 + <a href="#">About</a>
2516 + </div> -->
2518 + <%= @body %>
2519 + </div>
2521 + © Some rights reserved. <a href="http://github.com/pieter/gitx/tree/master/COPYING" title="GPL">GPL v2</a>. <a href="mailto:frimmirf+gitx@gmail.com">Pieter de Bie</a> is the GitX maintainer. Website design by <a href="http://www.ai.rug.nl/~kdoes/index.php?id=webdesign">Kim Does</a>.
2522 + </div>
2523 + </div>
2526 + document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
2532 + </body>
2533 +</html>
2534 diff --git a/Site/templates/sparkle.xml b/Site/templates/sparkle.xml
2535 new file mode 100644
2537 --- /dev/null
2538 +++ b/Site/templates/sparkle.xml
2541 +<rss xmlns:atom="http://www.w3.org/2005/Atom" xmlns:sparkle="http://www.andymatuschak.org/xml-namespaces/sparkle" version="2.0">
2542 + <channel>
2546 +
2547 +
2548 + <item>
2551 + <enclosure url="http://frim.frim.nl/GitXStable.app.zip" length="1531595" type="application/octet-stream" sparkle:version="<%= ReleaseNotes::last_version %>"/>
2552 + <description>
2553 + <![CDATA[
2554 + <style>
2555 + body {
2556 + font-size: 70%;
2557 + }
2558 + h1 {
2559 + font-size: 160%;
2560 + }
2561 + </style>
2563 + ]]>
2564 + </description>
2565 + </item>
2566 +
2567 + </channel>
2568 +</rss>
2569 diff --git a/Site/text/index.markdown b/Site/text/index.markdown
2570 index cd56c8b..c8bea36 100644
2571 --- a/Site/text/index.markdown
2572 +++ b/Site/text/index.markdown
2575 <a href="http://frim.frim.nl/GitXStable.app.zip" title="Latest GitX download" id="download_link" class="nohover">
2576 Download GitX
2579 </a>
2580 <p id="donate_link">(you can help GitX by <a href="http://www.pledgie.com/campaigns/1816">donating</a>)</p>
2581 </div>
2583 Download
2584 </h3>
2585 <p>
2586 - The newest version of GitX is 0.6.1. This version can be downloaded from <a href="http://frim.frim.nl/GitXStable.app.zip">here</a>. To see what has changed, read the <a href="release_history.html">Release History</a>.
2587 + The newest version of GitX is <%= ReleaseNotes::last_version %>. This version can be downloaded from <a href="http://frim.frim.nl/GitXStable.app.zip">here</a>. To see what has changed, read the <a href="release_history.html">Release History</a>.
2588 </p>
2589 <p>
2590 After you have started it once, you can install the command-line tool through the menu (GitX->Enable Terminal Usage…). This will install a “gitx” binary in /usr/local/bin.
2591 diff --git a/Site/text/release_history.markdown b/Site/text/release_history.markdown
2593 --- a/Site/text/release_history.markdown
2594 +++ b/Site/text/release_history.markdown
2596 Release history
2597 </h2>
2599 -### Changes in v0.6.1:
2600 -
2601 -This is a bugfix release. The following bugs have been fixed:
2602 -
2603 -* The commit view shows new files with linebreaks
2605 -* Reloading the detailed view in the History no longer causes an empty page
2606 -
2607 -### Changes in v0.6
2608 -
2609 -This release has the following new features and enhancements:
2610 -
2611 -* The diff display now looks much nicer, using boxes to segment files
2612 -* The toolbar can now me customized
2613 -* Images that have been changed or added in a commit can now be viewed
2614 - inline in GitX
2615 -* GitX has gained a preference pane which allows you to specify a git path
2616 - and disable the Gist and Gravatar integration
2617 -* The commit interface is now more intuitive. Particularly, you can now
2618 - select multiple files and use drag and drop to stage / unstage files
2619 -* You can now drag and drop files out of the commit view
2620 -* The files in the commit view have gained a context menu that allows you
2621 - to revert changes / open the file / ignore the file
2622 -* It is now possible to adjust the amount of context lines in the commit view.
2623 - Using a smaller context size allows you to do more fine-grained commits
2624 -* The branch menu is now organized in branches/remotes/tags
2625 -* The view switch button now uses icons rather than words
2628 -* Listing commits has become much faster
2629 -* GitX no longer spawns zombie processes
2630 -* GitX now shows a list of files that have been changed in a commit
2631 -* GitX now uses libgit2 to store object id's, reducing it's memory footprint
2632 -
2633 -In addition many bugs were fixed, including the correct calculation of a
2634 -gravatar MD5 hash.
2635 -
2636 -### Changes in v0.5
2637 -
2638 -This feature release has several new smaller or larger features:
2639 -
2640 -* The current branch is now highlighted
2641 -* In the commit view, there is an option to amend commits
2642 -* The "Gist it" button now respects github.user/token
2643 -* Display a gravatar of the committer
2644 -* The commit message view now displays a vertical line at 50 characters
2645 -* It is now possible to revert changes by using the context menu in the
2646 - commit view
2647 -* You can now stage only parts of a file by using the "Stage Hunk" buttons
2648 - in the commit view
2649 -* You can now use GitX to show a diff of anything, for example by using
2650 - 'gitx --diff HEAD^^' or 'git diff HEAD~3 | gitx --diff'
2651 -* You can now drag and drop refs to move them and also create branches
2652 -
2653 -In addition, the following bugs have been fixed:
2654 -
2655 -* Better detection of git version
2656 -* Branch lines are no longer interspersed with half a pixel of whitespace
2657 -* The toolbar keeps its state when switching views
2658 -
2660 -<ul>
2664 -
2665 -</ul>
2667 -<ul>
2670 -
2671 - <li>GitX now searches for your git binary in more directories and is smarter
2672 - about reporting errors regarding git paths.</li>
2675 - <li>The diff view has become prettier and now also highlights trailing
2676 - whitespace.</li>
2678 -</ul>
2680 -<ul>
2681 -<li>You can now pass on command-line arguments just like you can with ‘git log’</li>
2684 -
2686 - <li>Support for—left-right: use ‘gitx—left-right <span class="caps">HEAD</span>..origin/master’
2687 - to see which commits are only on your branch or on their branch</li>
2690 -</ul>
2691 -
2693 -<ul>
2695 -</ul>
2697 -<ul>
2700 -</ul>
2702 \ No newline at end of file
2703 diff --git a/gitx.mm b/gitx.mm
2705 --- a/gitx.mm
2706 +++ b/gitx.mm
2708 exit(1);
2709 }
2711 +void git_path()
2712 +{
2713 + if (![PBGitBinary path])
2714 + exit(101);
2715 +
2716 + NSString *path = [[PBGitBinary path] stringByDeletingLastPathComponent];
2717 + printf("%s", [path UTF8String]);
2718 + exit(0);
2719 +}
2720 +
2721 void handleSTDINDiff(id<GitXCliToolProtocol> proxy)
2722 {
2723 NSFileHandle *handle = [NSFileHandle fileHandleWithStandardInput];
2725 usage(argv[0]);
2727 version_info();
2729 + git_path();
2731 if (![PBGitBinary path]) {
2733 diff --git a/html/lib/diffHighlighter.js b/html/lib/diffHighlighter.js
2735 --- a/html/lib/diffHighlighter.js
2736 +++ b/html/lib/diffHighlighter.js
2738 return; // so printing the filename in the file-list is enough
2739 }
2743 + if (diffContent != "" || binary) {
2746 + }
2748 - if (!binary) {
2749 + if (!binary && (diffContent != "")) {
2754 }
2755 }
2757 - finalContent += '</div>';
2758 + if (diffContent != "" || binary)
2759 + finalContent += '</div>';
2761 line1 = "";
2762 line2 = "";
2764 }
2766 if (header) {
2767 + if (firstChar == "n") {
2768 + if (l.match(/^new file mode .*$/))
2769 + startname = "/dev/null";
2770 +
2771 + if (match = l.match(/^new mode (.*)$/)) {
2772 + mode_change = true;
2773 + new_mode = match[1];
2774 + }
2775 + continue;
2776 + }
2777 + if (firstChar == "o") {
2778 + if (match = l.match(/^old mode (.*)$/)) {
2779 + mode_change = true;
2780 + old_mode = match[1];
2781 + }
2782 + continue;
2783 + }
2784 +
2785 + if (firstChar == "d") {
2786 + if (l.match(/^deleted file mode .*$/))
2787 + endname = "/dev/null";
2788 + continue;
2789 + }
2790 if (firstChar == "-") {
2791 if (match = l.match(/^--- (a\/)?(.*)$/))
2792 startname = match[2];
2794 }
2795 }
2797 - if (match = l.match(/^old mode (.*)$/)) {
2798 - mode_change = true;
2799 - old_mode = match[1];
2800 - }
2801 -
2802 - if (match = l.match(/^new mode (.*)$/)) {
2803 - mode_change = true;
2804 - new_mode = match[1];
2805 - }
2806 -
2807 -
2808 // Finish the header
2809 if (firstChar == "@")
2810 header = false;
2812 header = false;
2813 }
2817 {
2821 } else if (firstChar == " ") {
2826 }
2827 }
2829 finishContent();
2831 // This takes about 7ms
2832 - element.innerHTML = finalContent;
2833 + // element.innerHTML = finalContent;
2835 // TODO: Replace this with a performance pref call
2836 if (false)
2837 diff --git a/html/test.html b/html/test.html
2839 --- a/html/test.html
2840 +++ b/html/test.html
2842 }
2844 var doeHet = function() {
2845 + var start = Date.now();
2846 highlightDiff($("orig_diff").value,
2847 $("diff"),
2848 { "newfile" : newFile }
2849 );
2850 + var end = Date.now();
2852 }
2853 </script>
2854 </head>
2855 diff --git a/html/views/commit/commit.css b/html/views/commit/commit.css
2857 --- a/html/views/commit/commit.css
2858 +++ b/html/views/commit/commit.css
2860 }
2862 .diff a.stagebutton {
2863 - display: block;
2864 width: 40px;
2866 margin-bottom: 4px;
2868 text-align: center;
2870 -webkit-border-radius: 2px;
2871 - float: left;
2872 }
2874 #multiselect {
2876 border: 5px solid #EEE;
2877 margin: -5px;
2878 padding-left: 20px;
2879 -}
2880 \ No newline at end of file
2881 +}
2882 diff --git a/html/views/history/history.css b/html/views/history/history.css
2884 --- a/html/views/history/history.css
2885 +++ b/html/views/history/history.css
2887 }
2889 .property_name {
2890 - width: 50px;
2891 + width: 6em;
2892 color:#7F7F7F;
2893 text-align: right;
2894 font-weight: bold;
2895 diff --git a/html/views/history/history.js b/html/views/history/history.js
2897 --- a/html/views/history/history.js
2898 +++ b/html/views/history/history.js
2900 }
2902 this.reloadRefs = function() {
2903 - this.refs = this.object.refs;
2904 + this.refs = this.object.refs();
2905 }
2907 };
2909 +
2910 +var confirm_gist = function(confirmation_message) {
2911 + if (!Controller.isFeatureEnabled_("confirmGist")) {
2912 + gistie();
2913 + return;
2914 + }
2915 +
2916 + // Set optional confirmation_message
2917 + confirmation_message = confirmation_message || "Yes. Paste this commit.";
2918 + var deleteMessage = Controller.getConfig_("github.token") ? " " : "You might not be able to delete it after posting.<br>";
2919 + var publicMessage = Controller.isFeatureEnabled_("publicGist") ? "<b>public</b>" : "private";
2920 + // Insert the verification links into div#notification_message
2921 + var notification_text = 'This will create a ' + publicMessage + ' paste of your commit to <a href="http://gist.github.com/">http://gist.github.com/</a><br>' +
2922 + deleteMessage +
2923 + 'Are you sure you want to continue?<br/><br/>' +
2924 + '<a href="#" onClick="hideNotification();return false;" style="color: red;">No. Cancel.</a> | ' +
2925 + '<a href="#" onClick="gistie();return false;" style="color: green;">' + confirmation_message + '</a>';
2926 +
2927 + notify(notification_text, 0);
2928 + // Hide img#spinner, since it?s visible by default
2930 +}
2931 +
2932 var gistie = function() {
2936 if (token && login) {
2937 parameters.login = login;
2938 parameters.token = token;
2939 - } else {
2940 - parameters.private = true;
2941 }
2942 + if (!Controller.isFeatureEnabled_("publicGist"))
2943 + parameters.private = true;
2945 var params = [];
2946 for (var name in parameters)
2949 var loadExtendedCommit = function(commit)
2950 {
2951 - if (commit.author_email)
2952 - $("authorID").innerHTML = commit.author_name + " <<a href='mailto:" + commit.author_email + "'>" + commit.author_email + "</a>>";
2953 + var formatEmail = function(name, email) {
2955 + }
2956 +
2957 + $("authorID").innerHTML = formatEmail(commit.author_name, commit.author_email);
2958 +
2959 + if (commit.committer_name != commit.author_name) {
2961 + $("committerID").innerHTML = formatEmail(commit.committer_name, commit.committer_email);
2962 +
2964 + $("committerDate").innerHTML = commit.committer_date;
2965 + } else {
2968 + }
2970 $("date").innerHTML = commit.author_date;
2972 diff --git a/html/views/history/index.html b/html/views/history/index.html
2974 --- a/html/views/history/index.html
2975 +++ b/html/views/history/index.html
2982 Gist it
2983 </a>
2984 </div>
2988 </tr>
2992 + </tr>
2996 + </tr>
2997 <tr>
3001 </div>
3002 <hr>
3007 </div>
3009 diff --git a/speedtest.m b/speedtest.m
3011 --- a/speedtest.m
3012 +++ b/speedtest.m
3014 // Copyright 2008 Pieter de Bie. All rights reserved.
3015 //
3017 -#import "speedtest.h"
3018 #import "PBGitRepository.h"
3019 -#import "PBGitRevList.h"
3020 +#import "PBGitRevSpecifier.h"
3021 +#import "PBGitCommit.h"
3022 +#import "PBGitRevPool.h"
3024 int main()
3025 {
3026 - PBGitRepository *repo = [[PBGitRepository alloc] initWithURL:[NSURL URLWithString:@"file:///Users/pieter/projects/git"]];
3027 - PBGitRevList *revList = [[PBGitRevList alloc] initWithRepository:repo];
3028 - PBGitRevSpecifier *revSpecifier = [[PBGitRevSpecifier alloc] initWithParameters:[NSArray arrayWithObject:@"master"]];
3029 + PBGitRepository *repo = [[PBGitRepository alloc] initWithURL:[NSURL URLWithString:@"file:///Users/pieter/projects/External/git"]];
3030 + //PBGitRevList *revList = [[PBGitRevList alloc] initWithRepository:repo];
3031 + PBGitRevSpecifier *revSpecifier = [[PBGitRevSpecifier alloc] initWithParameters:[NSArray arrayWithObject:@"HEAD"]];
3032 + PBGitRevPool *revPool = [[PBGitRevPool alloc] initWithRepository:repo];
3034 //[repo reloadRefs];
3035 - [revList walkRevisionListWithSpecifier:revSpecifier];
3036 -
3037 + [revPool loadRevisions:revSpecifier];
3038 +// [revPool listCommits];
3039 +
3040 + NSDate *start = [NSDate date];
3041 + PBGitCommit *commit = [revPool commitWithSha:@"6270bae2fe7b13a0809061760ddb2b03ce2ca33a"];
3042 + NSMutableArray *array = [NSMutableArray array];
3043 + while (commit)
3044 + {
3045 + [array addObject:[commit realSha]];
3046 + if (commit.nParents)
3047 + commit = [revPool commitWithOid:commit.parentShas[0]];
3048 + else
3049 + commit = NULL;
3050 + }
3051 + NSTimeInterval duration = [[NSDate date] timeIntervalSinceDate:start];
3052 +
3053 + NSLog(@"Walked all refs in %f seconds", duration);
3055 return 0;
3056 }
3057 \ No newline at end of file
3059 </textarea>
3061 </body>