* patch for local variable based todo blocking
@ 2010-01-28 18:27 Wes Hardaker
2010-02-01 16:36 ` Carsten Dominik
0 siblings, 1 reply; 2+ messages in thread
From: Wes Hardaker @ 2010-01-28 18:27 UTC (permalink / raw)
To: emacs-orgmode
[-- Attachment #1: Type: text/plain, Size: 655 bytes --]
Attached is a patch that lets local variables define whether or not todo
dependency blocking should be used (both for TODOs and for checkboxes).
I have one file in particular that I'm using checkboxes to quickly
indicate multi-selections from a list but for most of my files I want
TODOs blocked by uncompleted checkboxes.
Normally org uses hook methods for checking for TODO blocks and this
patch just inserts a check at the top to test and see if the variable
turning on the blocking type is still set.
--
Wes Hardaker
My Pictures: http://capturedonearth.com/
My Thoughts: http://pontifications.hardakers.net/
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: dyn-todo-blocking.patch --]
[-- Type: text/x-patch, Size: 6832 bytes --]
diff --git a/lisp/org.el b/lisp/org.el
index cd378b4..bdc5c5a 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -10159,54 +10159,56 @@ changes. Such blocking occurs when:
3. The parent of the task is blocked because it has siblings that should
be done first, or is child of a block grandparent TODO entry."
- (catch 'dont-block
- ;; If this is not a todo state change, or if this entry is already DONE,
- ;; do not block
- (when (or (not (eq (plist-get change-plist :type) 'todo-state-change))
- (member (plist-get change-plist :from)
- (cons 'done org-done-keywords))
- (member (plist-get change-plist :to)
- (cons 'todo org-not-done-keywords))
- (not (plist-get change-plist :to)))
- (throw 'dont-block t))
- ;; If this task has children, and any are undone, it's blocked
- (save-excursion
- (org-back-to-heading t)
- (let ((this-level (funcall outline-level)))
- (outline-next-heading)
- (let ((child-level (funcall outline-level)))
- (while (and (not (eobp))
- (> child-level this-level))
- ;; this todo has children, check whether they are all
- ;; completed
- (if (and (not (org-entry-is-done-p))
- (org-entry-is-todo-p))
- (throw 'dont-block nil))
- (outline-next-heading)
- (setq child-level (funcall outline-level))))))
- ;; Otherwise, if the task's parent has the :ORDERED: property, and
- ;; any previous siblings are undone, it's blocked
- (save-excursion
- (org-back-to-heading t)
- (let* ((pos (point))
- (parent-pos (and (org-up-heading-safe) (point))))
- (if (not parent-pos) (throw 'dont-block t)) ; no parent
- (when (and (org-entry-get (point) "ORDERED")
- (forward-line 1)
- (re-search-forward org-not-done-heading-regexp pos t))
- (throw 'dont-block nil)) ; block, there is an older sibling not done.
- ;; Search further up the hierarchy, to see if an anchestor is blocked
- (while t
- (goto-char parent-pos)
- (if (not (looking-at org-not-done-heading-regexp))
- (throw 'dont-block t)) ; do not block, parent is not a TODO
- (setq pos (point))
- (setq parent-pos (and (org-up-heading-safe) (point)))
+ (if (not org-enforce-todo-dependencies)
+ t ; if locally turned off don't block
+ (catch 'dont-block
+ ;; If this is not a todo state change, or if this entry is already DONE,
+ ;; do not block
+ (when (or (not (eq (plist-get change-plist :type) 'todo-state-change))
+ (member (plist-get change-plist :from)
+ (cons 'done org-done-keywords))
+ (member (plist-get change-plist :to)
+ (cons 'todo org-not-done-keywords))
+ (not (plist-get change-plist :to)))
+ (throw 'dont-block t))
+ ;; If this task has children, and any are undone, it's blocked
+ (save-excursion
+ (org-back-to-heading t)
+ (let ((this-level (funcall outline-level)))
+ (outline-next-heading)
+ (let ((child-level (funcall outline-level)))
+ (while (and (not (eobp))
+ (> child-level this-level))
+ ;; this todo has children, check whether they are all
+ ;; completed
+ (if (and (not (org-entry-is-done-p))
+ (org-entry-is-todo-p))
+ (throw 'dont-block nil))
+ (outline-next-heading)
+ (setq child-level (funcall outline-level))))))
+ ;; Otherwise, if the task's parent has the :ORDERED: property, and
+ ;; any previous siblings are undone, it's blocked
+ (save-excursion
+ (org-back-to-heading t)
+ (let* ((pos (point))
+ (parent-pos (and (org-up-heading-safe) (point))))
(if (not parent-pos) (throw 'dont-block t)) ; no parent
(when (and (org-entry-get (point) "ORDERED")
(forward-line 1)
(re-search-forward org-not-done-heading-regexp pos t))
- (throw 'dont-block nil))))))) ; block, older sibling not done.
+ (throw 'dont-block nil)) ; block, there is an older sibling not done.
+ ;; Search further up the hierarchy, to see if an anchestor is blocked
+ (while t
+ (goto-char parent-pos)
+ (if (not (looking-at org-not-done-heading-regexp))
+ (throw 'dont-block t)) ; do not block, parent is not a TODO
+ (setq pos (point))
+ (setq parent-pos (and (org-up-heading-safe) (point)))
+ (if (not parent-pos) (throw 'dont-block t)) ; no parent
+ (when (and (org-entry-get (point) "ORDERED")
+ (forward-line 1)
+ (re-search-forward org-not-done-heading-regexp pos t))
+ (throw 'dont-block nil)))))))) ; block, older sibling not done.
(defcustom org-track-ordered-property-with-tag nil
"Should the ORDERED property also be shown as a tag?
@@ -10250,30 +10252,32 @@ See variable `org-track-ordered-property-with-tag'."
"Block turning an entry into a TODO, using checkboxes.
This checks whether the current task should be blocked from state
changes because there are unchecked boxes in this entry."
- (catch 'dont-block
- ;; If this is not a todo state change, or if this entry is already DONE,
- ;; do not block
- (when (or (not (eq (plist-get change-plist :type) 'todo-state-change))
- (member (plist-get change-plist :from)
- (cons 'done org-done-keywords))
- (member (plist-get change-plist :to)
- (cons 'todo org-not-done-keywords))
- (not (plist-get change-plist :to)))
- (throw 'dont-block t))
- ;; If this task has checkboxes that are not checked, it's blocked
- (save-excursion
- (org-back-to-heading t)
- (let ((beg (point)) end)
- (outline-next-heading)
- (setq end (point))
- (goto-char beg)
- (if (re-search-forward "^[ \t]*\\([-+*]\\|[0-9]+[.)]\\)[ \t]+\\[[- ]\\]"
- end t)
- (progn
- (if (boundp 'org-blocked-by-checkboxes)
- (setq org-blocked-by-checkboxes t))
- (throw 'dont-block nil)))))
- t)) ; do not block
+ (if (not org-enforce-todo-checkbox-dependencies)
+ t ; if locally turned off don't block
+ (catch 'dont-block
+ ;; If this is not a todo state change, or if this entry is already DONE,
+ ;; do not block
+ (when (or (not (eq (plist-get change-plist :type) 'todo-state-change))
+ (member (plist-get change-plist :from)
+ (cons 'done org-done-keywords))
+ (member (plist-get change-plist :to)
+ (cons 'todo org-not-done-keywords))
+ (not (plist-get change-plist :to)))
+ (throw 'dont-block t))
+ ;; If this task has checkboxes that are not checked, it's blocked
+ (save-excursion
+ (org-back-to-heading t)
+ (let ((beg (point)) end)
+ (outline-next-heading)
+ (setq end (point))
+ (goto-char beg)
+ (if (re-search-forward "^[ \t]*\\([-+*]\\|[0-9]+[.)]\\)[ \t]+\\[[- ]\\]"
+ end t)
+ (progn
+ (if (boundp 'org-blocked-by-checkboxes)
+ (setq org-blocked-by-checkboxes t))
+ (throw 'dont-block nil)))))
+ t))) ; do not block
(defun org-entry-blocked-p ()
"Is the current entry blocked?"
[-- Attachment #3: Type: text/plain, Size: 201 bytes --]
_______________________________________________
Emacs-orgmode mailing list
Please use `Reply All' to send replies to the list.
Emacs-orgmode@gnu.org
http://lists.gnu.org/mailman/listinfo/emacs-orgmode
^ permalink raw reply related [flat|nested] 2+ messages in thread* Re: patch for local variable based todo blocking
2010-01-28 18:27 patch for local variable based todo blocking Wes Hardaker
@ 2010-02-01 16:36 ` Carsten Dominik
0 siblings, 0 replies; 2+ messages in thread
From: Carsten Dominik @ 2010-02-01 16:36 UTC (permalink / raw)
To: Wes Hardaker; +Cc: emacs-orgmode
Applied, thanks.
- Carsten
On Jan 28, 2010, at 7:27 PM, Wes Hardaker wrote:
>
> Attached is a patch that lets local variables define whether or not
> todo
> dependency blocking should be used (both for TODOs and for
> checkboxes).
> I have one file in particular that I'm using checkboxes to quickly
> indicate multi-selections from a list but for most of my files I want
> TODOs blocked by uncompleted checkboxes.
>
> Normally org uses hook methods for checking for TODO blocks and this
> patch just inserts a check at the top to test and see if the variable
> turning on the blocking type is still set.
>
> --
> Wes Hardaker
> My Pictures: http://capturedonearth.com/
> My Thoughts: http://pontifications.hardakers.net/
> diff --git a/lisp/org.el b/lisp/org.el
> index cd378b4..bdc5c5a 100644
> --- a/lisp/org.el
> +++ b/lisp/org.el
> @@ -10159,54 +10159,56 @@ changes. Such blocking occurs when:
> 3. The parent of the task is blocked because it has siblings that
> should
> be done first, or is child of a block grandparent TODO entry."
>
> - (catch 'dont-block
> - ;; If this is not a todo state change, or if this entry is
> already DONE,
> - ;; do not block
> - (when (or (not (eq (plist-get change-plist :type) 'todo-state-
> change))
> - (member (plist-get change-plist :from)
> - (cons 'done org-done-keywords))
> - (member (plist-get change-plist :to)
> - (cons 'todo org-not-done-keywords))
> - (not (plist-get change-plist :to)))
> - (throw 'dont-block t))
> - ;; If this task has children, and any are undone, it's blocked
> - (save-excursion
> - (org-back-to-heading t)
> - (let ((this-level (funcall outline-level)))
> - (outline-next-heading)
> - (let ((child-level (funcall outline-level)))
> - (while (and (not (eobp))
> - (> child-level this-level))
> - ;; this todo has children, check whether they are all
> - ;; completed
> - (if (and (not (org-entry-is-done-p))
> - (org-entry-is-todo-p))
> - (throw 'dont-block nil))
> - (outline-next-heading)
> - (setq child-level (funcall outline-level))))))
> - ;; Otherwise, if the task's parent has the :ORDERED: property,
> and
> - ;; any previous siblings are undone, it's blocked
> - (save-excursion
> - (org-back-to-heading t)
> - (let* ((pos (point))
> - (parent-pos (and (org-up-heading-safe) (point))))
> - (if (not parent-pos) (throw 'dont-block t)) ; no parent
> - (when (and (org-entry-get (point) "ORDERED")
> - (forward-line 1)
> - (re-search-forward org-not-done-heading-regexp pos t))
> - (throw 'dont-block nil)) ; block, there is an older sibling not
> done.
> - ;; Search further up the hierarchy, to see if an anchestor is
> blocked
> - (while t
> - (goto-char parent-pos)
> - (if (not (looking-at org-not-done-heading-regexp))
> - (throw 'dont-block t)) ; do not block, parent is not a TODO
> - (setq pos (point))
> - (setq parent-pos (and (org-up-heading-safe) (point)))
> + (if (not org-enforce-todo-dependencies)
> + t ; if locally turned off don't block
> + (catch 'dont-block
> + ;; If this is not a todo state change, or if this entry is
> already DONE,
> + ;; do not block
> + (when (or (not (eq (plist-get change-plist :type) 'todo-state-
> change))
> + (member (plist-get change-plist :from)
> + (cons 'done org-done-keywords))
> + (member (plist-get change-plist :to)
> + (cons 'todo org-not-done-keywords))
> + (not (plist-get change-plist :to)))
> + (throw 'dont-block t))
> + ;; If this task has children, and any are undone, it's blocked
> + (save-excursion
> + (org-back-to-heading t)
> + (let ((this-level (funcall outline-level)))
> + (outline-next-heading)
> + (let ((child-level (funcall outline-level)))
> + (while (and (not (eobp))
> + (> child-level this-level))
> + ;; this todo has children, check whether they are all
> + ;; completed
> + (if (and (not (org-entry-is-done-p))
> + (org-entry-is-todo-p))
> + (throw 'dont-block nil))
> + (outline-next-heading)
> + (setq child-level (funcall outline-level))))))
> + ;; Otherwise, if the task's parent has the :ORDERED:
> property, and
> + ;; any previous siblings are undone, it's blocked
> + (save-excursion
> + (org-back-to-heading t)
> + (let* ((pos (point))
> + (parent-pos (and (org-up-heading-safe) (point))))
> (if (not parent-pos) (throw 'dont-block t)) ; no parent
> (when (and (org-entry-get (point) "ORDERED")
> (forward-line 1)
> (re-search-forward org-not-done-heading-regexp pos t))
> - (throw 'dont-block nil))))))) ; block, older sibling not done.
> + (throw 'dont-block nil)) ; block, there is an older sibling
> not done.
> + ;; Search further up the hierarchy, to see if an anchestor is
> blocked
> + (while t
> + (goto-char parent-pos)
> + (if (not (looking-at org-not-done-heading-regexp))
> + (throw 'dont-block t)) ; do not block, parent is not a TODO
> + (setq pos (point))
> + (setq parent-pos (and (org-up-heading-safe) (point)))
> + (if (not parent-pos) (throw 'dont-block t)) ; no parent
> + (when (and (org-entry-get (point) "ORDERED")
> + (forward-line 1)
> + (re-search-forward org-not-done-heading-regexp pos t))
> + (throw 'dont-block nil)))))))) ; block, older sibling not
> done.
>
> (defcustom org-track-ordered-property-with-tag nil
> "Should the ORDERED property also be shown as a tag?
> @@ -10250,30 +10252,32 @@ See variable `org-track-ordered-property-
> with-tag'."
> "Block turning an entry into a TODO, using checkboxes.
> This checks whether the current task should be blocked from state
> changes because there are unchecked boxes in this entry."
> - (catch 'dont-block
> - ;; If this is not a todo state change, or if this entry is
> already DONE,
> - ;; do not block
> - (when (or (not (eq (plist-get change-plist :type) 'todo-state-
> change))
> - (member (plist-get change-plist :from)
> - (cons 'done org-done-keywords))
> - (member (plist-get change-plist :to)
> - (cons 'todo org-not-done-keywords))
> - (not (plist-get change-plist :to)))
> - (throw 'dont-block t))
> - ;; If this task has checkboxes that are not checked, it's blocked
> - (save-excursion
> - (org-back-to-heading t)
> - (let ((beg (point)) end)
> - (outline-next-heading)
> - (setq end (point))
> - (goto-char beg)
> - (if (re-search-forward "^[ \t]*\\([-+*]\\|[0-9]+[.)]\\)[ \t]+\\
> [[- ]\\]"
> - end t)
> - (progn
> - (if (boundp 'org-blocked-by-checkboxes)
> - (setq org-blocked-by-checkboxes t))
> - (throw 'dont-block nil)))))
> - t)) ; do not block
> + (if (not org-enforce-todo-checkbox-dependencies)
> + t ; if locally turned off don't block
> + (catch 'dont-block
> + ;; If this is not a todo state change, or if this entry is
> already DONE,
> + ;; do not block
> + (when (or (not (eq (plist-get change-plist :type) 'todo-state-
> change))
> + (member (plist-get change-plist :from)
> + (cons 'done org-done-keywords))
> + (member (plist-get change-plist :to)
> + (cons 'todo org-not-done-keywords))
> + (not (plist-get change-plist :to)))
> + (throw 'dont-block t))
> + ;; If this task has checkboxes that are not checked, it's
> blocked
> + (save-excursion
> + (org-back-to-heading t)
> + (let ((beg (point)) end)
> + (outline-next-heading)
> + (setq end (point))
> + (goto-char beg)
> + (if (re-search-forward "^[ \t]*\\([-+*]\\|[0-9]+[.)]\\)[ \t]+\\
> [[- ]\\]"
> + end t)
> + (progn
> + (if (boundp 'org-blocked-by-checkboxes)
> + (setq org-blocked-by-checkboxes t))
> + (throw 'dont-block nil)))))
> + t))) ; do not block
>
> (defun org-entry-blocked-p ()
> "Is the current entry blocked?"
> _______________________________________________
> Emacs-orgmode mailing list
> Please use `Reply All' to send replies to the list.
> Emacs-orgmode@gnu.org
> http://lists.gnu.org/mailman/listinfo/emacs-orgmode
- Carsten
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2010-02-01 17:12 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2010-01-28 18:27 patch for local variable based todo blocking Wes Hardaker
2010-02-01 16:36 ` Carsten Dominik
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).