motiejus
/
jgit
1
Fork 0
Code Releases Activity

Fix misc spelling errors in comments and method names 

Change-Id: I24552443710075856540696717ac4068dfe6a7f2
Signed-off-by: Robin Rosenberg <robin.rosenberg@dewire.com>
This commit is contained in:
Robin Rosenberg 2011-01-17 22:04:14 +01:00
parent de1d057d72
commit e43887b69e
4 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
org.eclipse.jgit/src/org/eclipse/jgit/api/CommitCommand.java
View File

@ -112,7 +112,7 @@ protected CommitCommand(Repository repo) {
* @throws NoMessageException * @throws NoMessageException
* when called without specifying a commit message * when called without specifying a commit message
* @throws UnmergedPathException * @throws UnmergedPathException
* when the current index contained unmerged pathes (conflicts) * when the current index contained unmerged paths (conflicts)
* @throws WrongRepositoryStateException * @throws WrongRepositoryStateException
* when repository is not in the right state for committing * when repository is not in the right state for committing
* @throws JGitInternalException * @throws JGitInternalException

2
org.eclipse.jgit/src/org/eclipse/jgit/api/MergeCommand.java
View File

@ -182,7 +182,7 @@ public MergeResult call() throws NoHeadException,
noProblems = merger.merge(headCommit, srcCommit); noProblems = merger.merge(headCommit, srcCommit);
lowLevelResults = resolveMerger lowLevelResults = resolveMerger
.getMergeResults(); .getMergeResults();
failingPaths = resolveMerger.getFailingPathes(); failingPaths = resolveMerger.getFailingPaths();
} else } else
noProblems = merger.merge(headCommit, srcCommit); noProblems = merger.merge(headCommit, srcCommit);

2
org.eclipse.jgit/src/org/eclipse/jgit/dircache/DirCacheCheckout.java
View File

@ -107,7 +107,7 @@ public class DirCacheCheckout {
private ArrayList<String> toBeDeleted = new ArrayList<String>(); private ArrayList<String> toBeDeleted = new ArrayList<String>();
/** /**
* @return a list of updated pathes and objectIds * @return a list of updated paths and objectIds
*/ */
public Map<String, ObjectId> getUpdated() { public Map<String, ObjectId> getUpdated() {
return updated; return updated;

28
org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java
View File

@ -120,7 +120,7 @@ public enum MergeFailureReason {
private ObjectId resultTree; private ObjectId resultTree;
private List<String> unmergedPathes = new ArrayList<String>(); private List<String> unmergedPaths = new ArrayList<String>();
private List<String> modifiedFiles = new LinkedList<String>(); private List<String> modifiedFiles = new LinkedList<String>();
@ -128,7 +128,7 @@ public enum MergeFailureReason {
private Map<String, MergeResult<? extends Sequence>> mergeResults = new HashMap<String, MergeResult<? extends Sequence>>(); private Map<String, MergeResult<? extends Sequence>> mergeResults = new HashMap<String, MergeResult<? extends Sequence>>();
private Map<String, MergeFailureReason> failingPathes = new HashMap<String, MergeFailureReason>(); private Map<String, MergeFailureReason> failingPaths = new HashMap<String, MergeFailureReason>();
private ObjectInserter oi; private ObjectInserter oi;
@ -224,7 +224,7 @@ protected boolean mergeImpl() throws IOException {
builder = null; builder = null;
} }
if (getUnmergedPathes().isEmpty()) { if (getUnmergedPaths().isEmpty()) {
resultTree = dircache.writeTree(oi); resultTree = dircache.writeTree(oi);
return true; return true;
} else { } else {
@ -247,7 +247,7 @@ private void checkout() throws NoWorkTreeException, IOException {
entry.getValue()); entry.getValue());
} else { } else {
if (!f.delete()) if (!f.delete())
failingPathes.put(entry.getKey(), failingPaths.put(entry.getKey(),
MergeFailureReason.COULD_NOT_DELETE); MergeFailureReason.COULD_NOT_DELETE);
} }
modifiedFiles.add(entry.getKey()); modifiedFiles.add(entry.getKey());
@ -369,7 +369,7 @@ private boolean processEntry(CanonicalTreeParser base,
// Each index entry has to match ours, means: it has to be clean // Each index entry has to match ours, means: it has to be clean
if (nonTree(modeI) if (nonTree(modeI)
&& !(tw.idEqual(T_INDEX, T_OURS) && modeO == modeI)) { && !(tw.idEqual(T_INDEX, T_OURS) && modeO == modeI)) {
failingPathes.put(tw.getPathString(), MergeFailureReason.DIRTY_INDEX); failingPaths.put(tw.getPathString(), MergeFailureReason.DIRTY_INDEX);
return false; return false;
} }
@ -416,7 +416,7 @@ private boolean processEntry(CanonicalTreeParser base,
if (nonTree(modeB)) if (nonTree(modeB))
add(tw.getRawPath(), base, DirCacheEntry.STAGE_1); add(tw.getRawPath(), base, DirCacheEntry.STAGE_1);
add(tw.getRawPath(), ours, DirCacheEntry.STAGE_2); add(tw.getRawPath(), ours, DirCacheEntry.STAGE_2);
unmergedPathes.add(tw.getPathString()); unmergedPaths.add(tw.getPathString());
enterSubtree = false; enterSubtree = false;
return true; return true;
} }
@ -424,7 +424,7 @@ private boolean processEntry(CanonicalTreeParser base,
if (nonTree(modeB)) if (nonTree(modeB))
add(tw.getRawPath(), base, DirCacheEntry.STAGE_1); add(tw.getRawPath(), base, DirCacheEntry.STAGE_1);
add(tw.getRawPath(), theirs, DirCacheEntry.STAGE_3); add(tw.getRawPath(), theirs, DirCacheEntry.STAGE_3);
unmergedPathes.add(tw.getPathString()); unmergedPaths.add(tw.getPathString());
enterSubtree = false; enterSubtree = false;
return true; return true;
} }
@ -447,14 +447,14 @@ private boolean processEntry(CanonicalTreeParser base,
if (work != null if (work != null
&& (!nonTree(work.getEntryRawMode()) || work && (!nonTree(work.getEntryRawMode()) || work
.isModified(index.getDirCacheEntry(), true))) { .isModified(index.getDirCacheEntry(), true))) {
failingPathes.put(tw.getPathString(), failingPaths.put(tw.getPathString(),
MergeFailureReason.DIRTY_WORKTREE); MergeFailureReason.DIRTY_WORKTREE);
return false; return false;
} }
} }
if (!contentMerge(base, ours, theirs)) { if (!contentMerge(base, ours, theirs)) {
unmergedPathes.add(tw.getPathString()); unmergedPaths.add(tw.getPathString());
} }
modifiedFiles.add(tw.getPathString()); modifiedFiles.add(tw.getPathString());
} }
@ -573,15 +573,15 @@ public String[] getCommitNames() {
* @return the paths with conflicts. This is a subset of the files listed * @return the paths with conflicts. This is a subset of the files listed
* by {@link #getModifiedFiles()} * by {@link #getModifiedFiles()}
*/ */
public List<String> getUnmergedPathes() { public List<String> getUnmergedPaths() {
return unmergedPathes; return unmergedPaths;
} }
/** /**
* @return the paths of files which have been modified by this merge. A * @return the paths of files which have been modified by this merge. A
* file will be modified if a content-merge works on this path or if * file will be modified if a content-merge works on this path or if
* the merge algorithm decides to take the theirs-version. This is a * the merge algorithm decides to take the theirs-version. This is a
* superset of the files listed by {@link #getUnmergedPathes()}. * superset of the files listed by {@link #getUnmergedPaths()}.
*/ */
public List<String> getModifiedFiles() { public List<String> getModifiedFiles() {
return modifiedFiles; return modifiedFiles;
@ -609,8 +609,8 @@ public Map<String, MergeResult<? extends Sequence>> getMergeResults() {
* a conflict). <code>null</code> is returned if this merge didn't * a conflict). <code>null</code> is returned if this merge didn't
* fail abnormally. * fail abnormally.
*/ */
public Map<String, MergeFailureReason> getFailingPathes() { public Map<String, MergeFailureReason> getFailingPaths() {
return (failingPathes.size() == 0) ? null : failingPathes; return (failingPaths.size() == 0) ? null : failingPaths;
} }
/** /**