diff options
author | Glenn Morris <rgm@gnu.org> | 2011-01-24 21:10:02 -0800 |
---|---|---|
committer | Glenn Morris <rgm@gnu.org> | 2011-01-24 21:10:02 -0800 |
commit | 5b69dadb80a8770bd499928a72f93f0cd0faefca (patch) | |
tree | d064ce73d9f461cb0b7412787e136e118c778bd9 /admin/bzrmerge.el | |
parent | ac267ba9493369185b8ca372942d4894f90e8d60 (diff) | |
download | emacs-5b69dadb80a8770bd499928a72f93f0cd0faefca.tar.gz |
Make it easier to control which revisions bzrmerge might skip.
* admin/bzrmerge.el (bzrmerge-skip-regexp): New variable.
(bzrmerge-missing): Use it.
Diffstat (limited to 'admin/bzrmerge.el')
-rw-r--r-- | admin/bzrmerge.el | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/admin/bzrmerge.el b/admin/bzrmerge.el index 3cf7cf9b389..e9fd0ea00f8 100644 --- a/admin/bzrmerge.el +++ b/admin/bzrmerge.el @@ -27,6 +27,11 @@ (eval-when-compile (require 'cl)) ; assert +(defvar bzrmerge-skip-regexp + "back[- ]?port\\|merge\\|sync\\|re-?generate\\|bump version" + "Regexp matching logs of revisions that might be skipped. +`bzrmerge-missing' will ask you if it should skip any matches.") + (defun bzrmerge-merges () "Return the list of already merged (not yet committed) revisions. The list returned is sorted by oldest-first." @@ -91,6 +96,7 @@ The list returned is sorted by oldest-first." (defun bzrmerge-missing (from merges) "Return the list of revisions that need to be merged. MERGES is the revisions already merged but not yet committed. +Asks about skipping revisions with logs matching `bzrmerge-skip-regexp'. The result is of the form (TOMERGE . TOSKIP) where TOMERGE and TOSKIP are both lists of revnos, in oldest-first order." (with-current-buffer (get-buffer-create "*bzrmerge*") @@ -114,8 +120,7 @@ are both lists of revnos, in oldest-first order." (setq revno (string-to-number revno))) (re-search-forward "^message:\n") (while (and (not skip) - (re-search-forward - "back[- ]?port\\|merge\\|sync\\|re-?generate\\|bump version" nil t)) + (re-search-forward bzrmerge-skip-regexp nil t)) (let ((str (buffer-substring (line-beginning-position) (line-end-position)))) (when (string-match "\\` *" str) |