[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r102972: Make it easier to control wh
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r102972: Make it easier to control which revisions bzrmerge might skip. |
Date: |
Mon, 24 Jan 2011 21:10:02 -0800 |
User-agent: |
Bazaar (2.0.3) |
------------------------------------------------------------
revno: 102972
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Mon 2011-01-24 21:10:02 -0800
message:
Make it easier to control which revisions bzrmerge might skip.
* admin/bzrmerge.el (bzrmerge-skip-regexp): New variable.
(bzrmerge-missing): Use it.
modified:
admin/ChangeLog
admin/bzrmerge.el
=== modified file 'admin/ChangeLog'
--- a/admin/ChangeLog 2011-01-25 04:08:28 +0000
+++ b/admin/ChangeLog 2011-01-25 05:10:02 +0000
@@ -1,3 +1,8 @@
+2011-01-25 Glenn Morris <address@hidden>
+
+ * bzrmerge.el (bzrmerge-skip-regexp): New variable.
+ (bzrmerge-missing): Use it.
+
2011-01-19 Paul Eggert <address@hidden>
* make-tarball.txt: Suggest 'autoreconf -I m4 --force'
=== modified file 'admin/bzrmerge.el'
--- a/admin/bzrmerge.el 2011-01-25 04:08:28 +0000
+++ b/admin/bzrmerge.el 2011-01-25 05:10:02 +0000
@@ -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 @@
(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 @@
(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)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r102972: Make it easier to control which revisions bzrmerge might skip.,
Glenn Morris <=