Skip to content

FindCommitBranchWasBranchedFrom should not throw NullReferenceException #677

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 7 commits into from
Oct 11, 2015
Merged

FindCommitBranchWasBranchedFrom should not throw NullReferenceException #677

merged 7 commits into from
Oct 11, 2015

Conversation

asbjornu
Copy link
Member

@asbjornu asbjornu commented Oct 8, 2015

This makes sure #618 and #674 are handled in a more graceful way, by throwing more intuitive exceptions than NullReferenceException when a branch has no tip. Before this is merged, it would be good to replace the example.com documentation URI with proper documentation explaining how to fix this problem in the repository.

@asbjornu
Added null-guard on branch in FindCommitBranchWasBranchedFrom().
7c17eb8
@asbjornu
Ensure that the branch Tip is not null and throw a more intuitive exc…
d6ad928 
…eption than `NulReferenceException` if it is.

TODO: Need to document how to fix this and add the URI for it to the exception.
@asbjornu
Copy link
Member Author

asbjornu commented Oct 8, 2015

And of course; if this problem can be avoided altogether (i.e. not throwing exceptions, but instead issuing a warning), it would be even better.

@asbjornu asbjornu mentioned this pull request Oct 8, 2015
Closed
@asbjornu
Copy link
Member Author

asbjornu commented Oct 8, 2015

I've tried to write warnings instead of throwing exceptions, return null and handle the nulls elsewhere and seem to have made some progress. The problem now is that finding a version number takes 21 seconds. Here's the log:

