[Monotone-commits-diffs] Revision 040ebb72c5f0c99c1c9675699a8d0ba7eabe0f71

[monotone]

-----------------------------------------------------------------
Revision: 040ebb72c5f0c99c1c9675699a8d0ba7eabe0f71
Ancestor: 029698fc606ca1a582118f3214a735ad2afbd87f
Author: address@hidden
Date: 2009-02-22T19:36:03
Branch: net.venge.monotone

Modified files:
        automate.cc cert.cc cmd_key_cert.cc cmd_merging.cc
        cmd_netsync.cc cmd_othervcs.cc cmd_ws_commit.cc keys.cc
        options_list.hh selectors.cc work.cc

ChangeLog: 

rename app.opts.branchname to app.opts.branch and simplify declaration;
change checks for empty branches to use branch().empty() consistently

* automate.cc (heads):
* cert.cc (guess_branch): app.opts.branchname renamed to app.opts.branch
* cmd_key_cert.cc (approve, suspend): check for empty branch using
  branch().empty(); app.opts.branchname renamed to app.opts.branch
* cmd_merging.cc (pick_branch_for_update, update, merge_two):
  app.opts.branchname renamed to app.opts.branch
  (merge, get_conflicts_rids, heads): check for empty branch using
  branch().empty(); app.opts.branchname renamed to app.opts.branch
* cmd_netsync.cc (clone): app.opts.branchname renamed to app.opts.branch
* cmd_othervcs.cc (cvs_import): check for empty branch using branch().empty();
  app.opts.branchname renamed to app.opts.branch
* cmd_ws_commit.cc (disapprove): check for empty branch using branch().empty();
  app.opts.branchname renamed to app.opts.branch
  (status, checkout, commit, setup, import): app.opts.branchname renamed to
  app.opts.branch
* keys.cc (get_user_key): app.opts.branchname renamed to app.opts.branch
* options_list.hh (branchname): renamed to ... 
  (branch) ... this; simplify using OPT rather than OPTVAR and OPTION; this bit
  of complexity seems to have existed solely to call the branch option
  "branchname" which appears to have no purpose other than confusing things;
  previously opts.branchname held the value while opts.branch_given held the
  flag indicating whether the command line had a --branch option or not; now the
  value is opts.branch and the flag is opts.branch_given
* selectors.cc (decode_selector): app.opts.branchname renamed to app.opts.branch
* work.cc (get_options, set_options): app.opts.branchname renamed to
  app.opts.branch

txtDYsEpsT47K.txt
Description: Diff [029698fc606ca1a582118f3214a735ad2afbd87f] -> [040ebb72c5f0c99c1c9675699a8d0ba7eabe0f71]