1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 610 611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 630 631 632 633 634 635 636 637 638 639 640 641 642 643 644 645 646 647 648 649 650 651 652 653 654 655 656 657 658 659 660 661 662 663 664 665 666 667 668 669 670 671 672 673 674 675 676 677 678 679 680 681 682 683 684 685 686 687 688 689 690 691 692 693 694 695 696 697 698 699 700 701 702 703 704 705 706 707 708 709 710 711 712 713 714 715 716 717 718 719 720 721 722 723 724 725 726 727 728 729 730 731 732 733 734 735 736 737 738 739 740 741 742 743 744 745 746 747 748 749 750 751 752 753 754 755 756 757 758 759 760 761 762 763 764 765 766 767 768 769 770 771 772 773 774 775 776 777 778 779 780 781 782 783 784 785 786 787 788 789 790 791 792 793 794 795 796 797 798 799 800 801 802 803 804 805 806 807 808 809 810 811 812 813 814 815 816 817 818 819 820 821 822 823 824 825 826 827 828 829 830 831 832 833 834 835 836 837 838 839 840 841 842 843 844 845 846 847 848 849 850 851 852 853 854 855 856 857 858 859 860 861 862 863 864 865 866 867 868 869 870 871 872 873 874 875 876 877 878 879 880 881 882 883 884 885 886 887 888 889 890 891 892 893 894 895 896 897 898 899 900 901 902 903 904 905 906 907 908 909 910 911 912 913 914 915 916 917 918 919 920 921 922 923 924 925 926 927 928 929 930 931 932 933 934 935 936 937 938 939 940 941 942 943 944 945 946 947 948 949 950 951 952 953 954 955 956 957 958 959 960 961 962 963 964 965 966 967 968 969 970 971 972 973 974 975 976 977
|
// Copyright (C) 2002 Graydon Hoare <graydon@pobox.com>
//
// This program is made available under the GNU GPL version 2.0 or
// greater. See the accompanying file COPYING for details.
//
// This program is distributed WITHOUT ANY WARRANTY; without even the
// implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
// PURPOSE.
#include <iostream>
#include <map>
#include "cmd.hh"
#include "diff_patch.hh"
#include "localized_file_io.hh"
#include "packet.hh"
#include "restrictions.hh"
#include "revision.hh"
#include "transforms.hh"
#include "work.hh"
#include "charset.hh"
using std::cout;
using std::make_pair;
using std::pair;
using std::map;
using std::set;
using std::string;
using std::vector;
using boost::shared_ptr;
static void
get_log_message_interactively(revision_t const & cs,
app_state & app,
utf8 & log_message)
{
revision_data summary;
write_revision(cs, summary);
external summary_external;
utf8_to_system(utf8(summary.inner()()), summary_external);
string commentary_str;
commentary_str += string(70, '-') + "\n";
commentary_str += _("Enter a description of this change.\n"
"Lines beginning with `MTN:' "
"are removed automatically.");
commentary_str += "\n\n";
commentary_str += summary_external();
commentary_str += string(70, '-') + "\n";
external commentary(commentary_str);
utf8 user_log_message;
app.work.read_user_log(user_log_message);
external user_log_message_external;
utf8_to_system(user_log_message, user_log_message_external);
external log_message_external;
N(app.lua.hook_edit_comment(commentary, user_log_message_external,
log_message_external),
F("edit of log message failed"));
system_to_utf8(log_message_external, log_message);
}
CMD(revert, N_("workspace"), N_("[PATH]..."),
N_("revert file(s), dir(s) or entire workspace (\".\")"),
options::opts::depth | options::opts::exclude | options::opts::missing)
{
temp_node_id_source nis;
roster_t old_roster, new_roster;
cset included, excluded;
N(app.opts.missing || !args.empty() || !app.opts.exclude_patterns.empty(),
F("you must pass at least one path to 'revert' (perhaps '.')"));
app.require_workspace();
app.work.get_base_and_current_roster_shape(old_roster, new_roster, nis);
node_restriction mask(args_to_paths(args), args_to_paths(app.opts.exclude_patterns),
app.opts.depth,
old_roster, new_roster, app);
if (app.opts.missing)
{
// --missing is a further filter on the files included by a
// restriction we first find all missing files included by the
// specified args and then make a restriction that includes only
// these missing files.
path_set missing;
app.work.find_missing(new_roster, mask, missing);
if (missing.empty())
{
P(F("no missing files to revert"));
return;
}
std::vector<file_path> missing_files;
for (path_set::const_iterator i = missing.begin(); i != missing.end(); i++)
{
file_path fp(*i);
L(FL("missing files are '%s'") % fp);
missing_files.push_back(fp);
}
// replace the original mask with a more restricted one
mask = node_restriction(missing_files, std::vector<file_path>(),
app.opts.depth,
old_roster, new_roster, app);
}
make_restricted_csets(old_roster, new_roster,
included, excluded, mask);
// The included cset will be thrown away (reverted) leaving the
// excluded cset pending in MTN/work which must be valid against the
// old roster.
check_restricted_cset(old_roster, excluded);
node_map const & nodes = old_roster.all_nodes();
for (node_map::const_iterator i = nodes.begin();
i != nodes.end(); ++i)
{
node_id nid = i->first;
node_t node = i->second;
if (old_roster.is_root(nid))
continue;
split_path sp;
old_roster.get_name(nid, sp);
file_path fp(sp);
if (!mask.includes(old_roster, nid))
continue;
if (is_file_t(node))
{
file_t f = downcast_to_file_t(node);
if (file_exists(fp))
{
hexenc<id> ident;
calculate_ident(fp, ident, app.lua);
// don't touch unchanged files
if (ident == f->content.inner())
continue;
}
P(F("reverting %s") % fp);
L(FL("reverting %s to [%s]") % fp % f->content);
N(app.db.file_version_exists(f->content),
F("no file version %s found in database for %s")
% f->content % fp);
file_data dat;
L(FL("writing file %s to %s")
% f->content % fp);
app.db.get_file_version(f->content, dat);
write_localized_data(fp, dat.inner(), app.lua);
}
else
{
if (!directory_exists(fp))
{
P(F("recreating %s/") % fp);
mkdir_p(fp);
}
}
}
// Included_work is thrown away which effectively reverts any adds,
// drops and renames it contains. Drops and rename sources will have
// been rewritten above but this may leave rename targets laying
// around.
revision_t remaining;
revision_id base;
app.work.get_revision_id(base);
make_revision_for_workspace(base, excluded, remaining);
// Race.
app.work.put_work_rev(remaining);
app.work.update_any_attrs();
app.work.maybe_update_inodeprints();
}
CMD(disapprove, N_("review"), N_("REVISION"),
N_("disapprove of a particular revision"),
options::opts::branch | options::opts::messages | options::opts::date |
options::opts::author)
{
if (args.size() != 1)
throw usage(name);
utf8 log_message("");
bool log_message_given;
revision_id r;
revision_t rev, rev_inverse;
shared_ptr<cset> cs_inverse(new cset());
complete(app, idx(args, 0)(), r);
app.db.get_revision(r, rev);
N(rev.edges.size() == 1,
F("revision %s has %d changesets, cannot invert") % r % rev.edges.size());
cert_value branchname;
guess_branch(r, app, branchname);
N(app.opts.branch_name() != "", F("need --branch argument for disapproval"));
process_commit_message_args(log_message_given, log_message, app,
(FL("disapproval of revision '%s'") % r).str());
edge_entry const & old_edge (*rev.edges.begin());
app.db.get_revision_manifest(edge_old_revision(old_edge),
rev_inverse.new_manifest);
{
roster_t old_roster, new_roster;
app.db.get_roster(edge_old_revision(old_edge), old_roster);
app.db.get_roster(r, new_roster);
make_cset(new_roster, old_roster, *cs_inverse);
}
rev_inverse.edges.insert(make_pair(r, cs_inverse));
{
transaction_guard guard(app.db);
packet_db_writer dbw(app);
revision_id inv_id;
revision_data rdat;
write_revision(rev_inverse, rdat);
calculate_ident(rdat, inv_id);
dbw.consume_revision_data(inv_id, rdat);
cert_revision_in_branch(inv_id, branchname, app, dbw);
if (app.opts.date_given)
cert_revision_date_time(inv_id, app.opts.date, app, dbw);
else
cert_revision_date_now(inv_id, app, dbw);
if (app.opts.author().length() > 0)
cert_revision_author(inv_id, app.opts.author(), app, dbw);
else
cert_revision_author_default(inv_id, app, dbw);
cert_revision_changelog(inv_id, log_message, app, dbw);
guard.commit();
}
}
CMD(add, N_("workspace"), N_("[PATH]..."),
N_("add files to workspace"),
options::opts::unknown | options::opts::no_ignore |
options::opts::recursive)
{
if (!app.opts.unknown && (args.size() < 1))
throw usage(name);
N(!app.opts.unknown || !app.opts.recursive,
F("cannot set '--unknown' and '--recursive' at the same time"));
N(!app.opts.unknown || !app.opts.no_ignore,
F("cannot set '--unknown' and '--no-respect-ignore' at the same time"));
app.require_workspace();
path_set paths;
if (app.opts.unknown)
{
vector<file_path> roots = args_to_paths(args);
path_restriction mask(roots, args_to_paths(app.opts.exclude_patterns),
app.opts.depth, app);
path_set ignored;
// if no starting paths have been specified use the workspace root
if (roots.empty())
roots.push_back(file_path());
app.work.find_unknown_and_ignored(mask, roots, paths, ignored);
}
else
for (vector<utf8>::const_iterator i = args.begin();
i != args.end(); ++i)
{
split_path sp;
file_path_external(*i).split(sp);
paths.insert(sp);
}
bool add_recursive = app.opts.recursive;
app.work.perform_additions(paths, add_recursive, !app.opts.no_ignore);
}
CMD(drop, N_("workspace"), N_("[PATH]..."),
N_("drop files from workspace"),
options::opts::execute | options::opts::missing | options::opts::recursive)
{
if (!app.opts.missing && (args.size() < 1))
throw usage(name);
app.require_workspace();
path_set paths;
if (app.opts.missing)
{
temp_node_id_source nis;
roster_t current_roster_shape;
app.work.get_current_roster_shape(current_roster_shape, nis);
node_restriction mask(args_to_paths(args),
args_to_paths(app.opts.exclude_patterns),
app.opts.depth,
current_roster_shape, app);
app.work.find_missing(current_roster_shape, mask, paths);
}
else
for (vector<utf8>::const_iterator i = args.begin();
i != args.end(); ++i)
{
split_path sp;
file_path_external(*i).split(sp);
paths.insert(sp);
}
app.work.perform_deletions(paths, app.opts.recursive, app.opts.execute);
}
ALIAS(rm, drop);
CMD(rename, N_("workspace"),
N_("SRC DEST\n"
"SRC1 [SRC2 [...]] DEST_DIR"),
N_("rename entries in the workspace"),
options::opts::execute)
{
if (args.size() < 2)
throw usage(name);
app.require_workspace();
file_path dst_path = file_path_external(args.back());
set<file_path> src_paths;
for (size_t i = 0; i < args.size()-1; i++)
{
file_path s = file_path_external(idx(args, i));
src_paths.insert(s);
}
app.work.perform_rename(src_paths, dst_path, app.opts.execute);
}
ALIAS(mv, rename)
CMD(pivot_root, N_("workspace"), N_("NEW_ROOT PUT_OLD"),
N_("rename the root directory\n"
"after this command, the directory that currently "
"has the name NEW_ROOT\n"
"will be the root directory, and the directory "
"that is currently the root\n"
"directory will have name PUT_OLD.\n"
"Using --execute is strongly recommended."),
options::opts::execute)
{
if (args.size() != 2)
throw usage(name);
app.require_workspace();
file_path new_root = file_path_external(idx(args, 0));
file_path put_old = file_path_external(idx(args, 1));
app.work.perform_pivot_root(new_root, put_old, app.opts.execute);
}
CMD(status, N_("informative"), N_("[PATH]..."), N_("show status of workspace"),
options::opts::depth | options::opts::exclude)
{
roster_t old_roster, new_roster;
cset included, excluded;
revision_id old_rev_id;
revision_t rev;
data tmp;
temp_node_id_source nis;
app.require_workspace();
app.work.get_base_and_current_roster_shape(old_roster, new_roster, nis);
node_restriction mask(args_to_paths(args),
args_to_paths(app.opts.exclude_patterns),
app.opts.depth,
old_roster, new_roster, app);
app.work.update_current_roster_from_filesystem(new_roster, mask);
make_restricted_csets(old_roster, new_roster,
included, excluded, mask);
check_restricted_cset(old_roster, included);
app.work.get_revision_id(old_rev_id);
make_revision(old_rev_id, old_roster, included, rev);
// We intentionally do not collapse the final \n into the format
// strings here, for consistency with newline conventions used by most
// other format strings.
cout << (F("Current branch: %s") % app.opts.branch_name).str() << "\n";
for (edge_map::const_iterator i = rev.edges.begin(); i != rev.edges.end(); ++i)
{
revision_id parent = edge_old_revision(*i);
// A colon at the end of this string looked nicer, but it made
// double-click copying from terminals annoying.
cout << (F("Changes against parent %s") % parent).str() << "\n";
cset const & cs = edge_changes(*i);
if (cs.empty())
cout << F(" no changes").str() << "\n";
for (path_set::const_iterator i = cs.nodes_deleted.begin();
i != cs.nodes_deleted.end(); ++i)
cout << (F(" dropped %s") % *i).str() << "\n";
for (map<split_path, split_path>::const_iterator
i = cs.nodes_renamed.begin();
i != cs.nodes_renamed.end(); ++i)
cout << (F(" renamed %s\n"
" to %s") % i->first % i->second).str() << "\n";
for (path_set::const_iterator i = cs.dirs_added.begin();
i != cs.dirs_added.end(); ++i)
cout << (F(" added %s") % *i).str() << "\n";
for (map<split_path, file_id>::const_iterator i = cs.files_added.begin();
i != cs.files_added.end(); ++i)
cout << (F(" added %s") % i->first).str() << "\n";
for (map<split_path, pair<file_id, file_id> >::const_iterator
i = cs.deltas_applied.begin(); i != cs.deltas_applied.end(); ++i)
cout << (F(" patched %s") % (i->first)).str() << "\n";
}
}
CMD(checkout, N_("tree"), N_("[DIRECTORY]"),
N_("check out a revision from database into directory.\n"
"If a revision is given, that's the one that will be checked out.\n"
"Otherwise, it will be the head of the branch (given or implicit).\n"
"If no directory is given, the branch name will be used as directory"),
options::opts::branch | options::opts::revision)
{
revision_id ident;
system_path dir;
transaction_guard guard(app.db, false);
if (args.size() > 1 || app.opts.revision_selectors.size() > 1)
throw usage(name);
if (app.opts.revision_selectors.size() == 0)
{
// use branch head revision
N(!app.opts.branch_name().empty(),
F("use --revision or --branch to specify what to checkout"));
set<revision_id> heads;
get_branch_heads(app.opts.branch_name(), app, heads);
N(heads.size() > 0,
F("branch '%s' is empty") % app.opts.branch_name);
if (heads.size() > 1)
{
P(F("branch %s has multiple heads:") % app.opts.branch_name);
for (set<revision_id>::const_iterator i = heads.begin(); i != heads.end(); ++i)
P(i18n_format(" %s") % describe_revision(app, *i));
P(F("choose one with '%s checkout -r<id>'") % ui.prog_name);
E(false, F("branch %s has multiple heads") % app.opts.branch_name);
}
ident = *(heads.begin());
}
else if (app.opts.revision_selectors.size() == 1)
{
// use specified revision
complete(app, idx(app.opts.revision_selectors, 0)(), ident);
N(app.db.revision_exists(ident),
F("no such revision '%s'") % ident);
cert_value b;
guess_branch(ident, app, b);
I(!app.opts.branch_name().empty());
cert_value branch_name(app.opts.branch_name());
base64<cert_value> branch_encoded;
encode_base64(branch_name, branch_encoded);
vector< revision<cert> > certs;
app.db.get_revision_certs(ident, branch_cert_name, branch_encoded, certs);
L(FL("found %d %s branch certs on revision %s")
% certs.size()
% app.opts.branch_name
% ident);
N(certs.size() != 0, F("revision %s is not a member of branch %s")
% ident % app.opts.branch_name);
}
// we do this part of the checking down here, because it is legitimate to
// do
// $ mtn co -r h:net.venge.monotone
// and have mtn guess the branch, and then use that branch name as the
// default directory. But in this case the branch name will not be set
// until after the guess_branch() call above:
{
bool checkout_dot = false;
if (args.size() == 0)
{
// No checkout dir specified, use branch name for dir.
N(!app.opts.branch_name().empty(),
F("you must specify a destination directory"));
dir = system_path(app.opts.branch_name());
}
else
{
// Checkout to specified dir.
dir = system_path(idx(args, 0));
if (idx(args, 0) == utf8("."))
checkout_dot = true;
}
if (!checkout_dot)
require_path_is_nonexistent
(dir, F("checkout directory '%s' already exists") % dir);
}
app.create_workspace(dir);
file_data data;
roster_t ros;
marking_map mm;
L(FL("checking out revision %s to directory %s") % ident % dir);
app.db.get_roster(ident, ros, mm);
revision_t workrev;
make_revision_for_workspace(ident, cset(), workrev);
app.work.put_work_rev(workrev);
node_map const & nodes = ros.all_nodes();
for (node_map::const_iterator i = nodes.begin();
i != nodes.end(); ++i)
{
node_t node = i->second;
split_path sp;
ros.get_name(i->first, sp);
file_path path(sp);
if (is_dir_t(node))
{
if (!workspace_root(sp))
mkdir_p(path);
}
else
{
file_t file = downcast_to_file_t(node);
N(app.db.file_version_exists(file->content),
F("no file %s found in database for %s")
% file->content % path);
file_data dat;
L(FL("writing file %s to %s")
% file->content % path);
app.db.get_file_version(file->content, dat);
write_localized_data(path, dat.inner(), app.lua);
}
}
app.work.update_any_attrs();
app.work.maybe_update_inodeprints();
guard.commit();
}
ALIAS(co, checkout)
CMD(attr, N_("workspace"), N_("set PATH ATTR VALUE\nget PATH [ATTR]\ndrop PATH [ATTR]"),
N_("set, get or drop file attributes"),
options::opts::none)
{
if (args.size() < 2 || args.size() > 4)
throw usage(name);
roster_t old_roster, new_roster;
temp_node_id_source nis;
app.require_workspace();
app.work.get_base_and_current_roster_shape(old_roster, new_roster, nis);
file_path path = file_path_external(idx(args,1));
split_path sp;
path.split(sp);
N(new_roster.has_node(sp), F("Unknown path '%s'") % path);
node_t node = new_roster.get_node(sp);
string subcmd = idx(args, 0)();
if (subcmd == "set" || subcmd == "drop")
{
if (subcmd == "set")
{
if (args.size() != 4)
throw usage(name);
attr_key a_key = idx(args, 2)();
attr_value a_value = idx(args, 3)();
node->attrs[a_key] = make_pair(true, a_value);
}
else
{
// Clear all attrs (or a specific attr).
if (args.size() == 2)
{
for (full_attr_map_t::iterator i = node->attrs.begin();
i != node->attrs.end(); ++i)
i->second = make_pair(false, "");
}
else if (args.size() == 3)
{
attr_key a_key = idx(args, 2)();
N(node->attrs.find(a_key) != node->attrs.end(),
F("Path '%s' does not have attribute '%s'")
% path % a_key);
node->attrs[a_key] = make_pair(false, "");
}
else
throw usage(name);
}
revision_id base;
app.work.get_revision_id(base);
revision_t new_work;
make_revision_for_workspace(base, old_roster, new_roster, new_work);
app.work.put_work_rev(new_work);
app.work.update_any_attrs();
}
else if (subcmd == "get")
{
if (args.size() == 2)
{
bool has_any_live_attrs = false;
for (full_attr_map_t::const_iterator i = node->attrs.begin();
i != node->attrs.end(); ++i)
if (i->second.first)
{
cout << path << " : "
<< i->first << "="
<< i->second.second << "\n";
has_any_live_attrs = true;
}
if (!has_any_live_attrs)
cout << F("No attributes for '%s'") % path << "\n";
}
else if (args.size() == 3)
{
attr_key a_key = idx(args, 2)();
full_attr_map_t::const_iterator i = node->attrs.find(a_key);
if (i != node->attrs.end() && i->second.first)
cout << path << " : "
<< i->first << "="
<< i->second.second << "\n";
else
cout << (F("No attribute '%s' on path '%s'")
% a_key % path) << "\n";
}
else
throw usage(name);
}
else
throw usage(name);
}
CMD(commit, N_("workspace"), N_("[PATH]..."),
N_("commit workspace to database"),
options::opts::branch | options::opts::message | options::opts::msgfile | options::opts::date
| options::opts::author | options::opts::depth | options::opts::exclude)
{
utf8 log_message("");
bool log_message_given;
revision_t restricted_rev;
revision_id old_rev_id, restricted_rev_id;
roster_t old_roster, new_roster;
temp_node_id_source nis;
cset included, excluded;
app.make_branch_sticky();
app.require_workspace();
app.work.get_base_and_current_roster_shape(old_roster, new_roster, nis);
node_restriction mask(args_to_paths(args),
args_to_paths(app.opts.exclude_patterns),
app.opts.depth,
old_roster, new_roster, app);
app.work.update_current_roster_from_filesystem(new_roster, mask);
make_restricted_csets(old_roster, new_roster,
included, excluded, mask);
check_restricted_cset(old_roster, included);
app.work.get_revision_id(old_rev_id);
make_revision(old_rev_id, old_roster, included, restricted_rev);
calculate_ident(restricted_rev, restricted_rev_id);
N(restricted_rev.is_nontrivial(), F("no changes to commit"));
cert_value branchname;
I(restricted_rev.edges.size() == 1);
set<revision_id> heads;
get_branch_heads(app.opts.branch_name(), app, heads);
unsigned int old_head_size = heads.size();
if (app.opts.branch_name() != "")
branchname = app.opts.branch_name();
else
guess_branch(edge_old_revision(restricted_rev.edges.begin()), app, branchname);
{
// fail early if there isn't a key
rsa_keypair_id key;
get_user_key(key, app);
}
P(F("beginning commit on branch '%s'") % branchname);
L(FL("new manifest '%s'\n"
"new revision '%s'\n")
% restricted_rev.new_manifest
% restricted_rev_id);
process_commit_message_args(log_message_given, log_message, app);
N(!(log_message_given && app.work.has_contents_user_log()),
F("_MTN/log is non-empty and log message "
"was specified on command line\n"
"perhaps move or delete _MTN/log,\n"
"or remove --message/--message-file from the command line?"));
if (!log_message_given)
{
// This call handles _MTN/log.
get_log_message_interactively(restricted_rev, app, log_message);
// We only check for empty log messages when the user entered them
// interactively. Consensus was that if someone wanted to explicitly
// type --message="", then there wasn't any reason to stop them.
N(log_message().find_first_not_of("\n\r\t ") != string::npos,
F("empty log message; commit canceled"));
// We save interactively entered log messages to _MTN/log, so if
// something goes wrong, the next commit will pop up their old
// log message by default. We only do this for interactively
// entered messages, because otherwise 'monotone commit -mfoo'
// giving an error, means that after you correct that error and
// hit up-arrow to try again, you get an "_MTN/log non-empty and
// message given on command line" error... which is annoying.
app.work.write_user_log(log_message);
}
// If the hook doesn't exist, allow the message to be used.
bool message_validated;
string reason, new_manifest_text;
revision_data new_rev;
write_revision(restricted_rev, new_rev);
app.lua.hook_validate_commit_message(log_message, new_rev, branchname,
message_validated, reason);
N(message_validated, F("log message rejected by hook: %s") % reason);
{
transaction_guard guard(app.db);
packet_db_writer dbw(app);
if (app.db.revision_exists(restricted_rev_id))
{
W(F("revision %s already in database") % restricted_rev_id);
}
else
{
// new revision
L(FL("inserting new revision %s") % restricted_rev_id);
I(restricted_rev.edges.size() == 1);
edge_map::const_iterator edge = restricted_rev.edges.begin();
I(edge != restricted_rev.edges.end());
// process file deltas or new files
cset const & cs = edge_changes(edge);
for (map<split_path, pair<file_id, file_id> >::const_iterator
i = cs.deltas_applied.begin();
i != cs.deltas_applied.end(); ++i)
{
file_path path(i->first);
file_id old_content = i->second.first;
file_id new_content = i->second.second;
if (app.db.file_version_exists(new_content))
{
L(FL("skipping file delta %s, already in database")
% delta_entry_dst(i));
}
else if (app.db.file_version_exists(old_content))
{
L(FL("inserting delta %s -> %s")
% old_content % new_content);
file_data old_data;
data new_data;
app.db.get_file_version(old_content, old_data);
read_localized_data(path, new_data, app.lua);
// sanity check
hexenc<id> tid;
calculate_ident(new_data, tid);
N(tid == new_content.inner(),
F("file '%s' modified during commit, aborting")
% path);
delta del;
diff(old_data.inner(), new_data, del);
dbw.consume_file_delta(old_content,
new_content,
file_delta(del));
}
else
// If we don't err out here, our packet writer will
// later.
E(false,
F("Your database is missing version %s of file '%s'")
% old_content % path);
}
for (map<split_path, file_id>::const_iterator
i = cs.files_added.begin();
i != cs.files_added.end(); ++i)
{
file_path path(i->first);
file_id new_content = i->second;
L(FL("inserting full version %s") % new_content);
data new_data;
read_localized_data(path, new_data, app.lua);
// sanity check
hexenc<id> tid;
calculate_ident(new_data, tid);
N(tid == new_content.inner(),
F("file '%s' modified during commit, aborting")
% path);
dbw.consume_file_data(new_content, file_data(new_data));
}
}
revision_data rdat;
write_revision(restricted_rev, rdat);
dbw.consume_revision_data(restricted_rev_id, rdat);
cert_revision_in_branch(restricted_rev_id, branchname, app, dbw);
if (app.opts.date_given)
cert_revision_date_time(restricted_rev_id, app.opts.date, app, dbw);
else
cert_revision_date_now(restricted_rev_id, app, dbw);
if (app.opts.author_given > 0)
cert_revision_author(restricted_rev_id, app.opts.author(), app, dbw);
else
cert_revision_author_default(restricted_rev_id, app, dbw);
cert_revision_changelog(restricted_rev_id, log_message, app, dbw);
guard.commit();
}
// the work revision is now whatever changes remain on top of the revision
// we just checked in.
revision_t remaining;
make_revision_for_workspace(restricted_rev_id, excluded, remaining);
// small race condition here...
app.work.put_work_rev(remaining);
P(F("committed revision %s") % restricted_rev_id);
app.work.blank_user_log();
get_branch_heads(app.opts.branch_name(), app, heads);
if (heads.size() > old_head_size && old_head_size > 0) {
P(F("note: this revision creates divergence\n"
"note: you may (or may not) wish to run '%s merge'")
% ui.prog_name);
}
app.work.update_any_attrs();
app.work.maybe_update_inodeprints();
{
// Tell lua what happened. Yes, we might lose some information
// here, but it's just an indicator for lua, eg. to post stuff to
// a mailing list. If the user *really* cares about cert validity,
// multiple certs with same name, etc. they can inquire further,
// later.
map<cert_name, cert_value> certs;
vector< revision<cert> > ctmp;
app.db.get_revision_certs(restricted_rev_id, ctmp);
for (vector< revision<cert> >::const_iterator i = ctmp.begin();
i != ctmp.end(); ++i)
{
cert_value vtmp;
decode_base64(i->inner().value, vtmp);
certs.insert(make_pair(i->inner().name, vtmp));
}
revision_data rdat;
app.db.get_revision(restricted_rev_id, rdat);
app.lua.hook_note_commit(restricted_rev_id, rdat, certs);
}
}
ALIAS(ci, commit);
CMD_NO_WORKSPACE(setup, N_("tree"), N_("[DIRECTORY]"),
N_("setup a new workspace directory, default to current"),
options::opts::branch)
{
if (args.size() > 1)
throw usage(name);
N(!app.opts.branch_name().empty(), F("need --branch argument for setup"));
app.db.ensure_open();
string dir;
if (args.size() == 1)
dir = idx(args,0)();
else
dir = ".";
app.create_workspace(dir);
revision_t rev;
make_revision_for_workspace(revision_id(), cset(), rev);
app.work.put_work_rev(rev);
}
CMD_NO_WORKSPACE(migrate_workspace, N_("tree"), N_("[DIRECTORY]"),
N_("migrate a workspace directory's metadata to the latest format; "
"defaults to the current workspace"),
options::opts::none)
{
if (args.size() > 1)
throw usage(name);
if (args.size() == 1)
go_to_workspace(system_path(idx(args, 0)));
app.work.migrate_ws_format();
}
CMD(refresh_inodeprints, N_("tree"), "", N_("refresh the inodeprint cache"),
options::opts::none)
{
app.require_workspace();
app.work.enable_inodeprints();
app.work.maybe_update_inodeprints();
}
// Local Variables:
// mode: C++
// fill-column: 76
// c-file-style: "gnu"
// indent-tabs-mode: nil
// End:
// vim: et:sw=2:sts=2:ts=2:cino=>2s,{s,\:s,+s,t0,g0,^-2,e-2,n-2,p2s,(0,=s:
|