2015-10-08 10:44:25     INFO [10/08/15 10:44:25:73] Working directory: C:\Redacted
2015-10-08 10:44:25     INFO [10/08/15 10:44:25:76] Project root is: C:\Redacted
2015-10-08 10:44:25     INFO [10/08/15 10:44:25:81] Using latest commit on specified branch
2015-10-08 10:44:25     INFO [10/08/15 10:44:25:82] Begin: Attempting to inherit branch configuration from parent branch
2015-10-08 10:44:25       INFO [10/08/15 10:44:25:84] Begin: Finding branch source
2015-10-08 10:44:25         WARN [10/08/15 10:44:25:88] origin/HEAD has no tip. Please see http://example.com/docs for information on how to fix this.
2015-10-08 10:44:26       INFO [10/08/15 10:44:26:19] End: Finding branch source (Took: 352.17ms)
2015-10-08 10:44:26       INFO [10/08/15 10:44:26:20] Found possible parent branches: develop
2015-10-08 10:44:26     INFO [10/08/15 10:44:26:20] End: Attempting to inherit branch configuration from parent branch (Took: 385.12ms)
2015-10-08 10:44:26     INFO [10/08/15 10:44:26:26] Running against branch: feature/gitversion (a1eb1940f6d3171cc1f6779b2ca624e167d89178)
2015-10-08 10:44:26     INFO [10/08/15 10:44:26:27] Begin: Calculating base versions
2015-10-08 10:44:26       INFO [10/08/15 10:44:26:35] Fallback base version: 0.1.0 with commit count source d47b3dc711d723e273017b214825c6c18ed70a7a
2015-10-08 10:44:27       INFO [10/08/15 10:44:27:16] Git tag '4.8.2': 4.8.2 with commit count source 321309235614cf40dcd345b237982335924102eb
2015-10-08 10:44:27       INFO [10/08/15 10:44:27:31] Git tag '4.8.1': 4.8.1 with commit count source c40e2db883f0e7d3f07a26417e29ebc1c9dc2a0e
2015-10-08 10:44:27       INFO [10/08/15 10:44:27:46] Git tag '4.7.4': 4.7.4 with commit count source c0c5d382f747d5e123f7feb6c80105a9c54da8f5
2015-10-08 10:44:27       INFO [10/08/15 10:44:27:61] Git tag '4.7.3': 4.7.3 with commit count source a1a54a127700cdaeef8541b4eb54925a9b2eadc9
2015-10-08 10:44:27       INFO [10/08/15 10:44:27:75] Git tag '4.7.2': 4.7.2 with commit count source 7615f34c65e62035f32062b71b73fc49c03eaf72
2015-10-08 10:44:27       INFO [10/08/15 10:44:27:90] Git tag '4.7.1': 4.7.1 with commit count source 1e4afc79a8f5b5bc17ca8f7ffa5938fe4b8810a3
2015-10-08 10:44:28       INFO [10/08/15 10:44:28:05] Git tag '4.6.10': 4.6.10 with commit count source 7bf8cde7fbff1c8c50413788254cba5963234f59
2015-10-08 10:44:28       INFO [10/08/15 10:44:28:21] Git tag '4.6.9': 4.6.9 with commit count source dfb354b01916b6287e00c1a7adb4c079fd45cfb9
2015-10-08 10:44:28       INFO [10/08/15 10:44:28:22] Git tag '4.6.8': 4.6.8 with commit count source 2520efdbc57d9a8a77ccfe7de9f95e6c5c392816
2015-10-08 10:44:28       INFO [10/08/15 10:44:28:38] Git tag '4.6.7': 4.6.7 with commit count source 31f98784427086684ffc033b04ae605a8cc1f8b9
2015-10-08 10:44:28       INFO [10/08/15 10:44:28:53] Git tag '4.6.6': 4.6.6 with commit count source 81f09ad6a2b48716a4e3e24de4d13dd94361b782
2015-10-08 10:44:28       INFO [10/08/15 10:44:28:70] Git tag '4.6.5': 4.6.5 with commit count source 9e26f24ddd3ca4ffc8f0c2c8e79ba7a62ecb0503
2015-10-08 10:44:28       INFO [10/08/15 10:44:28:86] Git tag '4.6.4': 4.6.4 with commit count source f532f3bc8c3de9ab89918006c3daf1195dc46dfc
2015-10-08 10:44:29       INFO [10/08/15 10:44:29:01] Git tag '4.6.3': 4.6.3 with commit count source bf401d47d057fd71654b396095c4954db7a7cf49
2015-10-08 10:44:29       INFO [10/08/15 10:44:29:18] Git tag '4.6.2': 4.6.2 with commit count source 6ebb577abd04916b3037ee77fd61b021a9a6a53c
2015-10-08 10:44:29       INFO [10/08/15 10:44:29:36] Git tag '4.6.1': 4.6.1 with commit count source 463c8853b9c84a738ce71372a2a7a0efa207c0cd
2015-10-08 10:44:29       INFO [10/08/15 10:44:29:55] Git tag '4.5.3': 4.5.3 with commit count source b8754fe3a7d16fdcf18704db170759ba509dfe2d
2015-10-08 10:44:29       INFO [10/08/15 10:44:29:73] Git tag '4.5.2': 4.5.2 with commit count source 184c58f31aa453610ee7b050b6b93bf918647bb4
2015-10-08 10:44:29       INFO [10/08/15 10:44:29:89] Git tag '4.5.1': 4.5.1 with commit count source 30ea249d3cf45919ddc894158bdab9e9e278dab1
2015-10-08 10:44:30       INFO [10/08/15 10:44:30:07] Git tag '4.4.5': 4.4.5 with commit count source dc52eed581407544935cc9fe20c999fd282ada54
2015-10-08 10:44:30       INFO [10/08/15 10:44:30:25] Git tag '4.4.4': 4.4.4 with commit count source 1c324141e89c63ba4ccb7f6d4896b749924ca814
2015-10-08 10:44:30       INFO [10/08/15 10:44:30:41] Git tag '4.4.3': 4.4.3 with commit count source 9b43d4e38aefba2f61068bffd3431cd939a233b0
2015-10-08 10:44:30       INFO [10/08/15 10:44:30:59] Git tag '4.4.2': 4.4.2 with commit count source fae28ea935206c641b3c9d69fb674fb9e4201f52
2015-10-08 10:44:30       INFO [10/08/15 10:44:30:76] Git tag '4.4.1': 4.4.1 with commit count source 537c1e56a256d5bf09bdfc93de2ba838e71831d7
2015-10-08 10:44:30       INFO [10/08/15 10:44:30:93] Git tag '4.3.4': 4.3.4 with commit count source 61ddd73da0b3eb92a4b4e4074e026e119d7243ac
2015-10-08 10:44:31       INFO [10/08/15 10:44:31:09] Git tag '4.3.3': 4.3.3 with commit count source 5817bfbe4ac02d408ccf9aab78265527f901f22d
2015-10-08 10:44:31       INFO [10/08/15 10:44:31:26] Git tag '4.3.2': 4.3.2 with commit count source 2660657b617307aa54b161e2e99fd9bb33c23415
2015-10-08 10:44:31       INFO [10/08/15 10:44:31:42] Git tag '4.3.1': 4.3.1 with commit count source eebb3354cce1714a211ec7cd8de1ae80266ab7e4
2015-10-08 10:44:31       INFO [10/08/15 10:44:31:59] Git tag '4.2.4': 4.2.4 with commit count source ecff4f1179386f7b0032d1fd6cb427cada8760e4
2015-10-08 10:44:31       INFO [10/08/15 10:44:31:77] Git tag '4.2.3': 4.2.3 with commit count source 8f283d8eb3fb190c7090ee196ee6407a8b430d95
2015-10-08 10:44:31       INFO [10/08/15 10:44:31:94] Git tag '4.2.2': 4.2.2 with commit count source 7059746c74b4a5c67f869f9ad72fa718db2ce537
2015-10-08 10:44:31       INFO [10/08/15 10:44:31:96] Git tag '4.2.1': 4.2.1 with commit count source 006c7c54881d11a129928c580aca8559f2e8873d
2015-10-08 10:44:32       INFO [10/08/15 10:44:32:15] Git tag '4.1.1': 4.1.1 with commit count source d993584795c70a2214fb71d2b4269716312f8b49
2015-10-08 10:44:32       INFO [10/08/15 10:44:32:32] Git tag '3.23.4': 3.23.4 with commit count source 4d013fe5590f96f32e377c7a620220d432028ace
2015-10-08 10:44:32       INFO [10/08/15 10:44:32:36] Git tag '3.23.3': 3.23.3 with commit count source 4128cd9d33364901be3362650551eb022ad7aff9
2015-10-08 10:44:32       INFO [10/08/15 10:44:32:40] Git tag '3.23.2': 3.23.2 with commit count source 1743cc4d7a25c1acddbdc48d430291be0c2ad23d
2015-10-08 10:44:32       INFO [10/08/15 10:44:32:43] Git tag '3.23.1': 3.23.1 with commit count source e3d3e728608112b6d3d94cc8fdf2cf32be24c327
2015-10-08 10:44:32       INFO [10/08/15 10:44:32:47] Git tag '3.22.1': 3.22.1 with commit count source 7dc22c9ec04d1c21c84d942e3c9c6ade024971fb
2015-10-08 10:44:32       INFO [10/08/15 10:44:32:51] Git tag '3.21.3': 3.21.3 with commit count source 4ec714655c2bef8b9c801958fd86e44f044d17a7
2015-10-08 10:44:32       INFO [10/08/15 10:44:32:54] Git tag '3.21.2': 3.21.2 with commit count source cb70d6c9513dea72bc7b78e50761ff5a47972db5
2015-10-08 10:44:32       INFO [10/08/15 10:44:32:58] Git tag '3.21.1': 3.21.1 with commit count source f3b7ea2ab1b7778e026260088f64bdf5b4e0ae17
2015-10-08 10:44:32       INFO [10/08/15 10:44:32:62] Git tag '3.20.1': 3.20.1 with commit count source 90b867854abf64e7a83746e2e47e91c3d885013a
2015-10-08 10:44:32       INFO [10/08/15 10:44:32:66] Git tag '3.19.2': 3.19.2 with commit count source bbaf3195177a9432f3a9af5d1a38608b9389148d
2015-10-08 10:44:32       INFO [10/08/15 10:44:32:69] Git tag '3.19.1': 3.19.1 with commit count source 3f7742a0ff6343edbf846f958a845c48b56189c8
2015-10-08 10:44:32       INFO [10/08/15 10:44:32:73] Git tag '3.18.1': 3.18.1 with commit count source ee39a7a5e5140fc641171b20f840e4d2d7b28621
2015-10-08 10:44:32       INFO [10/08/15 10:44:32:77] Git tag '3.17.4': 3.17.4 with commit count source 88dee4ff1e4590497582fa62a0cdc4d430c9f24b
2015-10-08 10:44:32       INFO [10/08/15 10:44:32:81] Git tag '3.17.3': 3.17.3 with commit count source b1d0a9684b741829b8889cd5a4bde36b9c41120c
2015-10-08 10:44:32       INFO [10/08/15 10:44:32:85] Git tag '3.17.2': 3.17.2 with commit count source ba88171f0aae680442fe57594aed149d4e1c8a58
2015-10-08 10:44:32       INFO [10/08/15 10:44:32:89] Git tag '3.17.1': 3.17.1 with commit count source 9503c657ca7b2cad574ed978fcbb0ff3e5587027
2015-10-08 10:44:32       INFO [10/08/15 10:44:32:93] Git tag '3.16.7': 3.16.7 with commit count source 61b6b42c556bb105568c67c61254fad39e3acb91
2015-10-08 10:44:32       INFO [10/08/15 10:44:32:99] Git tag '3.16.6': 3.16.6 with commit count source b6e58f3becd541c72bbaa468639e03173ca86a53
2015-10-08 10:44:33       INFO [10/08/15 10:44:33:06] Git tag '3.16.5': 3.16.5 with commit count source a6cee853abb16f3335f7dc823b864b0b34ec3d3c
2015-10-08 10:44:33       INFO [10/08/15 10:44:33:12] Git tag '3.16.4': 3.16.4 with commit count source c15390870a54cc6fc295fe3142a18afc1a8ed99a
2015-10-08 10:44:33       INFO [10/08/15 10:44:33:18] Git tag '3.16.3': 3.16.3 with commit count source 5ef5e14d47af60b1dfd8856431ea3f42adafeda1
2015-10-08 10:44:33       INFO [10/08/15 10:44:33:24] Git tag '3.16.2': 3.16.2 with commit count source 80df74a861896dca9ba312509e3d35d0c368512a
2015-10-08 10:44:33       INFO [10/08/15 10:44:33:30] Git tag '3.16.1': 3.16.1 with commit count source 9d0f53cf93fd4494f20e95f91dc59b1e5346c115
2015-10-08 10:44:33       INFO [10/08/15 10:44:33:37] Git tag '3.15.9': 3.15.9 with commit count source 3a8df831f59c6d90ae833aaebf29c1b8b89533b7
2015-10-08 10:44:33       INFO [10/08/15 10:44:33:43] Git tag '3.15.8': 3.15.8 with commit count source dc14051488345f110cedd03aafcf40ae2bc386d7
2015-10-08 10:44:33       INFO [10/08/15 10:44:33:49] Git tag '3.15.7': 3.15.7 with commit count source 3bc21103b5e8012a7437478900e2c9088f5a914f
2015-10-08 10:44:33       INFO [10/08/15 10:44:33:56] Git tag '3.15.6': 3.15.6 with commit count source 5b9aa8afd16af9f1de48156477cc660fc8c45133
2015-10-08 10:44:33       INFO [10/08/15 10:44:33:62] Git tag '3.15.5': 3.15.5 with commit count source f44204bc800fe7a9dd2b5b86ffc5ecd40ad979cb
2015-10-08 10:44:33       INFO [10/08/15 10:44:33:68] Git tag '3.15.4': 3.15.4 with commit count source c09ea0051c345673ad500815c85662bc3157e6c5
2015-10-08 10:44:33       INFO [10/08/15 10:44:33:74] Git tag '3.15.3': 3.15.3 with commit count source e9592a280d3ead4c47787a9c54d4fadb6ced0d5f
2015-10-08 10:44:33       INFO [10/08/15 10:44:33:80] Git tag '3.15.2': 3.15.2 with commit count source c0508fcdc22b564a7ee2736666c3b82fdfa4e603
2015-10-08 10:44:33       INFO [10/08/15 10:44:33:87] Git tag '3.15.1': 3.15.1 with commit count source 528335936b5f1b3d115ed7d2dec05ed19b90373c
2015-10-08 10:44:33       INFO [10/08/15 10:44:33:93] Git tag '3.14.2': 3.14.2 with commit count source 46e099a577c9a12fe8093d9049fd52b69453b22b
2015-10-08 10:44:33       INFO [10/08/15 10:44:33:99] Git tag '3.14.1': 3.14.1 with commit count source fdfa67c8f2f008c36b19e06210596ebb27695086
2015-10-08 10:44:34       INFO [10/08/15 10:44:34:05] Git tag '3.13.2': 3.13.2 with commit count source f7845eca70e1db08c3c8592a23dba3cb600dbfb6
2015-10-08 10:44:34       INFO [10/08/15 10:44:34:12] Git tag '3.13.1': 3.13.1 with commit count source 8b9d89f465374c577fc2e5a8f75cef38d7f0443e
2015-10-08 10:44:34       INFO [10/08/15 10:44:34:19] Git tag '3.12.3': 3.12.3 with commit count source 04fe483a5908568049a33179982eca537f5df2b1
2015-10-08 10:44:34       INFO [10/08/15 10:44:34:25] Git tag '3.12.2': 3.12.2 with commit count source 7f65677bfc48e99a21427be2f1f6cb4a29883b04
2015-10-08 10:44:34       INFO [10/08/15 10:44:34:32] Git tag '3.12.1': 3.12.1 with commit count source 0427971ea9c2afb443dcc606652c9f0575275c75
2015-10-08 10:44:34       INFO [10/08/15 10:44:34:38] Git tag '3.11.1': 3.11.1 with commit count source 6b5332b1c24fd8943c4e6cb4e8d4e3a8bb4a1523
2015-10-08 10:44:34       INFO [10/08/15 10:44:34:45] Git tag '3.10.3': 3.10.3 with commit count source c576ce3514fbcbd04088c33ab5293a40569b8a0e
2015-10-08 10:44:34       INFO [10/08/15 10:44:34:52] Git tag '3.10.2': 3.10.2 with commit count source 9d38b1494e6095a0a87167655f04eda0309d88cc
2015-10-08 10:44:34       INFO [10/08/15 10:44:34:58] Git tag '3.10.1': 3.10.1 with commit count source 61a1f2ae211c66a555a17beb58c72e141e1716db
2015-10-08 10:44:34       INFO [10/08/15 10:44:34:65] Git tag '3.9.1': 3.9.1 with commit count source d6895e236a1e8727286bae57f0cd52e533a35cf4
2015-10-08 10:44:34       INFO [10/08/15 10:44:34:72] Git tag '3.8.2': 3.8.2 with commit count source caa1f3028c913c039e2a3be71f14eb36e191b1de
2015-10-08 10:44:34       INFO [10/08/15 10:44:34:78] Git tag '3.8.1': 3.8.1 with commit count source 3d53492dc98196c4f65b0ff689f2a12c252769d6
2015-10-08 10:44:34       INFO [10/08/15 10:44:34:85] Git tag '3.7.3': 3.7.3 with commit count source e7ac6c7c38a90cb187fa6d1f1499261fbf882fa8
2015-10-08 10:44:34       INFO [10/08/15 10:44:34:92] Git tag '3.7.2': 3.7.2 with commit count source 1394d86bef09271d93d817eb7a690752ac216c3d
2015-10-08 10:44:34       INFO [10/08/15 10:44:34:99] Git tag '3.7.1': 3.7.1 with commit count source 4ad856fadedfcbe61c75168daae4710cfc533083
2015-10-08 10:44:35       INFO [10/08/15 10:44:35:05] Git tag '3.6.1': 3.6.1 with commit count source 976abcd48c6ef8447435dbb5e2d3dd4609ee069f
2015-10-08 10:44:35       INFO [10/08/15 10:44:35:12] Git tag '3.5.2': 3.5.2 with commit count source 62ffa8b1c0bfe4fb92a8daa7e3cbe9f8d70998c4
2015-10-08 10:44:35       INFO [10/08/15 10:44:35:19] Git tag '3.5.1': 3.5.1 with commit count source e8d42d4b753479d797e82e3f0d719fac435f7294
2015-10-08 10:44:35       INFO [10/08/15 10:44:35:26] Git tag '3.4.1': 3.4.1 with commit count source 6505f5578a50ea67bbad0efe3630509a2c7ed113
2015-10-08 10:44:35       INFO [10/08/15 10:44:35:33] Git tag '3.3.1': 3.3.1 with commit count source 653b94b9bc97a5fce463ef70e7de723761cc3771
2015-10-08 10:44:35       INFO [10/08/15 10:44:35:39] Git tag '3.2.1': 3.2.1 with commit count source e8d2686ff494c93fbaca71347fc4e1a63c433b88
2015-10-08 10:44:35       INFO [10/08/15 10:44:35:46] Git tag '3.1.3': 3.1.3 with commit count source 14b47e15d3b511d1cc0e89513a0dc371f0d2fb8a
2015-10-08 10:44:35       INFO [10/08/15 10:44:35:53] Git tag '3.1.2': 3.1.2 with commit count source 8444e9d6c27bb35731809573a85d7be71c1dbe48
2015-10-08 10:44:35       INFO [10/08/15 10:44:35:60] Git tag '3.1.1': 3.1.1 with commit count source 5eb26e557e4803ca0c4e2ce530c96588399d82f2
2015-10-08 10:44:35       INFO [10/08/15 10:44:35:67] Git tag '2.18.7': 2.18.7 with commit count source a8388dd7d486775acbca7995a75ff03863658873
2015-10-08 10:44:35       INFO [10/08/15 10:44:35:74] Git tag '2.18.6': 2.18.6 with commit count source 8143f2048e9e7956268ec40808b191a08e8a4c2f
2015-10-08 10:44:35       INFO [10/08/15 10:44:35:81] Git tag '2.18.5': 2.18.5 with commit count source 06c780af5229eb0b83d97f5c230b69cc7c159cda
2015-10-08 10:44:35       INFO [10/08/15 10:44:35:89] Git tag '2.18.4': 2.18.4 with commit count source dec7db05b7f0f73b2dd6d5eca960f0117c2b28d7
2015-10-08 10:44:35       INFO [10/08/15 10:44:35:95] Git tag '2.18.3': 2.18.3 with commit count source 3f0c51d7860dbf28619a2f3d02ce272e75a43ff8
2015-10-08 10:44:36       INFO [10/08/15 10:44:36:03] Git tag '2.18.2': 2.18.2 with commit count source 093fc64009b742f82c70082038e4bca57515d5dd
2015-10-08 10:44:36       INFO [10/08/15 10:44:36:10] Git tag '2.18.1': 2.18.1 with commit count source ff3543fbc4ef786d4755087b89714b230d7cc3e9
2015-10-08 10:44:36       INFO [10/08/15 10:44:36:17] Git tag '2.17.8': 2.17.8 with commit count source c12afa2c0468405f4a2d546321a8c836f7407dbf
2015-10-08 10:44:36       INFO [10/08/15 10:44:36:24] Git tag '2.17.7': 2.17.7 with commit count source e5be836d9e04ac4398119fbee8cc0d156e5c81be
2015-10-08 10:44:36       INFO [10/08/15 10:44:36:31] Git tag '2.17.6': 2.17.6 with commit count source d2409bd3b6dd324614193980bfc6f5bb85a2fe89
2015-10-08 10:44:36       INFO [10/08/15 10:44:36:39] Git tag '2.17.5': 2.17.5 with commit count source 90088becae42e5e4bb1daa789d613e2f8c7b24c7
2015-10-08 10:44:36       INFO [10/08/15 10:44:36:46] Git tag '2.17.4': 2.17.4 with commit count source c0bd9b93f3a2c8f5d55ff167c5aa5b240db209ab
2015-10-08 10:44:36       INFO [10/08/15 10:44:36:53] Git tag '2.17.3': 2.17.3 with commit count source 667c3ee0c593e2a9de48b1590f89050152063f24
2015-10-08 10:44:36       INFO [10/08/15 10:44:36:61] Git tag '2.17.2': 2.17.2 with commit count source 662da50710115631f795ae34bc04cfb83a731510
2015-10-08 10:44:36       INFO [10/08/15 10:44:36:68] Git tag '2.17.1': 2.17.1 with commit count source e2de53b768f4a8997be54110cfee98396989409f
2015-10-08 10:44:36       INFO [10/08/15 10:44:36:75] Git tag '2.16.4': 2.16.4 with commit count source 9a573b8ce3c219f0c2318908dd2887df2fdc141c
2015-10-08 10:44:36       INFO [10/08/15 10:44:36:83] Git tag '2.16.3': 2.16.3 with commit count source aff9a0e5c5739e09f64e74a654c7caa8d553511b
2015-10-08 10:44:36       INFO [10/08/15 10:44:36:91] Git tag '2.16.2': 2.16.2 with commit count source e18735c7a3805da8571def237fc46399d49c857d
2015-10-08 10:44:36       INFO [10/08/15 10:44:36:99] Git tag '2.16.1': 2.16.1 with commit count source c322cc82374efaaeca75d5b41a417171c3172255
2015-10-08 10:44:37       INFO [10/08/15 10:44:37:06] Git tag '2.15.4': 2.15.4 with commit count source c5d9d2be3d86e01cb1f1d35cd80568cefa9c277e
2015-10-08 10:44:37       INFO [10/08/15 10:44:37:14] Git tag '2.15.3': 2.15.3 with commit count source e58d1e73f0911910b86f99bce321408c65912244
2015-10-08 10:44:37       INFO [10/08/15 10:44:37:21] Git tag '2.15.2': 2.15.2 with commit count source 3926f593cef44d397fa4af9b3318beaefe092c7e
2015-10-08 10:44:37       INFO [10/08/15 10:44:37:29] Git tag '2.15.1': 2.15.1 with commit count source da65bdf3e28827b2189e94f31f910370bb826f9c
2015-10-08 10:44:37       INFO [10/08/15 10:44:37:36] Git tag '2.14.16': 2.14.16 with commit count source 548e659f4f7ba50fcdce4a17d98a3d65135996b1
2015-10-08 10:44:37       INFO [10/08/15 10:44:37:44] Git tag '2.14.15': 2.14.15 with commit count source c944e34b9d248624e6a06236f1d1a9469c3aafc3
2015-10-08 10:44:37       INFO [10/08/15 10:44:37:51] Git tag '2.14.14': 2.14.14 with commit count source 87fe9cbfe7663441845dbb00a23ea44831904c7e
2015-10-08 10:44:37       INFO [10/08/15 10:44:37:58] Git tag '2.14.13': 2.14.13 with commit count source 011423375a214e7eea61714e1931f5ef9d22fdca
2015-10-08 10:44:37       INFO [10/08/15 10:44:37:66] Git tag '2.14.12': 2.14.12 with commit count source 0f9f7da96fab7498fc9f38a64e9ed843146ac275
2015-10-08 10:44:37       INFO [10/08/15 10:44:37:74] Git tag '2.14.11': 2.14.11 with commit count source 4fae14e00e18faf29fa54dc3e526dfef2fab2cae
2015-10-08 10:44:37       INFO [10/08/15 10:44:37:81] Git tag '2.14.10': 2.14.10 with commit count source fa9ab531e81a757e22fd5f3379be3e3ae45ab916
2015-10-08 10:44:37       INFO [10/08/15 10:44:37:89] Git tag '2.14.9': 2.14.9 with commit count source 9542a751ea929e076f76074ccefc4d88aca07667
2015-10-08 10:44:37       INFO [10/08/15 10:44:37:97] Git tag '2.14.8-hotfix1-tag': 2.14.8-hotfix1-tag with commit count source 91fc7605899433fb7a3f1dba2dc82fb782988899
2015-10-08 10:44:38       INFO [10/08/15 10:44:38:05] Git tag '2.14.8': 2.14.8 with commit count source 125387368bc8caa09973d0da9e147e2ad9245e0f
2015-10-08 10:44:38       INFO [10/08/15 10:44:38:14] Git tag '2.14.7': 2.14.7 with commit count source 539fb3eb725619ce61e8294a37a48174df57c8b5
2015-10-08 10:44:38       INFO [10/08/15 10:44:38:23] Git tag '2.14.6': 2.14.6 with commit count source 8ee2cbad7eb148ec2b575738dc094eb5265c9c5b
2015-10-08 10:44:38       INFO [10/08/15 10:44:38:32] Git tag '2.14.5': 2.14.5 with commit count source 07beaa862aa57fb8ffb5a6d76b3f723f5842cb04
2015-10-08 10:44:38       INFO [10/08/15 10:44:38:41] Git tag '2.14.4': 2.14.4 with commit count source d35e4ee1b29d1e253d7cb068713b7a3f53a7d6d3
2015-10-08 10:44:38       INFO [10/08/15 10:44:38:50] Git tag '2.14.3': 2.14.3 with commit count source d96338dcb0a607524d2059ca32082ca6423d922f
2015-10-08 10:44:38       INFO [10/08/15 10:44:38:58] Git tag '2.14.2': 2.14.2 with commit count source cda97c0dce4e1cc60d569d16accc9620c8ac1fef
2015-10-08 10:44:38       INFO [10/08/15 10:44:38:67] Git tag '2.14.1': 2.14.1 with commit count source 6f946ea2f44650e82eb2ec325520868eac4e5ecc
2015-10-08 10:44:38       INFO [10/08/15 10:44:38:76] Git tag '2.13.5': 2.13.5 with commit count source d6c9619646d44d0b5076911e9f6d642563d5b939
2015-10-08 10:44:38       INFO [10/08/15 10:44:38:85] Git tag '2.13.4': 2.13.4 with commit count source 783577c6b7af08938dba1fd5cd9130f5d3adf30b
2015-10-08 10:44:38       INFO [10/08/15 10:44:38:93] Git tag '2.13.3': 2.13.3 with commit count source c6638115bad14d2840f05f3f86adfbbde42f83de
2015-10-08 10:44:39       INFO [10/08/15 10:44:39:02] Git tag '2.13.2': 2.13.2 with commit count source a25fc5f92ae3ad630196060b40db48325c5f87e4
2015-10-08 10:44:39       INFO [10/08/15 10:44:39:12] Git tag '2.12.1': 2.12.1 with commit count source 5b04e53a415959ba2544fc3c646a2b6c515932d5
2015-10-08 10:44:39       INFO [10/08/15 10:44:39:22] Git tag '2.11.3': 2.11.3 with commit count source 49e46ac3b0361d9bbe8b34550d91ba3ed3827486
2015-10-08 10:44:39       INFO [10/08/15 10:44:39:31] Git tag '2.11.2': 2.11.2 with commit count source fbd3198ce4dac686a1b336fa702ca341ea8603d3
2015-10-08 10:44:39       INFO [10/08/15 10:44:39:41] Git tag '2.11.1': 2.11.1 with commit count source 22d05a48fd0b9bedc417f1b76ab66ff811a185f5
2015-10-08 10:44:39       INFO [10/08/15 10:44:39:51] Git tag '2.10.7': 2.10.7 with commit count source 9ae4e39b08d2b8b285f9a77b05169584e4c5ca7d
2015-10-08 10:44:39       INFO [10/08/15 10:44:39:60] Git tag '2.10.6': 2.10.6 with commit count source ab6665fafe4d71ee3d0dbc77f8d756029e30cdca
2015-10-08 10:44:39       INFO [10/08/15 10:44:39:70] Git tag '2.10.5': 2.10.5 with commit count source e3c427b4ca5fcda4402056a339012213c3b58c27
2015-10-08 10:44:39       INFO [10/08/15 10:44:39:79] Git tag '2.10.4': 2.10.4 with commit count source 30c7f193b9d72d7f7c4ea28d501a26898ee9636e
2015-10-08 10:44:39       INFO [10/08/15 10:44:39:88] Git tag '2.10.3': 2.10.3 with commit count source ecc5fee0ded3545e6349cad601da97c6672ca5db
2015-10-08 10:44:39       INFO [10/08/15 10:44:39:98] Git tag '2.10.2': 2.10.2 with commit count source f3a267151f1dde91780be7acac118097da0e12cb
2015-10-08 10:44:40       INFO [10/08/15 10:44:40:07] Git tag '2.10.1': 2.10.1 with commit count source e048aa7d0a8bbbbd9a83d6b07ccc26e7414c3d3b
2015-10-08 10:44:40       INFO [10/08/15 10:44:40:17] Git tag '2.9.13': 2.9.13 with commit count source 9a66c2302261f7590532701a1c0a0f30132b8933
2015-10-08 10:44:40       INFO [10/08/15 10:44:40:27] Git tag '2.9.12': 2.9.12 with commit count source c13b095123df307d6ddd57926b4944944f106f35
2015-10-08 10:44:40       INFO [10/08/15 10:44:40:37] Git tag '2.9.11': 2.9.11 with commit count source 19f82e95a4e37fabcf4fa508f84f507ffd1b6e99
2015-10-08 10:44:40       INFO [10/08/15 10:44:40:47] Git tag '2.9.10': 2.9.10 with commit count source 7df315677f2edbdd75f816ecd8e4b8ca91938c7f
2015-10-08 10:44:40       INFO [10/08/15 10:44:40:56] Git tag '2.9.9': 2.9.9 with commit count source 942e29f7996d87f0ed3936b5a0441b687ed9dee2
2015-10-08 10:44:40       INFO [10/08/15 10:44:40:66] Git tag '2.9.8': 2.9.8 with commit count source d587e1cdd926af1feb8085aac808da5d8baa140a
2015-10-08 10:44:40       INFO [10/08/15 10:44:40:76] Git tag '2.9.6': 2.9.6 with commit count source 42f76f622d3a2355f288cd4bdacccbc2ffa3b9ed
2015-10-08 10:44:40       INFO [10/08/15 10:44:40:86] Git tag '2.9.3': 2.9.3 with commit count source 25532c8b7b59f1942a7782d3416bbfa1c19ecfe1
2015-10-08 10:44:40       INFO [10/08/15 10:44:40:98] Git tag '2.9.2': 2.9.2 with commit count source e6f1e7f87ea60dd3da6a3d8b79bdbbd7512191bb
2015-10-08 10:44:41       INFO [10/08/15 10:44:41:11] Git tag '2.9.1': 2.9.1 with commit count source 8debcec99c9c92c3e64c9676c900567a056f9a0b
2015-10-08 10:44:41       INFO [10/08/15 10:44:41:22] Git tag '2.9.0': 2.9.0 with commit count source 365069f2a2a340aa7a0bc86588ebc4b7ffb72b51
2015-10-08 10:44:41       INFO [10/08/15 10:44:41:34] Git tag '2.8.2': 2.8.2 with commit count source ecfdb79330d26b834524c4e33dee27e7f9028dbd
2015-10-08 10:44:41       INFO [10/08/15 10:44:41:46] Git tag '2.8.1': 2.8.1 with commit count source 0ee06e77830073e9bbbeaca3423d019620499779
2015-10-08 10:44:41       INFO [10/08/15 10:44:41:58] Git tag '2.8.0': 2.8.0 with commit count source 6fb6baa08b1bb7e5dc3c4ffa68647d444effc952
2015-10-08 10:44:41       INFO [10/08/15 10:44:41:69] Git tag '2.7.37': 2.7.37 with commit count source 05a32d1a336be9dec2ead8e998c0a5f8f9429ccc
2015-10-08 10:44:41       INFO [10/08/15 10:44:41:81] Git tag '2.7.36': 2.7.36 with commit count source 900d0cede360083cb463e4de76f38073cc4714dc
2015-10-08 10:44:41       INFO [10/08/15 10:44:41:93] Git tag '2.7.35': 2.7.35 with commit count source 4db5e4920d2a3068fe55b0a504adc0aa5b6d9105
2015-10-08 10:44:42       INFO [10/08/15 10:44:42:04] Git tag '2.7.34': 2.7.34 with commit count source c5522f4bb804175a5afb8d3b539a031eb2586cf9
2015-10-08 10:44:42       INFO [10/08/15 10:44:42:15] Git tag '2.7.32': 2.7.32 with commit count source bdd4bf7866b4b12a6896c1b4da285fdffaad3c60
2015-10-08 10:44:42       INFO [10/08/15 10:44:42:27] Git tag '2.7.30': 2.7.30 with commit count source a158404023b0a76af0aafe16e63df107beb1058b
2015-10-08 10:44:42       INFO [10/08/15 10:44:42:39] Git tag '2.7.29': 2.7.29 with commit count source 713581df2f2b38609d29d3304d154ad2a21e640f
2015-10-08 10:44:42       INFO [10/08/15 10:44:42:50] Git tag '2.7.28': 2.7.28 with commit count source c9a135a2472bcefff48d577e38d73a3333e0d4e4
2015-10-08 10:44:42       INFO [10/08/15 10:44:42:62] Git tag '2.7.27': 2.7.27 with commit count source 10e75de9c6f5bf697a7751359f0f7acd8a753251
2015-10-08 10:44:42       INFO [10/08/15 10:44:42:74] Git tag '2.7.26': 2.7.26 with commit count source a6380b39035194e03f3b5c8cbd500d9fc11e07f6
2015-10-08 10:44:42       INFO [10/08/15 10:44:42:86] Git tag '2.7.25': 2.7.25 with commit count source 0698f8ce215bccb0346d8a91c1d60b29157264d5
2015-10-08 10:44:42       INFO [10/08/15 10:44:42:98] Git tag '2.7.24': 2.7.24 with commit count source dbf0e9698d32b2b90c4c023b6efdb2cae035ada4
2015-10-08 10:44:43       INFO [10/08/15 10:44:43:11] Git tag '2.7.22': 2.7.22 with commit count source cd94dacceb4945aeeacfa7dbf352176fd4b61b2d
2015-10-08 10:44:43       INFO [10/08/15 10:44:43:30] Git tag '2.7.21': 2.7.21 with commit count source bd014bb96cba5de1085c74b418714a0632b4a5f8
2015-10-08 10:44:43       INFO [10/08/15 10:44:43:44] Git tag '2.7.19': 2.7.19 with commit count source e9c78c57bbb9817be9a16b2183d81bbbd5801efb
2015-10-08 10:44:43       INFO [10/08/15 10:44:43:60] Git tag '2.7.18': 2.7.18 with commit count source 226374c6cbdc0a04330ae102f299e0361c72e10f
2015-10-08 10:44:43       INFO [10/08/15 10:44:43:73] Git tag '2.7.17': 2.7.17 with commit count source 924992485f986b8364482a2b46896d339f7e2f5d
2015-10-08 10:44:43       INFO [10/08/15 10:44:43:86] Git tag '2.7.16': 2.7.16 with commit count source c057d29a1ba70a072bf82d0c2d444684ee71f20d
2015-10-08 10:44:43       INFO [10/08/15 10:44:43:98] Git tag '2.7.15': 2.7.15 with commit count source a9001d075441ec3bbfec25f9fdaa3142f596b290
2015-10-08 10:44:44       INFO [10/08/15 10:44:44:11] Git tag '2.7.14': 2.7.14 with commit count source 42512f84abe02f11dd72597118fca728ccfebd66
2015-10-08 10:44:44       INFO [10/08/15 10:44:44:24] Git tag '2.7.13': 2.7.13 with commit count source 395cf199027cc4852065a5c1d6455895fc019a10
2015-10-08 10:44:44       INFO [10/08/15 10:44:44:37] Git tag '2.7.12': 2.7.12 with commit count source 755e36e806e42a8be06df1c0e9daffa6a4cfc5ed
2015-10-08 10:44:44       INFO [10/08/15 10:44:44:49] Git tag '2.7.11': 2.7.11 with commit count source a06b94a406c14c86175dc733cb1e5f4542a206f2
2015-10-08 10:44:44       INFO [10/08/15 10:44:44:63] Git tag '2.7.10': 2.7.10 with commit count source d804c8a4460e9972cab2df183ec066a101e1db5c
2015-10-08 10:44:44       INFO [10/08/15 10:44:44:76] Git tag '2.7.8': 2.7.8 with commit count source f93b808f906345c4e3169cfceed82bbc47063c8d
2015-10-08 10:44:44       INFO [10/08/15 10:44:44:91] Git tag '2.7.7': 2.7.7 with commit count source fb284466e7966f6a0d64e651b45b542d2b3cf8bf
2015-10-08 10:44:45       INFO [10/08/15 10:44:45:06] Git tag '2.7.6': 2.7.6 with commit count source a086b5e770ed74acc5a3030c8bc8f5c20eb213a9
2015-10-08 10:44:45       INFO [10/08/15 10:44:45:19] Git tag '2.7.5': 2.7.5 with commit count source b558f7dd897f662432df538c2ad76e14316247ee
2015-10-08 10:44:45       INFO [10/08/15 10:44:45:33] Git tag '2.7.4': 2.7.4 with commit count source edc8f165e4fbdbd3730214ebfd64b297e5a6e9fd
2015-10-08 10:44:45       INFO [10/08/15 10:44:45:47] Git tag '2.7.3': 2.7.3 with commit count source 9a367e21d108d1e3ee369a35dbf5f2ff94c52062
2015-10-08 10:44:45       INFO [10/08/15 10:44:45:62] Git tag '2.7.2': 2.7.2 with commit count source da9b5e9639db45dd14a8dbdeac12535599b153f5
2015-10-08 10:44:45       INFO [10/08/15 10:44:45:76] Git tag '2.6.9': 2.6.9 with commit count source 6456da60fcafbc35adda3285761c3d83841795d0
2015-10-08 10:44:45       INFO [10/08/15 10:44:45:93] Git tag '2.6.8': 2.6.8 with commit count source 8cabf6cf4a6f0ad540db3c7229122f860d21cbbf
2015-10-08 10:44:46       INFO [10/08/15 10:44:46:09] Git tag '2.6.7': 2.6.7 with commit count source 7856f1ae7dd7939f397f61b417e557d69b5c2c2d
2015-10-08 10:44:46       INFO [10/08/15 10:44:46:25] Git tag '2.6.6': 2.6.6 with commit count source d08ad4aa703a17dda17291631be746db8d61fe6f
2015-10-08 10:44:46       INFO [10/08/15 10:44:46:41] Git tag '2.6.5': 2.6.5 with commit count source 308612f8796014b6c04a4c5fbc67e8beb5dfb0a3
2015-10-08 10:44:46       INFO [10/08/15 10:44:46:60] Git tag '2.6.4': 2.6.4 with commit count source b02458eacc601d627b12285afdbfad8c27df5ce8
2015-10-08 10:44:47       INFO [10/08/15 10:44:47:37] Merge message 'Merge branch '2.14.8-hotfix1' into development': 2.14.8 with commit count source 29feeb64041c2c58facf150500083281d29e84c9
2015-10-08 10:44:47       INFO [10/08/15 10:44:47:57] Found multiple base versions which will produce the same SemVer (4.9.0), taking oldest source for commit counting (Git tag '4.8.2')
2015-10-08 10:44:47       INFO [10/08/15 10:44:47:57] Base version used: Git tag '4.8.1': 4.8.1 with commit count source 321309235614cf40dcd345b237982335924102eb
2015-10-08 10:44:47     INFO [10/08/15 10:44:47:58] End: Calculating base versions (Took: 21,303.43ms)
2015-10-08 10:44:47     INFO [10/08/15 10:44:47:74] Using branch name to calculate version tag
2015-10-08 10:44:47     INFO [10/08/15 10:44:47:93] 6 commits found between 321309235614cf40dcd345b237982335924102eb and a1eb1940f6d3171cc1f6779b2ca624e167d89178

