Allow VersionedMetaData.onSave to skip committing

Change-Id: I65349b2fde9fd22381fa5e4a35f6265924c626f0
This commit is contained in:
Dave Borowitz
2014-01-16 10:10:17 -08:00
parent 906efd9d07
commit da93b83721
6 changed files with 23 additions and 10 deletions

View File

@@ -61,9 +61,17 @@ public abstract class VersionedMetaData {
/** @return name of the reference storing this configuration. */
protected abstract String getRefName();
/** Set up the metadata, parsing any state from the loaded revision. */
protected abstract void onLoad() throws IOException, ConfigInvalidException;
protected abstract void onSave(CommitBuilder commit) throws IOException,
/**
* Save any changes to the metadata in a commit.
*
* @return true if the commit should proceed, false to abort.
* @throws IOException
* @throws ConfigInvalidException
*/
protected abstract boolean onSave(CommitBuilder commit) throws IOException,
ConfigInvalidException;
/** @return revision of the metadata that was loaded. */
@@ -189,7 +197,7 @@ public abstract class VersionedMetaData {
write(VersionedMetaData.this, commit);
}
private void doSave(VersionedMetaData config, CommitBuilder commit) throws IOException {
private boolean doSave(VersionedMetaData config, CommitBuilder commit) throws IOException {
DirCache nt = config.newTree;
ObjectReader r = config.reader;
ObjectInserter i = config.inserter;
@@ -197,7 +205,7 @@ public abstract class VersionedMetaData {
config.newTree = newTree;
config.reader = reader;
config.inserter = inserter;
config.onSave(commit);
return config.onSave(commit);
} catch (ConfigInvalidException e) {
throw new IOException("Cannot update " + getRefName() + " in "
+ db.getDirectory() + ": " + e.getMessage(), e);
@@ -210,7 +218,9 @@ public abstract class VersionedMetaData {
@Override
public void write(VersionedMetaData config, CommitBuilder commit) throws IOException {
doSave(config, commit);
if (!doSave(config, commit)) {
return;
}
final ObjectId res = newTree.writeTree(inserter);
if (res.equals(srcTree) && !update.allowEmpty()) {