motiejus
/
jgit
1
Fork 0
Code Releases Activity

amend commit: Refactor repository construction to builder class 

During code review, Alex raised a few comments about commit
532421d989 ("Refactor repository construction to builder class").
Due to the size of the related series we aren't going to go back
and rebase in something this minor, so resolve them as a follow-up
commit instead.

Change-Id: Ied52f7a8f7252743353c58d20bfc3ec498933e00
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
This commit is contained in:
Shawn O. Pearce 2010-07-02 17:01:40 -07:00
parent fe9860a444
commit 08d349a27b
5 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Main.java
View File

@ -163,17 +163,17 @@ private void execute(final String[] argv) throws Exception {
final TextBuiltin cmd = subcommand;
if (cmd.requiresRepository()) {
RepositoryBuilder frb = new RepositoryBuilder() //
RepositoryBuilder rb = new RepositoryBuilder() //
.setGitDir(gitdir) //
.readEnvironment() //
.findGitDir();
if (frb.getGitDir() == null) {
if (rb.getGitDir() == null) {
writer.println(CLIText.get().cantFindGitDirectory);
writer.flush();
System.exit(1);
}
cmd.init(frb.build(), null);
cmd.init(rb.build(), null);
} else {
cmd.init(null, gitdir);
}

3
org.eclipse.jgit.test/tst/org/eclipse/jgit/storage/file/T0003_Basic.java
View File

@ -53,6 +53,7 @@
import java.io.IOException;
import java.io.PrintWriter;
import org.eclipse.jgit.JGitText;
import org.eclipse.jgit.errors.ConfigInvalidException;
import org.eclipse.jgit.lib.Commit;
import org.eclipse.jgit.lib.Config;
@ -99,7 +100,7 @@ public void test000_openRepoBadArgs() throws IOException {
fail("Must pass either GIT_DIR or GIT_WORK_TREE");
} catch (IllegalArgumentException e) {
assertEquals(
"Either GIT_DIR or GIT_WORK_TREE must be passed to Repository constructor",
JGitText.get().eitherGitDirOrWorkTreeRequired,
e.getMessage());
}
}

2
org.eclipse.jgit/resources/org/eclipse/jgit/JGitText.properties
View File

@ -125,7 +125,7 @@ duplicateAdvertisementsOf=duplicate advertisements of {0}
duplicateRef=Duplicate ref: {0}
duplicateRemoteRefUpdateIsIllegal=Duplicate remote ref update is illegal. Affected remote name: {0}
duplicateStagesNotAllowed=Duplicate stages not allowed
eitherGIT_DIRorGIT_WORK_TREEmustBePassed=Either GIT_DIR or GIT_WORK_TREE must be passed to Repository constructor
eitherGitDirOrWorkTreeRequired=One of setGitDir or setWorkTree must be called.
emptyPathNotPermitted=Empty path not permitted.
encryptionError=Encryption error: {0}
endOfFileInEscape=End of file in escape

2
org.eclipse.jgit/src/org/eclipse/jgit/JGitText.java
View File

@ -185,7 +185,7 @@ public static JGitText get() {
/***/ public String duplicateRef;
/***/ public String duplicateRemoteRefUpdateIsIllegal;
/***/ public String duplicateStagesNotAllowed;
/***/ public String eitherGIT_DIRorGIT_WORK_TREEmustBePassed;
/***/ public String eitherGitDirOrWorkTreeRequired;
/***/ public String emptyPathNotPermitted;
/***/ public String encryptionError;
/***/ public String endOfFileInEscape;

2
org.eclipse.jgit/src/org/eclipse/jgit/lib/BaseRepositoryBuilder.java
View File

@ -467,7 +467,7 @@ public R build() throws IOException {
protected void requireGitDirOrWorkTree() {
if (getGitDir() == null && getWorkTree() == null)
throw new IllegalArgumentException(
JGitText.get().eitherGIT_DIRorGIT_WORK_TREEmustBePassed);
JGitText.get().eitherGitDirOrWorkTreeRequired);
}
/**