@asbjornu
Copy link
Member Author

asbjornu commented Oct 8, 2015

Without a major rewrite of TaggedCommitVersionStrategy.GetVersions(), I'm unable to locate the exact place all the time is being consumed. The biggest hurdle now is the late execution of everything due to the use of IEnumerable. It makes profiling hard, because things doesn't happen in the order they appear.

I could rewrite everything to use regular foreach and IList, but that would take more time than I have available at the moment, so if @JakeGinnivan or someone else with more knowledge could figure out how to optimize this thing, I'd be happy to do it. I just need help figuring out how and what. 😃

@asbjornu
Added null guards in BranchConfigurationCalculatorBranchConfigurati…
7842a40 
…onCalculato.LookupBranchConfiguration()`.
@asbjornu
Throw exception if the current branch can't be found, instead of pass…
ddd4e81 
…ing on `null`, causing `ArgumentNullException` or worse; `NullReferenceException`.
@asbjornu
Rewrite the InheritBranchConfiguration() logic so it also works in …
3f98794 
…the crazy scenario when `master` hasn't been checked out locally (i.e. only exists in `origin`).
@JakeGinnivan
Copy link
Contributor

It appears each tag is adding ~100ms to the version calculation. Let me have a look into the code to see what can be improved.

@JakeGinnivan
Copy link
Contributor

I think it actually may be the logger..

// In Logger.cs
// introduce this at the top of the class
static readonly Regex ObscurePasswordRegex = new Regex("(https?://)(.+)(:.+@)", RegexOptions.Compiled);

// Replace ObscurePassword method with
static Action<string> ObscurePassword(Action<string> info)
{
    Action<string> logAction = s =>
    {
        s = ObscurePasswordRegex.Replace(s, "$1$2:*******@");
        info(s);
    };
    return logAction;
}

Give that a go. I think creating the regex and doing the replace on each log message may actually be the bottleneck..

@asbjornu
Move the obscure password regex in the Logger to a static field and m…
240a0e0 
…ake the regex compiled to hopefully shave off a few ms during logging.
@asbjornu
Copy link
Member Author

asbjornu commented Oct 9, 2015

@JakeGinnivan Thanks for the tip, but that didn't help. It might have shaved off a few ms, but "Calculating base versions" still takes ~20 seconds. Even just returning info from ObscurePassword (i.e. not doing anything), doesn't help much.

I ran the application through dotTrace, which actually blames this on LibGit2Sharp, specifically the LibGit2Sharp.Core.Proxy.git_revwalk_next method:

trace

Perhaps @nulltoken has some insight and ideas on if, and if so, how the performance of this method can be improved?

@JakeGinnivan
Copy link
Contributor

How many times are we calling it. What I don't understand is why there is 100ms between each log message. I thought we .ToList() on the list so all the processing through git should be done already and it should just log them all out.

@asbjornu
Copy link
Member Author

asbjornu commented Oct 9, 2015

@JakeGinnivan For each call to FindCommitMessageIncrement, we are calling git_revwalk_next more than 1.000 times for this particular repository. I expect the result from git_revwalk_next to be rather static, so shouldn't it be possible to just cache the result from one run and then do the processing on the in-memory cache instead?

trace

Another question is whether doing git_revwalk_next on each tag is actually necessary. Couldn't we instead build a revision graph with managed objects (in C#) to avoid the interop and I/O altogether?

@orjan
Copy link
Contributor

orjan commented Oct 9, 2015

I'm also having some performance issues similar to the one above:
image

The 173 calls to base version is what puzzles me the most.
This is from my local machine and the the build server it took 4m:19s for for finding the correct version. @JakeGinnivan what kind of checkout should I do on my local machine to make it as similar as the TeamCity build agent checkout, so I don't end up profiling something other on my local machine?

@gep13
Copy link
Member

gep13 commented Oct 9, 2015

@orjan the git commands that TeamCity uses to perform the checkout are in the build log, so you should be able to recreate the exact same git repo as on the build server locally on your machine.

@orjan
Copy link
Contributor

orjan commented Oct 9, 2015

Thanks! Vill give a go

/Örjan

On 09 Oct 2015, at 15:06, Gary Ewan Park [email protected] wrote:

@orjan the git commands that TeamCity uses to perform the checkout are in the build log, so you should be able to recreate the exact same git repo as on the build server locally on your machine.

—
Reply to this email directly or view it on GitHub.

@JakeGinnivan
Copy link
Contributor

Ahh, it's the commit message increment strategy..

To verify, in your config set commit-message-incrementing: Disabled. Can't see a simple fix, will need to be rethought

@asbjornu
Copy link
Member Author

asbjornu commented Oct 9, 2015

@JakeGinnivan Yes, commit-message-incrementing: Disabled brought the time total down to ~2 seconds.

@orjan orjan mentioned this pull request Oct 10, 2015
Merged
JakeGinnivan added a commit that referenced this pull request Oct 11, 2015
@JakeGinnivan
Merge pull request #677 from okb/feature/nullref-in-branched-from
c5c2094 
FindCommitBranchWasBranchedFrom should not throw NullReferenceException
@JakeGinnivan JakeGinnivan merged commit c5c2094 into GitTools:master Oct 11, 2015
@asbjornu asbjornu deleted the feature/nullref-in-branched-from branch October 12, 2015 07:37
@JakeGinnivan JakeGinnivan mentioned this pull request Oct 17, 2015
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@asbjornu @JakeGinnivan @orjan @gep13