30621f13fc591d60956e17e915f2dbdc1ac31e0c Pieter de Bie pdebie@ai.rug.nl http://github.com/pieter/gitx/commit/a256210880f2878707f1714515663f5f09360df8 a256210880f2878707f1714515663f5f09360df8 2009-10-02T01:19:14-07:00 2009-10-02T01:19:14-07:00 Testing: add missing file b8b5c2d4d54181dac26622366a79605b1cb80ac0 Pieter de Bie pdebie@ai.rug.nl a3f02b290281602609994ceb13a14402de2afac8 Pieter de Bie pdebie@ai.rug.nl http://github.com/pieter/gitx/commit/30621f13fc591d60956e17e915f2dbdc1ac31e0c 30621f13fc591d60956e17e915f2dbdc1ac31e0c 2009-10-01T12:59:19-07:00 2009-10-01T12:59:19-07:00 test/index: add more tests 52d824a3bc5b4f0510266b583e39bcd01230e11a Pieter de Bie pdebie@ai.rug.nl 339026981abb4d4f2b7168b59ec8954381599535 Pieter de Bie pdebie@ai.rug.nl http://github.com/pieter/gitx/commit/a3f02b290281602609994ceb13a14402de2afac8 a3f02b290281602609994ceb13a14402de2afac8 2009-10-01T12:59:08-07:00 2009-10-01T12:59:08-07:00 GitIndex: fix status update when changed file is deleted Fixes bug LH#209 be071d6e4469ca272a44662d3d589b596b51cc1a Pieter de Bie pdebie@ai.rug.nl 5be8aed2b75b428139a4aaefe4b0b89439c07e66 Pieter de Bie pdebie@ai.rug.nl http://github.com/pieter/gitx/commit/339026981abb4d4f2b7168b59ec8954381599535 339026981abb4d4f2b7168b59ec8954381599535 2009-10-01T12:55:40-07:00 2009-10-01T12:55:40-07:00 Update testing framework f587a9d51b0886287a09baf198467d7cadf75a86 Pieter de Bie pdebie@ai.rug.nl ce89e0f4684d4c6eea1fd87e99bfe8b9560344e5 Pieter de Bie pdebie@ai.rug.nl http://github.com/pieter/gitx/commit/5be8aed2b75b428139a4aaefe4b0b89439c07e66 5be8aed2b75b428139a4aaefe4b0b89439c07e66 2009-10-01T12:17:32-07:00 2009-10-01T12:17:32-07:00 GitIndex: increase refreshStatus before launching task We used to increase this variable after handing it over to the [handle readToEndOfFileInBackgroundAndNotify], but sometimes a task would quit before getting to that point, causing a premature index refresh event to be called. 06d73ccfd58e981e921b982d164989e947d291bc Pieter de Bie pdebie@ai.rug.nl f0860b4f9d859c03bfd873dfd9b5cb7a7f9997eb Pieter de Bie pdebie@ai.rug.nl http://github.com/pieter/gitx/commit/ce89e0f4684d4c6eea1fd87e99bfe8b9560344e5 ce89e0f4684d4c6eea1fd87e99bfe8b9560344e5 2009-10-01T12:06:20-07:00 2009-10-01T12:06:20-07:00 Add first test, in MacRuby 2390b8a5303b9bfba9c2ffca3aa0932b1e8f4507 Pieter de Bie pdebie@ai.rug.nl 1854fc0bd0ed3c335359af743965f41340ab167a Pieter de Bie pdebie@ai.rug.nl http://github.com/pieter/gitx/commit/f0860b4f9d859c03bfd873dfd9b5cb7a7f9997eb f0860b4f9d859c03bfd873dfd9b5cb7a7f9997eb 2009-10-01T12:06:09-07:00 2009-10-01T12:06:09-07:00 Add testing framework 1b51e2ab05b242f2f0e792e9b9e53575e4afe599 Pieter de Bie pdebie@ai.rug.nl 1a5a211ddfdfa08622d1413cb5aa5634dcedaee2 a2b3bf3d1e05c581468c32b41008223322f2a718 Pieter de Bie pdebie@ai.rug.nl http://github.com/pieter/gitx/commit/1854fc0bd0ed3c335359af743965f41340ab167a 1854fc0bd0ed3c335359af743965f41340ab167a 2009-09-17T14:47:43-07:00 2009-09-17T14:47:43-07:00 Merge branch 'pu/pb/index_refactor' * pu/pb/index_refactor: (24 commits) PBGitIndex: post notifications when index stuff fails GitIndexController: reorder methods a bit, remove unnecessary stuff PBGitIndex: Migrate discardChanges to the GitIndex CommitController: Make commit message editable after commit failed GitIndex: Fix a few comments GitIndex: explicitly tell when stuff is updated Remove cruft Show previous commit message when amending CommitController: Empty commit title when commit is successful CommitView: Remove cruft Add failed commit notifications GitIndex: add commit notifications CommitController: Add status messages for index operations GitIndex: Add a few notifications CommitView: Migrate patch apply stuff to GitIndex GitIndex: Add support for applying patches CommitController: Replace commit method with the one from GitIndex GitIndex: add basic commit method GitIndexController: Migrate stageFiles functions to GitIndex GitIndex: Add methods to stage and unstage files ... Conflicts: PBGitCommitController.m PBGitIndexController.h PBGitIndexController.m 6152a7a8bd0fc00cb4fa7829dc02d11b374d56ba Pieter de Bie pdebie@ai.rug.nl 44768921f37c099a5e8d24801c34c07837085dd6 5972bd4f7f194fce53f84c45ba68a4b63de22ffa Pieter de Bie pdebie@ai.rug.nl http://github.com/pieter/gitx/commit/1a5a211ddfdfa08622d1413cb5aa5634dcedaee2 1a5a211ddfdfa08622d1413cb5aa5634dcedaee2 2009-09-17T14:43:34-07:00 2009-09-17T14:43:34-07:00 Merge branch 'stable' * stable: HistoryView: Don't show the 'loading commit' thing until after 500 ms. HistoryView: Remove raw view HistoryView: don't load in commit information in a separate thread anymore Fix UTF-8 bug in NSString_RegEx CommitView: Don't keep rearranging when iterating over files IndexController: de-privatize the index-stopping stuff 1546af6bb3f588808c2555113d221e66cee85125 Pieter de Bie pdebie@ai.rug.nl 34394d056b5ff0a4620a79c606f26ff4870c67f3 Pieter de Bie pdebie@ai.rug.nl http://github.com/pieter/gitx/commit/5972bd4f7f194fce53f84c45ba68a4b63de22ffa 5972bd4f7f194fce53f84c45ba68a4b63de22ffa 2009-09-17T14:40:38-07:00 2009-09-17T14:40:38-07:00 HistoryView: Don't show the 'loading commit' thing until after 500 ms. This was annoying me a lot, so it's in stable :) Signed-off-by: Pieter de Bie <pdebie@ai.rug.nl> 1f95487d81c6a1fc524542e247c09fcf70b7f083 Pieter de Bie pdebie@ai.rug.nl 0363eea494602e3002f45f1790eaff3435151949 Pieter de Bie pdebie@ai.rug.nl http://github.com/pieter/gitx/commit/34394d056b5ff0a4620a79c606f26ff4870c67f3 34394d056b5ff0a4620a79c606f26ff4870c67f3 2009-09-17T14:32:35-07:00 2009-09-17T14:32:35-07:00 HistoryView: Remove raw view I don't think anybody has ever used this, so let's just remove it. 70ef25a5371df6c34b7976fd8b7daaa171d48f64 Pieter de Bie pdebie@ai.rug.nl 2cdf2b60f53445cff2ad7225261b6c6d2f8932f5 Pieter de Bie pdebie@ai.rug.nl http://github.com/pieter/gitx/commit/0363eea494602e3002f45f1790eaff3435151949 0363eea494602e3002f45f1790eaff3435151949 2009-09-17T14:29:06-07:00 2009-09-17T14:29:06-07:00 HistoryView: don't load in commit information in a separate thread anymore I've seen this hang or crash a few times, so I hope this works better. Instead of running a task in a separate thread, we just let it go through the run loop and catch it when the task is done. This ruins the second subview in the history view, but I don't think anybody ever used that, so I'm going to remove it. 4dc78d91c525cea28829b15674fd71dd32a3f8a2 Pieter de Bie pdebie@ai.rug.nl 3324591e6cb3af729bad654b1772e3bc34d2986e 00731eb285650df15befdda83ffccecd73012324 Pieter de Bie pdebie@ai.rug.nl http://github.com/pieter/gitx/commit/2cdf2b60f53445cff2ad7225261b6c6d2f8932f5 2cdf2b60f53445cff2ad7225261b6c6d2f8932f5 2009-09-14T06:09:03-07:00 2009-09-14T06:09:03-07:00 Merge branch 'pu/pb/index_quick_fix' into stable * pu/pb/index_quick_fix: CommitView: Don't keep rearranging when iterating over files IndexController: de-privatize the index-stopping stuff e227b7b20bcbe87a5a11930162f6023895090ecd Pieter de Bie pdebie@ai.rug.nl 4544816ac85411b99cdd20746ad70ae3c58638c5 Pieter de Bie pdebie@ai.rug.nl http://github.com/pieter/gitx/commit/3324591e6cb3af729bad654b1772e3bc34d2986e 3324591e6cb3af729bad654b1772e3bc34d2986e 2009-09-14T04:25:01-07:00 2009-09-14T04:02:36-07:00 Fix UTF-8 bug in NSString_RegEx This class would use the location information provided by regex(3) as range for for a substring. However, the information regex(3) returns is a byte-based, while NSString works on characters. This can cause a problem when there are UTF-8 characters in the string, as the wrong subsstring will be returned. This is fixed by taking the UTF bytesequence, and extracting a substring from that, rather than using NSString's own substring method e6d03741ba937feb546c9f7cdf7ccaaa57358f2d Pieter de Bie pdebie@ai.rug.nl 438a3f808dede8589d47ea36f695727522d8b6dc Pieter de Bie pdebie@ai.rug.nl http://github.com/pieter/gitx/commit/a2b3bf3d1e05c581468c32b41008223322f2a718 a2b3bf3d1e05c581468c32b41008223322f2a718 2009-09-13T07:55:40-07:00 2009-09-13T07:47:30-07:00 PBGitIndex: post notifications when index stuff fails We use notifications so that we can make all these methods async later on f51d31cf02105bcffc4f2bef0d0b18988238644c Pieter de Bie pdebie@ai.rug.nl 3dc312ff2e5971e528c89da63946cc2f67820558 Pieter de Bie pdebie@ai.rug.nl http://github.com/pieter/gitx/commit/438a3f808dede8589d47ea36f695727522d8b6dc 438a3f808dede8589d47ea36f695727522d8b6dc 2009-09-13T07:55:40-07:00 2009-09-13T07:32:35-07:00 GitIndexController: reorder methods a bit, remove unnecessary stuff ccbfa92e72367f5e81bded58b03555542f3d966f Pieter de Bie pdebie@ai.rug.nl e17b454c39d7556f2d676d424496e3f68b7f16fe Pieter de Bie pdebie@ai.rug.nl http://github.com/pieter/gitx/commit/3dc312ff2e5971e528c89da63946cc2f67820558 3dc312ff2e5971e528c89da63946cc2f67820558 2009-09-13T07:55:40-07:00 2009-09-13T07:16:53-07:00 PBGitIndex: Migrate discardChanges to the GitIndex eedf6cb7ecafa2e4575e7e46c53b431f61b4bd37 Pieter de Bie pdebie@ai.rug.nl 59d4a159a47945543398599f70d7de2db1e0a7cd Pieter de Bie pdebie@ai.rug.nl http://github.com/pieter/gitx/commit/e17b454c39d7556f2d676d424496e3f68b7f16fe e17b454c39d7556f2d676d424496e3f68b7f16fe 2009-09-13T07:55:40-07:00 2009-09-13T07:15:23-07:00 CommitController: Make commit message editable after commit failed 11a656319e622e892f783ecaac0b590b70b5037d Pieter de Bie pdebie@ai.rug.nl 029b42c5401a868078271132c49b813928e398ce Pieter de Bie pdebie@ai.rug.nl http://github.com/pieter/gitx/commit/59d4a159a47945543398599f70d7de2db1e0a7cd 59d4a159a47945543398599f70d7de2db1e0a7cd 2009-09-13T07:55:40-07:00 2009-09-13T07:14:11-07:00 GitIndex: Fix a few comments 4bda009b48289cdc4e8f2e5a328a0068fe06ab91 Pieter de Bie pdebie@ai.rug.nl 9b1fcd76280fe5e3e71cf4445379877b521735b0 Pieter de Bie pdebie@ai.rug.nl http://github.com/pieter/gitx/commit/029b42c5401a868078271132c49b813928e398ce 029b42c5401a868078271132c49b813928e398ce 2009-09-13T07:55:40-07:00 2009-09-12T19:16:51-07:00 GitIndex: explicitly tell when stuff is updated 07a66af33f6e73ba3c476add203b2554b1e642a7 Pieter de Bie pdebie@ai.rug.nl 249233114dbb4653fbac2821de68d066f2cbc09a Pieter de Bie pdebie@ai.rug.nl http://github.com/pieter/gitx/commit/9b1fcd76280fe5e3e71cf4445379877b521735b0 9b1fcd76280fe5e3e71cf4445379877b521735b0 2009-09-13T07:55:40-07:00 2009-09-12T19:07:52-07:00 Remove cruft bd9a4a35657d3b8fd3a8916a6eeeed1342e7bec2 Pieter de Bie pdebie@ai.rug.nl 2b317eee5c42fb93ba5f44a83d451f06ab9fe178 Pieter de Bie pdebie@ai.rug.nl http://github.com/pieter/gitx/commit/249233114dbb4653fbac2821de68d066f2cbc09a 249233114dbb4653fbac2821de68d066f2cbc09a 2009-09-13T07:55:40-07:00 2009-09-12T19:02:52-07:00 Show previous commit message when amending ab8193daabb08b4ff7e51c4fbb05c2a6735b3f02 Pieter de Bie pdebie@ai.rug.nl 6265c774ac8893c38ef462a057fd0e111604bf37 Pieter de Bie pdebie@ai.rug.nl http://github.com/pieter/gitx/commit/2b317eee5c42fb93ba5f44a83d451f06ab9fe178 2b317eee5c42fb93ba5f44a83d451f06ab9fe178 2009-09-13T07:55:39-07:00 2009-09-12T18:52:18-07:00 CommitController: Empty commit title when commit is successful e7daad55a53792884b1275e7fb7e1676d5251be1 Pieter de Bie pdebie@ai.rug.nl 5323b9159686b2d40f5a50077e704f6880b3aff3 Pieter de Bie pdebie@ai.rug.nl http://github.com/pieter/gitx/commit/6265c774ac8893c38ef462a057fd0e111604bf37 6265c774ac8893c38ef462a057fd0e111604bf37 2009-09-13T07:55:39-07:00 2009-09-12T18:51:36-07:00 CommitView: Remove cruft 874065153971fde24ae13208cdbc08b761c38fbd Pieter de Bie pdebie@ai.rug.nl 4192d6a03f08fa347d4600071eb08042cca594a5 Pieter de Bie pdebie@ai.rug.nl http://github.com/pieter/gitx/commit/5323b9159686b2d40f5a50077e704f6880b3aff3 5323b9159686b2d40f5a50077e704f6880b3aff3 2009-09-13T07:55:39-07:00 2009-09-12T18:44:00-07:00 Add failed commit notifications 97ec42c155a1f63de03faeae748497751f29aa33 Pieter de Bie pdebie@ai.rug.nl c6d2b61020455875fabe45a6f7e97d369e916858 Pieter de Bie pdebie@ai.rug.nl http://github.com/pieter/gitx/commit/4192d6a03f08fa347d4600071eb08042cca594a5 4192d6a03f08fa347d4600071eb08042cca594a5 2009-09-13T07:55:39-07:00 2009-09-12T18:37:30-07:00 GitIndex: add commit notifications 5a37304cf0cf578e45e4498721759a7effa24502 Pieter de Bie pdebie@ai.rug.nl ff263c6717cc3cf13f26669ff923634157b8873c Pieter de Bie pdebie@ai.rug.nl http://github.com/pieter/gitx/commit/c6d2b61020455875fabe45a6f7e97d369e916858 c6d2b61020455875fabe45a6f7e97d369e916858 2009-09-13T07:55:39-07:00 2009-09-12T18:20:42-07:00 CommitController: Add status messages for index operations d7d36e6c6356a18cd9145910ff7372ada769337f Pieter de Bie pdebie@ai.rug.nl cdae809f4132a95459933bf2e5333e03cd7959a5 Pieter de Bie pdebie@ai.rug.nl http://github.com/pieter/gitx/commit/ff263c6717cc3cf13f26669ff923634157b8873c ff263c6717cc3cf13f26669ff923634157b8873c 2009-09-13T07:55:39-07:00 2009-09-12T18:20:12-07:00 GitIndex: Add a few notifications 35597dff106c409f02da4f4111af122513afdb3b Pieter de Bie pdebie@ai.rug.nl 57dc38f58786f194e4cfe990d6bd6be1e4565de9 Pieter de Bie pdebie@ai.rug.nl http://github.com/pieter/gitx/commit/cdae809f4132a95459933bf2e5333e03cd7959a5 cdae809f4132a95459933bf2e5333e03cd7959a5 2009-09-13T07:55:39-07:00 2009-09-12T17:58:05-07:00 CommitView: Migrate patch apply stuff to GitIndex f4a40ebb8ddae3845d5b8fa5d324f65e24b61271 Pieter de Bie pdebie@ai.rug.nl 87dfb47f4f6aa0f4a547fbf6819ba8b983f0e7aa Pieter de Bie pdebie@ai.rug.nl http://github.com/pieter/gitx/commit/57dc38f58786f194e4cfe990d6bd6be1e4565de9 57dc38f58786f194e4cfe990d6bd6be1e4565de9 2009-09-13T07:55:39-07:00 2009-09-12T17:57:48-07:00 GitIndex: Add support for applying patches 1b55ecec529338734fb7e6a048c25d25c13ca5ef Pieter de Bie pdebie@ai.rug.nl