Mercurial > emacs

comparison lisp/vc-bzr.el @ 107097:6692a4cd2966

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* vc-bzr.el (vc-bzr-dir-extra-headers): Disable the pending merges header.
author Dan Nicolaescu <dann@ics.uci.edu>
date Fri, 05 Feb 2010 20:23:59 -0800
parents 8d8e02bbef81
children 6e6072f0c0a2
comparison
equal deleted inserted replaced
107096:31db1aaeac2d 107097:6692a4cd2966
794 (buffer-string))) 794 (buffer-string)))
795 (shelve (vc-bzr-shelve-list)) 795 (shelve (vc-bzr-shelve-list))
796 (shelve-help-echo "Use M-x vc-bzr-shelve to create shelves") 796 (shelve-help-echo "Use M-x vc-bzr-shelve to create shelves")
797 (root-dir (vc-bzr-root dir)) 797 (root-dir (vc-bzr-root dir))
798 (pending-merge 798 (pending-merge
799 (file-exists-p 799 ;; FIXME: looking for .bzr/checkout/merge-hashes is not a
800 (expand-file-name ".bzr/checkout/merge-hashes" root-dir))) 800 ;; reliable method to detect pending merges, disable this
801 ;; until a proper solution is implemented.
802 (and nil
803 (file-exists-p
804 (expand-file-name ".bzr/checkout/merge-hashes" root-dir))))
801 (pending-merge-help-echo 805 (pending-merge-help-echo
802 (format "A merge has been performed.\nA commit from the top-level directory (%s)\nis required before being able to check in anything else" root-dir)) 806 (format "A merge has been performed.\nA commit from the top-level directory (%s)\nis required before being able to check in anything else" root-dir))
803 (light-checkout 807 (light-checkout
804 (when (string-match ".+light checkout root: \\(.+\\)$" str) 808 (when (string-match ".+light checkout root: \\(.+\\)$" str)
805 (match-string 1 str))) 809 (match-string 1 str)))