Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
56 commits
Select commit Hold shift + click to select a range
f5c22ec
Project started.
ASGusev Mar 8, 2017
45ad67a
Repo creation, username change and committing implemented.
ASGusev Mar 10, 2017
1d44592
Repo creation, username change and committing implemented.
ASGusev Mar 10, 2017
950523d
Merge branch 'vcs' of https://github.com/ASGusev/java_hw_2c into vcs
ASGusev Mar 10, 2017
dbb9a22
Merge branch 'vcs' of https://github.com/ASGusev/java_hw_2c into vcs
ASGusev Mar 10, 2017
8e410e3
Merge branch 'vcs' of https://github.com/ASGusev/java_hw_2c into vcs
ASGusev Mar 10, 2017
55494f9
Commit ceration implemented.
ASGusev Mar 18, 2017
271ebff
Tests fixed
ASGusev Mar 18, 2017
ea1545d
Branch creation and deletion implemented.
ASGusev Mar 18, 2017
5fcc275
Log implemented
ASGusev Mar 18, 2017
b703549
Checkout implemented
ASGusev Mar 18, 2017
65226c3
Merge implemented
ASGusev Mar 22, 2017
ac298fe
Docs, tests
ASGusev Mar 23, 2017
ee98579
Branch test
ASGusev Mar 23, 2017
bd541e8
Some commands moved to new architecture.
ASGusev Mar 26, 2017
638da47
Everythibg switched to new architecture
ASGusev Mar 29, 2017
64993a8
Tests updated
ASGusev Mar 30, 2017
d57072d
Checkout test added
ASGusev Mar 30, 2017
7c7a472
Javadocs
ASGusev Mar 30, 2017
1cb77ef
Tests fixed
ASGusev Mar 31, 2017
fafa7ff
Merge tests added
ASGusev Mar 31, 2017
b54f4cd
Merge tests completed.
ASGusev Mar 31, 2017
67a0282
Many minor changes
ASGusev Apr 1, 2017
080f803
File removal implemented
ASGusev Apr 1, 2017
30b41e3
reset command implemented
ASGusev Apr 1, 2017
304de41
clean command implemented
ASGusev Apr 1, 2017
a4cbf1d
status command implemented
ASGusev Apr 1, 2017
03e0edd
Log fixed
ASGusev Apr 7, 2017
398b7fc
Minor improvements
ASGusev Apr 7, 2017
c04967c
StagingZone testing improved
ASGusev Apr 8, 2017
1e94d72
Working dir tests
ASGusev Apr 8, 2017
71957ad
Working dir tests
ASGusev Apr 8, 2017
4f1b128
WorkingDirectory fix
ASGusev Apr 8, 2017
7027829
HashedDirectory tests
ASGusev Apr 8, 2017
ab41d29
Commits with no changes forbidden
ASGusev Apr 8, 2017
6d87956
Storage for keeping a file one for all commits.
ASGusev Apr 12, 2017
20238b9
Commits now share common files
ASGusev Apr 12, 2017
1e91ca7
fixes
ASGusev Apr 12, 2017
f1be199
More tests
ASGusev Apr 12, 2017
7a579b7
help
ASGusev Apr 12, 2017
292eafa
test
ASGusev Apr 12, 2017
0349814
tests
ASGusev Apr 12, 2017
642ea97
Tests fix
ASGusev Apr 12, 2017
6bd303b
Main improved
ASGusev Apr 13, 2017
49da4c1
Error messages updated
ASGusev Apr 15, 2017
367f0d1
error messages
ASGusev Apr 15, 2017
e282093
Clean and checkout fixed
ASGusev May 10, 2017
5eb6c08
Branch list command added
ASGusev May 10, 2017
81b627f
Commit checkout fixed
ASGusev May 20, 2017
8a6ef82
Commit test improved
ASGusev May 22, 2017
d1b6d84
Branch tests improved
ASGusev May 22, 2017
b8cc513
Tests improved
ASGusev May 22, 2017
12e541a
Commit creating update
ASGusev May 25, 2017
a28c998
Unit tests for Commit and Branch
ASGusev May 26, 2017
406222d
Javadoccs updated
ASGusev May 26, 2017
38d8112
Branch command fix
ASGusev May 26, 2017
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
language: java
jdk:
- oraclejdk8
25 changes: 25 additions & 0 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
group 'ru.spbau.gusev.vcs'

apply plugin: 'java'

repositories {
mavenCentral()
}

dependencies {
testCompile group: 'junit', name: 'junit', version: '4.11'
testCompile group: 'org.mockito', name: 'mockito-core', version: '2.7.21'
compile group: 'com.google.code.findbugs', name: 'jsr305', version: '3.0.1'
}

jar {
manifest {
attributes(
'Main-Class': 'Main'
)
}
}

test {
forkEvery = 1
}
Binary file added gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
6 changes: 6 additions & 0 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
#Wed Mar 08 19:08:08 MSK 2017
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-3.1-bin.zip
169 changes: 169 additions & 0 deletions gradlew

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

84 changes: 84 additions & 0 deletions gradlew.bat

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions settings.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
rootProject.name = 'VCS'

Loading