diff options
Diffstat (limited to 'pearl.el')
| -rw-r--r-- | pearl.el | 17 |
1 files changed, 13 insertions, 4 deletions
@@ -4020,12 +4020,21 @@ reported. A clean file does nothing." (and pearl--cache-viewer (plist-get pearl--cache-viewer :id)))))))) +(defun pearl--subtree-has-local-edits-p () + "Non-nil if the issue subtree at point has any unpushed local edit. +Broader than `pearl--subtree-dirty-p', which inspects only the description: +this also covers a changed title, state, priority, assignee, labels, or comment. +A merge refresh uses it so it keeps a ticket you have touched in any field, not +just ones whose description changed." + (pearl--issue-has-dirty-fields-p (pearl--issue-dirty-fields))) + (defun pearl--merge-issues-into-buffer (issues) "Merge normalized ISSUES into the current buffer by `LINEAR-ID'. Same-source refresh semantics: an existing issue still in ISSUES is re-rendered in place; an issue new to ISSUES is appended after the last one; an issue no -longer in ISSUES is dropped. A subtree whose body has unpushed edits (see -`pearl--subtree-dirty-p') is never overwritten and never dropped -- it is kept +longer in ISSUES is dropped. A subtree with any unpushed local edit (see +`pearl--subtree-has-local-edits-p' -- title, state, priority, assignee, labels, +description, or a comment) is never overwritten and never dropped; it is kept and counted, so a refresh can't lose un-synced work. Returns a plist of counts \(:updated :added :dropped :skipped)." (let ((existing (pearl--issue-subtree-markers)) @@ -4037,7 +4046,7 @@ and counted, so a refresh can't lose un-synced work. Returns a plist of counts (when marker (save-excursion (goto-char marker) - (if (pearl--subtree-dirty-p) + (if (pearl--subtree-has-local-edits-p) (setq skipped (1+ skipped)) (pearl--replace-issue-subtree-at-point issue) (setq updated (1+ updated))))))) @@ -4046,7 +4055,7 @@ and counted, so a refresh can't lose un-synced work. Returns a plist of counts (unless (member (car cell) fetched-ids) (save-excursion (goto-char (cdr cell)) - (if (pearl--subtree-dirty-p) + (if (pearl--subtree-has-local-edits-p) (setq skipped (1+ skipped)) (org-back-to-heading t) (delete-region (point) (progn (org-end-of-subtree t t) (point))) |