Committed revision 488 to http://bzr.xsteve.at/dvc/
Merged from Stephen Leake: Implemented xmtn-conflicts.el
------------------------------------------------------------
revno: 477.1.8
committer: Stephe <[EMAIL PROTECTED]>
branch nick: dvc
timestamp: Sat 2008-09-06 18:01:30 -0400
message:
merge from Stefan
------------------------------------------------------------
revno: 477.1.7
committer: Stephe <[EMAIL PROTECTED]>
branch nick: dvc
timestamp: Sat 2008-09-06 17:56:06 -0400
message:
minor cleanups.
------------------------------------------------------------
revno: 477.1.6
committer: Stephe <[EMAIL PROTECTED]>
branch nick: dvc
timestamp: Sat 2008-09-06 17:54:11 -0400
message:
mtn conflict resolution: Add better top-level interface, improve
operation. Basically functional.
* lisp/xmtn-automate.el (xmtn-automate--append-encoded-strings): Allow
nil in list of strings.
* lisp/xmtn-basic-io.el (xmtn-basic-io-parse-line,
xmtn-basic-io-check-line, xmtn-basic-io-check-empty): move here from
xmtn-conflicts.el
* lisp/xmtn-conflicts.el (xmtn-conflicts-parse-content-conflict): fix
small bug.
(xmtn-conflicts-save): Replace region, don't just add to it.
(xmtn-conflicts-resolve-conflict-post-ediff): Clean up stuff.
(xmtn-conflicts-resolve-content-ediff): new.
(xmtn-conflicts-resolve-content-file): new.
(xmtn-check-workspace-for-propagate): new
(xmtn-conflicts-propagate): new
(xmtn-conflicts-merge): new
(xmtn-conflicts-clean): new.
------------------------------------------------------------
revno: 477.1.5
committer: Stephe <[EMAIL PROTECTED]>
branch nick: dvc
timestamp: Sun 2008-08-31 18:07:50 -0400
message:
xmtn-conflicts: add resolution.
* lisp/dvc-diff.el (dvc-diff-unmark-file): Simplify call to
dvc-fileinfo-next.
* lisp/dvc-utils.el (dvc-make-ewoc-next): new.
(dvc-make-ewoc-prev): new.
* lisp/xmtn-conflicts.el (xmtn-conflicts-current-conflict-buffer): new
(xmtn-conflicts-ediff-quit-info): new.
(xmtn-conflicts-parse-content-conflict): check for "file" file-type.
(xmtn-conflicts-after-insert-file): Move more functionality here.
(xmtn-conflicts-write-header): improve handling of blank lines.
(xmtn-conflicts-write-content): ditto.
(xmtn-conflicts-resolvedp): new.
(xmtn-conflicts-next-unresolved): new
(xmtn-conflicts-prev-unresolved): new
(xmtn-conflicts-resolve-conflict-post-ediff): new.
(xmtn-conflicts-resolve-content): new
(xmtn-conflicts-resolve-conflict): new.
(xmtn-conflicts-mode-map): Define some keys.
(xmtn-conflicts-mode-menu): Define some menu entries.
(xmtn-conflicts-mode): fix local variable stuff.
(xmtn-conflicts): Change to require workspace, other revision,
canonical conflicts file.
(xmtn-conflicts-review): Change to require workspace, use canonical
workspace file.
------------------------------------------------------------
revno: 477.1.4
committer: Stephe <[EMAIL PROTECTED]>
branch nick: dvc
timestamp: Sun 2008-08-31 13:44:10 -0400
message:
Add conflicts file save, ewoc printer.
* lisp/dvc-fileinfo.el (dvc-fileinfo-printer-full): Don't need to bind
inhibit-read-only here; ewoc--refresh-node does that.
* lisp/xmtn-basic-io.el (xmtn-basic-io--parse-nonempty-line): Handle line
containing single symbol followed by whitespace.
(xmtn-basic-io-write-id): new
(xmtn-basic-io-write-str): new
(xmtn-basic-io-write-sym): new
* lisp/xmtn-conflicts.el (xmtn-conflicts-output-buffer): new.
(xmtn-conflicts-printer): new
(xmtn-basic-io-check-line): declare indent, debug properties.
(xmtn-basic-io-parse-line): ditto
(xmtn-conflicts-parse-header): Fix.
(xmtn-conflicts-parse-content-conflict): Fix handling of resolutions.
(xmtn-conflicts-parse-conflicts): better loop termination.
(xmtn-conflicts-read): Fix off-by-one bug.
(xmtn-conflicts-after-insert-file): new
(xmtn-conflicts-write-header): new
(xmtn-conflicts-write-content): new
(xmtn-conflicts-write-conflicts): new.
(xmtn-conflicts-save): implement using above.
(xmtn-conflicts-header): use faces.
(xmtn-conflicts-done): deleted.
(xmtn-conflicts-mode): Improve for xmtn-conflicts-review; don't erase
buffer, set after-insert-file-functions. Not quite there yet.
(xmtn-conflicts): prompt for conflict file, save there, use
xmtn-conflicts-review to view.
(xmtn-conflicts-review): new.
------------------------------------------------------------
revno: 477.1.3
committer: Stephe <[EMAIL PROTECTED]>
branch nick: dvc
timestamp: Sat 2008-08-30 11:45:10 -0400
message:
Add first draft of xmtn-conflicts.el; not functional.
* lisp/xmtn-basic-io.el (xmtn-basic-io--read-field): Add doc string.
Allow a symbol value.
(xmtn-basic-io--peek): New.
* lisp/xmtn-conflicts.el: New; parse, edit output of 'automate
conflicts', for 'merge --resolve-conflicts-file'.
------------------------------------------------------------
revno: 477.1.2
committer: Stephe <[EMAIL PROTECTED]>
branch nick: dvc
timestamp: Sat 2008-08-23 04:56:59 -0400
message:
merge from Stefan
_______________________________________________
Dvc-dev mailing list
[email protected]
https://mail.gna.org/listinfo/dvc-dev
