# # # patch "HACKING" # from [c7f70f0b3353a12bcf84a27f491e9caca5499c5f] # to [c9981311719fe7751c33e403bc3130598379416c] # # patch "automate.cc" # from [844ab2fa3341091460558c6a98f60ac36e5007ec] # to [b4f2e4f163bed5056310111f625a20b7c65642ff] # # patch "monotone.texi" # from [90203c5058234c5d3041dc1e728897c7701e5b4e] # to [ac645aac59f751c269f852b3700cdafb58860b4c] # ============================================================ --- HACKING c7f70f0b3353a12bcf84a27f491e9caca5499c5f +++ HACKING c9981311719fe7751c33e403bc3130598379416c @@ -25,6 +25,10 @@ vim: et:sw=2:sts=2:ts=2:cino=>2s,{s,\:s, vim: et:sw=2:sts=2:ts=2:cino=>2s,{s,\:s,+s,t0,g0,^-2,e-2,n-2,p2s,(0,=s: +The appropriate astyle options are: + +astyle --style=gnu -s2 -p + monotone's source includes a number of third party libraries. These have been imported from upstream, and should retain the original coding style of the particular library in all cases. This makes life easier when a ============================================================ --- automate.cc 844ab2fa3341091460558c6a98f60ac36e5007ec +++ automate.cc b4f2e4f163bed5056310111f625a20b7c65642ff @@ -1607,43 +1607,43 @@ AUTOMATE(put_file, N_("[BASE-ID] CONTENT { file_id sha1sum; transaction_guard tr(app.db); - if (args.size()==1) - { - file_data dat(idx(args,0)()); - calculate_ident(dat,sha1sum); - if (!app.db.file_version_exists(sha1sum)) + if (args.size() == 1) { - app.db.put_file(sha1sum, dat); + file_data dat(idx(args, 0)()); + calculate_ident(dat, sha1sum); + if (!app.db.file_version_exists(sha1sum)) + { + app.db.put_file(sha1sum, dat); + } + else L(FL("revision %s already known") % sha1sum); } - else L(FL("revision %s already known") % sha1sum); - } - else if (args.size()==2) - { - file_data dat(idx(args,1)()); - calculate_ident(dat,sha1sum); - if (!app.db.file_version_exists(sha1sum)) + else if (args.size() == 2) { - file_id base_id(idx(args,0)()); - N(app.db.file_version_exists(base_id), - F("no file version %s found in database") % base_id); + file_data dat(idx(args, 1)()); + calculate_ident(dat, sha1sum); + if (!app.db.file_version_exists(sha1sum)) + { + file_id base_id(idx(args, 0)()); + N(app.db.file_version_exists(base_id), + F("no file version %s found in database") % base_id); - file_data olddat; - app.db.get_file_version(base_id, olddat); - delta del; - diff(olddat.inner(), dat.inner(), del); - L(FL("data size %d, delta size %d") % dat.inner()().size() % del().size()); - if (dat.inner()().size()<=del().size()) - // the data is smaller or of equal size to the patch - app.db.put_file(sha1sum, dat); - else - app.db.put_file_version(base_id,sha1sum,file_delta(del)); + file_data olddat; + app.db.get_file_version(base_id, olddat); + delta del; + diff(olddat.inner(), dat.inner(), del); + L(FL("data size %d, delta size %d") % dat.inner()().size() % del().size()); + if (dat.inner()().size() <= del().size()) + // the data is smaller or of equal size to the patch + app.db.put_file(sha1sum, dat); + else + app.db.put_file_version(base_id, sha1sum, file_delta(del)); + } + else L(FL("revision %s already known") % sha1sum); } - else L(FL("revision %s already known") % sha1sum); - } else throw usage(name); tr.commit(); - output << sha1sum; + output << sha1sum << '\n'; } // Name: put_revision @@ -1662,30 +1662,30 @@ AUTOMATE(put_revision, N_("SINGLE-EDGE-D throw usage(name); revision_t rev; - read_revision(revision_data(idx(args,0)()),rev); + read_revision(revision_data(idx(args, 0)()), rev); // recalculate manifest temp_node_id_source nis; - rev.new_manifest=manifest_id(); - for (edge_map::const_iterator e=rev.edges.begin(); e!=rev.edges.end(); ++e) - { - // calculate new manifest - roster_t old_roster; - if (!null_id(e->first)) app.db.get_roster(e->first, old_roster); - roster_t new_roster=old_roster; - editable_roster_base eros(new_roster,nis); - e->second->apply_to(eros); - if (null_id(rev.new_manifest)) - // first edge, initialize manifest - calculate_ident(new_roster, rev.new_manifest); - else - // following edge, make sure that all csets end at the same manifest + rev.new_manifest = manifest_id(); + for (edge_map::const_iterator e = rev.edges.begin(); e != rev.edges.end(); ++e) { - manifest_id calculated; - calculate_ident(new_roster, calculated); - I(calculated==rev.new_manifest); + // calculate new manifest + roster_t old_roster; + if (!null_id(e->first)) app.db.get_roster(e->first, old_roster); + roster_t new_roster = old_roster; + editable_roster_base eros(new_roster, nis); + e->second->apply_to(eros); + if (null_id(rev.new_manifest)) + // first edge, initialize manifest + calculate_ident(new_roster, rev.new_manifest); + else + // following edge, make sure that all csets end at the same manifest + { + manifest_id calculated; + calculate_ident(new_roster, calculated); + I(calculated == rev.new_manifest); + } } - } revision_id id; calculate_ident(rev, id); @@ -1693,14 +1693,14 @@ AUTOMATE(put_revision, N_("SINGLE-EDGE-D if (app.db.revision_exists(id)) W(F("revision %s already present in the database") % id); else - { - transaction_guard tr(app.db); - rev.made_for=made_for_database; - app.db.put_revision(id, rev); - tr.commit(); - } + { + transaction_guard tr(app.db); + rev.made_for = made_for_database; + app.db.put_revision(id, rev); + tr.commit(); + } - output << id; + output << id << '\n'; } // Name: cert @@ -1720,9 +1720,9 @@ AUTOMATE(cert, N_("REVISION-ID NAME VALU if (args.size() != 3) throw usage(name); cert c; - revision_id rid(idx(args,0)()); - make_simple_cert(rid.inner(),cert_name(idx(args,1)()), - cert_value(idx(args,2)()), app, c); + revision_id rid(idx(args, 0)()); + make_simple_cert(rid.inner(), cert_name(idx(args, 1)()), + cert_value(idx(args, 2)()), app, c); revision rc(c); packet_db_writer dbw(app); dbw.consume_revision_cert(rc); @@ -1746,9 +1746,9 @@ AUTOMATE(db_set, N_("DOMAIN NAME VALUE") throw usage(name); var_domain domain = var_domain(idx(args, 0)()); utf8 name = idx(args, 1); - string value = idx(args, 2)(); + utf8 value = idx(args, 2); var_key key(domain, var_name(name())); - app.db.set_var(key, var_value(value)); + app.db.set_var(key, var_value(value())); } // Name: db_get @@ -1771,13 +1771,13 @@ AUTOMATE(db_get, N_("DOMAIN NAME"), opti var_key key(domain, var_name(name())); var_value value; try - { - app.db.get_var(key, value); - } + { + app.db.get_var(key, value); + } catch (std::logic_error) - { - N(false, F("variable not found")); - } + { + N(false, F("variable not found")); + } output << value(); } ============================================================ --- monotone.texi 90203c5058234c5d3041dc1e728897c7701e5b4e +++ monotone.texi ac645aac59f751c269f852b3700cdafb58860b4c @@ -7383,7 +7383,7 @@ @section Automation @item Arguments: The optional @var{base-id} specifies a file-id on which the contents are -based on. This is used for diff encoding. @var{contents} are the contents of +based on. This is used for delta encoding. @var{contents} are the contents of the new file. @item Added in: @@ -7454,7 +7454,7 @@ @section Automation @item Output format: -The new revision, hex encoded. +The new revision id, hex encoded. @item Error conditions: