mirrors
/
jgit
mirror of https://github.com/eclipse/jgit.git
Watch 1
Star 0
Fork 0
Code Issues 0 Releases 204 Wiki Activity
Browse Source

Don't prefix output from jgit status with '# ' 

C Git does not do it anymore

Bug: 439937
Change-Id: I20bdb787a00bba3e4adf269fd64ec6296bdc2a66
tags/v3.5.0.201409071800-rc1
Robin Rosenberg 9 years ago
parent
48544e27ae
commit
fd58cbcdee
2 changed files with 76 additions and 76 deletions
Unified View Show Diff Stats
  1. 75
    75
      org.eclipse.jgit.pgm.test/tst/org/eclipse/jgit/pgm/StatusTest.java
  2. 1
    1
      org.eclipse.jgit.pgm/resources/org/eclipse/jgit/pgm/internal/CLIText.properties

+ 75
- 75
org.eclipse.jgit.pgm.test/tst/org/eclipse/jgit/pgm/StatusTest.java View File

writeTrashFile("untracked", "untracked"); writeTrashFile("untracked", "untracked");
// Test untracked // Test untracked
assertArrayOfLinesEquals(new String[] { // git status output assertArrayOfLinesEquals(new String[] { // git status output
"# On branch master", //
"# Untracked files:", //
"# ",//
"# \tstagedDeleted", //
"# \tstagedModified", //
"# \tstagedNew", //
"# \ttracked", //
"# \ttrackedDeleted", //
"# \ttrackedModified", //
"# \tuntracked", //
"On branch master", //
"Untracked files:", //
"",//
"\tstagedDeleted", //
"\tstagedModified", //
"\tstagedNew", //
"\ttracked", //
"\ttrackedDeleted", //
"\ttrackedModified", //
"\tuntracked", //
"" // "" //
}, execute("git status")); // }, execute("git status")); //
// Add to index // Add to index
git.add().addFilepattern("trackedDeleted").call(); git.add().addFilepattern("trackedDeleted").call();
// Test staged count // Test staged count
assertArrayOfLinesEquals(new String[] { // git status output assertArrayOfLinesEquals(new String[] { // git status output
"# On branch master", //
"# Changes to be committed:", //
"# ", //
"# \tnew file: stagedDeleted", //
"# \tnew file: stagedModified", //
"# \tnew file: tracked", //
"# \tnew file: trackedDeleted", //
"# \tnew file: trackedModified", //
"# ", //
"# Untracked files:", //
"# ", //
"# \tstagedNew", //
"# \tuntracked", //
"On branch master", //
"Changes to be committed:", //
"", //
"\tnew file: stagedDeleted", //
"\tnew file: stagedModified", //
"\tnew file: tracked", //
"\tnew file: trackedDeleted", //
"\tnew file: trackedModified", //
"", //
"Untracked files:", //
"", //
"\tstagedNew", //
"\tuntracked", //
"" // "" //
}, execute("git status")); // }, execute("git status")); //
// Commit // Commit
git.commit().setMessage("initial commit") git.commit().setMessage("initial commit")
.call(); .call();
assertArrayOfLinesEquals(new String[] { // git status output assertArrayOfLinesEquals(new String[] { // git status output
"# On branch master", //
"# Untracked files:", //
"# ", //
"# \tstagedNew", //
"# \tuntracked", //
"On branch master", //
"Untracked files:", //
"", //
"\tstagedNew", //
"\tuntracked", //
"" // "" //
}, execute("git status")); // }, execute("git status")); //
// Make some changes and stage them // Make some changes and stage them
git.add().addFilepattern("stagedNew").call(); git.add().addFilepattern("stagedNew").call();
// Test staged/not-staged status // Test staged/not-staged status
assertArrayOfLinesEquals(new String[] { // git status output assertArrayOfLinesEquals(new String[] { // git status output
"# On branch master", //
"# Changes to be committed:", //
"# ", //
"# \tdeleted: stagedDeleted", //
"# \tmodified: stagedModified", //
"# \tnew file: stagedNew", //
"# ", //
"# Changes not staged for commit:", //
"# ", //
"# \tdeleted: trackedDeleted", //
"# \tmodified: trackedModified", //
"# ", //
"# Untracked files:", //
"# ", //
"# \tuntracked", //
"On branch master", //
"Changes to be committed:", //
"", //
"\tdeleted: stagedDeleted", //
"\tmodified: stagedModified", //
"\tnew file: stagedNew", //
"", //
"Changes not staged for commit:", //
"", //
"\tdeleted: trackedDeleted", //
"\tmodified: trackedModified", //
"", //
"Untracked files:", //
"", //
"\tuntracked", //
"" // "" //
}, execute("git status")); // }, execute("git status")); //
// Create unmerged file // Create unmerged file
git.rm().addFilepattern("trackedDeleted").call(); git.rm().addFilepattern("trackedDeleted").call();
git.commit().setMessage("commit before branching").call(); git.commit().setMessage("commit before branching").call();
assertArrayOfLinesEquals(new String[] { // git status output assertArrayOfLinesEquals(new String[] { // git status output
"# On branch master", //
"# Untracked files:", //
"# ", //
"# \tuntracked", //
"On branch master", //
"Untracked files:", //
"", //
"\tuntracked", //
"" // "" //
}, execute("git status")); // }, execute("git status")); //
// Checkout new branch // Checkout new branch
git.checkout().setCreateBranch(true).setName("test").call(); git.checkout().setCreateBranch(true).setName("test").call();
// Test branch status // Test branch status
assertArrayOfLinesEquals(new String[] { // git status output assertArrayOfLinesEquals(new String[] { // git status output
"# On branch test", //
"# Untracked files:", //
"# ", //
"# \tuntracked", //
"On branch test", //
"Untracked files:", //
"", //
"\tuntracked", //
"" // "" //
}, execute("git status")); // }, execute("git status")); //
// Commit change and checkout master again // Commit change and checkout master again
RevCommit testBranch = git.commit() RevCommit testBranch = git.commit()
.setMessage("changed unmerged in test branch").call(); .setMessage("changed unmerged in test branch").call();
assertArrayOfLinesEquals(new String[] { // git status output assertArrayOfLinesEquals(new String[] { // git status output
"# On branch test", //
"# Untracked files:", //
"# ", //
"# \tuntracked", //
"On branch test", //
"Untracked files:", //
"", //
"\tuntracked", //
"" // "" //
}, execute("git status")); // }, execute("git status")); //
git.checkout().setName("master").call(); git.checkout().setName("master").call();
git.add().addFilepattern("unmerged").call(); git.add().addFilepattern("unmerged").call();
git.commit().setMessage("changed unmerged in master branch").call(); git.commit().setMessage("changed unmerged in master branch").call();
assertArrayOfLinesEquals(new String[] { // git status output assertArrayOfLinesEquals(new String[] { // git status output
"# On branch master", //
"# Untracked files:", //
"# ", //
"# \tuntracked", //
"On branch master", //
"Untracked files:", //
"", //
"\tuntracked", //
"" // "" //
}, execute("git status")); // }, execute("git status")); //
// Merge test branch into master // Merge test branch into master
git.merge().include(testBranch.getId()).call(); git.merge().include(testBranch.getId()).call();
// Test unmerged status // Test unmerged status
assertArrayOfLinesEquals(new String[] { // git status output assertArrayOfLinesEquals(new String[] { // git status output
"# On branch master", //
"# Unmerged paths:", //
"# ", //
"# \tboth modified: unmerged", //
"# ", //
"# Untracked files:", //
"# ", //
"# \tuntracked", //
"On branch master", //
"Unmerged paths:", //
"", //
"\tboth modified: unmerged", //
"", //
"Untracked files:", //
"", //
"\tuntracked", //
"" // "" //
}, execute("git status")); // }, execute("git status")); //
// Test detached head // Test detached head
String commitId = db.getRef(Constants.MASTER).getObjectId().name(); String commitId = db.getRef(Constants.MASTER).getObjectId().name();
git.checkout().setName(commitId).call(); git.checkout().setName(commitId).call();
assertArrayOfLinesEquals(new String[] { // git status output assertArrayOfLinesEquals(new String[] { // git status output
"# Not currently on any branch.", //
"# Unmerged paths:", //
"# ", //
"# \tboth modified: unmerged", //
"# ", //
"# Untracked files:", //
"# ", //
"# \tuntracked", //
"Not currently on any branch.", //
"Unmerged paths:", //
"", //
"\tboth modified: unmerged", //
"", //
"Untracked files:", //
"", //
"\tuntracked", //
"" // "" //
}, execute("git status")); // }, execute("git status")); //
} }

+ 1
- 1
org.eclipse.jgit.pgm/resources/org/eclipse/jgit/pgm/internal/CLIText.properties View File

initializedEmptyGitRepositoryIn=Initialized empty Git repository in {0} initializedEmptyGitRepositoryIn=Initialized empty Git repository in {0}
invalidHttpProxyOnlyHttpSupported=Invalid http_proxy: {0}: Only http supported. invalidHttpProxyOnlyHttpSupported=Invalid http_proxy: {0}: Only http supported.
jgitVersion=jgit version {0} jgitVersion=jgit version {0}
lineFormat=# {0}
lineFormat={0}
listeningOn=Listening on {0} listeningOn=Listening on {0}
mergeConflict=CONFLICT(content): Merge conflict in {0} mergeConflict=CONFLICT(content): Merge conflict in {0}
mergeCheckoutConflict=error: Your local changes to the following files would be overwritten by merge: mergeCheckoutConflict=error: Your local changes to the following files would be overwritten by merge:

Write Preview
Loading…
Cancel
Save