github
/
jgit
mirror of https://gitee.com/github-mirror-repo/jgit.git
1
0
Fork 0
Code Issues Releases Wiki Activity
Browse Source

Merge "Prepare 4.3.1-SNAPSHOT versions"

stable-4.4
Matthias Sohn 9 years ago committed by Gerrit Code Review @ Eclipse.org
parent
2708b11b6c f2ee537d55
commit
08fc807780
67 changed files with 664 additions and 325 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 12
      org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF
  2. 2
      org.eclipse.jgit.ant.test/pom.xml
  3. 6
      org.eclipse.jgit.ant/META-INF/MANIFEST.MF
  4. 2
      org.eclipse.jgit.ant/pom.xml
  5. 12
      org.eclipse.jgit.archive/META-INF/MANIFEST.MF
  6. 4
      org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF
  7. 2
      org.eclipse.jgit.archive/pom.xml
  8. 10
      org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF
  9. 2
      org.eclipse.jgit.http.apache/pom.xml
  10. 26
      org.eclipse.jgit.http.server/META-INF/MANIFEST.MF
  11. 2
      org.eclipse.jgit.http.server/pom.xml
  12. 36
      org.eclipse.jgit.http.test/META-INF/MANIFEST.MF
  13. 2
      org.eclipse.jgit.http.test/pom.xml
  14. 20
      org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF
  15. 2
      org.eclipse.jgit.junit.http/pom.xml
  16. 32
      org.eclipse.jgit.junit/META-INF/MANIFEST.MF
  17. 2
      org.eclipse.jgit.junit/pom.xml
  18. 12
      org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF
  19. 2
      org.eclipse.jgit.lfs.server.test/pom.xml
  20. 28
      org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF
  21. 2
      org.eclipse.jgit.lfs.server/pom.xml
  22. 14
      org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF
  23. 2
      org.eclipse.jgit.lfs.test/pom.xml
  24. 16
      org.eclipse.jgit.lfs/META-INF/MANIFEST.MF
  25. 2
      org.eclipse.jgit.lfs/pom.xml
  26. 2
      org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml
  27. 2
      org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml
  28. 2
      org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml
  29. 2
      org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml
  30. 2
      org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml
  31. 2
      org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml
  32. 2
      org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml
  33. 2
      org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml
  34. 2
      org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml
  35. 2
      org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml
  36. 2
      org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.source.feature/feature.xml
  37. 2
      org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.source.feature/pom.xml
  38. 2
      org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml
  39. 2
      org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml
  40. 2
      org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml
  41. 2
      org.eclipse.jgit.packaging/org.eclipse.jgit.target/META-INF/MANIFEST.MF
  42. 2
      org.eclipse.jgit.packaging/org.eclipse.jgit.target/pom.xml
  43. 2
      org.eclipse.jgit.packaging/pom.xml
  44. 36
      org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF
  45. 2
      org.eclipse.jgit.pgm.test/pom.xml
  46. 78
      org.eclipse.jgit.pgm/META-INF/MANIFEST.MF
  47. 4
      org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF
  48. 2
      org.eclipse.jgit.pgm/pom.xml
  49. 82
      org.eclipse.jgit.test/META-INF/MANIFEST.MF
  50. 2
      org.eclipse.jgit.test/pom.xml
  51. 116
      org.eclipse.jgit.test/tst/org/eclipse/jgit/api/AddCommandTest.java
  52. 107
      org.eclipse.jgit.test/tst/org/eclipse/jgit/api/CheckoutCommandTest.java
  53. 42
      org.eclipse.jgit.test/tst/org/eclipse/jgit/treewalk/FileTreeIteratorTest.java
  54. 18
      org.eclipse.jgit.ui/META-INF/MANIFEST.MF
  55. 2
      org.eclipse.jgit.ui/pom.xml
  56. 80
      org.eclipse.jgit/META-INF/MANIFEST.MF
  57. 4
      org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF
  58. 2
      org.eclipse.jgit/pom.xml
  59. 6
      org.eclipse.jgit/src/org/eclipse/jgit/api/AddCommand.java
  60. 12
      org.eclipse.jgit/src/org/eclipse/jgit/api/CheckoutCommand.java
  61. 6
      org.eclipse.jgit/src/org/eclipse/jgit/lib/ConfigConstants.java
  62. 9
      org.eclipse.jgit/src/org/eclipse/jgit/treewalk/AbstractTreeIterator.java
  63. 34
      org.eclipse.jgit/src/org/eclipse/jgit/treewalk/FileTreeIterator.java
  64. 7
      org.eclipse.jgit/src/org/eclipse/jgit/treewalk/TreeWalk.java
  65. 35
      org.eclipse.jgit/src/org/eclipse/jgit/treewalk/WorkingTreeIterator.java
  66. 13
      org.eclipse.jgit/src/org/eclipse/jgit/treewalk/WorkingTreeOptions.java
  67. 2
      pom.xml

12
org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF
Unescape View File

@ -3,14 +3,14 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %plugin_name
Bundle-SymbolicName: org.eclipse.jgit.ant.test
Bundle-Version: 4.3.0.qualifier
Bundle-Version: 4.3.1.qualifier
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Import-Package: org.apache.tools.ant,
org.eclipse.jgit.ant.tasks;version="[4.3.0,4.4.0)",
org.eclipse.jgit.internal.storage.file;version="[4.3.0,4.4.0)",
org.eclipse.jgit.junit;version="[4.3.0,4.4.0)",
org.eclipse.jgit.lib;version="[4.3.0,4.4.0)",
org.eclipse.jgit.util;version="[4.3.0,4.4.0)",
org.eclipse.jgit.ant.tasks;version="[4.3.1,4.4.0)",
org.eclipse.jgit.internal.storage.file;version="[4.3.1,4.4.0)",
org.eclipse.jgit.junit;version="[4.3.1,4.4.0)",
org.eclipse.jgit.lib;version="[4.3.1,4.4.0)",
org.eclipse.jgit.util;version="[4.3.1,4.4.0)",
org.hamcrest;version="[1.1.0,2.0.0)",
org.junit;version="[4.0.0,5.0.0)"

2
org.eclipse.jgit.ant.test/pom.xml
Unescape View File

@ -50,7 +50,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit-parent</artifactId>
<version>4.3.0-SNAPSHOT</version>
<version>4.3.1-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.jgit.ant.test</artifactId>

6
org.eclipse.jgit.ant/META-INF/MANIFEST.MF
Unescape View File

@ -2,11 +2,11 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.jgit.ant
Bundle-Version: 4.3.0.qualifier
Bundle-Version: 4.3.1.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Import-Package: org.apache.tools.ant,
org.eclipse.jgit.storage.file;version="[4.3.0,4.4.0)"
org.eclipse.jgit.storage.file;version="[4.3.1,4.4.0)"
Bundle-Localization: plugin
Bundle-Vendor: %Provider-Name
Export-Package: org.eclipse.jgit.ant.tasks;version="4.3.0";
Export-Package: org.eclipse.jgit.ant.tasks;version="4.3.1";
uses:="org.apache.tools.ant.types,org.apache.tools.ant"

2
org.eclipse.jgit.ant/pom.xml
Unescape View File

@ -48,7 +48,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit-parent</artifactId>
<version>4.3.0-SNAPSHOT</version>
<version>4.3.1-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.jgit.ant</artifactId>

12
org.eclipse.jgit.archive/META-INF/MANIFEST.MF
Unescape View File

@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %plugin_name
Bundle-SymbolicName: org.eclipse.jgit.archive
Bundle-Version: 4.3.0.qualifier
Bundle-Version: 4.3.1.qualifier
Bundle-Vendor: %provider_name
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
@ -12,14 +12,14 @@ Import-Package: org.apache.commons.compress.archivers;version="[1.4,2.0)",
org.apache.commons.compress.compressors.bzip2;version="[1.4,2.0)",
org.apache.commons.compress.compressors.gzip;version="[1.4,2.0)",
org.apache.commons.compress.compressors.xz;version="[1.4,2.0)",
org.eclipse.jgit.api;version="[4.3.0,4.4.0)",
org.eclipse.jgit.lib;version="[4.3.0,4.4.0)",
org.eclipse.jgit.nls;version="[4.3.0,4.4.0)",
org.eclipse.jgit.util;version="[4.3.0,4.4.0)",
org.eclipse.jgit.api;version="[4.3.1,4.4.0)",
org.eclipse.jgit.lib;version="[4.3.1,4.4.0)",
org.eclipse.jgit.nls;version="[4.3.1,4.4.0)",
org.eclipse.jgit.util;version="[4.3.1,4.4.0)",
org.osgi.framework;version="[1.3.0,2.0.0)"
Bundle-ActivationPolicy: lazy
Bundle-Activator: org.eclipse.jgit.archive.FormatActivator
Export-Package: org.eclipse.jgit.archive;version="4.3.0";
Export-Package: org.eclipse.jgit.archive;version="4.3.1";
uses:="org.eclipse.jgit.lib,
org.eclipse.jgit.api,
org.apache.commons.compress.archivers,

4
org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF
Unescape View File

@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2
Bundle-Name: org.eclipse.jgit.archive - Sources
Bundle-SymbolicName: org.eclipse.jgit.archive.source
Bundle-Vendor: Eclipse.org - JGit
Bundle-Version: 4.3.0.qualifier
Eclipse-SourceBundle: org.eclipse.jgit.archive;version="4.3.0.qualifier";roots="."
Bundle-Version: 4.3.1.qualifier
Eclipse-SourceBundle: org.eclipse.jgit.archive;version="4.3.1.qualifier";roots="."

2
org.eclipse.jgit.archive/pom.xml
Unescape View File

@ -50,7 +50,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit-parent</artifactId>
<version>4.3.0-SNAPSHOT</version>
<version>4.3.1-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.jgit.archive</artifactId>

10
org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF
Unescape View File

@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.jgit.http.apache
Bundle-Version: 4.3.0.qualifier
Bundle-Version: 4.3.1.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Bundle-Localization: plugin
Bundle-Vendor: %Provider-Name
@ -19,10 +19,10 @@ Import-Package: org.apache.http;version="[4.1.0,5.0.0)",
org.apache.http.impl.client;version="[4.1.0,5.0.0)",
org.apache.http.impl.client.cache;version="[4.1.0,5.0.0)",
org.apache.http.params;version="[4.1.0,5.0.0)",
org.eclipse.jgit.nls;version="[4.3.0,4.4.0)",
org.eclipse.jgit.transport.http;version="[4.3.0,4.4.0)",
org.eclipse.jgit.util;version="[4.3.0,4.4.0)"
Export-Package: org.eclipse.jgit.transport.http.apache;version="4.3.0";
org.eclipse.jgit.nls;version="[4.3.1,4.4.0)",
org.eclipse.jgit.transport.http;version="[4.3.1,4.4.0)",
org.eclipse.jgit.util;version="[4.3.1,4.4.0)"
Export-Package: org.eclipse.jgit.transport.http.apache;version="4.3.1";
uses:="org.eclipse.jgit.transport.http,
javax.net.ssl,
org.apache.http.client,

2
org.eclipse.jgit.http.apache/pom.xml
Unescape View File

@ -48,7 +48,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit-parent</artifactId>
<version>4.3.0-SNAPSHOT</version>
<version>4.3.1-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.jgit.http.apache</artifactId>

26
org.eclipse.jgit.http.server/META-INF/MANIFEST.MF
Unescape View File

