[Monotone-commits-diffs] Revision dbf38fd6d5265df467a88a468d110bcc039c2367

[monotone]

-----------------------------------------------------------------
Revision: dbf38fd6d5265df467a88a468d110bcc039c2367
Ancestor: add275e5fdb0824361d4a2fa15049281e7ada52e
Author: address@hidden
Date: 2009-03-05T05:41:48
Branch: net.venge.monotone

Modified files:
        cmd_ws_commit.cc merge_content.cc merge_content.hh
        tests/attr_set_drop/__driver__.lua
        tests/attr_set_get_commands/__driver__.lua
        tests/clobbered_attrs/__driver__.lua work.cc

ChangeLog: 

reimplement set/drop attrs using csets so they do the right thing

* cmd_ws_commit.cc (drop_attr): new function factored out from attr_drop and
  automate drop_attribute; use a cset with perform_content_update to do the
  work; don't call update_any_attrs which will reset attrs on other paths and
  *not* drop the attr on the specified path
  (attr_drop): throw usage on bad arguments rather than failing with E();
  delegate implementation to drop_attr
  (attr_get): throw usage on bad arguments rather than failing with E()
  (set_attr): new function factored out from attr_set and
  automate set_attribute; use a cset with perform_content_update to do the
  work; don't call update_any_attrs which will reset attrs on all paths, not
  just the specified path
  (attr_set): throw usage on bad arguments rather than failing with E();
  delegate implementation to set_attr
  (automate set_attribute): delegate implementation to set_attr
  (automate drop_attribute): delegate implementation to drop_attr

* merge_content.{cc,hh} (content_merge_empty_adaptor): move here ...
* work.cc (content_merge_empty_adaptor): ... from here

* tests/attr_set_drop/__driver__.lua: un-xfail; remove previous bug description
* tests/attr_set_get_commands/__driver__.lua: fix broken test so it fails on the
  actual problem it's testing for

* tests/clobbered_attrs/__driver__.lua: un-xfail; setting attributes on a path
  no longer resets attributes on other paths

txtyn5mYDn7Mn.txt
Description: Diff [add275e5fdb0824361d4a2fa15049281e7ada52e] -> [dbf38fd6d5265df467a88a468d110bcc039c2367]