Skip to content

Commit ab2dc14

Browse files
j4ykj4yk
committed
Merge branch 'release/0.9.0' into master
2 parents b37f114 + b65ca72 commit ab2dc14

File tree

1,463 files changed

+6244
-3190
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,463 files changed

+6244
-3190
lines changed

‎src/FileSystem-Git.package/FileSystemGitRepository.class/instance/commitNamed..st‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
accessing
22
commitNamed: hexHash
33
| git |
4-
git := GitCurrentUnitOfWork for: repository.
4+
git := repository unitOfWork.
55
^ self filesystemOn: (git objectNamed: hexHash)

‎src/FileSystem-Git.package/FileSystemGitRepository.class/instance/head.st‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
accessing
22
head
3-
^ self filesystemOn: (self unitOfWork headIfAbsent: [ nil ])
3+
^ self filesystemOn: (repository withUnitOfWork: [repository unitOfWork headIfAbsent: [ nil ]])

‎src/FileSystem-Git.package/FileSystemGitRepository.class/instance/recursivelyCollectCommits.into..st‎

Lines changed: 0 additions & 6 deletions
This file was deleted.

‎src/FileSystem-Git.package/FileSystemGitRepository.class/methodProperties.json‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,23 +7,22 @@
77
"branchNames" : "jr 3/3/2020 21:45",
88
"branches" : "jr 3/4/2020 00:46",
99
"cloneFrom:" : "jr 8/8/2020 01:17",
10-
"commitNamed:" : "jr 8/8/2020 16:27",
10+
"commitNamed:" : "jr 8/13/2020 23:08",
1111
"createBranchNamed:at:" : "jr 3/4/2020 00:47",
1212
"expandRemoteRef:" : "pre 6/15/2018 16:04",
1313
"fetchFrom:" : "jr 9/6/2020 21:11",
1414
"fetchFromAll:" : "jr 4/12/2017 11:26",
1515
"filesystemOn:" : "CamilloBruni 8/30/2012 14:06",
1616
"flushCaches" : "jr 7/2/2017 19:12",
1717
"gitStoreOn:" : "CamilloBruni 9/2/2012 12:33",
18-
"head" : "jr 2/29/2020 20:50",
18+
"head" : "jr 8/13/2020 23:10",
1919
"headReference" : "jr 3/4/2020 00:47",
2020
"initializeOn:" : "MaxLeske 7/23/2010 09:59",
2121
"orphanedHead" : "jr 1/29/2017 22:52",
2222
"push:toRemote:" : "jr 1/2/2017 10:20",
2323
"pushToRemote:deleteRemoteBranches:" : "jr 1/2/2017 10:18",
2424
"pushToRemote:update:deleteRemoteBranches:" : "jr 7/23/2020 00:43",
2525
"pushToUpstreamBranchOf:ifNone:" : "jr 3/4/2020 00:49",
26-
"recursivelyCollectCommits:into:" : "MaxLeske 8/25/2011 19:16",
2726
"recursivelyCollectCommits:into:limit:" : "jr 3/2/2017 10:39",
2827
"remoteNames" : "jr 7/22/2020 22:02",
2928
"remoteUrl:" : "jr 3/4/2020 00:46",

‎src/FileSystem-Git.package/FileSystemGitRepositoryRemoteTests.class/instance/setUp.st‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,12 @@ running
22
setUp
33
| commit1 commit2 blob1 blob2 tree1 tree2 stamp |
44
super setUp.
5-
stamp := GitStamp new
6-
name: 'Homer Simpson';
7-
email: 'homer@nuke.com';
8-
yourself.
5+
stamp := GitStamp nowBy: 'Homer Simpson'
6+
email: 'homer@nuke.com'.
97
reference := (FileSystem memory / 'test.git').
108
basicRepository := GitRepository on: reference.
119

10+
basicRepository withUnitOfWork: [
1211
blob1 := (GitBlob bytes: 'testBlob' in: basicRepository) store; yourself.
1312
blob2 := (GitBlob bytes: 'second test Blob' in: basicRepository) store; yourself.
1413
tree1 := GitTree
@@ -45,10 +44,11 @@ setUp
4544
parents: { commit1 hexHash };
4645
store;
4746
yourself.
48-
49-
basicRepository
50-
updateRef: basicRepository headsDir / 'branch1' to: commit1 hexHash;
51-
updateRef: basicRepository headsDir / 'master' to: commit2 hexHash.
47+
48+
basicRepository unitOfWork
49+
updateRef: 'refs/heads/branch1' to: commit1 hexHash;
50+
updateRef: 'refs/heads/master' to: commit2 hexHash.
5251
GitFSCK validate: basicRepository.
52+
].
5353

5454
repository := FileSystemGitRepository on: reference.

‎src/FileSystem-Git.package/FileSystemGitRepositoryRemoteTests.class/instance/tearDown.st‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
running
22
tearDown
3-
GitFSCK validate: basicRepository.
3+
basicRepository withUnitOfWork: [GitFSCK validate: basicRepository].
44
super tearDown.

‎src/FileSystem-Git.package/FileSystemGitRepositoryRemoteTests.class/instance/testClone.st‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,11 @@ tests
22
testClone
33
| repo master |
44
repo := FileSystemGitRepository on: FileSystem memory root.
5-
repo cloneFrom: self remoteUrl.
5+
repo withUnitOfWork: [repo cloneFrom: self remoteUrl].
6+
repo withUnitOfWork: [
67
self assert: (repo branches includesKey: 'master')
78
description: 'should have obtained master, got: ', (repo branches keys joinSeparatedBy: ' ').
89
master := repo branches at: 'master'.
910
self assert: (master / 'README.md') exists.
10-
self shouldnt: [repo validate] raise: Error.
11+
self shouldnt: [repo validate] raise: Error.
12+
].

‎src/FileSystem-Git.package/FileSystemGitRepositoryRemoteTests.class/instance/testPush.st‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,10 @@ testPush
33
<timeout: 20>
44
"when"
55
| remoteRefs |
6+
self withUnitOfWork: [
67
repository addRemote: 'test' url: self remoteUrl.
78
repository push: { 'branch1' } toRemote: 'test'.
9+
].
810
"then"
911
remoteRefs := (GitAbstractProtocol url: self remoteUrl) refs.
1012
self assert: (remoteRefs includesKey: 'refs/heads/branch1').

‎src/FileSystem-Git.package/FileSystemGitRepositoryRemoteTests.class/instance/testPushCreateUpdateDelete.st‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ testPushCreateUpdateDelete
33
<timeout: 20>
44
| remoteRefs master |
55
"given"
6+
self withUnitOfWork: [
67
repository addRemote: 'test' url: self remoteUrl.
78
"when"
89
repository push: { 'branch1' -> 'test/branch1'. 'master' -> 'test/branch2' } toRemote: 'test'.
@@ -19,4 +20,5 @@ testPushCreateUpdateDelete
1920
self assert: (repository branchNamed: 'oldmaster') revision hexHash
2021
equals: (remoteRefs at: 'refs/heads/test/oldmaster').
2122
"finally"
22-
repository pushToRemote: 'test' deleteRemoteBranches: { 'test/branch2'. 'test/oldmaster' }.
23+
repository pushToRemote: 'test' deleteRemoteBranches: { 'test/branch2'. 'test/oldmaster' }.
24+
].

‎src/FileSystem-Git.package/FileSystemGitRepositoryRemoteTests.class/instance/withUnitOfWork..st‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
tests
2+
withUnitOfWork: aBlock
3+
^ repository withUnitOfWork: aBlock

0 commit comments

Comments
 (0)