@ -2,13 +2,13 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %plugin_name
Bundle-SymbolicName: org.eclipse.jgit.http.server
Bundle-Version: 4.3.0.qualifier
Bundle-Version: 4.3.1.qualifier
Bundle-Localization: plugin
Bundle-Vendor: %provider_name
Export-Package: org.eclipse.jgit.http.server;version="4.3.0",
org.eclipse.jgit.http.server.glue;version="4.3.0";
Export-Package: org.eclipse.jgit.http.server;version="4.3.1",
org.eclipse.jgit.http.server.glue;version="4.3.1";
uses:="javax.servlet,javax.servlet.http",
org.eclipse.jgit.http.server.resolver;version="4.3.0";
org.eclipse.jgit.http.server.resolver;version="4.3.1";
uses:="org.eclipse.jgit.transport.resolver,
org.eclipse.jgit.lib,
org.eclipse.jgit.transport,
@ -17,12 +17,12 @@ Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Import-Package: javax.servlet;version="[2.5.0,3.2.0)",
javax.servlet.http;version="[2.5.0,3.2.0)",
org.eclipse.jgit.errors;version="[4.3.0,4.4.0)",
org.eclipse.jgit.internal.storage.dfs;version="[4.3.0,4.4.0)",
org.eclipse.jgit.internal.storage.file;version="[4.3.0,4.4.0)",
org.eclipse.jgit.lib;version="[4.3.0,4.4.0)",
org.eclipse.jgit.nls;version="[4.3.0,4.4.0)",
org.eclipse.jgit.revwalk;version="[4.3.0,4.4.0)",
org.eclipse.jgit.transport;version="[4.3.0,4.4.0)",
org.eclipse.jgit.transport.resolver;version="[4.3.0,4.4.0)",
org.eclipse.jgit.util;version="[4.3.0,4.4.0)"
org.eclipse.jgit.errors;version="[4.3.1,4.4.0)",
org.eclipse.jgit.internal.storage.dfs;version="[4.3.1,4.4.0)",
org.eclipse.jgit.internal.storage.file;version="[4.3.1,4.4.0)",
org.eclipse.jgit.lib;version="[4.3.1,4.4.0)",
org.eclipse.jgit.nls;version="[4.3.1,4.4.0)",
org.eclipse.jgit.revwalk;version="[4.3.1,4.4.0)",
org.eclipse.jgit.transport;version="[4.3.1,4.4.0)",
org.eclipse.jgit.transport.resolver;version="[4.3.1,4.4.0)",
org.eclipse.jgit.util;version="[4.3.1,4.4.0)"

2
org.eclipse.jgit.http.server/pom.xml
Unescape View File

@ -52,7 +52,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit-parent</artifactId>
<version>4.3.0-SNAPSHOT</version>
<version>4.3.1-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.jgit.http.server</artifactId>

36
org.eclipse.jgit.http.test/META-INF/MANIFEST.MF
Unescape View File

@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %plugin_name
Bundle-SymbolicName: org.eclipse.jgit.http.test
Bundle-Version: 4.3.0.qualifier
Bundle-Version: 4.3.1.qualifier
Bundle-Vendor: %provider_name
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
@ -22,23 +22,23 @@ Import-Package: javax.servlet;version="[2.5.0,3.2.0)",
org.eclipse.jetty.util.log;version="[9.0.0,10.0.0)",
org.eclipse.jetty.util.security;version="[9.0.0,10.0.0)",
org.eclipse.jetty.util.thread;version="[9.0.0,10.0.0)",
org.eclipse.jgit.errors;version="[4.3.0,4.4.0)",
org.eclipse.jgit.http.server;version="[4.3.0,4.4.0)",
org.eclipse.jgit.http.server.glue;version="[4.3.0,4.4.0)",
org.eclipse.jgit.http.server.resolver;version="[4.3.0,4.4.0)",
org.eclipse.jgit.internal;version="[4.3.0,4.4.0)",
org.eclipse.jgit.internal.storage.file;version="[4.3.0,4.4.0)",
org.eclipse.jgit.junit;version="[4.3.0,4.4.0)",
org.eclipse.jgit.junit.http;version="[4.3.0,4.4.0)",
org.eclipse.jgit.lib;version="[4.3.0,4.4.0)",
org.eclipse.jgit.nls;version="[4.3.0,4.4.0)",
org.eclipse.jgit.revwalk;version="[4.3.0,4.4.0)",
org.eclipse.jgit.storage.file;version="[4.3.0,4.4.0)",
org.eclipse.jgit.transport;version="[4.3.0,4.4.0)",
org.eclipse.jgit.transport.http;version="[4.3.0,4.4.0)",
org.eclipse.jgit.transport.http.apache;version="[4.3.0,4.4.0)",
org.eclipse.jgit.transport.resolver;version="[4.3.0,4.4.0)",
org.eclipse.jgit.util;version="[4.3.0,4.4.0)",
org.eclipse.jgit.errors;version="[4.3.1,4.4.0)",
org.eclipse.jgit.http.server;version="[4.3.1,4.4.0)",
org.eclipse.jgit.http.server.glue;version="[4.3.1,4.4.0)",
org.eclipse.jgit.http.server.resolver;version="[4.3.1,4.4.0)",
org.eclipse.jgit.internal;version="[4.3.1,4.4.0)",
org.eclipse.jgit.internal.storage.file;version="[4.3.1,4.4.0)",
org.eclipse.jgit.junit;version="[4.3.1,4.4.0)",
org.eclipse.jgit.junit.http;version="[4.3.1,4.4.0)",
org.eclipse.jgit.lib;version="[4.3.1,4.4.0)",
org.eclipse.jgit.nls;version="[4.3.1,4.4.0)",
org.eclipse.jgit.revwalk;version="[4.3.1,4.4.0)",
org.eclipse.jgit.storage.file;version="[4.3.1,4.4.0)",
org.eclipse.jgit.transport;version="[4.3.1,4.4.0)",
org.eclipse.jgit.transport.http;version="[4.3.1,4.4.0)",
org.eclipse.jgit.transport.http.apache;version="[4.3.1,4.4.0)",
org.eclipse.jgit.transport.resolver;version="[4.3.1,4.4.0)",
org.eclipse.jgit.util;version="[4.3.1,4.4.0)",
org.hamcrest.core;version="[1.1.0,2.0.0)",
org.junit;version="[4.0.0,5.0.0)",
org.junit.runner;version="[4.0.0,5.0.0)",

2
org.eclipse.jgit.http.test/pom.xml
Unescape View File

@ -51,7 +51,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit-parent</artifactId>
<version>4.3.0-SNAPSHOT</version>
<version>4.3.1-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.jgit.http.test</artifactId>

20
org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF
Unescape View File

@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %plugin_name
Bundle-SymbolicName: org.eclipse.jgit.junit.http
Bundle-Version: 4.3.0.qualifier
Bundle-Version: 4.3.1.qualifier
Bundle-Localization: plugin
Bundle-Vendor: %provider_name
Bundle-ActivationPolicy: lazy
@ -20,16 +20,16 @@ Import-Package: javax.servlet;version="[2.5.0,3.2.0)",
org.eclipse.jetty.util.component;version="[9.0.0,10.0.0)",
org.eclipse.jetty.util.log;version="[9.0.0,10.0.0)",
org.eclipse.jetty.util.security;version="[9.0.0,10.0.0)",
org.eclipse.jgit.errors;version="[4.3.0,4.4.0)",
org.eclipse.jgit.http.server;version="[4.3.0,4.4.0)",
org.eclipse.jgit.internal.storage.file;version="[4.3.0,4.4.0)",
org.eclipse.jgit.junit;version="[4.3.0,4.4.0)",
org.eclipse.jgit.lib;version="[4.3.0,4.4.0)",
org.eclipse.jgit.revwalk;version="[4.3.0,4.4.0)",
org.eclipse.jgit.transport;version="[4.3.0,4.4.0)",
org.eclipse.jgit.transport.resolver;version="[4.3.0,4.4.0)",
org.eclipse.jgit.errors;version="[4.3.1,4.4.0)",
org.eclipse.jgit.http.server;version="[4.3.1,4.4.0)",
org.eclipse.jgit.internal.storage.file;version="[4.3.1,4.4.0)",
org.eclipse.jgit.junit;version="[4.3.1,4.4.0)",
org.eclipse.jgit.lib;version="[4.3.1,4.4.0)",
org.eclipse.jgit.revwalk;version="[4.3.1,4.4.0)",
org.eclipse.jgit.transport;version="[4.3.1,4.4.0)",
org.eclipse.jgit.transport.resolver;version="[4.3.1,4.4.0)",
org.junit;version="[4.0.0,5.0.0)"
Export-Package: org.eclipse.jgit.junit.http;version="4.3.0";
Export-Package: org.eclipse.jgit.junit.http;version="4.3.1";
uses:="org.eclipse.jgit.transport,
org.eclipse.jgit.junit,
javax.servlet.http,

2
org.eclipse.jgit.junit.http/pom.xml
Unescape View File

@ -50,7 +50,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit-parent</artifactId>
<version>4.3.0-SNAPSHOT</version>
<version>4.3.1-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.jgit.junit.http</artifactId>

32
org.eclipse.jgit.junit/META-INF/MANIFEST.MF
Unescape View File

@ -2,27 +2,27 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %plugin_name
Bundle-SymbolicName: org.eclipse.jgit.junit
Bundle-Version: 4.3.0.qualifier
Bundle-Version: 4.3.1.qualifier
Bundle-Localization: plugin
Bundle-Vendor: %provider_name
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Import-Package: org.eclipse.jgit.api;version="[4.3.0,4.4.0)",
org.eclipse.jgit.api.errors;version="[4.3.0,4.4.0)",
org.eclipse.jgit.dircache;version="[4.3.0,4.4.0)",
org.eclipse.jgit.errors;version="[4.3.0,4.4.0)",
org.eclipse.jgit.internal.storage.file;version="[4.3.0,4.4.0)",
org.eclipse.jgit.internal.storage.pack;version="[4.3.0,4.4.0)",
org.eclipse.jgit.lib;version="[4.3.0,4.4.0)",
org.eclipse.jgit.merge;version="[4.3.0,4.4.0)",
org.eclipse.jgit.revwalk;version="[4.3.0,4.4.0)",
org.eclipse.jgit.storage.file;version="[4.3.0,4.4.0)",
org.eclipse.jgit.treewalk;version="[4.3.0,4.4.0)",
org.eclipse.jgit.treewalk.filter;version="[4.3.0,4.4.0)",
org.eclipse.jgit.util;version="[4.3.0,4.4.0)",
org.eclipse.jgit.util.io;version="[4.3.0,4.4.0)",
Import-Package: org.eclipse.jgit.api;version="[4.3.1,4.4.0)",
org.eclipse.jgit.api.errors;version="[4.3.1,4.4.0)",
org.eclipse.jgit.dircache;version="[4.3.1,4.4.0)",
org.eclipse.jgit.errors;version="[4.3.1,4.4.0)",
org.eclipse.jgit.internal.storage.file;version="[4.3.1,4.4.0)",
org.eclipse.jgit.internal.storage.pack;version="[4.3.1,4.4.0)",
org.eclipse.jgit.lib;version="[4.3.1,4.4.0)",
org.eclipse.jgit.merge;version="[4.3.1,4.4.0)",
org.eclipse.jgit.revwalk;version="[4.3.1,4.4.0)",
org.eclipse.jgit.storage.file;version="[4.3.1,4.4.0)",
org.eclipse.jgit.treewalk;version="[4.3.1,4.4.0)",
org.eclipse.jgit.treewalk.filter;version="[4.3.1,4.4.0)",
org.eclipse.jgit.util;version="[4.3.1,4.4.0)",
org.eclipse.jgit.util.io;version="[4.3.1,4.4.0)",
org.junit;version="[4.0.0,5.0.0)"
Export-Package: org.eclipse.jgit.junit;version="4.3.0";
Export-Package: org.eclipse.jgit.junit;version="4.3.1";
uses:="org.eclipse.jgit.dircache,
org.eclipse.jgit.lib,
org.eclipse.jgit.revwalk,

2
org.eclipse.jgit.junit/pom.xml
Unescape View File

@ -52,7 +52,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit-parent</artifactId>
<version>4.3.0-SNAPSHOT</version>
<version>4.3.1-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.jgit.junit</artifactId>

