Mercurial > hg4j
changeset 468:3ca4ae7bdd38 v1.0.0
Clean experimental marks and deprecation code. Update version number to release
| author | Artem Tikhomirov <tikhomirov.artem@gmail.com> |
|---|---|
| date | Wed, 11 Jul 2012 17:48:17 +0200 |
| parents | 51d682cf9cdc |
| children | e04e7ecc4882 |
| files | COPYING build.gradle build.xml src/org/tmatesoft/hg/core/HgChangesetFileSneaker.java src/org/tmatesoft/hg/core/HgManifestCommand.java src/org/tmatesoft/hg/repo/HgRepository.java test/org/tmatesoft/hg/test/TestHistory.java |
| diffstat | 7 files changed, 13 insertions(+), 26 deletions(-) [+] |
line wrap: on
line diff
--- a/COPYING Fri Jun 22 17:39:31 2012 +0200 +++ b/COPYING Wed Jul 11 17:48:17 2012 +0200 @@ -1,4 +1,4 @@ -Copyright (C) 2010-2011 TMate Software Ltd +Copyright (C) 2010-2012 TMate Software Ltd This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by
--- a/build.gradle Fri Jun 22 17:39:31 2012 +0200 +++ b/build.gradle Wed Jul 11 17:48:17 2012 +0200 @@ -1,6 +1,9 @@ +/* + * Copyright (c) 2012 TMate Software Ltd + */ def isRelease = false - version = '0.9.5-SNAPSHOT' + version = '1.0.0' description = 'Pure Java API and Toolkit for Mercurial DVCS' group = 'org.tmatesoft.hg4j' @@ -108,7 +111,7 @@ repositories { mavenDeployer { configuration = configurations.deployJars - repository(url: "http://maven.tmatesoft.com/content/repositories/snapshots/") { + repository(url: "http://maven.tmatesoft.com/content/repositories/releases/") { authentication(userName: project.ext.deploySnapshotsRepositoryUser, password: project.ext.deploySnapshotsRepositoryPassword) } }
--- a/build.xml Fri Jun 22 17:39:31 2012 +0200 +++ b/build.xml Wed Jul 11 17:48:17 2012 +0200 @@ -27,7 +27,7 @@ <property name="junit.jar" value="lib/junit-4.8.2.jar" /> <property name="ver.qualifier" value="" /> - <property name="version.lib" value="0.9.5" /> + <property name="version.lib" value="1.0.0" /> <property name="version.jar" value="${version.lib}${ver.qualifier}" /> <property name="compile-with-debug" value="yes"/> @@ -145,6 +145,7 @@ </javac> <jar destfile="${hg4j-tests.jar}"> <fileset dir="bin" includes="org/tmatesoft/hg/test/**"/> + <fileset dir="bin" includes="org/tmatesoft/hg/tools/**"/> <fileset file="COPYING"/> <!-- XXX perhaps, shall include test-data as well? --> </jar>
--- a/src/org/tmatesoft/hg/core/HgChangesetFileSneaker.java Fri Jun 22 17:39:31 2012 +0200 +++ b/src/org/tmatesoft/hg/core/HgChangesetFileSneaker.java Wed Jul 11 17:48:17 2012 +0200 @@ -166,13 +166,6 @@ } /** - * @deprecated use {@link #getCheckResult()} instead - */ - @Deprecated - public Outcome getCheckStatus() { - return getCheckResult(); - } - /** * Re-get latest check status object */ public Outcome getCheckResult() {
--- a/src/org/tmatesoft/hg/core/HgManifestCommand.java Fri Jun 22 17:39:31 2012 +0200 +++ b/src/org/tmatesoft/hg/core/HgManifestCommand.java Wed Jul 11 17:48:17 2012 +0200 @@ -103,14 +103,6 @@ } } - /** - * @deprecated confusing whether it's changeset or manifest own revision index in use, use {@link #changeset(int)} instead - */ - @Deprecated - public HgManifestCommand revision(int rev) { - return changeset(rev); - } - public HgManifestCommand dirs(boolean include) { // XXX whether directories with directories only are include or not // now lists only directories with files
--- a/src/org/tmatesoft/hg/repo/HgRepository.java Fri Jun 22 17:39:31 2012 +0200 +++ b/src/org/tmatesoft/hg/repo/HgRepository.java Wed Jul 11 17:48:17 2012 +0200 @@ -32,7 +32,6 @@ import org.tmatesoft.hg.internal.ByteArrayChannel; import org.tmatesoft.hg.internal.ConfigFile; import org.tmatesoft.hg.internal.DataAccessProvider; -import org.tmatesoft.hg.internal.Experimental; import org.tmatesoft.hg.internal.Filter; import org.tmatesoft.hg.internal.Internals; import org.tmatesoft.hg.internal.RevlogStream; @@ -235,7 +234,6 @@ return branches; } - @Experimental(reason="Perhaps, shall not cache instance, and provide loadMergeState as it may change often") public HgMergeState getMergeState() { if (mergeState == null) { mergeState = new HgMergeState(this);
--- a/test/org/tmatesoft/hg/test/TestHistory.java Fri Jun 22 17:39:31 2012 +0200 +++ b/test/org/tmatesoft/hg/test/TestHistory.java Wed Jul 11 17:48:17 2012 +0200 @@ -179,11 +179,11 @@ changelogParser.reset(); // fails with Mercurial 2.2.1, @see http://selenic.com/pipermail/mercurial-devel/2012-February/038249.html // and http://www.selenic.com/hg/rev/60101427d618?rev= -/* FIXME either fix test to update to revision 2, where a was still present, or change command to fail/report problem - eh.run("hg", "log", "--debug", "-f", "a", "--cwd", repo.getLocation()); - List<HgChangeset> r = cmd.file("a", true).execute(); - report("log -f a", r, true); -*/ + // fix for the test (replacement) is available below +// eh.run("hg", "log", "--debug", "-f", "a", "--cwd", repo.getLocation()); +// List<HgChangeset> r = cmd.file("a", true).execute(); +// report("log -f a", r, true); + // changelogParser.reset(); eh.run("hg", "log", "--debug", "-f", "e", "--cwd", repo.getLocation());