Michael Olson <[EMAIL PROTECTED]> writes:
> Committed revision 295 to http://mwolson.org/bzr/dvc/
>
> Use y-or-n-p in dvc-confirm-file-op, but make it customizable.
>
> * lisp/dvc-core.el (dvc-current-file-list): If selection-mode is
> nil-if-none-marked, then return nil instead of the name of the file.
> (dvc-confirm-file-op-method): New option that determines the function
> to use for confirming file-based DVC operations. It defaults to
> y-or-n-p, because it is irritating to type in the full "yes" string for
> routine operations.
> (dvc-always-true): New convenience function which like like `ignore'
> but returns t rather than nil. Useful for the
> dvc-confirm-file-op-method option.
> (dvc-confirm-file-op): Use dvc-confirm-file-op-method. If it is nil or
> not a function, then default to y-or-n-p.
When I merge from your branch, I get the following conflict:
(defun dvc-current-file-list (&optional selection-mode)
"Return a list of currently active files.
When in dired mode, return the marked files or the file under point.
In a DVC mode, return `dvc-buffer-marked-file-list' if non-nil;
otherwise the result depends on SELECTION-MODE:
* When 'nil-if-none-marked, return nil.
* When 'all-if-none-marked, return all files.
* Otherwise return result of calling `dvc-get-file-info-at-point'."
(cond
((eq major-mode 'dired-mode)
(dired-get-marked-files))
((eq major-mode 'dvc-diff-mode)
<<<<<<< TREE
(or (remove nil dvc-buffer-marked-file-list)
(cond
((eq selection-mode 'nil-if-none-marked)
nil)
((eq selection-mode 'all-if-none-marked)
(dvc-diff-all-files))
(t (list (dvc-get-file-info-at-point))))))
(t (list (dvc-get-file-info-at-point)))))
=======
(cond
((eq selection-mode 'nil-if-none-marked)
(remove nil dvc-buffer-marked-file-list))
((eq selection-mode 'all-if-none-marked)
(or dvc-buffer-marked-file-list
(dvc-diff-all-files)))
(t (list (dvc-get-file-info-at-point)))))
((eq selection-mode 'nil-if-none-marked)
nil)
(t (list (dvc-get-file-info-at-point)))))
>>>>>>> MERGE-SOURCE
Michael and Stephen, could you please find out, which solution is correct.
Thanks,
Stefan.
_______________________________________________
Dvc-dev mailing list
[email protected]
https://mail.gna.org/listinfo/dvc-dev