12
org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF
Unescape View File

@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %plugin_name
Bundle-SymbolicName: org.eclipse.jgit.lfs.server.test
Bundle-Version: 4.3.0.qualifier
Bundle-Version: 4.3.1.qualifier
Bundle-Vendor: %provider_name
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
@ -27,11 +27,11 @@ Import-Package: javax.servlet;version="[3.1.0,4.0.0)",
org.eclipse.jetty.util.log;version="[9.0.0,10.0.0)",
org.eclipse.jetty.util.security;version="[9.0.0,10.0.0)",
org.eclipse.jetty.util.thread;version="[9.0.0,10.0.0)",
org.eclipse.jgit.junit.http;version="[4.3.0,4.4.0)",
org.eclipse.jgit.lfs.lib;version="[4.3.0,4.4.0)",
org.eclipse.jgit.lfs.server.fs;version="[4.3.0,4.4.0)",
org.eclipse.jgit.lfs.test;version="[4.3.0,4.4.0)",
org.eclipse.jgit.util;version="[4.3.0,4.4.0)",
org.eclipse.jgit.junit.http;version="[4.3.1,4.4.0)",
org.eclipse.jgit.lfs.lib;version="[4.3.1,4.4.0)",
org.eclipse.jgit.lfs.server.fs;version="[4.3.1,4.4.0)",
org.eclipse.jgit.lfs.test;version="[4.3.1,4.4.0)",
org.eclipse.jgit.util;version="[4.3.1,4.4.0)",
org.hamcrest.core;version="[1.1.0,2.0.0)",
org.junit;version="[4.0.0,5.0.0)",
org.junit.runner;version="[4.0.0,5.0.0)",

2
org.eclipse.jgit.lfs.server.test/pom.xml
Unescape View File

@ -50,7 +50,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit-parent</artifactId>
<version>4.3.0-SNAPSHOT</version>
<version>4.3.1-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.jgit.lfs.server.test</artifactId>

28
org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF
Unescape View File

@ -2,19 +2,19 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %plugin_name
Bundle-SymbolicName: org.eclipse.jgit.lfs.server
Bundle-Version: 4.3.0.qualifier
Bundle-Version: 4.3.1.qualifier
Bundle-Localization: plugin
Bundle-Vendor: %provider_name
Export-Package: org.eclipse.jgit.lfs.server;version="4.3.0";
Export-Package: org.eclipse.jgit.lfs.server;version="4.3.1";
uses:="javax.servlet.http,
org.eclipse.jgit.lfs.lib",
org.eclipse.jgit.lfs.server.fs;version="4.3.0";
org.eclipse.jgit.lfs.server.fs;version="4.3.1";
uses:="javax.servlet,
javax.servlet.http,
org.eclipse.jgit.lfs.server,
org.eclipse.jgit.lfs.lib",
org.eclipse.jgit.lfs.server.internal;version="4.3.0";x-internal:=true,
org.eclipse.jgit.lfs.server.s3;version="4.3.0";
org.eclipse.jgit.lfs.server.internal;version="4.3.1";x-internal:=true,
org.eclipse.jgit.lfs.server.s3;version="4.3.1";
uses:="org.eclipse.jgit.lfs.server,
org.eclipse.jgit.lfs.lib"
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
@ -24,12 +24,12 @@ Import-Package: com.google.gson;version="[2.2.4,3.0.0)",
javax.servlet.http;version="[3.1.0,4.0.0)",
org.apache.http;version="[4.3.0,5.0.0)",
org.apache.http.client;version="[4.3.0,5.0.0)",
org.eclipse.jgit.annotations;version="[4.3.0,4.4.0)",
org.eclipse.jgit.internal;version="[4.3.0,4.4.0)",
org.eclipse.jgit.internal.storage.file;version="[4.3.0,4.4.0)",
org.eclipse.jgit.lfs.errors;version="[4.3.0,4.4.0)",
org.eclipse.jgit.lfs.lib;version="[4.3.0,4.4.0)",
org.eclipse.jgit.nls;version="[4.3.0,4.4.0)",
org.eclipse.jgit.transport.http;version="[4.3.0,4.4.0)",
org.eclipse.jgit.transport.http.apache;version="[4.3.0,4.4.0)",
org.eclipse.jgit.util;version="[4.3.0,4.4.0)"
org.eclipse.jgit.annotations;version="[4.3.1,4.4.0)",
org.eclipse.jgit.internal;version="[4.3.1,4.4.0)",
org.eclipse.jgit.internal.storage.file;version="[4.3.1,4.4.0)",
org.eclipse.jgit.lfs.errors;version="[4.3.1,4.4.0)",
org.eclipse.jgit.lfs.lib;version="[4.3.1,4.4.0)",
org.eclipse.jgit.nls;version="[4.3.1,4.4.0)",
org.eclipse.jgit.transport.http;version="[4.3.1,4.4.0)",
org.eclipse.jgit.transport.http.apache;version="[4.3.1,4.4.0)",
org.eclipse.jgit.util;version="[4.3.1,4.4.0)"

2
org.eclipse.jgit.lfs.server/pom.xml
Unescape View File

@ -50,7 +50,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit-parent</artifactId>
<version>4.3.0-SNAPSHOT</version>
<version>4.3.1-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.jgit.lfs.server</artifactId>

14
org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF
Unescape View File

@ -2,18 +2,18 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %plugin_name
Bundle-SymbolicName: org.eclipse.jgit.lfs.test
Bundle-Version: 4.3.0.qualifier
Bundle-Version: 4.3.1.qualifier
Bundle-Vendor: %provider_name
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Import-Package: org.eclipse.jgit.junit;version="[4.3.0,4.4.0)",
org.eclipse.jgit.lfs.errors;version="[4.3.0,4.4.0)",
org.eclipse.jgit.lfs.lib;version="[4.3.0,4.4.0)",
org.eclipse.jgit.lib;version="[4.3.0,4.4.0)",
org.eclipse.jgit.util;version="[4.3.0,4.4.0)",
Import-Package: org.eclipse.jgit.junit;version="[4.3.1,4.4.0)",
org.eclipse.jgit.lfs.errors;version="[4.3.1,4.4.0)",
org.eclipse.jgit.lfs.lib;version="[4.3.1,4.4.0)",
org.eclipse.jgit.lib;version="[4.3.1,4.4.0)",
org.eclipse.jgit.util;version="[4.3.1,4.4.0)",
org.hamcrest.core;version="[1.1.0,2.0.0)",
org.junit;version="[4.0.0,5.0.0)",
org.junit.runner;version="[4.0.0,5.0.0)",
org.junit.runners;version="[4.0.0,5.0.0)"
Export-Package: org.eclipse.jgit.lfs.test;version="4.3.0";x-friends:="org.eclipse.jgit.lfs.server.test"
Export-Package: org.eclipse.jgit.lfs.test;version="4.3.1";x-friends:="org.eclipse.jgit.lfs.server.test"

2
org.eclipse.jgit.lfs.test/pom.xml
Unescape View File

@ -50,7 +50,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit-parent</artifactId>
<version>4.3.0-SNAPSHOT</version>
<version>4.3.1-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.jgit.lfs.test</artifactId>

16
org.eclipse.jgit.lfs/META-INF/MANIFEST.MF
Unescape View File

@ -2,14 +2,14 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %plugin_name
Bundle-SymbolicName: org.eclipse.jgit.lfs
Bundle-Version: 4.3.0.qualifier
Bundle-Version: 4.3.1.qualifier
Bundle-Localization: plugin
Bundle-Vendor: %provider_name
Export-Package: org.eclipse.jgit.lfs.errors;version="4.3.0",
org.eclipse.jgit.lfs.internal;version="4.3.0";x-friends:="org.eclipse.jgit.lfs.test",
org.eclipse.jgit.lfs.lib;version="4.3.0"
Export-Package: org.eclipse.jgit.lfs.errors;version="4.3.1",
org.eclipse.jgit.lfs.internal;version="4.3.1";x-friends:="org.eclipse.jgit.lfs.test",
org.eclipse.jgit.lfs.lib;version="4.3.1"
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Import-Package: org.eclipse.jgit.internal.storage.file;version="[4.3.0,4.4.0)",
org.eclipse.jgit.lib;version="[4.3.0,4.4.0)",
org.eclipse.jgit.nls;version="[4.3.0,4.4.0)",
org.eclipse.jgit.util;version="[4.3.0,4.4.0)"
Import-Package: org.eclipse.jgit.internal.storage.file;version="[4.3.1,4.4.0)",
org.eclipse.jgit.lib;version="[4.3.1,4.4.0)",
org.eclipse.jgit.nls;version="[4.3.1,4.4.0)",
org.eclipse.jgit.util;version="[4.3.1,4.4.0)"

2
org.eclipse.jgit.lfs/pom.xml
Unescape View File

@ -50,7 +50,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit-parent</artifactId>
<version>4.3.0-SNAPSHOT</version>
<version>4.3.1-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.jgit.lfs</artifactId>

2
org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml
Unescape View File

@ -2,7 +2,7 @@
<feature
id="org.eclipse.jgit"
label="%featureName"
version="4.3.0.qualifier"
version="4.3.1.qualifier"
provider-name="%providerName">
<description url="http://www.eclipse.org/jgit/">

2
org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml
Unescape View File

@ -50,7 +50,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>jgit.tycho.parent</artifactId>
<version>4.3.0-SNAPSHOT</version>
<version>4.3.1-SNAPSHOT</version>
</parent>
<groupId>org.eclipse.jgit.feature</groupId>

2
org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml
Unescape View File

@ -2,7 +2,7 @@
<feature
id="org.eclipse.jgit.http.apache"
label="%featureName"
version="4.3.0.qualifier"
version="4.3.1.qualifier"
provider-name="%providerName">
<description url="http://www.eclipse.org/jgit/">

2
org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml
Unescape View File

@ -50,7 +50,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>jgit.tycho.parent</artifactId>
<version>4.3.0-SNAPSHOT</version>
<version>4.3.1-SNAPSHOT</version>
</parent>
<groupId>org.eclipse.jgit.feature</groupId>

2
org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml
Unescape View File

@ -2,7 +2,7 @@
<feature
id="org.eclipse.jgit.junit"
label="%featureName"
version="4.3.0.qualifier"
version="4.3.1.qualifier"
provider-name="%providerName">
<description url="http://www.eclipse.org/jgit/">

2
org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml
Unescape View File

@ -50,7 +50,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>jgit.tycho.parent</artifactId>
<version>4.3.0-SNAPSHOT</version>
<version>4.3.1-SNAPSHOT</version>
</parent>
<groupId>org.eclipse.jgit.feature</groupId>

2
org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml
Unescape View File

@ -2,7 +2,7 @@
<feature
id="org.eclipse.jgit.lfs"
label="%featureName"
version="4.3.0.qualifier"
version="4.3.1.qualifier"
provider-name="%providerName">
<description url="http://www.eclipse.org/jgit/">

2
org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml
Unescape View File

@ -50,7 +50,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>jgit.tycho.parent</artifactId>
<version>4.3.0-SNAPSHOT</version>
<version>4.3.1-SNAPSHOT</version>
</parent>
<groupId>org.eclipse.jgit.feature</groupId>

2
org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml
Unescape View File

@ -2,7 +2,7 @@
<feature
id="org.eclipse.jgit.pgm"
label="%featureName"
version="4.3.0.qualifier"
version="4.3.1.qualifier"
provider-name="%providerName">
<description url="http://www.eclipse.org/jgit/">

2
org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml
Unescape View File

@ -50,7 +50,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>jgit.tycho.parent</artifactId>
<version>4.3.0-SNAPSHOT</version>
<version>4.3.1-SNAPSHOT</version>
</parent>
<groupId>org.eclipse.jgit.feature</groupId>

2
org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.source.feature/feature.xml
Unescape View File

