[Monotone-commits-diffs] Revision 8afeea33a55abf47e7dace13d0216bbc19405dba

[monotone]

-----------------------------------------------------------------
Revision: 8afeea33a55abf47e7dace13d0216bbc19405dba
Ancestor: 6ef998b5433b34d70a1c7ff98cf5bd6168a76166
Author: address@hidden
Date: 2008-03-23T19:22:05
Branch: net.venge.monotone.automate_show_conflict

Added files:
        tests/automate_show_conflicts/expected-directory-loop.stdout
        tests/automate_show_conflicts/expected-invalid-add.stdout
        tests/automate_show_conflicts/expected-invalid-rename.stdout
        tests/automate_show_conflicts/expected-orphaned-add.stdout
        tests/automate_show_conflicts/expected-orphaned-rename.stdout
Modified files:
        cmd_merging.cc diff_patch.cc diff_patch.hh merge.cc merge.hh
        roster_merge.cc roster_merge.hh
        tests/automate_show_conflicts/expected-missing-root.stdout
        tests/conflict_messages/__driver__.lua

ChangeLog: 

Use adaptor to access db in conflict reports. automate_show_conflicts test 
passing thru orphaned-rename.

* merge.hh (resolve_merge_conflicts):
* merge.cc (resolve_merge_conflicts):
* cmd_merging.cc : Take 'db' parameter back out of
  resolve_merge_conflicts; access via adaptor.
  (show_conflicts_core): Cache rosters in adaptor. Output ancestor revision id.

* diff_patch.hh (content_merge_database_adaptor):
* diff_patch.cc (content_merge_database_adaptor): Store left_rid, right_rid.
  (content_merge_database_adaptor::cache_roster): New function.

* roster_merge.cc
  (put_added_conflict_left, put_added_conflict_right,
   put_rename_conflict_left, put_rename_conflict_right, put_stanza): New
   functions for basic_io to report conflicts.
  (roster_merge_result::report_*_conflicts): Take 'db' parameter back
  out; access via adaptor. Use new basic_io functions, clean up basic_io
  format, support more tests.

* roster_merge.hh (struct roster_merge_result): Take 'db' parameter back
  out.

* tests/automate_show_conflicts/expected-missing-root.stdout: Improve format.

* tests/conflict_messages/__driver__.lua: Delete "--debug" parameter mtn
  calls; clutters up log.

txt8sEsmty1n8.txt
Description: Diff [6ef998b5433b34d70a1c7ff98cf5bd6168a76166] -> [8afeea33a55abf47e7dace13d0216bbc19405dba]