Committed revision 481 to http://stephe-leake.org/dvc
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.
--
-- Stephe
_______________________________________________
Dvc-dev mailing list
[email protected]
https://mail.gna.org/listinfo/dvc-dev