@ -2,7 +2,7 @@
<feature
id="org.eclipse.jgit.pgm.source"
label="%featureName"
version="4.3.0.qualifier"
version="4.3.1.qualifier"
provider-name="%providerName">
<description url="http://www.eclipse.org/jgit/">

2
org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.source.feature/pom.xml
Unescape View File

@ -50,7 +50,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>jgit.tycho.parent</artifactId>
<version>4.3.0-SNAPSHOT</version>
<version>4.3.1-SNAPSHOT</version>
</parent>
<groupId>org.eclipse.jgit.feature</groupId>

2
org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml
Unescape View File

@ -50,7 +50,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>jgit.tycho.parent</artifactId>
<version>4.3.0-SNAPSHOT</version>
<version>4.3.1-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.jgit.repository</artifactId>

2
org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml
Unescape View File

@ -2,7 +2,7 @@
<feature
id="org.eclipse.jgit.source"
label="%featureName"
version="4.3.0.qualifier"
version="4.3.1.qualifier"
provider-name="%providerName">
<description url="http://www.eclipse.org/jgit/">

2
org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml
Unescape View File

@ -50,7 +50,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>jgit.tycho.parent</artifactId>
<version>4.3.0-SNAPSHOT</version>
<version>4.3.1-SNAPSHOT</version>
</parent>
<groupId>org.eclipse.jgit.feature</groupId>

2
org.eclipse.jgit.packaging/org.eclipse.jgit.target/META-INF/MANIFEST.MF
Unescape View File

@ -2,4 +2,4 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: JGit Target Platform Bundle
Bundle-SymbolicName: org.eclipse.jgit.target
Bundle-Version: 4.3.0.qualifier
Bundle-Version: 4.3.1.qualifier

2
org.eclipse.jgit.packaging/org.eclipse.jgit.target/pom.xml
Unescape View File

@ -49,7 +49,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>jgit.tycho.parent</artifactId>
<version>4.3.0-SNAPSHOT</version>
<version>4.3.1-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.jgit.target</artifactId>

2
org.eclipse.jgit.packaging/pom.xml
Unescape View File

@ -53,7 +53,7 @@
<groupId>org.eclipse.jgit</groupId>
<artifactId>jgit.tycho.parent</artifactId>
<version>4.3.0-SNAPSHOT</version>
<version>4.3.1-SNAPSHOT</version>
<packaging>pom</packaging>
<name>JGit Tycho Parent</name>

36
org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF
Unescape View File

@ -2,28 +2,28 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %plugin_name
Bundle-SymbolicName: org.eclipse.jgit.pgm.test
Bundle-Version: 4.3.0.qualifier
Bundle-Version: 4.3.1.qualifier
Bundle-Vendor: %provider_name
Bundle-Localization: plugin
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Import-Package: org.eclipse.jgit.api;version="[4.3.0,4.4.0)",
org.eclipse.jgit.api.errors;version="[4.3.0,4.4.0)",
org.eclipse.jgit.diff;version="[4.3.0,4.4.0)",
org.eclipse.jgit.dircache;version="[4.3.0,4.4.0)",
org.eclipse.jgit.internal.storage.file;version="4.3.0",
org.eclipse.jgit.junit;version="[4.3.0,4.4.0)",
org.eclipse.jgit.lib;version="[4.3.0,4.4.0)",
org.eclipse.jgit.merge;version="[4.3.0,4.4.0)",
org.eclipse.jgit.pgm;version="[4.3.0,4.4.0)",
org.eclipse.jgit.pgm.internal;version="[4.3.0,4.4.0)",
org.eclipse.jgit.pgm.opt;version="[4.3.0,4.4.0)",
org.eclipse.jgit.revwalk;version="[4.3.0,4.4.0)",
org.eclipse.jgit.storage.file;version="[4.3.0,4.4.0)",
org.eclipse.jgit.transport;version="[4.3.0,4.4.0)",
org.eclipse.jgit.treewalk;version="[4.3.0,4.4.0)",
org.eclipse.jgit.util;version="[4.3.0,4.4.0)",
org.eclipse.jgit.util.io;version="[4.3.0,4.4.0)",
Import-Package: org.eclipse.jgit.api;version="[4.3.1,4.4.0)",
org.eclipse.jgit.api.errors;version="[4.3.1,4.4.0)",
org.eclipse.jgit.diff;version="[4.3.1,4.4.0)",
org.eclipse.jgit.dircache;version="[4.3.1,4.4.0)",
org.eclipse.jgit.internal.storage.file;version="4.3.1",
org.eclipse.jgit.junit;version="[4.3.1,4.4.0)",
org.eclipse.jgit.lib;version="[4.3.1,4.4.0)",
org.eclipse.jgit.merge;version="[4.3.1,4.4.0)",
org.eclipse.jgit.pgm;version="[4.3.1,4.4.0)",
org.eclipse.jgit.pgm.internal;version="[4.3.1,4.4.0)",
org.eclipse.jgit.pgm.opt;version="[4.3.1,4.4.0)",
org.eclipse.jgit.revwalk;version="[4.3.1,4.4.0)",
org.eclipse.jgit.storage.file;version="[4.3.1,4.4.0)",
org.eclipse.jgit.transport;version="[4.3.1,4.4.0)",
org.eclipse.jgit.treewalk;version="[4.3.1,4.4.0)",
org.eclipse.jgit.util;version="[4.3.1,4.4.0)",
org.eclipse.jgit.util.io;version="[4.3.1,4.4.0)",
org.hamcrest.core;bundle-version="[1.1.0,2.0.0)",
org.junit;version="[4.4.0,5.0.0)",
org.kohsuke.args4j;version="[2.0.12,2.1.0)"

2
org.eclipse.jgit.pgm.test/pom.xml
Unescape View File

@ -50,7 +50,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit-parent</artifactId>
<version>4.3.0-SNAPSHOT</version>
<version>4.3.1-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.jgit.pgm.test</artifactId>

78
org.eclipse.jgit.pgm/META-INF/MANIFEST.MF
Unescape View File

@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %plugin_name
Bundle-SymbolicName: org.eclipse.jgit.pgm
Bundle-Version: 4.3.0.qualifier
Bundle-Version: 4.3.1.qualifier
Bundle-Vendor: %provider_name
Bundle-ActivationPolicy: lazy
Bundle-Localization: plugin
@ -26,45 +26,45 @@ Import-Package: javax.servlet;version="[3.1.0,4.0.0)",
org.eclipse.jetty.util.log;version="[9.0.0,10.0.0)",
org.eclipse.jetty.util.security;version="[9.0.0,10.0.0)",
org.eclipse.jetty.util.thread;version="[9.0.0,10.0.0)",
org.eclipse.jgit.api;version="[4.3.0,4.4.0)",
org.eclipse.jgit.api.errors;version="[4.3.0,4.4.0)",
org.eclipse.jgit.archive;version="[4.3.0,4.4.0)",
org.eclipse.jgit.awtui;version="[4.3.0,4.4.0)",
org.eclipse.jgit.blame;version="[4.3.0,4.4.0)",
org.eclipse.jgit.diff;version="[4.3.0,4.4.0)",
org.eclipse.jgit.dircache;version="[4.3.0,4.4.0)",
org.eclipse.jgit.errors;version="[4.3.0,4.4.0)",
org.eclipse.jgit.gitrepo;version="[4.3.0,4.4.0)",
org.eclipse.jgit.internal.ketch;version="[4.3.0,4.4.0)",
org.eclipse.jgit.internal.storage.file;version="[4.3.0,4.4.0)",
org.eclipse.jgit.internal.storage.pack;version="[4.3.0,4.4.0)",
org.eclipse.jgit.internal.storage.reftree;version="[4.3.0,4.4.0)",
org.eclipse.jgit.lfs.lib;version="[4.3.0,4.4.0)",
org.eclipse.jgit.lfs.server;version="[4.3.0,4.4.0)",
org.eclipse.jgit.lfs.server.fs;version="[4.3.0,4.4.0)",
org.eclipse.jgit.lfs.server.s3;version="[4.3.0,4.4.0)",
org.eclipse.jgit.lib;version="[4.3.0,4.4.0)",
org.eclipse.jgit.merge;version="[4.3.0,4.4.0)",
org.eclipse.jgit.nls;version="[4.3.0,4.4.0)",
org.eclipse.jgit.notes;version="[4.3.0,4.4.0)",
org.eclipse.jgit.revplot;version="[4.3.0,4.4.0)",
org.eclipse.jgit.revwalk;version="[4.3.0,4.4.0)",
org.eclipse.jgit.revwalk.filter;version="[4.3.0,4.4.0)",
org.eclipse.jgit.storage.file;version="[4.3.0,4.4.0)",
org.eclipse.jgit.storage.pack;version="[4.3.0,4.4.0)",
org.eclipse.jgit.transport;version="[4.3.0,4.4.0)",
org.eclipse.jgit.transport.http.apache;version="[4.3.0,4.4.0)",
org.eclipse.jgit.transport.resolver;version="[4.3.0,4.4.0)",
org.eclipse.jgit.treewalk;version="[4.3.0,4.4.0)",
org.eclipse.jgit.treewalk.filter;version="[4.3.0,4.4.0)",
org.eclipse.jgit.util;version="[4.3.0,4.4.0)",
org.eclipse.jgit.util.io;version="[4.3.0,4.4.0)",
org.eclipse.jgit.api;version="[4.3.1,4.4.0)",
org.eclipse.jgit.api.errors;version="[4.3.1,4.4.0)",
org.eclipse.jgit.archive;version="[4.3.1,4.4.0)",
org.eclipse.jgit.awtui;version="[4.3.1,4.4.0)",
org.eclipse.jgit.blame;version="[4.3.1,4.4.0)",
org.eclipse.jgit.diff;version="[4.3.1,4.4.0)",
org.eclipse.jgit.dircache;version="[4.3.1,4.4.0)",
org.eclipse.jgit.errors;version="[4.3.1,4.4.0)",
org.eclipse.jgit.gitrepo;version="[4.3.1,4.4.0)",
org.eclipse.jgit.internal.ketch;version="[4.3.1,4.4.0)",
org.eclipse.jgit.internal.storage.file;version="[4.3.1,4.4.0)",
org.eclipse.jgit.internal.storage.pack;version="[4.3.1,4.4.0)",
org.eclipse.jgit.internal.storage.reftree;version="[4.3.1,4.4.0)",
org.eclipse.jgit.lfs.lib;version="[4.3.1,4.4.0)",
org.eclipse.jgit.lfs.server;version="[4.3.1,4.4.0)",
org.eclipse.jgit.lfs.server.fs;version="[4.3.1,4.4.0)",
org.eclipse.jgit.lfs.server.s3;version="[4.3.1,4.4.0)",
org.eclipse.jgit.lib;version="[4.3.1,4.4.0)",
org.eclipse.jgit.merge;version="[4.3.1,4.4.0)",
org.eclipse.jgit.nls;version="[4.3.1,4.4.0)",
org.eclipse.jgit.notes;version="[4.3.1,4.4.0)",
org.eclipse.jgit.revplot;version="[4.3.1,4.4.0)",
org.eclipse.jgit.revwalk;version="[4.3.1,4.4.0)",
org.eclipse.jgit.revwalk.filter;version="[4.3.1,4.4.0)",
org.eclipse.jgit.storage.file;version="[4.3.1,4.4.0)",
org.eclipse.jgit.storage.pack;version="[4.3.1,4.4.0)",
org.eclipse.jgit.transport;version="[4.3.1,4.4.0)",
org.eclipse.jgit.transport.http.apache;version="[4.3.1,4.4.0)",
org.eclipse.jgit.transport.resolver;version="[4.3.1,4.4.0)",
org.eclipse.jgit.treewalk;version="[4.3.1,4.4.0)",
org.eclipse.jgit.treewalk.filter;version="[4.3.1,4.4.0)",
org.eclipse.jgit.util;version="[4.3.1,4.4.0)",
org.eclipse.jgit.util.io;version="[4.3.1,4.4.0)",
org.kohsuke.args4j;version="[2.0.12,2.1.0)",
org.kohsuke.args4j.spi;version="[2.0.15,2.1.0)"
Export-Package: org.eclipse.jgit.console;version="4.3.0";
Export-Package: org.eclipse.jgit.console;version="4.3.1";
uses:="org.eclipse.jgit.transport,
org.eclipse.jgit.util",
org.eclipse.jgit.pgm;version="4.3.0";
org.eclipse.jgit.pgm;version="4.3.1";
uses:="org.eclipse.jgit.revwalk,
org.eclipse.jgit.treewalk.filter,
org.eclipse.jgit.pgm.opt,
@ -75,11 +75,11 @@ Export-Package: org.eclipse.jgit.console;version="4.3.0";
org.eclipse.jgit.treewalk,
javax.swing,
org.eclipse.jgit.transport",
org.eclipse.jgit.pgm.debug;version="4.3.0";
org.eclipse.jgit.pgm.debug;version="4.3.1";
uses:="org.eclipse.jgit.util.io,
org.eclipse.jgit.pgm",
org.eclipse.jgit.pgm.internal;version="4.3.0";x-friends:="org.eclipse.jgit.pgm.test,org.eclipse.jgit.test",
org.eclipse.jgit.pgm.opt;version="4.3.0";
org.eclipse.jgit.pgm.internal;version="4.3.1";x-friends:="org.eclipse.jgit.pgm.test,org.eclipse.jgit.test",
org.eclipse.jgit.pgm.opt;version="4.3.1";
uses:="org.eclipse.jgit.lib,
org.eclipse.jgit.revwalk,
org.kohsuke.args4j.spi,

