Merge branch 'stable-5.6' into stable-5.7
* stable-5.6: Remove texts which were added by mistake in00386272
Fix formatting which was broken in00386272
Change-Id: I45d444b360485564744bf3dfad2c2f5a5e7fcdf6
This commit is contained in:
commit
26dee2d984
|
@ -418,10 +418,6 @@ lockOnNotClosed=Lock on {0} not closed.
|
|||
lockOnNotHeld=Lock on {0} not held.
|
||||
lockStreamClosed=Output to lock on {0} already closed
|
||||
lockStreamMultiple=Output to lock on {0} already opened
|
||||
logInconsistentFiletimeDiff={}: inconsistent duration from file timestamps on {}, {}: {} > {}, but diff = {}. Aborting measurement at resolution {}.
|
||||
logLargerFiletimeDiff={}: inconsistent duration from file timestamps on {}, {}: diff = {} > {} (last good value). Aborting measurement.
|
||||
logSmallerFiletime={}: got smaller file timestamp on {}, {}: {} < {}. Aborting measurement at resolution {}.
|
||||
logXDGConfigHomeInvalid=Environment variable XDG_CONFIG_HOME contains an invalid path {}
|
||||
maxCountMustBeNonNegative=max count must be >= 0
|
||||
mergeConflictOnNonNoteEntries=Merge conflict on non-note entries: base = {0}, ours = {1}, theirs = {2}
|
||||
mergeConflictOnNotes=Merge conflict on note {0}. base = {1}, ours = {2}, theirs = {2}
|
||||
|
|
|
@ -446,10 +446,6 @@ public static JGitText get() {
|
|||
/***/ public String lockOnNotHeld;
|
||||
/***/ public String lockStreamClosed;
|
||||
/***/ public String lockStreamMultiple;
|
||||
/***/ public String logInconsistentFiletimeDiff;
|
||||
/***/ public String logLargerFiletimeDiff;
|
||||
/***/ public String logSmallerFiletime;
|
||||
/***/ public String logXDGConfigHomeInvalid;
|
||||
/***/ public String maxCountMustBeNonNegative;
|
||||
/***/ public String mergeConflictOnNonNoteEntries;
|
||||
/***/ public String mergeConflictOnNotes;
|
||||
|
|
|
@ -218,14 +218,14 @@ public void copyCurrentContent() throws IOException {
|
|||
int r;
|
||||
while ((r = fis.read(buf)) >= 0) {
|
||||
out.write(buf, 0, r);
|
||||
}
|
||||
}
|
||||
}
|
||||
} catch (FileNotFoundException fnfe) {
|
||||
if (ref.exists()) {
|
||||
throw fnfe;
|
||||
}
|
||||
// Don't worry about a file that doesn't exist yet, it
|
||||
// conceptually has no current content to copy.
|
||||
} catch (FileNotFoundException fnfe) {
|
||||
if (ref.exists()) {
|
||||
throw fnfe;
|
||||
}
|
||||
// Don't worry about a file that doesn't exist yet, it
|
||||
// conceptually has no current content to copy.
|
||||
}
|
||||
} catch (IOException | RuntimeException | Error ioe) {
|
||||
unlock();
|
||||
|
@ -322,17 +322,16 @@ private OutputStream get() throws IOException {
|
|||
if (out == null) {
|
||||
os = getStream();
|
||||
if (fsync) {
|
||||
out = Channels.newOutputStream(os.getChannel());
|
||||
out = Channels.newOutputStream(os.getChannel());
|
||||
} else {
|
||||
out = os;
|
||||
out = os;
|
||||
}
|
||||
}
|
||||
return out;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void write(byte[] b, int o, int n)
|
||||
throws IOException {
|
||||
public void write(byte[] b, int o, int n) throws IOException {
|
||||
get().write(b, o, n);
|
||||
}
|
||||
|
||||
|
@ -359,10 +358,10 @@ public void close() throws IOException {
|
|||
}
|
||||
if (out != null) {
|
||||
if (fsync) {
|
||||
os.getChannel().force(true);
|
||||
os.getChannel().force(true);
|
||||
}
|
||||
out.close();
|
||||
os = null;
|
||||
out.close();
|
||||
os = null;
|
||||
}
|
||||
written = true;
|
||||
} catch (IOException | RuntimeException | Error ioe) {
|
||||
|
|
Loading…
Reference in New Issue