Browse Source

Simplify UploadPack use of options during writing

We only use these variables once, so just put them at the proper
use site and avoid assigning the local variable.  The code is a
bit shorter and the intent is a little bit more clear.

Change-Id: I70d120fb149b612ac93055ea39bc053b8d90a5db
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
stable-0.9
Shawn O. Pearce 15 years ago
parent
commit
bb99ec0aa0
  1. 6
      org.eclipse.jgit/src/org/eclipse/jgit/transport/UploadPack.java

6
org.eclipse.jgit/src/org/eclipse/jgit/transport/UploadPack.java

@ -548,8 +548,6 @@ public class UploadPack {
} }
private void sendPack() throws IOException { private void sendPack() throws IOException {
final boolean thin = options.contains(OPTION_THIN_PACK);
final boolean progress = !options.contains(OPTION_NO_PROGRESS);
final boolean sideband = options.contains(OPTION_SIDE_BAND) final boolean sideband = options.contains(OPTION_SIDE_BAND)
|| options.contains(OPTION_SIDE_BAND_64K); || options.contains(OPTION_SIDE_BAND_64K);
@ -563,7 +561,7 @@ public class UploadPack {
packOut = new SideBandOutputStream(SideBandOutputStream.CH_DATA, packOut = new SideBandOutputStream(SideBandOutputStream.CH_DATA,
bufsz, rawOut); bufsz, rawOut);
if (progress) if (!options.contains(OPTION_NO_PROGRESS))
pm = new SideBandProgressMonitor(new SideBandOutputStream( pm = new SideBandProgressMonitor(new SideBandOutputStream(
SideBandOutputStream.CH_PROGRESS, bufsz, rawOut)); SideBandOutputStream.CH_PROGRESS, bufsz, rawOut));
} }
@ -571,7 +569,7 @@ public class UploadPack {
final PackWriter pw = new PackWriter(db, walk.getObjectReader()); final PackWriter pw = new PackWriter(db, walk.getObjectReader());
try { try {
pw.setDeltaBaseAsOffset(options.contains(OPTION_OFS_DELTA)); pw.setDeltaBaseAsOffset(options.contains(OPTION_OFS_DELTA));
pw.setThin(thin); pw.setThin(options.contains(OPTION_THIN_PACK));
pw.preparePack(pm, wantAll, commonBase); pw.preparePack(pm, wantAll, commonBase);
if (options.contains(OPTION_INCLUDE_TAG)) { if (options.contains(OPTION_INCLUDE_TAG)) {
for (final Ref r : refs.values()) { for (final Ref r : refs.values()) {

Loading…
Cancel
Save