4
org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF
Unescape View File

@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2
Bundle-Name: org.eclipse.jgit.pgm - Sources
Bundle-SymbolicName: org.eclipse.jgit.pgm.source
Bundle-Vendor: Eclipse.org - JGit
Bundle-Version: 4.3.0.qualifier
Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="4.3.0.qualifier";roots="."
Bundle-Version: 4.3.1.qualifier
Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="4.3.1.qualifier";roots="."

2
org.eclipse.jgit.pgm/pom.xml
Unescape View File

@ -50,7 +50,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit-parent</artifactId>
<version>4.3.0-SNAPSHOT</version>
<version>4.3.1-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.jgit.pgm</artifactId>

82
org.eclipse.jgit.test/META-INF/MANIFEST.MF
Unescape View File

@ -2,52 +2,52 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %plugin_name
Bundle-SymbolicName: org.eclipse.jgit.test
Bundle-Version: 4.3.0.qualifier
Bundle-Version: 4.3.1.qualifier
Bundle-Localization: plugin
Bundle-Vendor: %provider_name
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Import-Package: com.googlecode.javaewah;version="[0.7.9,0.8.0)",
org.eclipse.jgit.api;version="[4.3.0,4.4.0)",
org.eclipse.jgit.api.errors;version="[4.3.0,4.4.0)",
org.eclipse.jgit.attributes;version="[4.3.0,4.4.0)",
org.eclipse.jgit.awtui;version="[4.3.0,4.4.0)",
org.eclipse.jgit.blame;version="[4.3.0,4.4.0)",
org.eclipse.jgit.diff;version="[4.3.0,4.4.0)",
org.eclipse.jgit.dircache;version="[4.3.0,4.4.0)",
org.eclipse.jgit.errors;version="[4.3.0,4.4.0)",
org.eclipse.jgit.events;version="[4.3.0,4.4.0)",
org.eclipse.jgit.fnmatch;version="[4.3.0,4.4.0)",
org.eclipse.jgit.gitrepo;version="[4.3.0,4.4.0)",
org.eclipse.jgit.hooks;version="[4.3.0,4.4.0)",
org.eclipse.jgit.ignore;version="[4.3.0,4.4.0)",
org.eclipse.jgit.ignore.internal;version="[4.3.0,4.4.0)",
org.eclipse.jgit.internal;version="[4.3.0,4.4.0)",
org.eclipse.jgit.internal.storage.dfs;version="[4.3.0,4.4.0)",
org.eclipse.jgit.internal.storage.file;version="[4.3.0,4.4.0)",
org.eclipse.jgit.internal.storage.pack;version="[4.3.0,4.4.0)",
org.eclipse.jgit.internal.storage.reftree;version="[4.3.0,4.4.0)",
org.eclipse.jgit.junit;version="[4.3.0,4.4.0)",
org.eclipse.jgit.lib;version="[4.3.0,4.4.0)",
org.eclipse.jgit.merge;version="[4.3.0,4.4.0)",
org.eclipse.jgit.nls;version="[4.3.0,4.4.0)",
org.eclipse.jgit.notes;version="[4.3.0,4.4.0)",
org.eclipse.jgit.patch;version="[4.3.0,4.4.0)",
org.eclipse.jgit.pgm;version="[4.3.0,4.4.0)",
org.eclipse.jgit.pgm.internal;version="[4.3.0,4.4.0)",
org.eclipse.jgit.revplot;version="[4.3.0,4.4.0)",
org.eclipse.jgit.revwalk;version="[4.3.0,4.4.0)",
org.eclipse.jgit.revwalk.filter;version="[4.3.0,4.4.0)",
org.eclipse.jgit.storage.file;version="[4.3.0,4.4.0)",
org.eclipse.jgit.storage.pack;version="[4.3.0,4.4.0)",
org.eclipse.jgit.submodule;version="[4.3.0,4.4.0)",
org.eclipse.jgit.transport;version="[4.3.0,4.4.0)",
org.eclipse.jgit.transport.http;version="[4.3.0,4.4.0)",
org.eclipse.jgit.transport.resolver;version="[4.3.0,4.4.0)",
org.eclipse.jgit.treewalk;version="[4.3.0,4.4.0)",
org.eclipse.jgit.treewalk.filter;version="[4.3.0,4.4.0)",
org.eclipse.jgit.util;version="[4.3.0,4.4.0)",
org.eclipse.jgit.util.io;version="[4.3.0,4.4.0)",
org.eclipse.jgit.api;version="[4.3.1,4.4.0)",
org.eclipse.jgit.api.errors;version="[4.3.1,4.4.0)",
org.eclipse.jgit.attributes;version="[4.3.1,4.4.0)",
org.eclipse.jgit.awtui;version="[4.3.1,4.4.0)",
org.eclipse.jgit.blame;version="[4.3.1,4.4.0)",
org.eclipse.jgit.diff;version="[4.3.1,4.4.0)",
org.eclipse.jgit.dircache;version="[4.3.1,4.4.0)",
org.eclipse.jgit.errors;version="[4.3.1,4.4.0)",
org.eclipse.jgit.events;version="[4.3.1,4.4.0)",
org.eclipse.jgit.fnmatch;version="[4.3.1,4.4.0)",
org.eclipse.jgit.gitrepo;version="[4.3.1,4.4.0)",
org.eclipse.jgit.hooks;version="[4.3.1,4.4.0)",
org.eclipse.jgit.ignore;version="[4.3.1,4.4.0)",
org.eclipse.jgit.ignore.internal;version="[4.3.1,4.4.0)",
org.eclipse.jgit.internal;version="[4.3.1,4.4.0)",
org.eclipse.jgit.internal.storage.dfs;version="[4.3.1,4.4.0)",
org.eclipse.jgit.internal.storage.file;version="[4.3.1,4.4.0)",
org.eclipse.jgit.internal.storage.pack;version="[4.3.1,4.4.0)",
org.eclipse.jgit.internal.storage.reftree;version="[4.3.1,4.4.0)",
org.eclipse.jgit.junit;version="[4.3.1,4.4.0)",
org.eclipse.jgit.lib;version="[4.3.1,4.4.0)",
org.eclipse.jgit.merge;version="[4.3.1,4.4.0)",
org.eclipse.jgit.nls;version="[4.3.1,4.4.0)",
org.eclipse.jgit.notes;version="[4.3.1,4.4.0)",
org.eclipse.jgit.patch;version="[4.3.1,4.4.0)",
org.eclipse.jgit.pgm;version="[4.3.1,4.4.0)",
org.eclipse.jgit.pgm.internal;version="[4.3.1,4.4.0)",
org.eclipse.jgit.revplot;version="[4.3.1,4.4.0)",
org.eclipse.jgit.revwalk;version="[4.3.1,4.4.0)",
org.eclipse.jgit.revwalk.filter;version="[4.3.1,4.4.0)",
org.eclipse.jgit.storage.file;version="[4.3.1,4.4.0)",
org.eclipse.jgit.storage.pack;version="[4.3.1,4.4.0)",
org.eclipse.jgit.submodule;version="[4.3.1,4.4.0)",
org.eclipse.jgit.transport;version="[4.3.1,4.4.0)",
org.eclipse.jgit.transport.http;version="[4.3.1,4.4.0)",
org.eclipse.jgit.transport.resolver;version="[4.3.1,4.4.0)",
org.eclipse.jgit.treewalk;version="[4.3.1,4.4.0)",
org.eclipse.jgit.treewalk.filter;version="[4.3.1,4.4.0)",
org.eclipse.jgit.util;version="[4.3.1,4.4.0)",
org.eclipse.jgit.util.io;version="[4.3.1,4.4.0)",
org.hamcrest;version="[1.1.0,2.0.0)",
org.junit;version="[4.4.0,5.0.0)",
org.junit.experimental.theories;version="[4.4.0,5.0.0)",

2
org.eclipse.jgit.test/pom.xml
Unescape View File

@ -52,7 +52,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit-parent</artifactId>
<version>4.3.0-SNAPSHOT</version>
<version>4.3.1-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.jgit.test</artifactId>

116
org.eclipse.jgit.test/tst/org/eclipse/jgit/api/AddCommandTest.java
Unescape View File

