Committed revision 522 to http://stephe-leake.org/dvc
xmtn-conflicts: store branches in options file, other improvements.
* lisp/dvc-buffers.el (dvc-revert-some-buffers): preserve major mode on
revert-buffer.
* lisp/dvc-log.el (dvc-ediff-setup): new function.
* lisp/dvc-ui.el (tools-menu): Add dvc-missing
* lisp/dvc-unified.el (dvc-back-end-wrappers): add 'other-frame' to
add-log-entry.
* lisp/xmtn-automate.el (xmtn--tree-default-branch): move here from
xmtn-dvc, so xmtn-conflicts can use it.
* lisp/xmtn-basic-io.el (xmtn-basic-io-eof): new.
* lisp/xmtn-conflicts.el (xmtn-conflicts-left-work,
xmtn-conflicts-right-work): new buffer-local variables.
(xmtn-conflicts-parse-header): get branches from options file.
(xmtn-conflicts-read): handle no conflicts case.
(xmtn-conflicts-resolve-content-file): factor out.
(xmtn-conflicts-resolve-duplicate_name-ediff): preserve window config.
(xmtn-conflicts-resolve-map): add clear-resolution, file.
(xmtn-conflicts-dtrt): Add FIXME: not working.
(xmtn-conflicts-current-conflict): new function.
(xmtn-conflicts-path): new function.
(xmtn-add-log-entry): new function.
(xmtn-conflicts-do-propagate): new function.
(xmtn-conflicts-do-merge): split out propagate for menu key binding
display.
(xmtn-conflicts-mode-map): add add-log-entry; use keyboard menu instead
of dtrt.
(xmtn-conflicts-opts-file): new const
(xmtn-conflicts-save-opts): new function
(xmtn-conflicts-load-opts): new function
(xmtn-conflicts-1): add workspace args to allow getting branches; save
branches in opts file.
(xmtn-conflicts-merge): only merge current heads.
* lisp/xmtn-dvc.el (xmtn--tree-default-branch): move to xmtn-automate.el
(xmtn-dvc-log-message): new; factored out of log-edit-done.
(xmtn-dvc-log-edit-done): use it.
(xmtn-diff-mode-map): improve.
(xmtn-propagate-from): add log message.
(xmtn-dvc-merge): support resolve-conflicts, log message.
* lisp/xmtn-ids.el (xmtn--branches-of): new.
* lisp/xmtn-revlist.el (xmtn-revlist-mode-map): improve.
--
-- Stephe
_______________________________________________
Dvc-dev mailing list
[email protected]
https://mail.gna.org/listinfo/dvc-dev
