From 194dcbe2740b9069b4f8ca65b1da60d90d4c972a Mon Sep 17 00:00:00 2001 From: maxkvant Date: Thu, 23 Mar 2017 06:01:09 +0300 Subject: [PATCH 01/21] initial commit --- myVCS/build.gradle | 15 + myVCS/gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 52928 bytes .../gradle/wrapper/gradle-wrapper.properties | 6 + myVCS/gradlew | 169 +++++++++++ myVCS/gradlew.bat | 84 ++++++ myVCS/settings.gradle | 2 + .../java/com/maxim/vcs_impl/FileUtil.java | 63 +++++ .../src/main/java/com/maxim/vcs_impl/Vcs.java | 21 ++ .../main/java/com/maxim/vcs_impl/VcsImpl.java | 264 ++++++++++++++++++ .../java/com/maxim/vcs_objects/VcsBlob.java | 13 + .../com/maxim/vcs_objects/VcsBlobLink.java | 22 ++ .../java/com/maxim/vcs_objects/VcsBranch.java | 17 ++ .../java/com/maxim/vcs_objects/VcsCommit.java | 41 +++ .../java/com/maxim/vcs_objects/VcsObject.java | 18 ++ .../java/com/maxim/vcs_impl/VcsImplTest.java | 47 ++++ 15 files changed, 782 insertions(+) create mode 100644 myVCS/build.gradle create mode 100644 myVCS/gradle/wrapper/gradle-wrapper.jar create mode 100644 myVCS/gradle/wrapper/gradle-wrapper.properties create mode 100755 myVCS/gradlew create mode 100644 myVCS/gradlew.bat create mode 100644 myVCS/settings.gradle create mode 100644 myVCS/src/main/java/com/maxim/vcs_impl/FileUtil.java create mode 100644 myVCS/src/main/java/com/maxim/vcs_impl/Vcs.java create mode 100644 myVCS/src/main/java/com/maxim/vcs_impl/VcsImpl.java create mode 100644 myVCS/src/main/java/com/maxim/vcs_objects/VcsBlob.java create mode 100644 myVCS/src/main/java/com/maxim/vcs_objects/VcsBlobLink.java create mode 100644 myVCS/src/main/java/com/maxim/vcs_objects/VcsBranch.java create mode 100644 myVCS/src/main/java/com/maxim/vcs_objects/VcsCommit.java create mode 100644 myVCS/src/main/java/com/maxim/vcs_objects/VcsObject.java create mode 100644 myVCS/src/test/java/com/maxim/vcs_impl/VcsImplTest.java diff --git a/myVCS/build.gradle b/myVCS/build.gradle new file mode 100644 index 0000000..093af3e --- /dev/null +++ b/myVCS/build.gradle @@ -0,0 +1,15 @@ +version '1.0-SNAPSHOT' + +apply plugin: 'java' + +sourceCompatibility = 1.8 + +repositories { + mavenCentral() +} + +dependencies { + testCompile group: 'junit', name: 'junit', version: '4.11' + compile group: 'com.google.guava', name: 'guava', version: '19.0' + compile group: 'commons-codec', name: 'commons-codec', version: '1.5' +} diff --git a/myVCS/gradle/wrapper/gradle-wrapper.jar b/myVCS/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..6ffa237849ef3607e39c3b334a92a65367962071 GIT binary patch literal 52928 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 \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS="" + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn ( ) { + echo "$*" +} + +die ( ) { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; + NONSTOP* ) + nonstop=true + ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin, switch paths to Windows format before running java +if $cygwin ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + JAVACMD=`cygpath --unix "$JAVACMD"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=$((i+1)) + done + case $i in + (0) set -- ;; + (1) set -- "$args0" ;; + (2) set -- "$args0" "$args1" ;; + (3) set -- "$args0" "$args1" "$args2" ;; + (4) set -- "$args0" "$args1" "$args2" "$args3" ;; + (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules +function splitJvmOpts() { + JVM_OPTS=("$@") +} +eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS +JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME" + +# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong +if [[ "$(uname)" == "Darwin" ]] && [[ "$HOME" == "$PWD" ]]; then + cd "$(dirname "$0")" +fi + +exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@" diff --git a/myVCS/gradlew.bat b/myVCS/gradlew.bat new file mode 100644 index 0000000..f955316 --- /dev/null +++ b/myVCS/gradlew.bat @@ -0,0 +1,84 @@ +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS= + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto init + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto init + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:init +@rem Get command-line arguments, handling Windows variants + +if not "%OS%" == "Windows_NT" goto win9xME_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/myVCS/settings.gradle b/myVCS/settings.gradle new file mode 100644 index 0000000..6a1d802 --- /dev/null +++ b/myVCS/settings.gradle @@ -0,0 +1,2 @@ +rootProject.name = 'myVCS' + diff --git a/myVCS/src/main/java/com/maxim/vcs_impl/FileUtil.java b/myVCS/src/main/java/com/maxim/vcs_impl/FileUtil.java new file mode 100644 index 0000000..66fb54d --- /dev/null +++ b/myVCS/src/main/java/com/maxim/vcs_impl/FileUtil.java @@ -0,0 +1,63 @@ +package com.maxim.vcs_impl; + +import com.maxim.vcs_objects.*; + +import java.io.*; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.Paths; + +public class FileUtil { + private static final String vcs_dir = ".vcs"; + private static final String blobs_dir = "blobs"; + private static final String commits_dir = "commits"; + private static final String branches_dir = "branches"; + private static final String index_file = "index"; + + public static final Path vcs_dir_path = Paths.get(".", vcs_dir); + public static final Path blobs_dir_path = Paths.get(".", vcs_dir, blobs_dir); + public static final Path commits_dir_path = Paths.get(".", vcs_dir, commits_dir); + public static final Path branches_dir_path = Paths.get(".", vcs_dir, branches_dir); + public static final Path index_file_path = Paths.get(".", vcs_dir, index_file); + + public static VcsBlobLink addBlob(Path path) { + try { + VcsBlob blob = new VcsBlob(Files.readAllBytes(path)); + Path blob_path = Paths.get(blobs_dir_path + "", blob.md5_hash); + if (!Files.exists(blob_path)) { + Files.createFile(blob_path); + Files.write(blob_path, blob.bytes); + } + return new VcsBlobLink(blob.md5_hash); + } catch (IOException e) { + e.printStackTrace(); + throw new RuntimeException(e); + } + } + + public static void writeObject(Object object, Path path) throws IOException { + try (ByteArrayOutputStream bos = new ByteArrayOutputStream()) { + ObjectOutput out = new ObjectOutputStream(bos); + out.writeObject(object); + if (!Files.exists(path)) { + Files.createFile(path); + } else { + Files.delete(path); + Files.createFile(path); + } + Files.write(path, bos.toByteArray()); + } catch (IOException e) { + e.printStackTrace(); + } + } + + public static Object readObject(Path path) throws IOException { + try (FileInputStream fin = new FileInputStream(path.toString())) { + ObjectInput ois = new ObjectInputStream(fin); + return ois.readObject(); + } catch (ClassNotFoundException e) { + e.printStackTrace(); + } + return null; + } +} diff --git a/myVCS/src/main/java/com/maxim/vcs_impl/Vcs.java b/myVCS/src/main/java/com/maxim/vcs_impl/Vcs.java new file mode 100644 index 0000000..c05426e --- /dev/null +++ b/myVCS/src/main/java/com/maxim/vcs_impl/Vcs.java @@ -0,0 +1,21 @@ +package com.maxim.vcs_impl; + +import com.maxim.vcs_objects.VcsCommit; + +import java.io.IOException; +import java.nio.file.Path; +import java.util.List; + +public interface Vcs { + VcsCommit commit(String message) throws IOException; + void checkoutCommit(long commit_id) throws IOException; + void checkoutBranch(String branch_name) throws IOException; + void add(Path path) throws IOException; + + void deleteBranch(String branch_name) throws IOException; + + List logCommits() throws IOException; + List logBranches() throws IOException; + void merge(String other_branch) throws IOException; + void createBranch(String other_branch_name) throws IOException; +} \ No newline at end of file diff --git a/myVCS/src/main/java/com/maxim/vcs_impl/VcsImpl.java b/myVCS/src/main/java/com/maxim/vcs_impl/VcsImpl.java new file mode 100644 index 0000000..1ee99cd --- /dev/null +++ b/myVCS/src/main/java/com/maxim/vcs_impl/VcsImpl.java @@ -0,0 +1,264 @@ +package com.maxim.vcs_impl; + +import com.google.common.collect.ImmutableList; +import com.google.common.collect.MapDifference; +import com.google.common.collect.Maps; +import com.maxim.vcs_objects.VcsBlobLink; +import com.maxim.vcs_objects.VcsBranch; +import com.maxim.vcs_objects.VcsCommit; + +import java.io.IOException; +import java.io.Serializable; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.Paths; +import java.util.*; +import java.util.stream.Collectors; + +import static com.maxim.vcs_impl.FileUtil.*; +import static java.nio.file.StandardCopyOption.REPLACE_EXISTING; + +public class VcsImpl implements Vcs { + private Index index = new Index(); + + VcsImpl() throws IOException { + Files.createDirectories(commits_dir_path); + Files.createDirectories(blobs_dir_path); + Files.createDirectories(branches_dir_path); + + writeCommit(VcsCommit.nullCommit); + + if (!Files.exists(index_file_path)) { + writeObject(index, index_file_path); + } + } + + @Override + public VcsCommit commit(String message) throws IOException { + readIndex(); + + if (index.branch == null) { + throw new IOException("Please, checkout branch or create branch"); + } + + VcsCommit commit = readCommit(index.commit_id); + Map oldFiles = commit.files; + List parents_ids = Collections.singletonList(commit.id); + + Map currentFiles = new TreeMap<>(loadAdded()); + oldFiles.forEach(currentFiles::putIfAbsent); + + VcsCommit new_commit = new VcsCommit(message, parents_ids, currentFiles); + writeCommit(new_commit); + + index.branch = index.branch.changeCommit(new_commit.id); + writeBranch(index.branch); + + index.commit_id = index.branch.commit_id; + index.added = new TreeSet<>(); + + writeIndex(); + return commit; + } + + @Override + public void checkoutCommit(long commit_id) throws IOException { + readIndex(); + + VcsCommit curCommit = readCommit(commit_id); + for (String file_path : curCommit.files.keySet()) { + try { + Files.delete(Paths.get(file_path)); + } catch (IOException e) { + e.printStackTrace(); + } + } + + VcsCommit commit = readCommit(commit_id); + for (Map.Entry entry : commit.files.entrySet()) { + Path path = Paths.get(entry.getKey()); + Files.createDirectories(path.getParent()); + if (!Files.exists(path)) { + Files.createFile(path); + } + String blob_name = entry.getValue().md5_hash; + Path blob_path = Paths.get(blobs_dir_path.toString(), blob_name); + Files.copy(blob_path, path, REPLACE_EXISTING); + } + index.branch = null; + index.added = new TreeSet<>(); + index.commit_id = commit_id; + + writeIndex(); + } + + @Override + public void checkoutBranch(String branch_name) throws IOException { + readIndex(); + + VcsBranch branch = readBranch(branch_name); + checkoutCommit(branch.commit_id); + index.branch = branch; + + writeIndex(); + } + + @Override + public void add(Path path) throws IOException { + readIndex(); + index.added.add(path.toString()); + writeIndex(); + } + + @Override + public void merge(String other_branch_name) throws IOException { + //TODO fix repeating code form commit(...) + + readIndex(); + + if (index.branch == null) { + throw new IOException("Please, checkout branch or create branch"); + } + + if (index.branch.name.equals(other_branch_name)) { + return; + } + + VcsCommit cur_commit = readCommit(index.commit_id); + VcsBranch other_branch = readBranch(other_branch_name); + VcsCommit other_commit = readCommit(other_branch.commit_id); + + MapDifference map_difference = Maps.difference(cur_commit.files, other_commit.files); + if (map_difference.entriesDiffering().size() > 0) { + throw new IOException("files are differ:" + map_difference.entriesDiffering()); + } + + Map res_files = new TreeMap<>(); + cur_commit.files.forEach(res_files::putIfAbsent); + other_commit.files.forEach(res_files::putIfAbsent); + + List parents_ids = ImmutableList.of(cur_commit.id, other_commit.id); + VcsCommit new_commit = new VcsCommit("merged " + other_branch_name, parents_ids, res_files); + writeCommit(new_commit); + + VcsBranch branch = index.branch.changeCommit(new_commit.id); + writeBranch(branch); + + index.branch = branch; + index.commit_id = branch.commit_id; + index.added = new TreeSet<>(); + + deleteBranch(other_branch_name); + + writeIndex(); + } + + @Override + public void createBranch(String branch_name) throws IOException { + readIndex(); + + if (Files.exists(Paths.get(branches_dir_path + "", branch_name))) { + throw new IOException("branch exits"); + } + VcsBranch branch = new VcsBranch(branch_name, index.commit_id); + writeBranch(branch); + checkoutBranch(branch_name); + + writeIndex(); + } + + @Override + public void deleteBranch(String branch_name) throws IOException { + readIndex(); + + Path branch_path = Paths.get(branches_dir_path + "", branch_name); + if (Files.exists(branch_path)) { + Files.delete(branch_path); + } + + writeIndex(); + } + + @Override + public List logCommits() throws IOException { + try { + return Files.walk(commits_dir_path) + .filter(Files::isRegularFile) + .map(path -> { + try { + return (VcsCommit) readObject(path); + } catch (IOException e) { + throw new RuntimeException(e); + } + }) + .sorted((commit1, commit2) -> { + if (commit1.date < commit2.date) { + return 0; + } + return commit1.date < commit2.date ? 1 : -1; + }) + .collect(Collectors.toList()); + } catch (RuntimeException e) { + throw (IOException) e.getCause(); + } + } + + @Override + public List logBranches() throws IOException { + return Files.walk(commits_dir_path) + .filter(Files::isRegularFile) + .map(path -> path.getFileName().toString()) + .collect(Collectors.toList()); + } + + private void writeIndex() throws IOException { + if (index.branch != null) { + index.commit_id = index.branch.commit_id; + } + writeObject(index, index_file_path); + } + + private void readIndex() throws IOException { + index = (Index) readObject(index_file_path); + } + + private void writeCommit(VcsCommit commit) throws IOException { + Path path = Paths.get(commits_dir_path + "", commit.id + ""); + writeObject(commit, path); + } + + private VcsCommit readCommit(long commit_id) throws IOException { + Path path = Paths.get(commits_dir_path + "", commit_id + ""); + return (VcsCommit) FileUtil.readObject(path); + } + + private Map loadAdded() throws IOException { + Path path = Paths.get("."); + try { + return Files.walk(path) + .filter(Files::isRegularFile) + .filter(entry -> index.added.contains(entry.toString())) + .collect(Collectors.toMap( + Path::toString, + FileUtil::addBlob)); + } catch (RuntimeException e) { + throw (IOException) e.getCause(); + } + } + + private void writeBranch(VcsBranch branch) throws IOException { + Path branch_path = Paths.get(branches_dir_path.toString(), branch.name); + writeObject(branch, branch_path); + } + + private VcsBranch readBranch(String branch_name) throws IOException { + Path branch_path = Paths.get(branches_dir_path.toString(), branch_name); + return (VcsBranch) readObject(branch_path); + } + + private static class Index implements Serializable { + private Set added = new TreeSet<>(); + private VcsBranch branch; + private long commit_id = VcsCommit.nullCommit.id; + } +} diff --git a/myVCS/src/main/java/com/maxim/vcs_objects/VcsBlob.java b/myVCS/src/main/java/com/maxim/vcs_objects/VcsBlob.java new file mode 100644 index 0000000..fe2f47f --- /dev/null +++ b/myVCS/src/main/java/com/maxim/vcs_objects/VcsBlob.java @@ -0,0 +1,13 @@ +package com.maxim.vcs_objects; + +import org.apache.commons.codec.digest.DigestUtils; + +public class VcsBlob extends VcsObject { + public final byte[] bytes; + public final String md5_hash; + + public VcsBlob(byte[] bytes) { + this.bytes = bytes; + md5_hash = DigestUtils.md5Hex(bytes); + } +} diff --git a/myVCS/src/main/java/com/maxim/vcs_objects/VcsBlobLink.java b/myVCS/src/main/java/com/maxim/vcs_objects/VcsBlobLink.java new file mode 100644 index 0000000..073f894 --- /dev/null +++ b/myVCS/src/main/java/com/maxim/vcs_objects/VcsBlobLink.java @@ -0,0 +1,22 @@ +package com.maxim.vcs_objects; + +public class VcsBlobLink extends VcsObject implements Comparable { + public final String md5_hash; + + public VcsBlobLink(String md5_hash) { + this.md5_hash = md5_hash; + } + + @Override + public boolean equals(Object other) { + return !(other == null || !(other instanceof VcsBlobLink)) && md5_hash.equals(((VcsBlobLink) other).md5_hash); + } + + @Override + public int compareTo(Object other) { + if (other == null || !(other instanceof VcsBlobLink)) { + return -1; + } + return md5_hash.compareTo(((VcsBlobLink) other).md5_hash); + } +} diff --git a/myVCS/src/main/java/com/maxim/vcs_objects/VcsBranch.java b/myVCS/src/main/java/com/maxim/vcs_objects/VcsBranch.java new file mode 100644 index 0000000..09a270d --- /dev/null +++ b/myVCS/src/main/java/com/maxim/vcs_objects/VcsBranch.java @@ -0,0 +1,17 @@ +package com.maxim.vcs_objects; + +import java.io.Serializable; + +public class VcsBranch implements Serializable { + public final String name; + public final long commit_id; + + public VcsBranch(String name, long commit_id) { + this.name = name; + this.commit_id = commit_id; + } + + public VcsBranch changeCommit(long commit_id) { + return new VcsBranch(name, commit_id); + } +} diff --git a/myVCS/src/main/java/com/maxim/vcs_objects/VcsCommit.java b/myVCS/src/main/java/com/maxim/vcs_objects/VcsCommit.java new file mode 100644 index 0000000..16cf237 --- /dev/null +++ b/myVCS/src/main/java/com/maxim/vcs_objects/VcsCommit.java @@ -0,0 +1,41 @@ +package com.maxim.vcs_objects; + +import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableMap; + +import java.util.Collections; +import java.util.Date; +import java.util.List; +import java.util.Map; + +public class VcsCommit extends VcsObject { + public final String message; + public final long date; + public final List parents_ids; + public final Map files; + public final static VcsCommit nullCommit = new VcsCommit(); + + public VcsCommit(String message, List parents_ids, Map files) { + this.message = message; + this.parents_ids = ImmutableList.copyOf(parents_ids); + this.files = ImmutableMap.copyOf(files); + this.date = new Date().getTime(); + } + + @Override + public String toString() { + return String.valueOf(id) + "\n" + + " message: " + message + "\n" + + " date:" + new Date(date) + "\n" + + " parents: " + parents_ids + "\n" + + "\n"; + } + + private VcsCommit() { + super(0); + this.message = "initial"; + this.parents_ids = ImmutableList.of(); + this.files = ImmutableMap.of(); + this.date = 0; + } +} diff --git a/myVCS/src/main/java/com/maxim/vcs_objects/VcsObject.java b/myVCS/src/main/java/com/maxim/vcs_objects/VcsObject.java new file mode 100644 index 0000000..c920484 --- /dev/null +++ b/myVCS/src/main/java/com/maxim/vcs_objects/VcsObject.java @@ -0,0 +1,18 @@ +package com.maxim.vcs_objects; + +import com.maxim.vcs_impl.Vcs; + +import java.io.Serializable; +import java.util.Random; + +public class VcsObject implements Serializable { + public final long id; + + public VcsObject() { + id = Math.abs(new Random().nextLong()); + } + + protected VcsObject(long id) { + this.id = id; + } +} diff --git a/myVCS/src/test/java/com/maxim/vcs_impl/VcsImplTest.java b/myVCS/src/test/java/com/maxim/vcs_impl/VcsImplTest.java new file mode 100644 index 0000000..a905a9f --- /dev/null +++ b/myVCS/src/test/java/com/maxim/vcs_impl/VcsImplTest.java @@ -0,0 +1,47 @@ +package com.maxim.vcs_impl; + +import com.maxim.vcs_objects.VcsCommit; +import org.junit.Test; + +import java.nio.file.Paths; +import java.util.Arrays; +import java.util.Set; +import java.util.TreeSet; + + +public class VcsImplTest { + @Test + public void test() throws Exception { + Vcs vcs = new VcsImpl(); + + Set set1 = new TreeSet<>( + Arrays.asList("./.idea/uiDesigner.xml", + "./.gradle/3.1/taskArtifacts/fileHashes.bin") + ); + + Set set2 = new TreeSet<>( + Arrays.asList("./.idea/uiDesigner.xml", + "./.gradle/3.1/taskArtifacts/fileSnapshots.bin") + ); + + vcs.createBranch("1"); + for (int i = 0; i < 2; i++) { + for (String path : set1) { + vcs.add(Paths.get(path)); + } + VcsCommit commit = vcs.commit("2"); + } + + vcs.checkoutCommit(0); + vcs.createBranch("2"); + for (int i = 0; i < 2; i++) { + for (String path : set2) { + vcs.add(Paths.get(path)); + } + VcsCommit commit = vcs.commit("2"); + } + + vcs.merge("1"); + vcs.deleteBranch("2"); + } +} \ No newline at end of file From 7306a50ef91c7ae9a9b102a041f4220f17d305e8 Mon Sep 17 00:00:00 2001 From: Maksim Vinnichenko Date: Thu, 23 Mar 2017 06:13:03 +0300 Subject: [PATCH 02/21] Update .travis.yml --- .travis.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index f958b80..3f0d0d1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,6 +5,10 @@ os: - linux env: - SOURCE_DIR_1=001-Lazy + - SOURCE_DIR_1=myVcs script: - cd $SOURCE_DIR_1 && gradle check - + - cd .. + - cd $SOURCE_DIR_2 && gradle check + + From a2ee40dbddfac0731fa8b64a04e9dd970c4ce002 Mon Sep 17 00:00:00 2001 From: Maksim Vinnichenko Date: Thu, 23 Mar 2017 06:22:08 +0300 Subject: [PATCH 03/21] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 3f0d0d1..342ab14 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,7 @@ os: - linux env: - SOURCE_DIR_1=001-Lazy - - SOURCE_DIR_1=myVcs + - SOURCE_DIR_1=myVCS script: - cd $SOURCE_DIR_1 && gradle check - cd .. From 2026c6bf0852d0c2866e967979040f48ffe2c262 Mon Sep 17 00:00:00 2001 From: maxkvant Date: Thu, 23 Mar 2017 13:01:40 +0300 Subject: [PATCH 04/21] some fixes, added Main class --- .../gradle/wrapper/gradle-wrapper.properties | 4 +- myVCS/src/main/java/com/maxim/Main.java | 130 ++++++++++++++++++ .../java/com/maxim/vcs_impl/FileUtil.java | 4 + .../main/java/com/maxim/vcs_impl/VcsImpl.java | 2 +- 4 files changed, 137 insertions(+), 3 deletions(-) create mode 100644 myVCS/src/main/java/com/maxim/Main.java diff --git a/myVCS/gradle/wrapper/gradle-wrapper.properties b/myVCS/gradle/wrapper/gradle-wrapper.properties index 73e38cb..bcf650f 100644 --- a/myVCS/gradle/wrapper/gradle-wrapper.properties +++ b/myVCS/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Sun Mar 19 21:02:03 MSK 2017 +#Thu Mar 23 06:06:06 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-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-3.1-bin.zip diff --git a/myVCS/src/main/java/com/maxim/Main.java b/myVCS/src/main/java/com/maxim/Main.java new file mode 100644 index 0000000..eb6f790 --- /dev/null +++ b/myVCS/src/main/java/com/maxim/Main.java @@ -0,0 +1,130 @@ +package com.maxim; + +import com.google.common.collect.ImmutableList; +import com.google.common.collect.Lists; +import com.maxim.vcs_impl.Vcs; +import com.maxim.vcs_impl.VcsImpl; +import com.maxim.vcs_objects.VcsCommit; + +import java.io.IOException; +import java.nio.file.Paths; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; +import java.util.stream.Collector; +import java.util.stream.Collectors; + +public class Main { + private final Vcs vcs; + { + Vcs vcs1 = null; + try { + vcs1 = new VcsImpl(); + } catch (IOException e) { + e.printStackTrace(); + System.out.println("failed to init vcs"); + System.exit(3); + } + this.vcs = vcs1; + } + + private final String[] args; + + private final List commands = ImmutableList.of( + new Command(true,"path", "add") { + @Override + public void execute() throws IOException { + vcs.add(Paths.get(arg)); + } + }, + + new Command(true,"message", "commit") { + @Override + public void execute() throws IOException { + vcs.commit(arg); + } + }, + new Command(true,"branch_name", "checkout", "-b") { + @Override + public void execute() throws IOException { + vcs.checkoutBranch(arg); + } + }, + new Command(true, "commit_id", "checkout", "-c") { + @Override + public void execute() throws IOException { + vcs.checkoutCommit(Long.parseLong(arg)); + } + }, + new Command(true,"other_branch_name", "merge") { + @Override + public void execute() throws IOException { + vcs.merge(arg); + } + }, + new Command(false, "", "log", "-b") { + @Override + public void execute() throws IOException { + vcs.logBranches(); + } + }, + new Command(false, "", "log", "-c") { + @Override + public void execute() throws IOException { + vcs.logCommits(); + } + } + ); + + public Main(String args[]) { + this.args = args; + } + + public static void main(String[] args) { + new Main(args).run(); + } + + public void run() { + List ok_commands = commands.stream().filter(command -> command.check(args)).collect(Collectors.toList()); + if (ok_commands.size() == 1) { + try { + Command command = ok_commands.get(0); + command.execute(); + } catch (IOException e){ + e.printStackTrace(); + } + } else { + System.out.println("usage: \n"); + String help_message = commands.stream().map(Command::getMessage).collect(Collectors.joining("\n")); + System.out.println(help_message); + } + } + + private abstract static class Command { + private final ImmutableList prefix; + private final String arg_name; + int args_count; + protected String arg; + + public Command(boolean has_arg, String arg_name, String... prefix) { + this.prefix = ImmutableList.copyOf(prefix); + this.arg_name = arg_name; + this.args_count = has_arg ? 1 : 0; + } + + public String getMessage() { + return prefix.stream().collect(Collectors.joining(" ")) + " " + arg_name; + } + + public boolean check(String[] args) { + return prefix.size() + args_count == args.length && + ImmutableList.copyOf(args).subList(0, prefix.size()).equals(prefix); + } + + public void getArg(String[] args) { + this.arg = check(args) ? args[args.length - 1] : null; + } + + public abstract void execute() throws IOException; + } +} diff --git a/myVCS/src/main/java/com/maxim/vcs_impl/FileUtil.java b/myVCS/src/main/java/com/maxim/vcs_impl/FileUtil.java index 66fb54d..1e51b2a 100644 --- a/myVCS/src/main/java/com/maxim/vcs_impl/FileUtil.java +++ b/myVCS/src/main/java/com/maxim/vcs_impl/FileUtil.java @@ -1,6 +1,7 @@ package com.maxim.vcs_impl; import com.maxim.vcs_objects.*; +import com.sun.xml.internal.ws.policy.privateutil.PolicyUtils; import java.io.*; import java.nio.file.Files; @@ -22,6 +23,9 @@ public class FileUtil { public static VcsBlobLink addBlob(Path path) { try { + if (!Files.isRegularFile(path)) { + throw new IOException("not file"); + } VcsBlob blob = new VcsBlob(Files.readAllBytes(path)); Path blob_path = Paths.get(blobs_dir_path + "", blob.md5_hash); if (!Files.exists(blob_path)) { diff --git a/myVCS/src/main/java/com/maxim/vcs_impl/VcsImpl.java b/myVCS/src/main/java/com/maxim/vcs_impl/VcsImpl.java index 1ee99cd..746ab1c 100644 --- a/myVCS/src/main/java/com/maxim/vcs_impl/VcsImpl.java +++ b/myVCS/src/main/java/com/maxim/vcs_impl/VcsImpl.java @@ -21,7 +21,7 @@ public class VcsImpl implements Vcs { private Index index = new Index(); - VcsImpl() throws IOException { + public VcsImpl() throws IOException { Files.createDirectories(commits_dir_path); Files.createDirectories(blobs_dir_path); Files.createDirectories(branches_dir_path); From a06f080ae7768da10e4a3058e8526f7ecfb44d4b Mon Sep 17 00:00:00 2001 From: Maksim Vinnichenko Date: Thu, 23 Mar 2017 13:09:22 +0300 Subject: [PATCH 05/21] Update .travis.yml --- .travis.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 342ab14..2942245 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,10 +5,9 @@ os: - linux env: - SOURCE_DIR_1=001-Lazy - - SOURCE_DIR_1=myVCS + - SOURCE_DIR_2=myVCS script: - - cd $SOURCE_DIR_1 && gradle check - - cd .. + - cd $SOURCE_DIR_1 && gradle check && cd .. - cd $SOURCE_DIR_2 && gradle check From 188108995dd832f5939beae33ff1c1bc991ec538 Mon Sep 17 00:00:00 2001 From: Maksim Vinnichenko Date: Thu, 23 Mar 2017 13:17:11 +0300 Subject: [PATCH 06/21] Update .travis.yml --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 2942245..3dffb7b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,7 +7,7 @@ env: - SOURCE_DIR_1=001-Lazy - SOURCE_DIR_2=myVCS script: - - cd $SOURCE_DIR_1 && gradle check && cd .. - - cd $SOURCE_DIR_2 && gradle check + - pwd && cd $SOURCE_DIR_1 && pwd && gradle check && cd .. + - pwd && cd $SOURCE_DIR_2 && pwd && gradle check && cd .. From 40eae0965a9bbbfc0d29d9ecd1b29330dc6564e9 Mon Sep 17 00:00:00 2001 From: Maksim Vinnichenko Date: Thu, 23 Mar 2017 13:22:37 +0300 Subject: [PATCH 07/21] Update .travis.yml --- .travis.yml | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3dffb7b..58587b2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,7 +7,18 @@ env: - SOURCE_DIR_1=001-Lazy - SOURCE_DIR_2=myVCS script: - - pwd && cd $SOURCE_DIR_1 && pwd && gradle check && cd .. - - pwd && cd $SOURCE_DIR_2 && pwd && gradle check && cd .. + - pwd + - cd $SOURCE_DIR_1 + - pwd + - ls -aux + - gradle check + - cd .. + - pwd + - ls -aux + - cd $SOURCE_DIR_2 + - pwd + - ls -aux + - gradle check + - cd .. From 77b62c8a35fad8792545bf4f8e6b8e758dbd9123 Mon Sep 17 00:00:00 2001 From: Maksim Vinnichenko Date: Thu, 23 Mar 2017 13:33:35 +0300 Subject: [PATCH 08/21] Update .travis.yml --- .travis.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 58587b2..2f6a446 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,8 +4,7 @@ jdk: os: - linux env: - - SOURCE_DIR_1=001-Lazy - - SOURCE_DIR_2=myVCS + - SOURCE_DIR_1=001-Lazy SOURCE_DIR_2=myVCS script: - pwd - cd $SOURCE_DIR_1 From 99417d1f148b3954d9c34a355da60c9735fe648d Mon Sep 17 00:00:00 2001 From: Maksim Vinnichenko Date: Thu, 23 Mar 2017 13:40:13 +0300 Subject: [PATCH 09/21] Update .travis.yml --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 2f6a446..8ce460b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,6 +14,7 @@ script: - cd .. - pwd - ls -aux + - printf $SOURCE_DIR_2 - cd $SOURCE_DIR_2 - pwd - ls -aux From 68c54c8ec3c0bcf277781fcd43a6c98695d7f0d9 Mon Sep 17 00:00:00 2001 From: maxkvant Date: Thu, 23 Mar 2017 13:48:36 +0300 Subject: [PATCH 10/21] some trying fix build --- myVCS/src/main/java/com/maxim/vcs_impl/FileUtil.java | 1 - 1 file changed, 1 deletion(-) diff --git a/myVCS/src/main/java/com/maxim/vcs_impl/FileUtil.java b/myVCS/src/main/java/com/maxim/vcs_impl/FileUtil.java index 1e51b2a..f610c5a 100644 --- a/myVCS/src/main/java/com/maxim/vcs_impl/FileUtil.java +++ b/myVCS/src/main/java/com/maxim/vcs_impl/FileUtil.java @@ -1,7 +1,6 @@ package com.maxim.vcs_impl; import com.maxim.vcs_objects.*; -import com.sun.xml.internal.ws.policy.privateutil.PolicyUtils; import java.io.*; import java.nio.file.Files; From 6acdb2bcad33226af8a3d66c820432653c789003 Mon Sep 17 00:00:00 2001 From: Maksim Vinnichenko Date: Thu, 23 Mar 2017 13:53:52 +0300 Subject: [PATCH 11/21] Update .travis.yml --- .travis.yml | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8ce460b..8e2ebb0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,19 +6,5 @@ os: env: - SOURCE_DIR_1=001-Lazy SOURCE_DIR_2=myVCS script: - - pwd - - cd $SOURCE_DIR_1 - - pwd - - ls -aux - - gradle check - - cd .. - - pwd - - ls -aux - - printf $SOURCE_DIR_2 - - cd $SOURCE_DIR_2 - - pwd - - ls -aux - - gradle check - - cd .. - - + - cd $SOURCE_DIR_1 && gradle check && cd .. + - cd $SOURCE_DIR_2 && gradle check && cd .. From b72c7ecf7fb19c1478d86e374127e00b47bde296 Mon Sep 17 00:00:00 2001 From: maxkvant Date: Thu, 23 Mar 2017 14:28:13 +0300 Subject: [PATCH 12/21] fixed bugs in console --- myVCS/build.gradle | 3 +++ myVCS/src/main/java/com/maxim/Main.java | 18 +++++++++++++----- .../main/java/com/maxim/vcs_impl/VcsImpl.java | 5 ++++- 3 files changed, 20 insertions(+), 6 deletions(-) diff --git a/myVCS/build.gradle b/myVCS/build.gradle index 093af3e..d1c5487 100644 --- a/myVCS/build.gradle +++ b/myVCS/build.gradle @@ -1,6 +1,9 @@ version '1.0-SNAPSHOT' apply plugin: 'java' +apply plugin: 'application' + +mainClassName = "com.maxim.Main" sourceCompatibility = 1.8 diff --git a/myVCS/src/main/java/com/maxim/Main.java b/myVCS/src/main/java/com/maxim/Main.java index eb6f790..2be4b20 100644 --- a/myVCS/src/main/java/com/maxim/Main.java +++ b/myVCS/src/main/java/com/maxim/Main.java @@ -31,19 +31,25 @@ public class Main { private final String[] args; private final List commands = ImmutableList.of( - new Command(true,"path", "add") { + new Command(true, "path", "add") { @Override public void execute() throws IOException { vcs.add(Paths.get(arg)); } }, - new Command(true,"message", "commit") { + new Command(true, "message", "commit") { @Override public void execute() throws IOException { vcs.commit(arg); } }, + new Command(true, "branch_name", "create-branch") { + @Override + public void execute() throws IOException { + vcs.createBranch(arg); + } + }, new Command(true,"branch_name", "checkout", "-b") { @Override public void execute() throws IOException { @@ -65,13 +71,13 @@ public void execute() throws IOException { new Command(false, "", "log", "-b") { @Override public void execute() throws IOException { - vcs.logBranches(); + vcs.logBranches().stream().forEach(System.out::println); } }, new Command(false, "", "log", "-c") { @Override public void execute() throws IOException { - vcs.logCommits(); + vcs.logCommits().stream().forEach(System.out::println); } } ); @@ -117,8 +123,10 @@ public String getMessage() { } public boolean check(String[] args) { - return prefix.size() + args_count == args.length && + boolean res = prefix.size() + args_count == args.length && ImmutableList.copyOf(args).subList(0, prefix.size()).equals(prefix); + arg = (res && args_count == 1) ? args[args.length - 1] : null; + return res; } public void getArg(String[] args) { diff --git a/myVCS/src/main/java/com/maxim/vcs_impl/VcsImpl.java b/myVCS/src/main/java/com/maxim/vcs_impl/VcsImpl.java index 746ab1c..f9741b8 100644 --- a/myVCS/src/main/java/com/maxim/vcs_impl/VcsImpl.java +++ b/myVCS/src/main/java/com/maxim/vcs_impl/VcsImpl.java @@ -157,7 +157,10 @@ public void merge(String other_branch_name) throws IOException { public void createBranch(String branch_name) throws IOException { readIndex(); - if (Files.exists(Paths.get(branches_dir_path + "", branch_name))) { + System.out.println(branches_dir_path + " | " + branch_name); + Path path = Paths.get(branches_dir_path + "", branch_name); + System.out.println(path); + if (Files.exists(path)) { throw new IOException("branch exits"); } VcsBranch branch = new VcsBranch(branch_name, index.commit_id); From 64c879ae983d5eecd775dcd51800ba17d4c50ce4 Mon Sep 17 00:00:00 2001 From: maxkvant Date: Thu, 23 Mar 2017 14:44:59 +0300 Subject: [PATCH 13/21] fixed bugs --- myVCS/src/main/java/com/maxim/vcs_impl/VcsImpl.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/myVCS/src/main/java/com/maxim/vcs_impl/VcsImpl.java b/myVCS/src/main/java/com/maxim/vcs_impl/VcsImpl.java index f9741b8..016bc44 100644 --- a/myVCS/src/main/java/com/maxim/vcs_impl/VcsImpl.java +++ b/myVCS/src/main/java/com/maxim/vcs_impl/VcsImpl.java @@ -157,7 +157,6 @@ public void merge(String other_branch_name) throws IOException { public void createBranch(String branch_name) throws IOException { readIndex(); - System.out.println(branches_dir_path + " | " + branch_name); Path path = Paths.get(branches_dir_path + "", branch_name); System.out.println(path); if (Files.exists(path)) { @@ -208,9 +207,10 @@ public List logCommits() throws IOException { @Override public List logBranches() throws IOException { - return Files.walk(commits_dir_path) + return Files.walk(branches_dir_path) .filter(Files::isRegularFile) - .map(path -> path.getFileName().toString()) + .map(Path::getFileName) + .map(Path::toString) .collect(Collectors.toList()); } From 31d6fce4e853b292bebcc2170b16917c6c9b2def Mon Sep 17 00:00:00 2001 From: maxkvant Date: Thu, 13 Apr 2017 02:18:48 +0300 Subject: [PATCH 14/21] added operations rm, status, clean, reset --- myVCS/build.gradle | 1 + .../java/com/maxim/vcs_impl/FileUtil.java | 14 +- .../src/main/java/com/maxim/vcs_impl/Vcs.java | 6 + .../main/java/com/maxim/vcs_impl/VcsImpl.java | 139 ++++++++++++++---- 4 files changed, 131 insertions(+), 29 deletions(-) diff --git a/myVCS/build.gradle b/myVCS/build.gradle index d1c5487..7978d40 100644 --- a/myVCS/build.gradle +++ b/myVCS/build.gradle @@ -15,4 +15,5 @@ dependencies { testCompile group: 'junit', name: 'junit', version: '4.11' compile group: 'com.google.guava', name: 'guava', version: '19.0' compile group: 'commons-codec', name: 'commons-codec', version: '1.5' + compile group: 'org.mockito', name: 'mockito-all', version: '1.8.4' } diff --git a/myVCS/src/main/java/com/maxim/vcs_impl/FileUtil.java b/myVCS/src/main/java/com/maxim/vcs_impl/FileUtil.java index f610c5a..5669c05 100644 --- a/myVCS/src/main/java/com/maxim/vcs_impl/FileUtil.java +++ b/myVCS/src/main/java/com/maxim/vcs_impl/FileUtil.java @@ -20,12 +20,20 @@ public class FileUtil { public static final Path branches_dir_path = Paths.get(".", vcs_dir, branches_dir); public static final Path index_file_path = Paths.get(".", vcs_dir, index_file); - public static VcsBlobLink addBlob(Path path) { + public static VcsBlob getBlob(Path path) { try { if (!Files.isRegularFile(path)) { - throw new IOException("not file"); + throw new IOException("not suck file"); } - VcsBlob blob = new VcsBlob(Files.readAllBytes(path)); + return new VcsBlob(Files.readAllBytes(path)); + } catch (IOException e) { + throw new RuntimeException(e); + } + } + + public static VcsBlobLink addBlob(Path path) { + try { + VcsBlob blob = getBlob(path); Path blob_path = Paths.get(blobs_dir_path + "", blob.md5_hash); if (!Files.exists(blob_path)) { Files.createFile(blob_path); diff --git a/myVCS/src/main/java/com/maxim/vcs_impl/Vcs.java b/myVCS/src/main/java/com/maxim/vcs_impl/Vcs.java index c05426e..2b01f54 100644 --- a/myVCS/src/main/java/com/maxim/vcs_impl/Vcs.java +++ b/myVCS/src/main/java/com/maxim/vcs_impl/Vcs.java @@ -5,6 +5,7 @@ import java.io.IOException; import java.nio.file.Path; import java.util.List; +import java.util.Map; public interface Vcs { VcsCommit commit(String message) throws IOException; @@ -18,4 +19,9 @@ public interface Vcs { List logBranches() throws IOException; void merge(String other_branch) throws IOException; void createBranch(String other_branch_name) throws IOException; + + void reset(Path path) throws IOException; + Map status(Path path) throws IOException; + void rm(Path path) throws IOException; + void clean(Path path) throws IOException; } \ No newline at end of file diff --git a/myVCS/src/main/java/com/maxim/vcs_impl/VcsImpl.java b/myVCS/src/main/java/com/maxim/vcs_impl/VcsImpl.java index 016bc44..51bc342 100644 --- a/myVCS/src/main/java/com/maxim/vcs_impl/VcsImpl.java +++ b/myVCS/src/main/java/com/maxim/vcs_impl/VcsImpl.java @@ -1,11 +1,10 @@ package com.maxim.vcs_impl; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.MapDifference; -import com.google.common.collect.Maps; +import com.google.common.collect.*; import com.maxim.vcs_objects.VcsBlobLink; import com.maxim.vcs_objects.VcsBranch; import com.maxim.vcs_objects.VcsCommit; +import com.sun.xml.internal.ws.policy.privateutil.PolicyUtils; import java.io.IOException; import java.io.Serializable; @@ -19,7 +18,7 @@ import static java.nio.file.StandardCopyOption.REPLACE_EXISTING; public class VcsImpl implements Vcs { - private Index index = new Index(); + private Index index = new Index(VcsCommit.nullCommit.id); public VcsImpl() throws IOException { Files.createDirectories(commits_dir_path); @@ -41,9 +40,8 @@ public VcsCommit commit(String message) throws IOException { throw new IOException("Please, checkout branch or create branch"); } - VcsCommit commit = readCommit(index.commit_id); - Map oldFiles = commit.files; - List parents_ids = Collections.singletonList(commit.id); + Map oldFiles = getCommittedFiles(); + List parents_ids = Collections.singletonList(index.commit_id); Map currentFiles = new TreeMap<>(loadAdded()); oldFiles.forEach(currentFiles::putIfAbsent); @@ -52,25 +50,23 @@ public VcsCommit commit(String message) throws IOException { writeCommit(new_commit); index.branch = index.branch.changeCommit(new_commit.id); - writeBranch(index.branch); - - index.commit_id = index.branch.commit_id; - index.added = new TreeSet<>(); + index = new Index(index.branch); + writeBranch(index.branch); writeIndex(); - return commit; + return new_commit; } @Override public void checkoutCommit(long commit_id) throws IOException { readIndex(); - VcsCommit curCommit = readCommit(commit_id); - for (String file_path : curCommit.files.keySet()) { + Map committedFiles = getCommittedFiles(); + for (String file_path : committedFiles.keySet()) { try { Files.delete(Paths.get(file_path)); } catch (IOException e) { - e.printStackTrace(); + throw new RuntimeException(e); } } @@ -85,9 +81,8 @@ public void checkoutCommit(long commit_id) throws IOException { Path blob_path = Paths.get(blobs_dir_path.toString(), blob_name); Files.copy(blob_path, path, REPLACE_EXISTING); } - index.branch = null; - index.added = new TreeSet<>(); - index.commit_id = commit_id; + + index = new Index(commit_id); writeIndex(); } @@ -98,7 +93,8 @@ public void checkoutBranch(String branch_name) throws IOException { VcsBranch branch = readBranch(branch_name); checkoutCommit(branch.commit_id); - index.branch = branch; + writeBranch(branch); + index = new Index(branch); writeIndex(); } @@ -124,29 +120,27 @@ public void merge(String other_branch_name) throws IOException { return; } - VcsCommit cur_commit = readCommit(index.commit_id); VcsBranch other_branch = readBranch(other_branch_name); VcsCommit other_commit = readCommit(other_branch.commit_id); + Map cur_files = getCommittedFiles(); - MapDifference map_difference = Maps.difference(cur_commit.files, other_commit.files); + MapDifference map_difference = Maps.difference(cur_files, other_commit.files); if (map_difference.entriesDiffering().size() > 0) { throw new IOException("files are differ:" + map_difference.entriesDiffering()); } Map res_files = new TreeMap<>(); - cur_commit.files.forEach(res_files::putIfAbsent); + cur_files.forEach(res_files::putIfAbsent); other_commit.files.forEach(res_files::putIfAbsent); - List parents_ids = ImmutableList.of(cur_commit.id, other_commit.id); + List parents_ids = ImmutableList.of(index.commit_id, other_commit.id); VcsCommit new_commit = new VcsCommit("merged " + other_branch_name, parents_ids, res_files); writeCommit(new_commit); VcsBranch branch = index.branch.changeCommit(new_commit.id); writeBranch(branch); - index.branch = branch; - index.commit_id = branch.commit_id; - index.added = new TreeSet<>(); + index = new Index(branch); deleteBranch(other_branch_name); @@ -214,6 +208,76 @@ public List logBranches() throws IOException { .collect(Collectors.toList()); } + @Override + public void clean(Path path) throws IOException { + Set tracking = getTrackingNames(); + Files.walk(path) + .filter(Files::isRegularFile) + .filter(entry -> !tracking.contains(entry.toString())) + .forEach(entry -> { + try { + Files.delete(entry); + } catch (IOException e) { + throw new RuntimeException(e); + } + }); + } + + + @Override + public void reset(Path path) throws IOException { + Map committed = getCommittedFiles(); + if (!committed.containsKey(path.toString())) { + throw new IOException("no such committed file"); + } + String blob_name = committed.get(path.toString()).md5_hash; + Path blob_path = Paths.get(blobs_dir_path.toString(), blob_name); + Files.copy(blob_path, path); + } + + @Override + public Map status(Path path) throws IOException { + Map committedFiles = getCommittedFiles(); + Set committedNames = committedFiles.keySet(); + ImmutableMap.Builder mapBuilder = ImmutableMap.builder(); + Files.walk(path) + .filter(Files::isRegularFile) + .forEach(entry -> { + String state = "untracked"; + if (index.added.contains(entry.toString())) { + state = "added"; + } else if (index.removed.contains(entry.toString())) { + state = "removed"; + } else if (committedNames.contains(entry.toString())) { + String fileHash = committedFiles.get(entry.toString()).md5_hash; + if (getBlob(entry).md5_hash.equals(fileHash)) { + state = "committed"; + } else { + state = "modified"; + } + } + mapBuilder.put(entry.toString(), state); + }); + return mapBuilder.build(); + } + + @Override + public void rm(Path path) throws IOException { + readIndex(); + + if (!getTrackingNames().contains(path.toString())) { + throw new IOException("no such tracking file"); + } + Files.delete(path); + if (index.added.contains(path.toString())) { + index.added.remove(path.toString()); + } else { + index.removed.add(path.toString()); + } + + writeIndex(); + } + private void writeIndex() throws IOException { if (index.branch != null) { index.commit_id = index.branch.commit_id; @@ -259,9 +323,32 @@ private VcsBranch readBranch(String branch_name) throws IOException { return (VcsBranch) readObject(branch_path); } + private Set getTrackingNames() throws IOException { + Set added = index.added; + Set committed = getCommittedFiles().keySet(); + return new ImmutableSet.Builder().addAll(added).addAll(committed).build(); + } + + private Map getCommittedFiles() throws IOException { + Map committed = readCommit(index.commit_id).files; + return Maps.filterKeys(committed, path -> !index.removed.contains(path)); + } + private static class Index implements Serializable { private Set added = new TreeSet<>(); + private Set removed = new TreeSet<>(); private VcsBranch branch; private long commit_id = VcsCommit.nullCommit.id; + + Index(long commit_id) { + this.commit_id = commit_id; + this.branch = null; + } + + Index(VcsBranch branch) { + this.branch = branch; + this.commit_id = branch.commit_id; + } } + } From f87be19d48c6f8743bf8876d7672d2a29bb7f64a Mon Sep 17 00:00:00 2001 From: maxkvant Date: Thu, 13 Apr 2017 04:53:14 +0300 Subject: [PATCH 15/21] added comments, removed class vcsObject --- myVCS/src/main/java/com/maxim/Main.java | 126 +++++++++++------- .../java/com/maxim/vcs_impl/FileUtil.java | 18 ++- .../src/main/java/com/maxim/vcs_impl/Vcs.java | 90 ++++++++++++- .../main/java/com/maxim/vcs_impl/VcsImpl.java | 24 +++- .../java/com/maxim/vcs_objects/VcsBlob.java | 7 +- .../com/maxim/vcs_objects/VcsBlobLink.java | 7 +- .../java/com/maxim/vcs_objects/VcsBranch.java | 3 + .../java/com/maxim/vcs_objects/VcsCommit.java | 17 ++- .../java/com/maxim/vcs_objects/VcsObject.java | 18 --- 9 files changed, 229 insertions(+), 81 deletions(-) delete mode 100644 myVCS/src/main/java/com/maxim/vcs_objects/VcsObject.java diff --git a/myVCS/src/main/java/com/maxim/Main.java b/myVCS/src/main/java/com/maxim/Main.java index 2be4b20..c7ba8b2 100644 --- a/myVCS/src/main/java/com/maxim/Main.java +++ b/myVCS/src/main/java/com/maxim/Main.java @@ -1,17 +1,14 @@ package com.maxim; import com.google.common.collect.ImmutableList; -import com.google.common.collect.Lists; +import com.google.common.collect.ImmutableSet; import com.maxim.vcs_impl.Vcs; import com.maxim.vcs_impl.VcsImpl; -import com.maxim.vcs_objects.VcsCommit; import java.io.IOException; +import java.nio.file.Path; import java.nio.file.Paths; -import java.util.Arrays; -import java.util.Collections; import java.util.List; -import java.util.stream.Collector; import java.util.stream.Collectors; public class Main { @@ -31,53 +28,93 @@ public class Main { private final String[] args; private final List commands = ImmutableList.of( - new Command(true, "path", "add") { + new Command(1, "add", "") { @Override - public void execute() throws IOException { - vcs.add(Paths.get(arg)); + public void execute(String[] args) throws IOException { + Path path = Paths.get(parseArgs(args).get(0)); + vcs.add(path); } }, - new Command(true, "message", "commit") { + new Command(1, "commit", "message") { @Override - public void execute() throws IOException { - vcs.commit(arg); + public void execute(String[] args) throws IOException { + vcs.commit(parseArgs(args).get(0)); } }, - new Command(true, "branch_name", "create-branch") { + new Command(1, "create-branch", "") { @Override - public void execute() throws IOException { - vcs.createBranch(arg); + public void execute(String[] args) throws IOException { + vcs.createBranch(parseArgs(args).get(0)); } }, - new Command(true,"branch_name", "checkout", "-b") { + new Command(2,"checkout", "-b", "") { @Override - public void execute() throws IOException { - vcs.checkoutBranch(arg); + public void execute(String[] args) throws IOException { + vcs.checkoutBranch(parseArgs(args).get(0)); } }, - new Command(true, "commit_id", "checkout", "-c") { + new Command(2, "checkout", "-c", "") { @Override - public void execute() throws IOException { - vcs.checkoutCommit(Long.parseLong(arg)); + public void execute(String[] args) throws IOException { + long arg = Long.parseLong(parseArgs(args).get(0)); + vcs.checkoutCommit(arg); } }, - new Command(true,"other_branch_name", "merge") { + new Command(1,"merge", "") { @Override - public void execute() throws IOException { - vcs.merge(arg); + public void execute(String[] args) throws IOException { + vcs.merge(parseArgs(args).get(0)); } }, - new Command(false, "", "log", "-b") { + new Command(2, "log", "-b") { @Override - public void execute() throws IOException { - vcs.logBranches().stream().forEach(System.out::println); + public void execute(String[] args) throws IOException { + System.out.println("---- current branch:"); + System.out.println(vcs.getCurrentBranchName()); + System.out.println(); + System.out.println("---- all branches:"); + + vcs.logBranches().forEach(System.out::println); + } + }, + new Command(2, "log", "-c") { + @Override + public void execute(String[] args) throws IOException { + System.out.println("---- current commit:"); + System.out.println(vcs.getCurrentCommitId()); + System.out.println(); + System.out.println("---- all commits:"); + + vcs.logCommits().forEach(System.out::println); + } + }, + new Command(1, "clean") { + @Override + public void execute(String[] args) throws IOException { + vcs.clean(Paths.get(".")); } }, - new Command(false, "", "log", "-c") { + new Command(1, "status") { @Override - public void execute() throws IOException { - vcs.logCommits().stream().forEach(System.out::println); + public void execute(String[] args) throws IOException { + vcs.status(Paths.get(".")) + .entrySet() + .forEach(entry -> System.out.println(entry.getKey() + " " + entry.getValue())); + } + }, + new Command(1, "rm", "") { + @Override + public void execute(String[] args) throws IOException { + Path path = Paths.get(parseArgs(args).get(0)); + vcs.rm(path); + } + }, + new Command(1, "reset", "") { + @Override + public void execute(String[] args) throws IOException { + Path path = Paths.get(parseArgs(args).get(0)); + vcs.reset(path); } } ); @@ -95,7 +132,7 @@ public void run() { if (ok_commands.size() == 1) { try { Command command = ok_commands.get(0); - command.execute(); + command.execute(args); } catch (IOException e){ e.printStackTrace(); } @@ -107,32 +144,27 @@ public void run() { } private abstract static class Command { - private final ImmutableList prefix; - private final String arg_name; - int args_count; - protected String arg; - - public Command(boolean has_arg, String arg_name, String... prefix) { - this.prefix = ImmutableList.copyOf(prefix); - this.arg_name = arg_name; - this.args_count = has_arg ? 1 : 0; + private final ImmutableList args_names; + private final int prefix_len; + + public Command(int args_count, String... arg_names) { + this.args_names = ImmutableList.copyOf(arg_names); + this.prefix_len = args_count; } public String getMessage() { - return prefix.stream().collect(Collectors.joining(" ")) + " " + arg_name; + return args_names.stream().collect(Collectors.joining(" ")); } public boolean check(String[] args) { - boolean res = prefix.size() + args_count == args.length && - ImmutableList.copyOf(args).subList(0, prefix.size()).equals(prefix); - arg = (res && args_count == 1) ? args[args.length - 1] : null; - return res; + return args_names.size() == args.length && + ImmutableList.copyOf(args).subList(0, prefix_len).equals(args_names.subList(0, prefix_len)); } - public void getArg(String[] args) { - this.arg = check(args) ? args[args.length - 1] : null; + public List parseArgs(String[] args) { + return check(args) ? ImmutableList.copyOf(args).subList(prefix_len, args_names.size()) : null; } - public abstract void execute() throws IOException; + public abstract void execute(String[] args) throws IOException; } } diff --git a/myVCS/src/main/java/com/maxim/vcs_impl/FileUtil.java b/myVCS/src/main/java/com/maxim/vcs_impl/FileUtil.java index 5669c05..9bd871a 100644 --- a/myVCS/src/main/java/com/maxim/vcs_impl/FileUtil.java +++ b/myVCS/src/main/java/com/maxim/vcs_impl/FileUtil.java @@ -7,6 +7,9 @@ import java.nio.file.Path; import java.nio.file.Paths; +/** + * Class contains static methods to work with files + */ public class FileUtil { private static final String vcs_dir = ".vcs"; private static final String blobs_dir = "blobs"; @@ -14,12 +17,15 @@ public class FileUtil { private static final String branches_dir = "branches"; private static final String index_file = "index"; - public static final Path vcs_dir_path = Paths.get(".", vcs_dir); public static final Path blobs_dir_path = Paths.get(".", vcs_dir, blobs_dir); public static final Path commits_dir_path = Paths.get(".", vcs_dir, commits_dir); public static final Path branches_dir_path = Paths.get(".", vcs_dir, branches_dir); public static final Path index_file_path = Paths.get(".", vcs_dir, index_file); + /** + * creates VcsBlob from file + * throws RuntimeException + */ public static VcsBlob getBlob(Path path) { try { if (!Files.isRegularFile(path)) { @@ -31,6 +37,10 @@ public static VcsBlob getBlob(Path path) { } } + /** + * creates VcsBlobLink from file + * throws RuntimeException + */ public static VcsBlobLink addBlob(Path path) { try { VcsBlob blob = getBlob(path); @@ -46,6 +56,9 @@ public static VcsBlobLink addBlob(Path path) { } } + /** + * serializes object to path + */ public static void writeObject(Object object, Path path) throws IOException { try (ByteArrayOutputStream bos = new ByteArrayOutputStream()) { ObjectOutput out = new ObjectOutputStream(bos); @@ -62,6 +75,9 @@ public static void writeObject(Object object, Path path) throws IOException { } } + /** + * deserialize object from path + */ public static Object readObject(Path path) throws IOException { try (FileInputStream fin = new FileInputStream(path.toString())) { ObjectInput ois = new ObjectInputStream(fin); diff --git a/myVCS/src/main/java/com/maxim/vcs_impl/Vcs.java b/myVCS/src/main/java/com/maxim/vcs_impl/Vcs.java index 2b01f54..96ef192 100644 --- a/myVCS/src/main/java/com/maxim/vcs_impl/Vcs.java +++ b/myVCS/src/main/java/com/maxim/vcs_impl/Vcs.java @@ -7,21 +7,109 @@ import java.util.List; import java.util.Map; +/** + * Interface for an implementation of version control system. + */ + public interface Vcs { + /** + * if current branch doesn't exists + * throws an exception + * otherwise + * commits all tracking files, + * moves current branch head to new commit + * + * returns new commit + */ + VcsCommit commit(String message) throws IOException; + + /** + * if such commit exists + * checkouts commit with id=commit + * otherwise + * throws an Exception + */ + void checkoutCommit(long commit_id) throws IOException; + + /** + * if such branch exists + * checkouts commit with name=branch_name + * otherwise + * throws an Exception + */ + void checkoutBranch(String branch_name) throws IOException; + + /** + * puts file if absent in list tracking files + */ + void add(Path path) throws IOException; + /** + * removes branch + */ + void deleteBranch(String branch_name) throws IOException; + /** + * returns list, which contains all commits + */ + List logCommits() throws IOException; + + /** + * returns list, which contains all branches names + */ + List logBranches() throws IOException; + + /** + * merges current branch with other_branch, deletes other_branch + */ + void merge(String other_branch) throws IOException; + + /** + * creates a new branch with name other_branch_name, + * branch new branch points to current commit + */ + void createBranch(String other_branch_name) throws IOException; + /** + * resets file to previous version, if file staged + * otherwise throws an exception + */ + void reset(Path path) throws IOException; - Map status(Path path) throws IOException; + + /** + * shows status: (path to file, "untracked" | "added" | "removed" | "committed" | "modified" + */ + Map status(Path path) throws IOException; + + /** + * removes file from path, also removes file from working copy + */ void rm(Path path) throws IOException; + + /** + * removes all untracked files + */ + void clean(Path path) throws IOException; + + /** + * returns name of current branch, if it exists, otherwise "null" + */ + String getCurrentBranchName(); + + /** + * returns id of current commit, + * note: id of initial commit is null + */ + long getCurrentCommitId(); } \ No newline at end of file diff --git a/myVCS/src/main/java/com/maxim/vcs_impl/VcsImpl.java b/myVCS/src/main/java/com/maxim/vcs_impl/VcsImpl.java index 51bc342..20dcdcf 100644 --- a/myVCS/src/main/java/com/maxim/vcs_impl/VcsImpl.java +++ b/myVCS/src/main/java/com/maxim/vcs_impl/VcsImpl.java @@ -4,7 +4,6 @@ import com.maxim.vcs_objects.VcsBlobLink; import com.maxim.vcs_objects.VcsBranch; import com.maxim.vcs_objects.VcsCommit; -import com.sun.xml.internal.ws.policy.privateutil.PolicyUtils; import java.io.IOException; import java.io.Serializable; @@ -17,6 +16,10 @@ import static com.maxim.vcs_impl.FileUtil.*; import static java.nio.file.StandardCopyOption.REPLACE_EXISTING; + +/** + * Implements methods of Interface VCS + */ public class VcsImpl implements Vcs { private Index index = new Index(VcsCommit.nullCommit.id); @@ -24,6 +27,7 @@ public VcsImpl() throws IOException { Files.createDirectories(commits_dir_path); Files.createDirectories(blobs_dir_path); Files.createDirectories(branches_dir_path); + Files.createDirectories(branches_dir_path); writeCommit(VcsCommit.nullCommit); @@ -108,8 +112,6 @@ public void add(Path path) throws IOException { @Override public void merge(String other_branch_name) throws IOException { - //TODO fix repeating code form commit(...) - readIndex(); if (index.branch == null) { @@ -236,10 +238,10 @@ public void reset(Path path) throws IOException { } @Override - public Map status(Path path) throws IOException { + public Map status(Path path) throws IOException { Map committedFiles = getCommittedFiles(); Set committedNames = committedFiles.keySet(); - ImmutableMap.Builder mapBuilder = ImmutableMap.builder(); + ImmutableMap.Builder mapBuilder = ImmutableMap.builder(); Files.walk(path) .filter(Files::isRegularFile) .forEach(entry -> { @@ -256,7 +258,7 @@ public Map status(Path path) throws IOException { state = "modified"; } } - mapBuilder.put(entry.toString(), state); + mapBuilder.put(entry, state); }); return mapBuilder.build(); } @@ -313,6 +315,16 @@ private Map loadAdded() throws IOException { } } + @Override + public String getCurrentBranchName() { + return String.valueOf(index.branch); + } + + @Override + public long getCurrentCommitId() { + return index.commit_id; + } + private void writeBranch(VcsBranch branch) throws IOException { Path branch_path = Paths.get(branches_dir_path.toString(), branch.name); writeObject(branch, branch_path); diff --git a/myVCS/src/main/java/com/maxim/vcs_objects/VcsBlob.java b/myVCS/src/main/java/com/maxim/vcs_objects/VcsBlob.java index fe2f47f..434a685 100644 --- a/myVCS/src/main/java/com/maxim/vcs_objects/VcsBlob.java +++ b/myVCS/src/main/java/com/maxim/vcs_objects/VcsBlob.java @@ -2,7 +2,12 @@ import org.apache.commons.codec.digest.DigestUtils; -public class VcsBlob extends VcsObject { +import java.io.Serializable; + +/** + * stores file, it's hash + */ +public class VcsBlob implements Serializable { public final byte[] bytes; public final String md5_hash; diff --git a/myVCS/src/main/java/com/maxim/vcs_objects/VcsBlobLink.java b/myVCS/src/main/java/com/maxim/vcs_objects/VcsBlobLink.java index 073f894..1cdfc3b 100644 --- a/myVCS/src/main/java/com/maxim/vcs_objects/VcsBlobLink.java +++ b/myVCS/src/main/java/com/maxim/vcs_objects/VcsBlobLink.java @@ -1,6 +1,11 @@ package com.maxim.vcs_objects; -public class VcsBlobLink extends VcsObject implements Comparable { +import java.io.Serializable; + +/** + * Stores md5 hash of file + */ +public class VcsBlobLink implements Comparable, Serializable { public final String md5_hash; public VcsBlobLink(String md5_hash) { diff --git a/myVCS/src/main/java/com/maxim/vcs_objects/VcsBranch.java b/myVCS/src/main/java/com/maxim/vcs_objects/VcsBranch.java index 09a270d..8b1ab98 100644 --- a/myVCS/src/main/java/com/maxim/vcs_objects/VcsBranch.java +++ b/myVCS/src/main/java/com/maxim/vcs_objects/VcsBranch.java @@ -2,6 +2,9 @@ import java.io.Serializable; +/** + * Stores name of branch, and head commit id + */ public class VcsBranch implements Serializable { public final String name; public final long commit_id; diff --git a/myVCS/src/main/java/com/maxim/vcs_objects/VcsCommit.java b/myVCS/src/main/java/com/maxim/vcs_objects/VcsCommit.java index 16cf237..1de7d92 100644 --- a/myVCS/src/main/java/com/maxim/vcs_objects/VcsCommit.java +++ b/myVCS/src/main/java/com/maxim/vcs_objects/VcsCommit.java @@ -3,12 +3,16 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; -import java.util.Collections; -import java.util.Date; -import java.util.List; -import java.util.Map; +import java.io.Serializable; +import java.util.*; -public class VcsCommit extends VcsObject { +/** + * Represent commit: + * stores id, message, date, parent commits id, links to committed files + */ + +public class VcsCommit implements Serializable { + public final long id; public final String message; public final long date; public final List parents_ids; @@ -16,6 +20,7 @@ public class VcsCommit extends VcsObject { public final static VcsCommit nullCommit = new VcsCommit(); public VcsCommit(String message, List parents_ids, Map files) { + id = Math.abs(new Random().nextLong()); this.message = message; this.parents_ids = ImmutableList.copyOf(parents_ids); this.files = ImmutableMap.copyOf(files); @@ -32,7 +37,7 @@ public String toString() { } private VcsCommit() { - super(0); + id = 0; this.message = "initial"; this.parents_ids = ImmutableList.of(); this.files = ImmutableMap.of(); diff --git a/myVCS/src/main/java/com/maxim/vcs_objects/VcsObject.java b/myVCS/src/main/java/com/maxim/vcs_objects/VcsObject.java deleted file mode 100644 index c920484..0000000 --- a/myVCS/src/main/java/com/maxim/vcs_objects/VcsObject.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.maxim.vcs_objects; - -import com.maxim.vcs_impl.Vcs; - -import java.io.Serializable; -import java.util.Random; - -public class VcsObject implements Serializable { - public final long id; - - public VcsObject() { - id = Math.abs(new Random().nextLong()); - } - - protected VcsObject(long id) { - this.id = id; - } -} From b879aebe84c730a8871a0fb6b4c02523c04471a5 Mon Sep 17 00:00:00 2001 From: maxkvant Date: Thu, 13 Apr 2017 05:21:42 +0300 Subject: [PATCH 16/21] added NotNull/Nullable, added comments to Main --- myVCS/src/main/java/com/maxim/Main.java | 39 ++++++++++-------- .../java/com/maxim/vcs_impl/FileUtil.java | 14 ++++--- .../src/main/java/com/maxim/vcs_impl/Vcs.java | 25 +++++++----- .../main/java/com/maxim/vcs_impl/VcsImpl.java | 40 ++++++++++++------- .../java/com/maxim/vcs_objects/VcsBlob.java | 7 ++-- .../com/maxim/vcs_objects/VcsBlobLink.java | 11 +++-- .../java/com/maxim/vcs_objects/VcsBranch.java | 5 ++- .../java/com/maxim/vcs_objects/VcsCommit.java | 10 +++-- 8 files changed, 93 insertions(+), 58 deletions(-) diff --git a/myVCS/src/main/java/com/maxim/Main.java b/myVCS/src/main/java/com/maxim/Main.java index c7ba8b2..6d1db82 100644 --- a/myVCS/src/main/java/com/maxim/Main.java +++ b/myVCS/src/main/java/com/maxim/Main.java @@ -4,6 +4,8 @@ import com.google.common.collect.ImmutableSet; import com.maxim.vcs_impl.Vcs; import com.maxim.vcs_impl.VcsImpl; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; import java.io.IOException; import java.nio.file.Path; @@ -11,6 +13,9 @@ import java.util.List; import java.util.stream.Collectors; +/** + * Implements console mode + */ public class Main { private final Vcs vcs; { @@ -30,7 +35,7 @@ public class Main { private final List commands = ImmutableList.of( new Command(1, "add", "") { @Override - public void execute(String[] args) throws IOException { + public void execute(@NotNull String[] args) throws IOException { Path path = Paths.get(parseArgs(args).get(0)); vcs.add(path); } @@ -38,38 +43,38 @@ public void execute(String[] args) throws IOException { new Command(1, "commit", "message") { @Override - public void execute(String[] args) throws IOException { + public void execute(@NotNull String[] args) throws IOException { vcs.commit(parseArgs(args).get(0)); } }, new Command(1, "create-branch", "") { @Override - public void execute(String[] args) throws IOException { + public void execute(@NotNull String[] args) throws IOException { vcs.createBranch(parseArgs(args).get(0)); } }, new Command(2,"checkout", "-b", "") { @Override - public void execute(String[] args) throws IOException { + public void execute(@NotNull String[] args) throws IOException { vcs.checkoutBranch(parseArgs(args).get(0)); } }, new Command(2, "checkout", "-c", "") { @Override - public void execute(String[] args) throws IOException { + public void execute(@NotNull String[] args) throws IOException { long arg = Long.parseLong(parseArgs(args).get(0)); vcs.checkoutCommit(arg); } }, new Command(1,"merge", "") { @Override - public void execute(String[] args) throws IOException { + public void execute(@NotNull String[] args) throws IOException { vcs.merge(parseArgs(args).get(0)); } }, new Command(2, "log", "-b") { @Override - public void execute(String[] args) throws IOException { + public void execute(@NotNull String[] args) throws IOException { System.out.println("---- current branch:"); System.out.println(vcs.getCurrentBranchName()); System.out.println(); @@ -80,7 +85,7 @@ public void execute(String[] args) throws IOException { }, new Command(2, "log", "-c") { @Override - public void execute(String[] args) throws IOException { + public void execute(@NotNull String[] args) throws IOException { System.out.println("---- current commit:"); System.out.println(vcs.getCurrentCommitId()); System.out.println(); @@ -91,28 +96,27 @@ public void execute(String[] args) throws IOException { }, new Command(1, "clean") { @Override - public void execute(String[] args) throws IOException { + public void execute(@NotNull String[] args) throws IOException { vcs.clean(Paths.get(".")); } }, new Command(1, "status") { @Override - public void execute(String[] args) throws IOException { + public void execute(@NotNull String[] args) throws IOException { vcs.status(Paths.get(".")) - .entrySet() - .forEach(entry -> System.out.println(entry.getKey() + " " + entry.getValue())); + .forEach((key, value) -> System.out.println(key + " " + value)); } }, new Command(1, "rm", "") { @Override - public void execute(String[] args) throws IOException { + public void execute(@NotNull String[] args) throws IOException { Path path = Paths.get(parseArgs(args).get(0)); vcs.rm(path); } }, new Command(1, "reset", "") { @Override - public void execute(String[] args) throws IOException { + public void execute(@NotNull String[] args) throws IOException { Path path = Paths.get(parseArgs(args).get(0)); vcs.reset(path); } @@ -147,7 +151,7 @@ private abstract static class Command { private final ImmutableList args_names; private final int prefix_len; - public Command(int args_count, String... arg_names) { + public Command(int args_count, @NotNull String... arg_names) { this.args_names = ImmutableList.copyOf(arg_names); this.prefix_len = args_count; } @@ -156,12 +160,13 @@ public String getMessage() { return args_names.stream().collect(Collectors.joining(" ")); } - public boolean check(String[] args) { + public boolean check(@NotNull String[] args) { return args_names.size() == args.length && ImmutableList.copyOf(args).subList(0, prefix_len).equals(args_names.subList(0, prefix_len)); } - public List parseArgs(String[] args) { + @Nullable + public List parseArgs(@NotNull String[] args) { return check(args) ? ImmutableList.copyOf(args).subList(prefix_len, args_names.size()) : null; } diff --git a/myVCS/src/main/java/com/maxim/vcs_impl/FileUtil.java b/myVCS/src/main/java/com/maxim/vcs_impl/FileUtil.java index 9bd871a..d058564 100644 --- a/myVCS/src/main/java/com/maxim/vcs_impl/FileUtil.java +++ b/myVCS/src/main/java/com/maxim/vcs_impl/FileUtil.java @@ -1,6 +1,7 @@ package com.maxim.vcs_impl; import com.maxim.vcs_objects.*; +import org.jetbrains.annotations.NotNull; import java.io.*; import java.nio.file.Files; @@ -26,7 +27,8 @@ public class FileUtil { * creates VcsBlob from file * throws RuntimeException */ - public static VcsBlob getBlob(Path path) { + @NotNull + public static VcsBlob getBlob(@NotNull Path path) { try { if (!Files.isRegularFile(path)) { throw new IOException("not suck file"); @@ -41,7 +43,8 @@ public static VcsBlob getBlob(Path path) { * creates VcsBlobLink from file * throws RuntimeException */ - public static VcsBlobLink addBlob(Path path) { + @NotNull + public static VcsBlobLink addBlob(@NotNull Path path) { try { VcsBlob blob = getBlob(path); Path blob_path = Paths.get(blobs_dir_path + "", blob.md5_hash); @@ -59,7 +62,7 @@ public static VcsBlobLink addBlob(Path path) { /** * serializes object to path */ - public static void writeObject(Object object, Path path) throws IOException { + public static void writeObject(@NotNull Object object, @NotNull Path path) throws IOException { try (ByteArrayOutputStream bos = new ByteArrayOutputStream()) { ObjectOutput out = new ObjectOutputStream(bos); out.writeObject(object); @@ -78,13 +81,14 @@ public static void writeObject(Object object, Path path) throws IOException { /** * deserialize object from path */ - public static Object readObject(Path path) throws IOException { + @NotNull + public static Object readObject(@NotNull Path path) throws IOException { try (FileInputStream fin = new FileInputStream(path.toString())) { ObjectInput ois = new ObjectInputStream(fin); return ois.readObject(); } catch (ClassNotFoundException e) { e.printStackTrace(); } - return null; + throw new RuntimeException(); } } diff --git a/myVCS/src/main/java/com/maxim/vcs_impl/Vcs.java b/myVCS/src/main/java/com/maxim/vcs_impl/Vcs.java index 96ef192..47a6a4c 100644 --- a/myVCS/src/main/java/com/maxim/vcs_impl/Vcs.java +++ b/myVCS/src/main/java/com/maxim/vcs_impl/Vcs.java @@ -1,6 +1,7 @@ package com.maxim.vcs_impl; import com.maxim.vcs_objects.VcsCommit; +import org.jetbrains.annotations.NotNull; import java.io.IOException; import java.nio.file.Path; @@ -22,7 +23,8 @@ public interface Vcs { * returns new commit */ - VcsCommit commit(String message) throws IOException; + @NotNull + VcsCommit commit(@NotNull String message) throws IOException; /** * if such commit exists @@ -40,67 +42,70 @@ public interface Vcs { * throws an Exception */ - void checkoutBranch(String branch_name) throws IOException; + void checkoutBranch(@NotNull String branch_name) throws IOException; /** * puts file if absent in list tracking files */ - void add(Path path) throws IOException; + void add(@NotNull Path path) throws IOException; /** * removes branch */ - void deleteBranch(String branch_name) throws IOException; + void deleteBranch(@NotNull String branch_name) throws IOException; /** * returns list, which contains all commits */ + @NotNull List logCommits() throws IOException; /** * returns list, which contains all branches names */ + @NotNull List logBranches() throws IOException; /** * merges current branch with other_branch, deletes other_branch */ - void merge(String other_branch) throws IOException; + void merge(@NotNull String other_branch) throws IOException; /** * creates a new branch with name other_branch_name, * branch new branch points to current commit */ - void createBranch(String other_branch_name) throws IOException; + void createBranch(@NotNull String other_branch_name) throws IOException; /** * resets file to previous version, if file staged * otherwise throws an exception */ - void reset(Path path) throws IOException; + void reset(@NotNull Path path) throws IOException; /** * shows status: (path to file, "untracked" | "added" | "removed" | "committed" | "modified" */ - Map status(Path path) throws IOException; + @NotNull + Map status(@NotNull Path path) throws IOException; /** * removes file from path, also removes file from working copy */ - void rm(Path path) throws IOException; + void rm(@NotNull Path path) throws IOException; /** * removes all untracked files */ - void clean(Path path) throws IOException; + void clean(@NotNull Path path) throws IOException; /** * returns name of current branch, if it exists, otherwise "null" diff --git a/myVCS/src/main/java/com/maxim/vcs_impl/VcsImpl.java b/myVCS/src/main/java/com/maxim/vcs_impl/VcsImpl.java index 20dcdcf..cacc441 100644 --- a/myVCS/src/main/java/com/maxim/vcs_impl/VcsImpl.java +++ b/myVCS/src/main/java/com/maxim/vcs_impl/VcsImpl.java @@ -4,6 +4,8 @@ import com.maxim.vcs_objects.VcsBlobLink; import com.maxim.vcs_objects.VcsBranch; import com.maxim.vcs_objects.VcsCommit; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; import java.io.IOException; import java.io.Serializable; @@ -21,6 +23,7 @@ * Implements methods of Interface VCS */ public class VcsImpl implements Vcs { + @NotNull private Index index = new Index(VcsCommit.nullCommit.id); public VcsImpl() throws IOException { @@ -36,8 +39,9 @@ public VcsImpl() throws IOException { } } + @NotNull @Override - public VcsCommit commit(String message) throws IOException { + public VcsCommit commit(@NotNull String message) throws IOException { readIndex(); if (index.branch == null) { @@ -92,7 +96,7 @@ public void checkoutCommit(long commit_id) throws IOException { } @Override - public void checkoutBranch(String branch_name) throws IOException { + public void checkoutBranch(@NotNull String branch_name) throws IOException { readIndex(); VcsBranch branch = readBranch(branch_name); @@ -104,14 +108,14 @@ public void checkoutBranch(String branch_name) throws IOException { } @Override - public void add(Path path) throws IOException { + public void add(@NotNull Path path) throws IOException { readIndex(); index.added.add(path.toString()); writeIndex(); } @Override - public void merge(String other_branch_name) throws IOException { + public void merge(@NotNull String other_branch_name) throws IOException { readIndex(); if (index.branch == null) { @@ -150,7 +154,7 @@ public void merge(String other_branch_name) throws IOException { } @Override - public void createBranch(String branch_name) throws IOException { + public void createBranch(@NotNull String branch_name) throws IOException { readIndex(); Path path = Paths.get(branches_dir_path + "", branch_name); @@ -166,7 +170,7 @@ public void createBranch(String branch_name) throws IOException { } @Override - public void deleteBranch(String branch_name) throws IOException { + public void deleteBranch(@NotNull String branch_name) throws IOException { readIndex(); Path branch_path = Paths.get(branches_dir_path + "", branch_name); @@ -177,6 +181,7 @@ public void deleteBranch(String branch_name) throws IOException { writeIndex(); } + @NotNull @Override public List logCommits() throws IOException { try { @@ -201,6 +206,7 @@ public List logCommits() throws IOException { } } + @NotNull @Override public List logBranches() throws IOException { return Files.walk(branches_dir_path) @@ -211,7 +217,7 @@ public List logBranches() throws IOException { } @Override - public void clean(Path path) throws IOException { + public void clean(@NotNull Path path) throws IOException { Set tracking = getTrackingNames(); Files.walk(path) .filter(Files::isRegularFile) @@ -225,9 +231,8 @@ public void clean(Path path) throws IOException { }); } - @Override - public void reset(Path path) throws IOException { + public void reset(@NotNull Path path) throws IOException { Map committed = getCommittedFiles(); if (!committed.containsKey(path.toString())) { throw new IOException("no such committed file"); @@ -237,8 +242,9 @@ public void reset(Path path) throws IOException { Files.copy(blob_path, path); } + @NotNull @Override - public Map status(Path path) throws IOException { + public Map status(@NotNull Path path) throws IOException { Map committedFiles = getCommittedFiles(); Set committedNames = committedFiles.keySet(); ImmutableMap.Builder mapBuilder = ImmutableMap.builder(); @@ -264,7 +270,7 @@ public Map status(Path path) throws IOException { } @Override - public void rm(Path path) throws IOException { + public void rm(@NotNull Path path) throws IOException { readIndex(); if (!getTrackingNames().contains(path.toString())) { @@ -291,7 +297,7 @@ private void readIndex() throws IOException { index = (Index) readObject(index_file_path); } - private void writeCommit(VcsCommit commit) throws IOException { + private void writeCommit(@NotNull VcsCommit commit) throws IOException { Path path = Paths.get(commits_dir_path + "", commit.id + ""); writeObject(commit, path); } @@ -301,6 +307,7 @@ private VcsCommit readCommit(long commit_id) throws IOException { return (VcsCommit) FileUtil.readObject(path); } + @NotNull private Map loadAdded() throws IOException { Path path = Paths.get("."); try { @@ -330,25 +337,30 @@ private void writeBranch(VcsBranch branch) throws IOException { writeObject(branch, branch_path); } - private VcsBranch readBranch(String branch_name) throws IOException { + private VcsBranch readBranch(@NotNull String branch_name) throws IOException { Path branch_path = Paths.get(branches_dir_path.toString(), branch_name); return (VcsBranch) readObject(branch_path); } + @NotNull private Set getTrackingNames() throws IOException { Set added = index.added; Set committed = getCommittedFiles().keySet(); return new ImmutableSet.Builder().addAll(added).addAll(committed).build(); } + @NotNull private Map getCommittedFiles() throws IOException { Map committed = readCommit(index.commit_id).files; return Maps.filterKeys(committed, path -> !index.removed.contains(path)); } private static class Index implements Serializable { + @NotNull private Set added = new TreeSet<>(); + @NotNull private Set removed = new TreeSet<>(); + @Nullable private VcsBranch branch; private long commit_id = VcsCommit.nullCommit.id; @@ -357,7 +369,7 @@ private static class Index implements Serializable { this.branch = null; } - Index(VcsBranch branch) { + Index(@NotNull VcsBranch branch) { this.branch = branch; this.commit_id = branch.commit_id; } diff --git a/myVCS/src/main/java/com/maxim/vcs_objects/VcsBlob.java b/myVCS/src/main/java/com/maxim/vcs_objects/VcsBlob.java index 434a685..49dc035 100644 --- a/myVCS/src/main/java/com/maxim/vcs_objects/VcsBlob.java +++ b/myVCS/src/main/java/com/maxim/vcs_objects/VcsBlob.java @@ -1,6 +1,7 @@ package com.maxim.vcs_objects; import org.apache.commons.codec.digest.DigestUtils; +import org.jetbrains.annotations.NotNull; import java.io.Serializable; @@ -8,10 +9,10 @@ * stores file, it's hash */ public class VcsBlob implements Serializable { - public final byte[] bytes; - public final String md5_hash; + public final @NotNull byte[] bytes; + public final @NotNull String md5_hash; - public VcsBlob(byte[] bytes) { + public VcsBlob(@NotNull byte[] bytes) { this.bytes = bytes; md5_hash = DigestUtils.md5Hex(bytes); } diff --git a/myVCS/src/main/java/com/maxim/vcs_objects/VcsBlobLink.java b/myVCS/src/main/java/com/maxim/vcs_objects/VcsBlobLink.java index 1cdfc3b..aa15c98 100644 --- a/myVCS/src/main/java/com/maxim/vcs_objects/VcsBlobLink.java +++ b/myVCS/src/main/java/com/maxim/vcs_objects/VcsBlobLink.java @@ -1,24 +1,27 @@ package com.maxim.vcs_objects; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; + import java.io.Serializable; /** * Stores md5 hash of file */ public class VcsBlobLink implements Comparable, Serializable { - public final String md5_hash; + public final @NotNull String md5_hash; - public VcsBlobLink(String md5_hash) { + public VcsBlobLink(@NotNull String md5_hash) { this.md5_hash = md5_hash; } @Override - public boolean equals(Object other) { + public boolean equals(@Nullable Object other) { return !(other == null || !(other instanceof VcsBlobLink)) && md5_hash.equals(((VcsBlobLink) other).md5_hash); } @Override - public int compareTo(Object other) { + public int compareTo(@Nullable Object other) { if (other == null || !(other instanceof VcsBlobLink)) { return -1; } diff --git a/myVCS/src/main/java/com/maxim/vcs_objects/VcsBranch.java b/myVCS/src/main/java/com/maxim/vcs_objects/VcsBranch.java index 8b1ab98..c509f80 100644 --- a/myVCS/src/main/java/com/maxim/vcs_objects/VcsBranch.java +++ b/myVCS/src/main/java/com/maxim/vcs_objects/VcsBranch.java @@ -1,15 +1,18 @@ package com.maxim.vcs_objects; +import org.jetbrains.annotations.NotNull; + import java.io.Serializable; /** * Stores name of branch, and head commit id */ public class VcsBranch implements Serializable { + @NotNull public final String name; public final long commit_id; - public VcsBranch(String name, long commit_id) { + public VcsBranch(@NotNull String name, long commit_id) { this.name = name; this.commit_id = commit_id; } diff --git a/myVCS/src/main/java/com/maxim/vcs_objects/VcsCommit.java b/myVCS/src/main/java/com/maxim/vcs_objects/VcsCommit.java index 1de7d92..8144a2f 100644 --- a/myVCS/src/main/java/com/maxim/vcs_objects/VcsCommit.java +++ b/myVCS/src/main/java/com/maxim/vcs_objects/VcsCommit.java @@ -2,6 +2,7 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; +import org.jetbrains.annotations.NotNull; import java.io.Serializable; import java.util.*; @@ -13,13 +14,13 @@ public class VcsCommit implements Serializable { public final long id; - public final String message; + public final @NotNull String message; public final long date; - public final List parents_ids; - public final Map files; + public final @NotNull List parents_ids; + public final @NotNull Map files; public final static VcsCommit nullCommit = new VcsCommit(); - public VcsCommit(String message, List parents_ids, Map files) { + public VcsCommit(@NotNull String message, @NotNull List parents_ids, @NotNull Map files) { id = Math.abs(new Random().nextLong()); this.message = message; this.parents_ids = ImmutableList.copyOf(parents_ids); @@ -27,6 +28,7 @@ public VcsCommit(String message, List parents_ids, Map Date: Thu, 13 Apr 2017 11:25:57 +0300 Subject: [PATCH 17/21] added custom in vcsImpl; trying fix buld --- myVCS/build.gradle | 1 + myVCS/src/main/java/com/maxim/Main.java | 6 +-- .../java/com/maxim/vcs_impl/FileUtil.java | 21 +++----- .../src/main/java/com/maxim/vcs_impl/Vcs.java | 4 +- .../main/java/com/maxim/vcs_impl/VcsImpl.java | 52 +++++++++++++------ .../java/com/maxim/vcs_impl/VcsImplTest.java | 13 ++++- 6 files changed, 62 insertions(+), 35 deletions(-) diff --git a/myVCS/build.gradle b/myVCS/build.gradle index 7978d40..57d028d 100644 --- a/myVCS/build.gradle +++ b/myVCS/build.gradle @@ -16,4 +16,5 @@ dependencies { compile group: 'com.google.guava', name: 'guava', version: '19.0' compile group: 'commons-codec', name: 'commons-codec', version: '1.5' compile group: 'org.mockito', name: 'mockito-all', version: '1.8.4' + compile 'com.intellij:annotations:+@jar' } diff --git a/myVCS/src/main/java/com/maxim/Main.java b/myVCS/src/main/java/com/maxim/Main.java index 6d1db82..eec0d54 100644 --- a/myVCS/src/main/java/com/maxim/Main.java +++ b/myVCS/src/main/java/com/maxim/Main.java @@ -21,7 +21,7 @@ public class Main { { Vcs vcs1 = null; try { - vcs1 = new VcsImpl(); + vcs1 = new VcsImpl(Paths.get(".")); } catch (IOException e) { e.printStackTrace(); System.out.println("failed to init vcs"); @@ -97,13 +97,13 @@ public void execute(@NotNull String[] args) throws IOException { new Command(1, "clean") { @Override public void execute(@NotNull String[] args) throws IOException { - vcs.clean(Paths.get(".")); + vcs.clean(); } }, new Command(1, "status") { @Override public void execute(@NotNull String[] args) throws IOException { - vcs.status(Paths.get(".")) + vcs.status() .forEach((key, value) -> System.out.println(key + " " + value)); } }, diff --git a/myVCS/src/main/java/com/maxim/vcs_impl/FileUtil.java b/myVCS/src/main/java/com/maxim/vcs_impl/FileUtil.java index d058564..35f1d34 100644 --- a/myVCS/src/main/java/com/maxim/vcs_impl/FileUtil.java +++ b/myVCS/src/main/java/com/maxim/vcs_impl/FileUtil.java @@ -12,16 +12,11 @@ * Class contains static methods to work with files */ public class FileUtil { - private static final String vcs_dir = ".vcs"; - private static final String blobs_dir = "blobs"; - private static final String commits_dir = "commits"; - private static final String branches_dir = "branches"; - private static final String index_file = "index"; - - public static final Path blobs_dir_path = Paths.get(".", vcs_dir, blobs_dir); - public static final Path commits_dir_path = Paths.get(".", vcs_dir, commits_dir); - public static final Path branches_dir_path = Paths.get(".", vcs_dir, branches_dir); - public static final Path index_file_path = Paths.get(".", vcs_dir, index_file); + public static final String vcs_dir = ".vcs"; + public static final String blobs_dir = "blobs"; + public static final String commits_dir = "commits"; + public static final String branches_dir = "branches"; + public static final String index_file = "index"; /** * creates VcsBlob from file @@ -31,7 +26,7 @@ public class FileUtil { public static VcsBlob getBlob(@NotNull Path path) { try { if (!Files.isRegularFile(path)) { - throw new IOException("not suck file"); + throw new IOException("not such file"); } return new VcsBlob(Files.readAllBytes(path)); } catch (IOException e) { @@ -44,10 +39,10 @@ public static VcsBlob getBlob(@NotNull Path path) { * throws RuntimeException */ @NotNull - public static VcsBlobLink addBlob(@NotNull Path path) { + public static VcsBlobLink addBlob(@NotNull Path path, @NotNull Path blobs_dir) { try { VcsBlob blob = getBlob(path); - Path blob_path = Paths.get(blobs_dir_path + "", blob.md5_hash); + Path blob_path = Paths.get(blobs_dir + "", blob.md5_hash); if (!Files.exists(blob_path)) { Files.createFile(blob_path); Files.write(blob_path, blob.bytes); diff --git a/myVCS/src/main/java/com/maxim/vcs_impl/Vcs.java b/myVCS/src/main/java/com/maxim/vcs_impl/Vcs.java index 47a6a4c..8be4762 100644 --- a/myVCS/src/main/java/com/maxim/vcs_impl/Vcs.java +++ b/myVCS/src/main/java/com/maxim/vcs_impl/Vcs.java @@ -94,7 +94,7 @@ public interface Vcs { * shows status: (path to file, "untracked" | "added" | "removed" | "committed" | "modified" */ @NotNull - Map status(@NotNull Path path) throws IOException; + Map status() throws IOException; /** * removes file from path, also removes file from working copy @@ -105,7 +105,7 @@ public interface Vcs { * removes all untracked files */ - void clean(@NotNull Path path) throws IOException; + void clean() throws IOException; /** * returns name of current branch, if it exists, otherwise "null" diff --git a/myVCS/src/main/java/com/maxim/vcs_impl/VcsImpl.java b/myVCS/src/main/java/com/maxim/vcs_impl/VcsImpl.java index cacc441..e267953 100644 --- a/myVCS/src/main/java/com/maxim/vcs_impl/VcsImpl.java +++ b/myVCS/src/main/java/com/maxim/vcs_impl/VcsImpl.java @@ -25,8 +25,23 @@ public class VcsImpl implements Vcs { @NotNull private Index index = new Index(VcsCommit.nullCommit.id); + @NotNull + private final Path root_path; + + private final Path blobs_dir_path; + private final Path commits_dir_path; + private final Path branches_dir_path; + private final Path index_file_path; + + + public VcsImpl(@NotNull Path root_path) throws IOException { + this.root_path = root_path.normalize(); + + blobs_dir_path = Paths.get(root_path.toString(), vcs_dir, blobs_dir); + commits_dir_path = Paths.get(root_path.toString(), vcs_dir, commits_dir); + branches_dir_path = Paths.get(root_path.toString(), vcs_dir, branches_dir); + index_file_path = Paths.get(root_path.toString(), vcs_dir, index_file); - public VcsImpl() throws IOException { Files.createDirectories(commits_dir_path); Files.createDirectories(blobs_dir_path); Files.createDirectories(branches_dir_path); @@ -110,7 +125,11 @@ public void checkoutBranch(@NotNull String branch_name) throws IOException { @Override public void add(@NotNull Path path) throws IOException { readIndex(); - index.added.add(path.toString()); + //if (Files.isRegularFile(path)) { + index.added.add(path.toString()); + //} else { + // throw new IOException(path + " isn't regular file"); + //} writeIndex(); } @@ -217,9 +236,9 @@ public List logBranches() throws IOException { } @Override - public void clean(@NotNull Path path) throws IOException { + public void clean() throws IOException { Set tracking = getTrackingNames(); - Files.walk(path) + Files.walk(root_path) .filter(Files::isRegularFile) .filter(entry -> !tracking.contains(entry.toString())) .forEach(entry -> { @@ -244,11 +263,11 @@ public void reset(@NotNull Path path) throws IOException { @NotNull @Override - public Map status(@NotNull Path path) throws IOException { + public Map status() throws IOException { Map committedFiles = getCommittedFiles(); Set committedNames = committedFiles.keySet(); ImmutableMap.Builder mapBuilder = ImmutableMap.builder(); - Files.walk(path) + Files.walk(root_path) .filter(Files::isRegularFile) .forEach(entry -> { String state = "untracked"; @@ -273,14 +292,17 @@ public Map status(@NotNull Path path) throws IOException { public void rm(@NotNull Path path) throws IOException { readIndex(); - if (!getTrackingNames().contains(path.toString())) { - throw new IOException("no such tracking file"); + if (!Files.exists(path) || !Files.isRegularFile(path)) { + throw new IOException("no such regular file " + path); } Files.delete(path); - if (index.added.contains(path.toString())) { - index.added.remove(path.toString()); - } else { - index.removed.add(path.toString()); + + if (getTrackingNames().contains(path.toString())) { + if (index.added.contains(path.toString())) { + index.added.remove(path.toString()); + } else { + index.removed.add(path.toString()); + } } writeIndex(); @@ -309,14 +331,13 @@ private VcsCommit readCommit(long commit_id) throws IOException { @NotNull private Map loadAdded() throws IOException { - Path path = Paths.get("."); try { - return Files.walk(path) + return Files.walk(root_path) .filter(Files::isRegularFile) .filter(entry -> index.added.contains(entry.toString())) .collect(Collectors.toMap( Path::toString, - FileUtil::addBlob)); + path1 -> FileUtil.addBlob(path1, blobs_dir_path))); } catch (RuntimeException e) { throw (IOException) e.getCause(); } @@ -374,5 +395,4 @@ private static class Index implements Serializable { this.commit_id = branch.commit_id; } } - } diff --git a/myVCS/src/test/java/com/maxim/vcs_impl/VcsImplTest.java b/myVCS/src/test/java/com/maxim/vcs_impl/VcsImplTest.java index a905a9f..e9c3368 100644 --- a/myVCS/src/test/java/com/maxim/vcs_impl/VcsImplTest.java +++ b/myVCS/src/test/java/com/maxim/vcs_impl/VcsImplTest.java @@ -1,7 +1,9 @@ package com.maxim.vcs_impl; import com.maxim.vcs_objects.VcsCommit; +import org.junit.Rule; import org.junit.Test; +import org.junit.rules.TemporaryFolder; import java.nio.file.Paths; import java.util.Arrays; @@ -10,9 +12,14 @@ public class VcsImplTest { + @Rule + public TemporaryFolder temporaryFolder = new TemporaryFolder(); + @Test public void test() throws Exception { - Vcs vcs = new VcsImpl(); + System.out.println("root " + temporaryFolder.getRoot().getPath()); + + Vcs vcs = new VcsImpl(Paths.get(temporaryFolder.getRoot().getPath())); Set set1 = new TreeSet<>( Arrays.asList("./.idea/uiDesigner.xml", @@ -44,4 +51,8 @@ public void test() throws Exception { vcs.merge("1"); vcs.deleteBranch("2"); } + + public void statusTest() { + + } } \ No newline at end of file From 5d0ad6c978fe3e354b71d4f938f1cf3c2db5dd24 Mon Sep 17 00:00:00 2001 From: maxkvant Date: Thu, 13 Apr 2017 13:10:15 +0300 Subject: [PATCH 18/21] added hamcrest library, added test, fixed bug --- myVCS/build.gradle | 1 + .../src/main/java/com/maxim/vcs_impl/Vcs.java | 2 +- .../main/java/com/maxim/vcs_impl/VcsImpl.java | 15 +++-- .../java/com/maxim/vcs_impl/VcsImplTest.java | 62 +++++++++++++++++-- 4 files changed, 68 insertions(+), 12 deletions(-) diff --git a/myVCS/build.gradle b/myVCS/build.gradle index 57d028d..a5f9264 100644 --- a/myVCS/build.gradle +++ b/myVCS/build.gradle @@ -17,4 +17,5 @@ dependencies { compile group: 'commons-codec', name: 'commons-codec', version: '1.5' compile group: 'org.mockito', name: 'mockito-all', version: '1.8.4' compile 'com.intellij:annotations:+@jar' + compile group: 'org.hamcrest', name: 'hamcrest-all', version: '1.3' } diff --git a/myVCS/src/main/java/com/maxim/vcs_impl/Vcs.java b/myVCS/src/main/java/com/maxim/vcs_impl/Vcs.java index 8be4762..c8be768 100644 --- a/myVCS/src/main/java/com/maxim/vcs_impl/Vcs.java +++ b/myVCS/src/main/java/com/maxim/vcs_impl/Vcs.java @@ -37,7 +37,7 @@ public interface Vcs { /** * if such branch exists - * checkouts commit with name=branch_name + * checkouts commit which is head of branch with name=branch_name * otherwise * throws an Exception */ diff --git a/myVCS/src/main/java/com/maxim/vcs_impl/VcsImpl.java b/myVCS/src/main/java/com/maxim/vcs_impl/VcsImpl.java index e267953..d199ff4 100644 --- a/myVCS/src/main/java/com/maxim/vcs_impl/VcsImpl.java +++ b/myVCS/src/main/java/com/maxim/vcs_impl/VcsImpl.java @@ -71,6 +71,7 @@ public VcsCommit commit(@NotNull String message) throws IOException { VcsCommit new_commit = new VcsCommit(message, parents_ids, currentFiles); writeCommit(new_commit); + System.out.println(new_commit.files); index.branch = index.branch.changeCommit(new_commit.id); index = new Index(index.branch); @@ -125,11 +126,13 @@ public void checkoutBranch(@NotNull String branch_name) throws IOException { @Override public void add(@NotNull Path path) throws IOException { readIndex(); - //if (Files.isRegularFile(path)) { - index.added.add(path.toString()); - //} else { + + if (!Files.isRegularFile(path)){ // throw new IOException(path + " isn't regular file"); - //} + } + if (!getTrackingNames().contains(path.toString())) { + index.added.add(path.toString()); + } writeIndex(); } @@ -177,7 +180,6 @@ public void createBranch(@NotNull String branch_name) throws IOException { readIndex(); Path path = Paths.get(branches_dir_path + "", branch_name); - System.out.println(path); if (Files.exists(path)) { throw new IOException("branch exits"); } @@ -264,6 +266,8 @@ public void reset(@NotNull Path path) throws IOException { @NotNull @Override public Map status() throws IOException { + readIndex(); + Map committedFiles = getCommittedFiles(); Set committedNames = committedFiles.keySet(); ImmutableMap.Builder mapBuilder = ImmutableMap.builder(); @@ -332,6 +336,7 @@ private VcsCommit readCommit(long commit_id) throws IOException { @NotNull private Map loadAdded() throws IOException { try { + System.out.println(index.added); return Files.walk(root_path) .filter(Files::isRegularFile) .filter(entry -> index.added.contains(entry.toString())) diff --git a/myVCS/src/test/java/com/maxim/vcs_impl/VcsImplTest.java b/myVCS/src/test/java/com/maxim/vcs_impl/VcsImplTest.java index e9c3368..58d11bd 100644 --- a/myVCS/src/test/java/com/maxim/vcs_impl/VcsImplTest.java +++ b/myVCS/src/test/java/com/maxim/vcs_impl/VcsImplTest.java @@ -1,14 +1,23 @@ package com.maxim.vcs_impl; +import com.google.common.collect.ImmutableSet; import com.maxim.vcs_objects.VcsCommit; import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; +import java.io.File; +import java.io.IOException; +import java.nio.file.Files; +import java.nio.file.Path; import java.nio.file.Paths; -import java.util.Arrays; -import java.util.Set; -import java.util.TreeSet; +import java.util.*; +import java.util.concurrent.Callable; +import java.util.function.Function; + +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.containsInAnyOrder; +import static org.hamcrest.Matchers.equalTo; public class VcsImplTest { @@ -17,8 +26,6 @@ public class VcsImplTest { @Test public void test() throws Exception { - System.out.println("root " + temporaryFolder.getRoot().getPath()); - Vcs vcs = new VcsImpl(Paths.get(temporaryFolder.getRoot().getPath())); Set set1 = new TreeSet<>( @@ -52,7 +59,50 @@ public void test() throws Exception { vcs.deleteBranch("2"); } - public void statusTest() { + @Test + public void addTest() throws Exception { + final Vcs vcs = new VcsImpl(Paths.get(temporaryFolder.getRoot().getPath())); + List paths = initFolder(); + vcs.createBranch("branch"); + + Callable> getAdded = () -> { + Map < Path, String > cur_status = vcs.status(); + List added = new ArrayList<>(); + cur_status.forEach((path, state) -> { + if (state.equals("added")) { + added.add(path); + } + }); + return added; + }; + + vcs.add(paths.get(0)); + vcs.add(paths.get(1)); + + assertThat(getAdded.call(), containsInAnyOrder(paths.get(0), paths.get(1))); + + vcs.commit("message"); + assertThat(getAdded.call().size(), equalTo(0)); + vcs.add(paths.get(0)); + vcs.add(paths.get(2)); + + assertThat(getAdded.call().size(), equalTo(1)); + assertThat(getAdded.call(), containsInAnyOrder( paths.get(2))); + assertThat(getAdded.call().size(), equalTo(1)); + } + + + private List initFolder() throws IOException { + List res = new ArrayList<>(); + res.add(Paths.get(temporaryFolder.getRoot().getPath(), "1")); + FileUtil.writeObject(1, res.get(0)); + + File folder = temporaryFolder.newFolder("folder"); + for (int i = 2; i <= 4; i++) { + res.add(Paths.get(folder.getPath(), i + "")); + FileUtil.writeObject(i, res.get(res.size() - 1)); + } + return res; } } \ No newline at end of file From 07eefffa1d94b03a7be8baf51961ec9a09cea13e Mon Sep 17 00:00:00 2001 From: maxkvant Date: Thu, 13 Apr 2017 13:42:43 +0300 Subject: [PATCH 19/21] added logTest --- .../src/main/java/com/maxim/vcs_impl/Vcs.java | 4 +-- .../main/java/com/maxim/vcs_impl/VcsImpl.java | 22 ++++++------ .../java/com/maxim/vcs_objects/VcsCommit.java | 8 +++++ .../java/com/maxim/vcs_impl/VcsImplTest.java | 35 +++++++++++++++---- 4 files changed, 49 insertions(+), 20 deletions(-) diff --git a/myVCS/src/main/java/com/maxim/vcs_impl/Vcs.java b/myVCS/src/main/java/com/maxim/vcs_impl/Vcs.java index c8be768..bb324c0 100644 --- a/myVCS/src/main/java/com/maxim/vcs_impl/Vcs.java +++ b/myVCS/src/main/java/com/maxim/vcs_impl/Vcs.java @@ -77,8 +77,8 @@ public interface Vcs { void merge(@NotNull String other_branch) throws IOException; /** - * creates a new branch with name other_branch_name, - * branch new branch points to current commit + * creates a new branch with name other_branch_name and checkouts that branch + * new branch points to current commit */ void createBranch(@NotNull String other_branch_name) throws IOException; diff --git a/myVCS/src/main/java/com/maxim/vcs_impl/VcsImpl.java b/myVCS/src/main/java/com/maxim/vcs_impl/VcsImpl.java index d199ff4..db19a6c 100644 --- a/myVCS/src/main/java/com/maxim/vcs_impl/VcsImpl.java +++ b/myVCS/src/main/java/com/maxim/vcs_impl/VcsImpl.java @@ -71,7 +71,6 @@ public VcsCommit commit(@NotNull String message) throws IOException { VcsCommit new_commit = new VcsCommit(message, parents_ids, currentFiles); writeCommit(new_commit); - System.out.println(new_commit.files); index.branch = index.branch.changeCommit(new_commit.id); index = new Index(index.branch); @@ -312,6 +311,16 @@ public void rm(@NotNull Path path) throws IOException { writeIndex(); } + @Override + public String getCurrentBranchName() { + return index.branch == null ? "null" : index.branch.name; + } + + @Override + public long getCurrentCommitId() { + return index.commit_id; + } + private void writeIndex() throws IOException { if (index.branch != null) { index.commit_id = index.branch.commit_id; @@ -336,7 +345,6 @@ private VcsCommit readCommit(long commit_id) throws IOException { @NotNull private Map loadAdded() throws IOException { try { - System.out.println(index.added); return Files.walk(root_path) .filter(Files::isRegularFile) .filter(entry -> index.added.contains(entry.toString())) @@ -348,16 +356,6 @@ private Map loadAdded() throws IOException { } } - @Override - public String getCurrentBranchName() { - return String.valueOf(index.branch); - } - - @Override - public long getCurrentCommitId() { - return index.commit_id; - } - private void writeBranch(VcsBranch branch) throws IOException { Path branch_path = Paths.get(branches_dir_path.toString(), branch.name); writeObject(branch, branch_path); diff --git a/myVCS/src/main/java/com/maxim/vcs_objects/VcsCommit.java b/myVCS/src/main/java/com/maxim/vcs_objects/VcsCommit.java index 8144a2f..e23c6b6 100644 --- a/myVCS/src/main/java/com/maxim/vcs_objects/VcsCommit.java +++ b/myVCS/src/main/java/com/maxim/vcs_objects/VcsCommit.java @@ -45,4 +45,12 @@ private VcsCommit() { this.files = ImmutableMap.of(); this.date = 0; } + + @Override + public boolean equals(Object other) { + if (other == null || !(other instanceof VcsCommit)) { + return false; + } + return id == ((VcsCommit) other).id; + } } diff --git a/myVCS/src/test/java/com/maxim/vcs_impl/VcsImplTest.java b/myVCS/src/test/java/com/maxim/vcs_impl/VcsImplTest.java index 58d11bd..1d0310b 100644 --- a/myVCS/src/test/java/com/maxim/vcs_impl/VcsImplTest.java +++ b/myVCS/src/test/java/com/maxim/vcs_impl/VcsImplTest.java @@ -14,6 +14,7 @@ import java.util.*; import java.util.concurrent.Callable; import java.util.function.Function; +import java.util.stream.Collectors; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.containsInAnyOrder; @@ -78,20 +79,42 @@ public void addTest() throws Exception { vcs.add(paths.get(0)); vcs.add(paths.get(1)); - assertThat(getAdded.call(), containsInAnyOrder(paths.get(0), paths.get(1))); - vcs.commit("message"); assertThat(getAdded.call().size(), equalTo(0)); - vcs.add(paths.get(0)); vcs.add(paths.get(2)); - - assertThat(getAdded.call().size(), equalTo(1)); assertThat(getAdded.call(), containsInAnyOrder( paths.get(2))); - assertThat(getAdded.call().size(), equalTo(1)); } + @Test + public void logTest() throws IOException { + final Vcs vcs = new VcsImpl(Paths.get(temporaryFolder.getRoot().getPath())); + List paths = initFolder(); + + assertThat(vcs.getCurrentBranchName(), equalTo("null")); + assertThat(vcs.logBranches().size(), equalTo(0)); + + vcs.createBranch("master"); + vcs.createBranch("develop"); + + assertThat(vcs.logBranches(), containsInAnyOrder("master", "develop")); + assertThat(vcs.getCurrentBranchName(), equalTo("develop")); + + assertThat(vcs.logCommits(), containsInAnyOrder(VcsCommit.nullCommit)); + + List commits = new ArrayList<>(); + commits.add(VcsCommit.nullCommit.id); + + for (int i = 0; i < 10; i++) { + commits.add(vcs.commit("message").id); + } + + assertThat(vcs.logCommits().size(), equalTo(commits.size())); + + vcs.merge("master"); + assertThat(vcs.logBranches(), containsInAnyOrder("develop")); + } private List initFolder() throws IOException { List res = new ArrayList<>(); From 827af86d8a68f9e2d7530bdfccbbda44bedafe0e Mon Sep 17 00:00:00 2001 From: maxkvant Date: Sat, 15 Apr 2017 23:10:38 +0300 Subject: [PATCH 20/21] added commitTest, fixed bugs --- myVCS/src/main/java/com/maxim/Main.java | 5 +- .../main/java/com/maxim/vcs_impl/VcsImpl.java | 9 +- .../java/com/maxim/vcs_objects/VcsCommit.java | 5 +- .../java/com/maxim/vcs_impl/VcsImplTest.java | 93 ++++++++++++------- 4 files changed, 66 insertions(+), 46 deletions(-) diff --git a/myVCS/src/main/java/com/maxim/Main.java b/myVCS/src/main/java/com/maxim/Main.java index eec0d54..06f70bf 100644 --- a/myVCS/src/main/java/com/maxim/Main.java +++ b/myVCS/src/main/java/com/maxim/Main.java @@ -10,6 +10,7 @@ import java.io.IOException; import java.nio.file.Path; import java.nio.file.Paths; +import java.util.ArrayList; import java.util.List; import java.util.stream.Collectors; @@ -165,9 +166,9 @@ public boolean check(@NotNull String[] args) { ImmutableList.copyOf(args).subList(0, prefix_len).equals(args_names.subList(0, prefix_len)); } - @Nullable + @NotNull public List parseArgs(@NotNull String[] args) { - return check(args) ? ImmutableList.copyOf(args).subList(prefix_len, args_names.size()) : null; + return check(args) ? ImmutableList.copyOf(args).subList(prefix_len, args_names.size()) : new ArrayList<>(); } public abstract void execute(String[] args) throws IOException; diff --git a/myVCS/src/main/java/com/maxim/vcs_impl/VcsImpl.java b/myVCS/src/main/java/com/maxim/vcs_impl/VcsImpl.java index db19a6c..c6477c1 100644 --- a/myVCS/src/main/java/com/maxim/vcs_impl/VcsImpl.java +++ b/myVCS/src/main/java/com/maxim/vcs_impl/VcsImpl.java @@ -66,7 +66,7 @@ public VcsCommit commit(@NotNull String message) throws IOException { Map oldFiles = getCommittedFiles(); List parents_ids = Collections.singletonList(index.commit_id); - Map currentFiles = new TreeMap<>(loadAdded()); + Map currentFiles = new TreeMap<>(loadFiles()); oldFiles.forEach(currentFiles::putIfAbsent); VcsCommit new_commit = new VcsCommit(message, parents_ids, currentFiles); @@ -127,7 +127,7 @@ public void add(@NotNull Path path) throws IOException { readIndex(); if (!Files.isRegularFile(path)){ - // throw new IOException(path + " isn't regular file"); + throw new IOException(path + " isn't regular file"); } if (!getTrackingNames().contains(path.toString())) { index.added.add(path.toString()); @@ -343,11 +343,12 @@ private VcsCommit readCommit(long commit_id) throws IOException { } @NotNull - private Map loadAdded() throws IOException { + private Map loadFiles() throws IOException { + Set paths = getTrackingNames(); try { return Files.walk(root_path) .filter(Files::isRegularFile) - .filter(entry -> index.added.contains(entry.toString())) + .filter(entry -> paths.contains(entry.toString())) .collect(Collectors.toMap( Path::toString, path1 -> FileUtil.addBlob(path1, blobs_dir_path))); diff --git a/myVCS/src/main/java/com/maxim/vcs_objects/VcsCommit.java b/myVCS/src/main/java/com/maxim/vcs_objects/VcsCommit.java index e23c6b6..bdf5f77 100644 --- a/myVCS/src/main/java/com/maxim/vcs_objects/VcsCommit.java +++ b/myVCS/src/main/java/com/maxim/vcs_objects/VcsCommit.java @@ -48,9 +48,6 @@ private VcsCommit() { @Override public boolean equals(Object other) { - if (other == null || !(other instanceof VcsCommit)) { - return false; - } - return id == ((VcsCommit) other).id; + return !(other == null || !(other instanceof VcsCommit)) && id == ((VcsCommit) other).id; } } diff --git a/myVCS/src/test/java/com/maxim/vcs_impl/VcsImplTest.java b/myVCS/src/test/java/com/maxim/vcs_impl/VcsImplTest.java index 1d0310b..05787e4 100644 --- a/myVCS/src/test/java/com/maxim/vcs_impl/VcsImplTest.java +++ b/myVCS/src/test/java/com/maxim/vcs_impl/VcsImplTest.java @@ -4,6 +4,7 @@ import com.maxim.vcs_objects.VcsCommit; import org.junit.Rule; import org.junit.Test; +import org.junit.rules.ExpectedException; import org.junit.rules.TemporaryFolder; import java.io.File; @@ -19,6 +20,8 @@ import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.containsInAnyOrder; import static org.hamcrest.Matchers.equalTo; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; public class VcsImplTest { @@ -26,42 +29,7 @@ public class VcsImplTest { public TemporaryFolder temporaryFolder = new TemporaryFolder(); @Test - public void test() throws Exception { - Vcs vcs = new VcsImpl(Paths.get(temporaryFolder.getRoot().getPath())); - - Set set1 = new TreeSet<>( - Arrays.asList("./.idea/uiDesigner.xml", - "./.gradle/3.1/taskArtifacts/fileHashes.bin") - ); - - Set set2 = new TreeSet<>( - Arrays.asList("./.idea/uiDesigner.xml", - "./.gradle/3.1/taskArtifacts/fileSnapshots.bin") - ); - - vcs.createBranch("1"); - for (int i = 0; i < 2; i++) { - for (String path : set1) { - vcs.add(Paths.get(path)); - } - VcsCommit commit = vcs.commit("2"); - } - - vcs.checkoutCommit(0); - vcs.createBranch("2"); - for (int i = 0; i < 2; i++) { - for (String path : set2) { - vcs.add(Paths.get(path)); - } - VcsCommit commit = vcs.commit("2"); - } - - vcs.merge("1"); - vcs.deleteBranch("2"); - } - - @Test - public void addTest() throws Exception { + public void addTest1() throws Exception { final Vcs vcs = new VcsImpl(Paths.get(temporaryFolder.getRoot().getPath())); List paths = initFolder(); vcs.createBranch("branch"); @@ -87,6 +55,13 @@ public void addTest() throws Exception { assertThat(getAdded.call(), containsInAnyOrder( paths.get(2))); } + @Test(expected = IOException.class) + public void addTest2() throws Exception { + final Vcs vcs = new VcsImpl(Paths.get(temporaryFolder.getRoot().getPath())); + List paths = initFolder(); + vcs.add(Paths.get(paths.get(0) + "", "abrcadabra")); + } + @Test public void logTest() throws IOException { final Vcs vcs = new VcsImpl(Paths.get(temporaryFolder.getRoot().getPath())); @@ -116,6 +91,52 @@ public void logTest() throws IOException { assertThat(vcs.logBranches(), containsInAnyOrder("develop")); } + @Test + public void commitTest1() throws IOException { + final Vcs vcs = new VcsImpl(Paths.get(temporaryFolder.getRoot().getPath())); + List paths = initFolder(); + vcs.createBranch("master"); + Path path1 = paths.get(0); + Date date1 = new Date(); + vcs.add(path1); + VcsCommit commit1 = vcs.commit("Hello, world"); + assertThat(commit1.message, equalTo("Hello, world")); + assertThat(commit1.parents_ids, containsInAnyOrder(0L)); + assertThat(commit1.files.keySet(), containsInAnyOrder(path1.toString())); + assertTrue(commit1.date > date1.getTime()); + } + + @Test(expected=IOException.class) + public void commitTest2() throws IOException { + final Vcs vcs = new VcsImpl(Paths.get(temporaryFolder.getRoot().getPath())); + vcs.commit("message"); + } + + @Test + public void checkoutTest() throws IOException { + final Vcs vcs = new VcsImpl(Paths.get(temporaryFolder.getRoot().getPath())); + List paths = initFolder(); + Path path = paths.get(0); + vcs.createBranch("master"); + List commits = new ArrayList<>(); + final int n = 10; + for (long i = 0; i < n; i++) { + FileUtil.writeObject(i, path); + vcs.add(path); + commits.add(vcs.commit("Hi")); + if (i == 0) { + vcs.createBranch("dev"); + } + } + for (int i = 0; i < n; i++) { + vcs.checkoutCommit(commits.get(i).id); + Long value = (Long) FileUtil.readObject(path); + assertEquals(Long.valueOf(i), value); + } + vcs.checkoutBranch("master"); + assertEquals(0L, FileUtil.readObject(path)); + } + private List initFolder() throws IOException { List res = new ArrayList<>(); res.add(Paths.get(temporaryFolder.getRoot().getPath(), "1")); From d72c6e3c1e051825ef13b163815c14b40beb9362 Mon Sep 17 00:00:00 2001 From: maxkvant Date: Sun, 16 Apr 2017 01:40:43 +0300 Subject: [PATCH 21/21] added tests, fixed bugs --- .../src/main/java/com/maxim/vcs_impl/Vcs.java | 8 +- .../main/java/com/maxim/vcs_impl/VcsImpl.java | 42 ++++--- .../java/com/maxim/vcs_impl/VcsImplTest.java | 115 +++++++++++++++++- 3 files changed, 136 insertions(+), 29 deletions(-) diff --git a/myVCS/src/main/java/com/maxim/vcs_impl/Vcs.java b/myVCS/src/main/java/com/maxim/vcs_impl/Vcs.java index bb324c0..e104f13 100644 --- a/myVCS/src/main/java/com/maxim/vcs_impl/Vcs.java +++ b/myVCS/src/main/java/com/maxim/vcs_impl/Vcs.java @@ -50,12 +50,6 @@ public interface Vcs { void add(@NotNull Path path) throws IOException; - /** - * removes branch - */ - - void deleteBranch(@NotNull String branch_name) throws IOException; - /** * returns list, which contains all commits */ @@ -74,7 +68,7 @@ public interface Vcs { * merges current branch with other_branch, deletes other_branch */ - void merge(@NotNull String other_branch) throws IOException; + VcsCommit merge(@NotNull String other_branch) throws IOException; /** * creates a new branch with name other_branch_name and checkouts that branch diff --git a/myVCS/src/main/java/com/maxim/vcs_impl/VcsImpl.java b/myVCS/src/main/java/com/maxim/vcs_impl/VcsImpl.java index c6477c1..cbdc883 100644 --- a/myVCS/src/main/java/com/maxim/vcs_impl/VcsImpl.java +++ b/myVCS/src/main/java/com/maxim/vcs_impl/VcsImpl.java @@ -32,6 +32,7 @@ public class VcsImpl implements Vcs { private final Path commits_dir_path; private final Path branches_dir_path; private final Path index_file_path; + private final Path vcs_dir_path; public VcsImpl(@NotNull Path root_path) throws IOException { @@ -41,6 +42,7 @@ public VcsImpl(@NotNull Path root_path) throws IOException { commits_dir_path = Paths.get(root_path.toString(), vcs_dir, commits_dir); branches_dir_path = Paths.get(root_path.toString(), vcs_dir, branches_dir); index_file_path = Paths.get(root_path.toString(), vcs_dir, index_file); + vcs_dir_path = Paths.get(root_path.toString(), vcs_dir); Files.createDirectories(commits_dir_path); Files.createDirectories(blobs_dir_path); @@ -136,17 +138,13 @@ public void add(@NotNull Path path) throws IOException { } @Override - public void merge(@NotNull String other_branch_name) throws IOException { + public VcsCommit merge(@NotNull String other_branch_name) throws IOException { readIndex(); if (index.branch == null) { throw new IOException("Please, checkout branch or create branch"); } - if (index.branch.name.equals(other_branch_name)) { - return; - } - VcsBranch other_branch = readBranch(other_branch_name); VcsCommit other_commit = readCommit(other_branch.commit_id); Map cur_files = getCommittedFiles(); @@ -169,9 +167,13 @@ public void merge(@NotNull String other_branch_name) throws IOException { index = new Index(branch); - deleteBranch(other_branch_name); + if (!branch.name.equals(other_branch_name)) { + deleteBranch(other_branch_name); + } writeIndex(); + + return new_commit; } @Override @@ -189,18 +191,6 @@ public void createBranch(@NotNull String branch_name) throws IOException { writeIndex(); } - @Override - public void deleteBranch(@NotNull String branch_name) throws IOException { - readIndex(); - - Path branch_path = Paths.get(branches_dir_path + "", branch_name); - if (Files.exists(branch_path)) { - Files.delete(branch_path); - } - - writeIndex(); - } - @NotNull @Override public List logCommits() throws IOException { @@ -241,6 +231,7 @@ public void clean() throws IOException { Set tracking = getTrackingNames(); Files.walk(root_path) .filter(Files::isRegularFile) + .filter(entry -> !entry.startsWith(vcs_dir_path)) .filter(entry -> !tracking.contains(entry.toString())) .forEach(entry -> { try { @@ -259,7 +250,7 @@ public void reset(@NotNull Path path) throws IOException { } String blob_name = committed.get(path.toString()).md5_hash; Path blob_path = Paths.get(blobs_dir_path.toString(), blob_name); - Files.copy(blob_path, path); + Files.copy(blob_path, path, REPLACE_EXISTING); } @NotNull @@ -272,6 +263,7 @@ public Map status() throws IOException { ImmutableMap.Builder mapBuilder = ImmutableMap.builder(); Files.walk(root_path) .filter(Files::isRegularFile) + .filter(entry -> !entry.startsWith(vcs_dir_path)) .forEach(entry -> { String state = "untracked"; if (index.added.contains(entry.toString())) { @@ -288,6 +280,7 @@ public Map status() throws IOException { } mapBuilder.put(entry, state); }); + index.removed.forEach(entry -> mapBuilder.put(Paths.get(entry), "removed")); return mapBuilder.build(); } @@ -342,6 +335,17 @@ private VcsCommit readCommit(long commit_id) throws IOException { return (VcsCommit) FileUtil.readObject(path); } + private void deleteBranch(@NotNull String branch_name) throws IOException { + readIndex(); + + Path branch_path = Paths.get(branches_dir_path + "", branch_name); + if (Files.exists(branch_path)) { + Files.delete(branch_path); + } + + writeIndex(); + } + @NotNull private Map loadFiles() throws IOException { Set paths = getTrackingNames(); diff --git a/myVCS/src/test/java/com/maxim/vcs_impl/VcsImplTest.java b/myVCS/src/test/java/com/maxim/vcs_impl/VcsImplTest.java index 05787e4..0e9086c 100644 --- a/myVCS/src/test/java/com/maxim/vcs_impl/VcsImplTest.java +++ b/myVCS/src/test/java/com/maxim/vcs_impl/VcsImplTest.java @@ -1,10 +1,8 @@ package com.maxim.vcs_impl; -import com.google.common.collect.ImmutableSet; import com.maxim.vcs_objects.VcsCommit; import org.junit.Rule; import org.junit.Test; -import org.junit.rules.ExpectedException; import org.junit.rules.TemporaryFolder; import java.io.File; @@ -14,14 +12,16 @@ import java.nio.file.Paths; import java.util.*; import java.util.concurrent.Callable; +import java.util.function.Consumer; import java.util.function.Function; -import java.util.stream.Collectors; +import static junit.framework.TestCase.assertFalse; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.containsInAnyOrder; import static org.hamcrest.Matchers.equalTo; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; public class VcsImplTest { @@ -137,6 +137,115 @@ public void checkoutTest() throws IOException { assertEquals(0L, FileUtil.readObject(path)); } + @Test + public void mergeTest() throws IOException { + final Vcs vcs = new VcsImpl(Paths.get(temporaryFolder.getRoot().getPath())); + List paths = initFolder(); + Path path = paths.get(0); + class InitBranch implements Function { + final int value; + final Vcs vcs; + + public InitBranch(int value, Vcs vcs) { + this.value = value; + this.vcs = vcs; + } + + @Override + public VcsCommit apply(String name) { + try { + vcs.checkoutCommit(VcsCommit.nullCommit.id); + vcs.createBranch(name); + FileUtil.writeObject(value, path); + vcs.add(path); + return vcs.commit("commit"); + } catch (IOException e) { + throw new RuntimeException(e); + } + } + } + VcsCommit commit1 = new InitBranch(10, vcs).apply("dev"); + VcsCommit commit2 = new InitBranch(10, vcs).apply("test"); + VcsCommit commit = vcs.merge("dev"); + assertThat(commit.parents_ids, containsInAnyOrder(commit1.id, commit2.id)); + assertEquals("test", vcs.getCurrentBranchName()); + try { + new InitBranch(11, vcs).apply("dev2"); + vcs.merge("test"); + fail(); + } catch (Exception e) { + assertEquals(IOException.class, e.getClass()); + } + } + + @Test + public void resetTest() throws IOException { + final Vcs vcs = new VcsImpl(Paths.get(temporaryFolder.getRoot().getPath())); + List paths = initFolder(); + Path path = paths.get(0); + vcs.createBranch("master"); + FileUtil.writeObject("hello", path); + vcs.add(path); + vcs.commit(""); + FileUtil.writeObject("hello!", path); + vcs.reset(path); + assertThat(FileUtil.readObject(path), equalTo("hello")); + } + + @Test + public void statusTest() throws IOException { + final Vcs vcs = new VcsImpl(Paths.get(temporaryFolder.getRoot().getPath())); + List paths = initFolder(); + vcs.createBranch("master"); + + vcs.add(paths.get(0)); + vcs.add(paths.get(1)); + assertThat(vcs.status().values(), containsInAnyOrder("added", "added", "untracked", "untracked")); + + vcs.commit(""); + assertThat(vcs.status().values(), containsInAnyOrder("committed", "committed", "untracked", "untracked")); + + vcs.rm(paths.get(0)); + assertThat(vcs.status().values(), containsInAnyOrder("removed", "committed", "untracked", "untracked")); + + FileUtil.writeObject("hey", paths.get(1)); + assertThat(vcs.status().values(), containsInAnyOrder("removed", "modified", "untracked", "untracked")); + } + + @Test + public void rmTest() throws IOException { + final Vcs vcs = new VcsImpl(Paths.get(temporaryFolder.getRoot().getPath())); + List paths = initFolder(); + vcs.rm(paths.get(3)); + assertFalse(Files.exists(paths.get(3))); + + vcs.createBranch("master"); + vcs.add(paths.get(0)); + VcsCommit commit = vcs.commit(""); + vcs.rm(paths.get(0)); + vcs.add(paths.get(1)); + vcs.commit(""); + assertFalse(Files.exists(paths.get(0))); + + vcs.checkoutCommit(commit.id); + assertTrue(Files.exists(paths.get(0))); + assertFalse(Files.exists(paths.get(1))); + } + + @Test + public void cleanTest() throws IOException { + final Vcs vcs = new VcsImpl(Paths.get(temporaryFolder.getRoot().getPath())); + List paths = initFolder(); + + vcs.createBranch("master"); + vcs.add(paths.get(0)); + vcs.add(paths.get(2)); + vcs.commit(""); + vcs.clean(); + + assertThat(vcs.status().values(), containsInAnyOrder("committed", "committed")); + } + private List initFolder() throws IOException { List res = new ArrayList<>(); res.add(Paths.get(temporaryFolder.getRoot().getPath(), "1"));