@ -53,6 +53,7 @@ import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
import java.io.PrintWriter;
import java.util.Set;
import org.eclipse.jgit.api.errors.FilterFailedException;
import org.eclipse.jgit.api.errors.GitAPIException;
@ -62,14 +63,11 @@ import org.eclipse.jgit.dircache.DirCacheBuilder;
import org.eclipse.jgit.dircache.DirCacheEntry;
import org.eclipse.jgit.junit.JGitTestUtil;
import org.eclipse.jgit.junit.RepositoryTestCase;
import org.eclipse.jgit.lib.ConfigConstants;
import org.eclipse.jgit.lib.Constants;
import org.eclipse.jgit.lib.FileMode;
import org.eclipse.jgit.lib.ObjectId;
import org.eclipse.jgit.lib.ObjectInserter;
import org.eclipse.jgit.lib.StoredConfig;
import org.eclipse.jgit.lib.*;
import org.eclipse.jgit.revwalk.RevCommit;
import org.eclipse.jgit.storage.file.FileRepositoryBuilder;
import org.eclipse.jgit.treewalk.TreeWalk;
import org.eclipse.jgit.treewalk.WorkingTreeOptions;
import org.eclipse.jgit.util.FS;
import org.eclipse.jgit.util.FileUtils;
import org.junit.Test;
@ -1002,6 +1000,91 @@ public class AddCommandTest extends RepositoryTestCase {
assertEquals(FileMode.EXECUTABLE_FILE, walk.getFileMode(0));
}
@Test
public void testAddGitlink() throws Exception {
createNestedRepo("git-link-dir");
try (Git git = new Git(db)) {
git.add().addFilepattern("git-link-dir").call();
assertEquals(
"[git-link-dir, mode:160000]",
indexState(0));
Set<String> untrackedFiles = git.status().call().getUntracked();
assert (untrackedFiles.isEmpty());
}
}
@Test
public void testAddSubrepoWithDirNoGitlinks() throws Exception {
createNestedRepo("nested-repo");
// Set DIR_NO_GITLINKS
StoredConfig config = db.getConfig();
config.setBoolean(ConfigConstants.CONFIG_CORE_SECTION, null,
ConfigConstants.CONFIG_KEY_DIRNOGITLINKS, true);
config.save();
assert (db.getConfig().get(WorkingTreeOptions.KEY).isDirNoGitLinks());
try (Git git = new Git(db)) {
git.add().addFilepattern("nested-repo").call();
assertEquals(
"[nested-repo/README1.md, mode:100644]" +
"[nested-repo/README2.md, mode:100644]",
indexState(0));
}
// Turn off DIR_NO_GITLINKS, ensure nested-repo is still treated as
// a normal directory
// Set DIR_NO_GITLINKS
config.setBoolean(ConfigConstants.CONFIG_CORE_SECTION, null,
ConfigConstants.CONFIG_KEY_DIRNOGITLINKS, false);
config.save();
writeTrashFile("nested-repo", "README3.md", "content");
try (Git git = new Git(db)) {
git.add().addFilepattern("nested-repo").call();
assertEquals(
"[nested-repo/README1.md, mode:100644]" +
"[nested-repo/README2.md, mode:100644]" +
"[nested-repo/README3.md, mode:100644]",
indexState(0));
}
}
@Test
public void testAddGitlinkDoesNotChange() throws Exception {
createNestedRepo("nested-repo");
try (Git git = new Git(db)) {
git.add().addFilepattern("nested-repo").call();
assertEquals(
"[nested-repo, mode:160000]",
indexState(0));
}
// Set DIR_NO_GITLINKS
StoredConfig config = db.getConfig();
config.setBoolean(ConfigConstants.CONFIG_CORE_SECTION, null,
ConfigConstants.CONFIG_KEY_DIRNOGITLINKS, true);
config.save();
assert (db.getConfig().get(WorkingTreeOptions.KEY).isDirNoGitLinks());
try (Git git = new Git(db)) {
git.add().addFilepattern("nested-repo").call();
assertEquals(
"[nested-repo, mode:160000]",
indexState(0));
}
}
private static DirCacheEntry addEntryToBuilder(String path, File file,
ObjectInserter newObjectInserter, DirCacheBuilder builder, int stage)
throws IOException {
@ -1029,4 +1112,25 @@ public class AddCommandTest extends RepositoryTestCase {
throw new IOException("could not commit");
}
private void createNestedRepo(String path) throws IOException {
File gitLinkDir = new File(db.getWorkTree(), path);
FileUtils.mkdir(gitLinkDir);
FileRepositoryBuilder nestedBuilder = new FileRepositoryBuilder();
nestedBuilder.setWorkTree(gitLinkDir);
Repository nestedRepo = nestedBuilder.build();
nestedRepo.create();
writeTrashFile(path, "README1.md", "content");
writeTrashFile(path, "README2.md", "content");
// Commit these changes in the subrepo
try (Git git = new Git(nestedRepo)) {
git.add().addFilepattern(".").call();
git.commit().setMessage("subrepo commit").call();
} catch (GitAPIException e) {
throw new RuntimeException(e);
}
}
}

107
org.eclipse.jgit.test/tst/org/eclipse/jgit/api/CheckoutCommandTest.java
Unescape View File

@ -632,6 +632,113 @@ public class CheckoutCommandTest extends RepositoryTestCase {
assertEquals("fee\n", read("src/a.txt"));
}
@Test
public void testSmudgeFilter_deleteFileAndRestoreFromCommit()
throws IOException, GitAPIException {
File script = writeTempFile("sed s/o/e/g");
StoredConfig config = git.getRepository().getConfig();
config.setString("filter", "tstFilter", "smudge",
"sh " + slashify(script.getPath()));
config.save();
writeTrashFile("foo", "foo");
git.add().addFilepattern("foo").call();
git.commit().setMessage("initial").call();
writeTrashFile(".gitattributes", "*.txt filter=tstFilter");
git.add().addFilepattern(".gitattributes").call();
git.commit().setMessage("add filter").call();
writeTrashFile("src/a.tmp", "foo");
// Caution: we need a trailing '\n' since sed on mac always appends
// linefeeds if missing
writeTrashFile("src/a.txt", "foo\n");
git.add().addFilepattern("src/a.tmp").addFilepattern("src/a.txt")
.call();
RevCommit content = git.commit().setMessage("added content").call();
deleteTrashFile("src/a.txt");
git.checkout().setStartPoint(content.getName()).addPath("src/a.txt")
.call();
assertEquals(
"[.gitattributes, mode:100644, content:*.txt filter=tstFilter][Test.txt, mode:100644, content:Some change][foo, mode:100644, content:foo][src/a.tmp, mode:100644, content:foo][src/a.txt, mode:100644, content:foo\n]",
indexState(CONTENT));
assertEquals("foo", read("src/a.tmp"));
assertEquals("fee\n", read("src/a.txt"));
}
@Test
public void testSmudgeFilter_deleteFileAndRestoreFromIndex()
throws IOException, GitAPIException {
File script = writeTempFile("sed s/o/e/g");
StoredConfig config = git.getRepository().getConfig();
config.setString("filter", "tstFilter", "smudge",
"sh " + slashify(script.getPath()));
config.save();
writeTrashFile("foo", "foo");
git.add().addFilepattern("foo").call();
git.commit().setMessage("initial").call();
writeTrashFile(".gitattributes", "*.txt filter=tstFilter");
git.add().addFilepattern(".gitattributes").call();
git.commit().setMessage("add filter").call();
writeTrashFile("src/a.tmp", "foo");
// Caution: we need a trailing '\n' since sed on mac always appends
// linefeeds if missing
writeTrashFile("src/a.txt", "foo\n");
git.add().addFilepattern("src/a.tmp").addFilepattern("src/a.txt")
.call();
git.commit().setMessage("added content").call();
deleteTrashFile("src/a.txt");
git.checkout().addPath("src/a.txt").call();
assertEquals(
"[.gitattributes, mode:100644, content:*.txt filter=tstFilter][Test.txt, mode:100644, content:Some change][foo, mode:100644, content:foo][src/a.tmp, mode:100644, content:foo][src/a.txt, mode:100644, content:foo\n]",
indexState(CONTENT));
assertEquals("foo", read("src/a.tmp"));
assertEquals("fee\n", read("src/a.txt"));
}
@Test
public void testSmudgeFilter_deleteFileAndCreateBranchAndRestoreFromCommit()
throws IOException, GitAPIException {
File script = writeTempFile("sed s/o/e/g");
StoredConfig config = git.getRepository().getConfig();
config.setString("filter", "tstFilter", "smudge",
"sh " + slashify(script.getPath()));
config.save();
writeTrashFile("foo", "foo");
git.add().addFilepattern("foo").call();
git.commit().setMessage("initial").call();
writeTrashFile(".gitattributes", "*.txt filter=tstFilter");
git.add().addFilepattern(".gitattributes").call();
git.commit().setMessage("add filter").call();
writeTrashFile("src/a.tmp", "foo");
// Caution: we need a trailing '\n' since sed on mac always appends
// linefeeds if missing
writeTrashFile("src/a.txt", "foo\n");
git.add().addFilepattern("src/a.tmp").addFilepattern("src/a.txt")
.call();
RevCommit content = git.commit().setMessage("added content").call();
deleteTrashFile("src/a.txt");
git.checkout().setName("newBranch").setCreateBranch(true)
.setStartPoint(content).addPath("src/a.txt").call();
assertEquals(
"[.gitattributes, mode:100644, content:*.txt filter=tstFilter][Test.txt, mode:100644, content:Some change][foo, mode:100644, content:foo][src/a.tmp, mode:100644, content:foo][src/a.txt, mode:100644, content:foo\n]",
indexState(CONTENT));
assertEquals("foo", read("src/a.tmp"));
assertEquals("fee\n", read("src/a.txt"));
}
@Test
@Ignore
public void testSmudgeAndClean() throws IOException, GitAPIException {

42
org.eclipse.jgit.test/tst/org/eclipse/jgit/treewalk/FileTreeIteratorTest.java
Unescape View File

@ -64,7 +64,12 @@ import org.eclipse.jgit.errors.IncorrectObjectTypeException;
import org.eclipse.jgit.errors.MissingObjectException;
import org.eclipse.jgit.junit.JGitTestUtil;
import org.eclipse.jgit.junit.RepositoryTestCase;
import org.eclipse.jgit.lib.*;
import org.eclipse.jgit.lib.ConfigConstants;
import org.eclipse.jgit.lib.Constants;
import org.eclipse.jgit.lib.FileMode;
import org.eclipse.jgit.lib.ObjectId;
import org.eclipse.jgit.lib.ObjectReader;
import org.eclipse.jgit.lib.Repository;
import org.eclipse.jgit.revwalk.RevCommit;
import org.eclipse.jgit.storage.file.FileRepositoryBuilder;
import org.eclipse.jgit.treewalk.WorkingTreeIterator.MetadataDiff;
@ -279,6 +284,37 @@ public class FileTreeIteratorTest extends RepositoryTestCase {
}
}
@Test
public void testTreewalkEnterSubtree() throws Exception {
try (Git git = new Git(db)) {
writeTrashFile("b/c", "b/c");
writeTrashFile("z/.git", "gitdir: /tmp/somewhere");
git.add().addFilepattern(".").call();
git.rm().addFilepattern("a,").addFilepattern("a,b")
.addFilepattern("a0b").call();
assertEquals("[a/b, mode:100644][b/c, mode:100644][z, mode:160000]",
indexState(0));
FileUtils.delete(new File(db.getWorkTree(), "b"),
FileUtils.RECURSIVE);
TreeWalk tw = new TreeWalk(db);
tw.addTree(new DirCacheIterator(db.readDirCache()));
tw.addTree(new FileTreeIterator(db));
assertTrue(tw.next());
assertEquals("a", tw.getPathString());
tw.enterSubtree();
tw.next();
assertEquals("a/b", tw.getPathString());
tw.next();
assertEquals("b", tw.getPathString());
tw.enterSubtree();
tw.next();
assertEquals("b/c", tw.getPathString());
assertNotNull(tw.getTree(0, AbstractTreeIterator.class));
assertNotNull(tw.getTree(EmptyTreeIterator.class));
}
}
@Test
public void testIsModifiedSymlinkAsFile() throws Exception {
writeTrashFile("symlink", "content");
@ -345,7 +381,7 @@ public class FileTreeIteratorTest extends RepositoryTestCase {
DirCache cache = db.lockDirCache();
DirCacheEditor editor = cache.editor();
editor.add(new PathEdit(path) {
public void apply(DirCacheEntry ent) {
ent.setFileMode(FileMode.GITLINK);
ent.setObjectId(id);
@ -362,7 +398,7 @@ public class FileTreeIteratorTest extends RepositoryTestCase {
walk.addTree(indexIter);
walk.addTree(workTreeIter);
walk.setFilter(PathFilter.create(path));
assertTrue(walk.next());
assertTrue(indexIter.idEqual(workTreeIter));
}

18
org.eclipse.jgit.ui/META-INF/MANIFEST.MF
Unescape View File

@ -3,14 +3,14 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %plugin_name
Bundle-SymbolicName: org.eclipse.jgit.ui
Bundle-Version: 4.3.0.qualifier
Bundle-Version: 4.3.1.qualifier
Bundle-Vendor: %provider_name
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Export-Package: org.eclipse.jgit.awtui;version="4.3.0"
Import-Package: org.eclipse.jgit.errors;version="[4.3.0,4.4.0)",
org.eclipse.jgit.lib;version="[4.3.0,4.4.0)",
org.eclipse.jgit.nls;version="[4.3.0,4.4.0)",
org.eclipse.jgit.revplot;version="[4.3.0,4.4.0)",
org.eclipse.jgit.revwalk;version="[4.3.0,4.4.0)",
org.eclipse.jgit.transport;version="[4.3.0,4.4.0)",
org.eclipse.jgit.util;version="[4.3.0,4.4.0)"
Export-Package: org.eclipse.jgit.awtui;version="4.3.1"
Import-Package: org.eclipse.jgit.errors;version="[4.3.1,4.4.0)",
org.eclipse.jgit.lib;version="[4.3.1,4.4.0)",
org.eclipse.jgit.nls;version="[4.3.1,4.4.0)",
org.eclipse.jgit.revplot;version="[4.3.1,4.4.0)",
org.eclipse.jgit.revwalk;version="[4.3.1,4.4.0)",
org.eclipse.jgit.transport;version="[4.3.1,4.4.0)",
org.eclipse.jgit.util;version="[4.3.1,4.4.0)"

2
org.eclipse.jgit.ui/pom.xml
Unescape View File

@ -52,7 +52,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit-parent</artifactId>
<version>4.3.0-SNAPSHOT</version>
<version>4.3.1-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.jgit.ui</artifactId>

80
org.eclipse.jgit/META-INF/MANIFEST.MF
Unescape View File

@ -2,12 +2,12 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %plugin_name
Bundle-SymbolicName: org.eclipse.jgit
Bundle-Version: 4.3.0.qualifier
Bundle-Version: 4.3.1.qualifier
Bundle-Localization: plugin
Bundle-Vendor: %provider_name
Bundle-ActivationPolicy: lazy
Export-Package: org.eclipse.jgit.annotations;version="4.3.0",
org.eclipse.jgit.api;version="4.3.0";
Export-Package: org.eclipse.jgit.annotations;version="4.3.1",
org.eclipse.jgit.api;version="4.3.1";
uses:="org.eclipse.jgit.revwalk,
org.eclipse.jgit.treewalk.filter,
org.eclipse.jgit.diff,
@ -21,47 +21,47 @@ Export-Package: org.eclipse.jgit.annotations;version="4.3.0",
org.eclipse.jgit.submodule,
org.eclipse.jgit.transport,
org.eclipse.jgit.merge",
org.eclipse.jgit.api.errors;version="4.3.0";uses:="org.eclipse.jgit.lib,org.eclipse.jgit.errors",
org.eclipse.jgit.attributes;version="4.3.0",
org.eclipse.jgit.blame;version="4.3.0";
org.eclipse.jgit.api.errors;version="4.3.1";uses:="org.eclipse.jgit.lib,org.eclipse.jgit.errors",
org.eclipse.jgit.attributes;version="4.3.1",
org.eclipse.jgit.blame;version="4.3.1";
uses:="org.eclipse.jgit.lib,
org.eclipse.jgit.revwalk,
org.eclipse.jgit.treewalk.filter,
org.eclipse.jgit.diff",
org.eclipse.jgit.diff;version="4.3.0";
org.eclipse.jgit.diff;version="4.3.1";
uses:="org.eclipse.jgit.patch,
org.eclipse.jgit.lib,
org.eclipse.jgit.treewalk,
org.eclipse.jgit.revwalk,
org.eclipse.jgit.treewalk.filter,
org.eclipse.jgit.util",
org.eclipse.jgit.dircache;version="4.3.0";
org.eclipse.jgit.dircache;version="4.3.1";
uses:="org.eclipse.jgit.lib,
org.eclipse.jgit.treewalk,
org.eclipse.jgit.util,
org.eclipse.jgit.events,
org.eclipse.jgit.attributes",
org.eclipse.jgit.errors;version="4.3.0";
org.eclipse.jgit.errors;version="4.3.1";
uses:="org.eclipse.jgit.lib,
org.eclipse.jgit.internal.storage.pack,
org.eclipse.jgit.transport,
org.eclipse.jgit.dircache",
org.eclipse.jgit.events;version="4.3.0";uses:="org.eclipse.jgit.lib",
org.eclipse.jgit.fnmatch;version="4.3.0",
org.eclipse.jgit.gitrepo;version="4.3.0";
org.eclipse.jgit.events;version="4.3.1";uses:="org.eclipse.jgit.lib",
org.eclipse.jgit.fnmatch;version="4.3.1",
org.eclipse.jgit.gitrepo;version="4.3.1";
uses:="org.eclipse.jgit.api,
org.eclipse.jgit.lib,
org.eclipse.jgit.revwalk,
org.xml.sax.helpers,
org.xml.sax",
org.eclipse.jgit.gitrepo.internal;version="4.3.0";x-internal:=true,
org.eclipse.jgit.hooks;version="4.3.0";uses:="org.eclipse.jgit.lib",
org.eclipse.jgit.ignore;version="4.3.0",
org.eclipse.jgit.ignore.internal;version="4.3.0";x-friends:="org.eclipse.jgit.test",
org.eclipse.jgit.internal;version="4.3.0";x-friends:="org.eclipse.jgit.test,org.eclipse.jgit.http.test",
org.eclipse.jgit.internal.ketch;version="4.3.0";x-friends:="org.eclipse.jgit.junit,org.eclipse.jgit.test,org.eclipse.jgit.pgm",
org.eclipse.jgit.internal.storage.dfs;version="4.3.0";x-friends:="org.eclipse.jgit.test,org.eclipse.jgit.http.server",
org.eclipse.jgit.internal.storage.file;version="4.3.0";
org.eclipse.jgit.gitrepo.internal;version="4.3.1";x-internal:=true,
org.eclipse.jgit.hooks;version="4.3.1";uses:="org.eclipse.jgit.lib",
org.eclipse.jgit.ignore;version="4.3.1",
org.eclipse.jgit.ignore.internal;version="4.3.1";x-friends:="org.eclipse.jgit.test",
org.eclipse.jgit.internal;version="4.3.1";x-friends:="org.eclipse.jgit.test,org.eclipse.jgit.http.test",
org.eclipse.jgit.internal.ketch;version="4.3.1";x-friends:="org.eclipse.jgit.junit,org.eclipse.jgit.test,org.eclipse.jgit.pgm",
org.eclipse.jgit.internal.storage.dfs;version="4.3.1";x-friends:="org.eclipse.jgit.test,org.eclipse.jgit.http.server",
org.eclipse.jgit.internal.storage.file;version="4.3.1";
x-friends:="org.eclipse.jgit.test,
org.eclipse.jgit.junit,
org.eclipse.jgit.junit.http,
@ -69,9 +69,9 @@ Export-Package: org.eclipse.jgit.annotations;version="4.3.0",
org.eclipse.jgit.lfs.server,
org.eclipse.jgit.pgm,
org.eclipse.jgit.pgm.test",
org.eclipse.jgit.internal.storage.pack;version="4.3.0";x-friends:="org.eclipse.jgit.junit,org.eclipse.jgit.test,org.eclipse.jgit.pgm",
org.eclipse.jgit.internal.storage.reftree;version="4.3.0";x-friends:="org.eclipse.jgit.junit,org.eclipse.jgit.test,org.eclipse.jgit.pgm",
org.eclipse.jgit.lib;version="4.3.0";
org.eclipse.jgit.internal.storage.pack;version="4.3.1";x-friends:="org.eclipse.jgit.junit,org.eclipse.jgit.test,org.eclipse.jgit.pgm",
org.eclipse.jgit.internal.storage.reftree;version="4.3.1";x-friends:="org.eclipse.jgit.junit,org.eclipse.jgit.test,org.eclipse.jgit.pgm",
org.eclipse.jgit.lib;version="4.3.1";
uses:="org.eclipse.jgit.revwalk,
org.eclipse.jgit.treewalk.filter,
org.eclipse.jgit.util,
@ -81,32 +81,32 @@ Export-Package: org.eclipse.jgit.annotations;version="4.3.0",
org.eclipse.jgit.treewalk,
org.eclipse.jgit.transport,
org.eclipse.jgit.submodule",
org.eclipse.jgit.merge;version="4.3.0";
org.eclipse.jgit.merge;version="4.3.1";
uses:="org.eclipse.jgit.lib,
org.eclipse.jgit.treewalk,
org.eclipse.jgit.revwalk,
org.eclipse.jgit.diff,
org.eclipse.jgit.dircache,
org.eclipse.jgit.api",
org.eclipse.jgit.nls;version="4.3.0",
org.eclipse.jgit.notes;version="4.3.0";
org.eclipse.jgit.nls;version="4.3.1",
org.eclipse.jgit.notes;version="4.3.1";
uses:="org.eclipse.jgit.lib,
org.eclipse.jgit.treewalk,
org.eclipse.jgit.revwalk,
org.eclipse.jgit.merge",
org.eclipse.jgit.patch;version="4.3.0";uses:="org.eclipse.jgit.lib,org.eclipse.jgit.diff",
org.eclipse.jgit.revplot;version="4.3.0";uses:="org.eclipse.jgit.lib,org.eclipse.jgit.revwalk",
org.eclipse.jgit.revwalk;version="4.3.0";
org.eclipse.jgit.patch;version="4.3.1";uses:="org.eclipse.jgit.lib,org.eclipse.jgit.diff",
org.eclipse.jgit.revplot;version="4.3.1";uses:="org.eclipse.jgit.lib,org.eclipse.jgit.revwalk",
org.eclipse.jgit.revwalk;version="4.3.1";
uses:="org.eclipse.jgit.lib,
org.eclipse.jgit.treewalk,
org.eclipse.jgit.treewalk.filter,
org.eclipse.jgit.diff,
org.eclipse.jgit.revwalk.filter",
org.eclipse.jgit.revwalk.filter;version="4.3.0";uses:="org.eclipse.jgit.revwalk,org.eclipse.jgit.lib,org.eclipse.jgit.util",
org.eclipse.jgit.storage.file;version="4.3.0";uses:="org.eclipse.jgit.lib,org.eclipse.jgit.util",
org.eclipse.jgit.storage.pack;version="4.3.0";uses:="org.eclipse.jgit.lib",
org.eclipse.jgit.submodule;version="4.3.0";uses:="org.eclipse.jgit.lib,org.eclipse.jgit.treewalk.filter,org.eclipse.jgit.treewalk",
org.eclipse.jgit.transport;version="4.3.0";
org.eclipse.jgit.revwalk.filter;version="4.3.1";uses:="org.eclipse.jgit.revwalk,org.eclipse.jgit.lib,org.eclipse.jgit.util",
org.eclipse.jgit.storage.file;version="4.3.1";uses:="org.eclipse.jgit.lib,org.eclipse.jgit.util",
org.eclipse.jgit.storage.pack;version="4.3.1";uses:="org.eclipse.jgit.lib",
org.eclipse.jgit.submodule;version="4.3.1";uses:="org.eclipse.jgit.lib,org.eclipse.jgit.treewalk.filter,org.eclipse.jgit.treewalk",
org.eclipse.jgit.transport;version="4.3.1";
uses:="org.eclipse.jgit.transport.resolver,
org.eclipse.jgit.revwalk,
org.eclipse.jgit.internal.storage.pack,
@ -118,22 +118,22 @@ Export-Package: org.eclipse.jgit.annotations;version="4.3.0",
org.eclipse.jgit.transport.http,
org.eclipse.jgit.errors,
org.eclipse.jgit.storage.pack",
org.eclipse.jgit.transport.http;version="4.3.0";uses:="javax.net.ssl",
org.eclipse.jgit.transport.resolver;version="4.3.0";uses:="org.eclipse.jgit.lib,org.eclipse.jgit.transport",
org.eclipse.jgit.treewalk;version="4.3.0";
org.eclipse.jgit.transport.http;version="4.3.1";uses:="javax.net.ssl",
org.eclipse.jgit.transport.resolver;version="4.3.1";uses:="org.eclipse.jgit.lib,org.eclipse.jgit.transport",
org.eclipse.jgit.treewalk;version="4.3.1";
uses:="org.eclipse.jgit.lib,
org.eclipse.jgit.revwalk,
org.eclipse.jgit.attributes,
org.eclipse.jgit.treewalk.filter,
org.eclipse.jgit.util,
org.eclipse.jgit.dircache",
org.eclipse.jgit.treewalk.filter;version="4.3.0";uses:="org.eclipse.jgit.treewalk",
org.eclipse.jgit.util;version="4.3.0";
org.eclipse.jgit.treewalk.filter;version="4.3.1";uses:="org.eclipse.jgit.treewalk",
org.eclipse.jgit.util;version="4.3.1";
uses:="org.eclipse.jgit.lib,
org.eclipse.jgit.transport.http,
org.eclipse.jgit.storage.file,
org.ietf.jgss",
org.eclipse.jgit.util.io;version="4.3.0"
org.eclipse.jgit.util.io;version="4.3.1"
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Require-Bundle: com.jcraft.jsch;bundle-version="[0.1.37,0.2.0)"
Import-Package: com.googlecode.javaewah;version="[0.7.9,0.8.0)",

4
org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF
Unescape View File

@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2
Bundle-Name: org.eclipse.jgit - Sources
Bundle-SymbolicName: org.eclipse.jgit.source
Bundle-Vendor: Eclipse.org - JGit
Bundle-Version: 4.3.0.qualifier
Eclipse-SourceBundle: org.eclipse.jgit;version="4.3.0.qualifier";roots="."
Bundle-Version: 4.3.1.qualifier
Eclipse-SourceBundle: org.eclipse.jgit;version="4.3.1.qualifier";roots="."

2
org.eclipse.jgit/pom.xml
Unescape View File

@ -53,7 +53,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit-parent</artifactId>
<version>4.3.0-SNAPSHOT</version>
<version>4.3.1-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.jgit</artifactId>

6
org.eclipse.jgit/src/org/eclipse/jgit/api/AddCommand.java
Unescape View File

@ -45,6 +45,7 @@ package org.eclipse.jgit.api;
import static org.eclipse.jgit.lib.Constants.OBJ_BLOB;
import static org.eclipse.jgit.lib.FileMode.GITLINK;
import static org.eclipse.jgit.lib.FileMode.TYPE_GITLINK;
import static org.eclipse.jgit.lib.FileMode.TYPE_TREE;
import java.io.IOException;
@ -201,7 +202,10 @@ public class AddCommand extends GitCommand<DirCache> {
continue;
}
if (f.getEntryRawMode() == TYPE_TREE) {
if ((f.getEntryRawMode() == TYPE_TREE
&& f.getIndexFileMode(c) != FileMode.GITLINK) ||
(f.getEntryRawMode() == TYPE_GITLINK
&& f.getIndexFileMode(c) == FileMode.TREE)) {
// Index entry exists and is symlink, gitlink or file,
// otherwise the tree would have been entered above.
// Replace the index entry by diving into tree of files.

12
org.eclipse.jgit/src/org/eclipse/jgit/api/CheckoutCommand.java
Unescape View File

@ -430,6 +430,8 @@ public class CheckoutCommand extends GitCommand<Ref> {
continue;
final EolStreamType eolStreamType = treeWalk.getEolStreamType();
final String filterCommand = treeWalk
.getFilterCommand(Constants.ATTR_FILTER_TYPE_SMUDGE);
editor.add(new PathEdit(path) {
public void apply(DirCacheEntry ent) {
int stage = ent.getStage();
@ -437,15 +439,15 @@ public class CheckoutCommand extends GitCommand<Ref> {
if (checkoutStage != null) {
if (stage == checkoutStage.number)
checkoutPath(ent, r, new CheckoutMetadata(
eolStreamType, null));
eolStreamType, filterCommand));
} else {
UnmergedPathException e = new UnmergedPathException(
ent);
throw new JGitInternalException(e.getMessage(), e);
}
} else {
checkoutPath(ent, r,
new CheckoutMetadata(eolStreamType, null));
checkoutPath(ent, r, new CheckoutMetadata(eolStreamType,
filterCommand));
}
}
});
@ -464,12 +466,14 @@ public class CheckoutCommand extends GitCommand<Ref> {
final ObjectId blobId = treeWalk.getObjectId(0);
final FileMode mode = treeWalk.getFileMode(0);
final EolStreamType eolStreamType = treeWalk.getEolStreamType();
final String filterCommand = treeWalk
.getFilterCommand(Constants.ATTR_FILTER_TYPE_SMUDGE);
editor.add(new PathEdit(treeWalk.getPathString()) {
public void apply(DirCacheEntry ent) {
ent.setObjectId(blobId);
ent.setFileMode(mode);
checkoutPath(ent, r,
new CheckoutMetadata(eolStreamType, null));
new CheckoutMetadata(eolStreamType, filterCommand));
}
});
}

6
org.eclipse.jgit/src/org/eclipse/jgit/lib/ConfigConstants.java
Unescape View File

@ -235,6 +235,12 @@ public class ConfigConstants {
*/
public static final String CONFIG_KEY_HIDEDOTFILES = "hidedotfiles";
/**
* The "dirnogitlinks" key
* @since 4.3
*/
public static final String CONFIG_KEY_DIRNOGITLINKS = "dirNoGitLinks";
/** The "precomposeunicode" key */
public static final String CONFIG_KEY_PRECOMPOSEUNICODE = "precomposeunicode";

9
org.eclipse.jgit/src/org/eclipse/jgit/treewalk/AbstractTreeIterator.java
Unescape View File

@ -729,4 +729,13 @@ public abstract class AbstractTreeIterator {
public String toString() {
return getClass().getSimpleName() + "[" + getEntryPathString() + "]"; //$NON-NLS-1$
}
/**
* @return whether or not this Iterator is iterating through the Work Tree
*
* @since 4.3
*/
public boolean isWorkTree() {
return false;
}
}

34
org.eclipse.jgit/src/org/eclipse/jgit/treewalk/FileTreeIterator.java
Unescape View File

@ -94,7 +94,10 @@ public class FileTreeIterator extends WorkingTreeIterator {
* the repository whose working tree will be scanned.
*/
public FileTreeIterator(Repository repo) {
this(repo, DefaultFileModeStrategy.INSTANCE);
this(repo,
repo.getConfig().get(WorkingTreeOptions.KEY).isDirNoGitLinks() ?
NoGitlinksStrategy.INSTANCE :
DefaultFileModeStrategy.INSTANCE);
}
/**
@ -291,6 +294,35 @@ public class FileTreeIterator extends WorkingTreeIterator {
}
}
/**
* A FileModeStrategy that implements native git's DIR_NO_GITLINKS
* behavior. This is the same as the default FileModeStrategy, except
* all directories will be treated as directories regardless of whether
* or not they contain a .git directory or file.
*
* @since 4.3
*/
static public class NoGitlinksStrategy implements FileModeStrategy {
/**
* a singleton instance of the default FileModeStrategy
*/
public final static NoGitlinksStrategy INSTANCE = new NoGitlinksStrategy();
@Override
public FileMode getMode(File f, FS.Attributes attributes) {
if (attributes.isSymbolicLink()) {
return FileMode.SYMLINK;
} else if (attributes.isDirectory()) {
return FileMode.TREE;
} else if (attributes.isExecutable()) {
return FileMode.EXECUTABLE_FILE;
} else {
return FileMode.REGULAR_FILE;
}
}
}
/**
* Wrapper for a standard Java IO file

7
org.eclipse.jgit/src/org/eclipse/jgit/treewalk/TreeWalk.java
Unescape View File

@ -1187,7 +1187,12 @@ public class TreeWalk implements AutoCloseable, AttributesProvider {
for (int i = 0; i < trees.length; i++) {
final AbstractTreeIterator t = trees[i];
final AbstractTreeIterator n;
if (t.matches == ch && !t.eof() && FileMode.TREE.equals(t.mode))
// If we find a GITLINK when attempting to enter a subtree, then the
// GITLINK must exist as a TREE in the index, meaning the working tree
// entry should be treated as a TREE
if (t.matches == ch && !t.eof() &&
(FileMode.TREE.equals(t.mode)
|| (FileMode.GITLINK.equals(t.mode) && t.isWorkTree())))
n = t.createSubtreeIterator(reader, idBuffer);
else
n = t.createEmptyTreeIterator();

35
org.eclipse.jgit/src/org/eclipse/jgit/treewalk/WorkingTreeIterator.java
Unescape View File

@ -264,7 +264,7 @@ public abstract class WorkingTreeIterator extends AbstractTreeIterator {
// the cached index information for the path.
//
DirCacheIterator i = state.walk.getTree(state.dirCacheTree,
DirCacheIterator.class);
DirCacheIterator.class);
if (i != null) {
DirCacheEntry ent = i.getDirCacheEntry();
if (ent != null && compareMetadata(ent) == MetadataDiff.EQUAL) {
@ -289,6 +289,11 @@ public abstract class WorkingTreeIterator extends AbstractTreeIterator {
return zeroid;
}
@Override
public boolean isWorkTree() {
return true;
}
/**
* Get submodule id for given entry.
*
@ -916,17 +921,31 @@ public abstract class WorkingTreeIterator extends AbstractTreeIterator {
*/
public FileMode getIndexFileMode(final DirCacheIterator indexIter) {
final FileMode wtMode = getEntryFileMode();
if (indexIter == null)
return wtMode;
if (getOptions().isFileMode())
if (indexIter == null) {
return wtMode;
}
final FileMode iMode = indexIter.getEntryFileMode();
if (FileMode.REGULAR_FILE == wtMode
&& FileMode.EXECUTABLE_FILE == iMode)
if (getOptions().isFileMode() && iMode != FileMode.GITLINK && iMode != FileMode.TREE) {
return wtMode;
}
if (!getOptions().isFileMode()) {
if (FileMode.REGULAR_FILE == wtMode
&& FileMode.EXECUTABLE_FILE == iMode) {
return iMode;
}
if (FileMode.EXECUTABLE_FILE == wtMode
&& FileMode.REGULAR_FILE == iMode) {
return iMode;
}
}
if (FileMode.GITLINK == iMode
&& FileMode.TREE == wtMode) {
return iMode;
if (FileMode.EXECUTABLE_FILE == wtMode
&& FileMode.REGULAR_FILE == iMode)
}
if (FileMode.TREE == iMode
&& FileMode.GITLINK == wtMode) {
return iMode;
}
return wtMode;
}

13
org.eclipse.jgit/src/org/eclipse/jgit/treewalk/WorkingTreeOptions.java
Unescape View File

@ -73,6 +73,8 @@ public class WorkingTreeOptions {
private final HideDotFiles hideDotFiles;
private final boolean dirNoGitLinks;
private WorkingTreeOptions(final Config rc) {
fileMode = rc.getBoolean(ConfigConstants.CONFIG_CORE_SECTION,
ConfigConstants.CONFIG_KEY_FILEMODE, true);
@ -87,6 +89,9 @@ public class WorkingTreeOptions {
hideDotFiles = rc.getEnum(ConfigConstants.CONFIG_CORE_SECTION, null,
ConfigConstants.CONFIG_KEY_HIDEDOTFILES,
HideDotFiles.DOTGITONLY);
dirNoGitLinks = rc.getBoolean(ConfigConstants.CONFIG_CORE_SECTION, null,
ConfigConstants.CONFIG_KEY_DIRNOGITLINKS,
false);
}
/** @return true if the execute bit on working files should be trusted. */
@ -131,4 +136,12 @@ public class WorkingTreeOptions {
public HideDotFiles getHideDotFiles() {
return hideDotFiles;
}
/**
* @return whether or not we treat nested repos as directories.
* If true, folders containing .git entries will not be
* treated as gitlinks.
* @since 4.3
*/
public boolean isDirNoGitLinks() { return dirNoGitLinks; }
}

2
pom.xml
Unescape View File

@ -51,7 +51,7 @@
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit-parent</artifactId>
<packaging>pom</packaging>
<version>4.3.0-SNAPSHOT</version>
<version>4.3.1-SNAPSHOT</version>
<name>JGit - Parent</name>
<url>${jgit-url}</url>

Write Preview
Loading…
Cancel
Save