------------------------------------------------------------ revno: 541 committer: Samuel Bronson <[email protected]> branch nick: devel timestamp: Mon 2009-03-09 09:28:06 -0400 message: Add code to make sure MML gets converted to MIME when using 'sendmail-user-agent.
# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: [email protected] # target_branch: http://bzr.xsteve.at/dvc/ # testament_sha1: a17c2dc863520645e9c7ed4990e04fa5ba5d9fcc # timestamp: 2009-03-09 09:28:26 -0400 # base_revision_id: [email protected] # # Begin patch === modified file 'lisp/bzr.el' --- lisp/bzr.el 2008-10-02 19:44:36 +0000 +++ lisp/bzr.el 2009-03-09 13:28:06 +0000 @@ -1231,7 +1231,7 @@ "Call bzr send --output to create a file containing a bundle" (interactive (list (bzr-read-revision "Create bundle for revision: ") (read-file-name "Name of the bzr bundle file: ") - (read-string "Extra parameters: "))) + (split-string (read-string "Extra parameters: ")))) (let ((arg-list (list "send" "-o" (expand-file-name file-name) "-r" rev))) (when extra-parameter-list (setq arg-list (append arg-list extra-parameter-list))) @@ -1240,7 +1240,9 @@ (lambda (output error status arguments) (message "Created bundle for revision %s in %s." rev file-name))))) -(defvar bzr-export-via-email-parameters nil) +;;; FIXME: this should probably be a defcustom +(defvar bzr-export-via-email-parameters nil + "list of (PATH (EMAIL BRANCH-NICK (EXTRA-ARG ...)))") ;;(add-to-list 'bzr-export-via-email-parameters '("~/work/myprg/dvc" ("[email protected]" "dvc-el"))) ;; or: ;;(add-to-list 'bzr-export-via-email-parameters @@ -1250,6 +1252,10 @@ "Export the revision at point via email. `bzr-export-via-email-parameters' can be used to customize the behaviour of this function." (interactive) + + (require 'message) + (require 'mml) + (let* ((rev (bzr-get-revision-at-point)) (log-message (bzr-revision-st-message (dvc-revlist-current-patch-struct))) (base-file-name nil) @@ -1282,6 +1288,10 @@ nil description) + ;; we need MML converted to MIME or the attachment isn't attached! + (when (eq mail-user-agent 'sendmail-user-agent) + (add-hook 'mail-send-hook 'mml-to-mime nil t)) + ;; delete emacs version - its not needed here (delete-region (point) (point-max)) === modified file 'lisp/dvc-defs.el' --- lisp/dvc-defs.el 2008-11-04 20:03:34 +0000 +++ lisp/dvc-defs.el 2009-03-03 14:28:52 +0000 @@ -48,6 +48,7 @@ (unless (fboundp 'executable-find) (autoload 'executable-find "executable")) +;;;###autoload (defvar dvc-registered-backends nil "The list of registered dvc backends.") (defgroup dvc nil === modified file 'lisp/dvc-unified.el' --- lisp/dvc-unified.el 2009-02-05 19:45:01 +0000 +++ lisp/dvc-unified.el 2009-03-08 21:06:41 +0000 @@ -112,7 +112,9 @@ (defmacro define-dvc-unified-command (name args comment &optional interactive) "Define a DVC unified command. &optional arguments are permitted, but not &rest." - (declare (indent 2) (debug (&define name sexp stringp sexp))) + (declare (indent 2) + (debug (&define name lambda-list stringp + [&optional interactive]))) `(defun ,name ,args ,comment ,@(when interactive (list interactive)) === modified file 'texinfo/dvc.texinfo' --- texinfo/dvc.texinfo 2008-10-28 20:19:10 +0000 +++ texinfo/dvc.texinfo 2009-03-03 14:29:46 +0000 @@ -866,7 +866,7 @@ There is one mailing list for @b{DVC}. -...@code{dvc-el-dev@@gna.org} intended for the discussion of development +...@code{dvc-dev@@gna.org} intended for the discussion of development versions of @b{DVC}. Users of development versions of @b{DVC} should subscribe to this list. Bugs should also be reported to this list. === modified file 'www/index.html' --- www/index.html 2009-03-01 20:20:46 +0000 +++ www/index.html 2009-03-02 22:16:59 +0000 @@ -21,7 +21,7 @@ </head> <body> - <img src="dvc.png" /> + <img src="dvc.png" alt="DVC logo"/> <h1>DVC: Distributed Version Control for Emacs</h1> @@ -98,11 +98,11 @@ <pre> +- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - : Optional common UI (which autodetects the back-end) :<----. + : Optional common UI (which autodetects the back-end) :<----. +---------------+-------------------+------------------+---------+ | | tla (Xtla) | Mercurial (xhg) | Bazaar (bzr) | | v |+-------------+|+-----------------+|+----------------+| ... | \O/ - || Xtla core ||| xhg core ||| bzr core || |<--> | + || Xtla core ||| xhg core ||| bzr core || |<--> | |+-------------+|+-----------------+|+----------------+| | / \ +---------------+-------------------+------------------+---------+ | DVC core | @@ -146,11 +146,10 @@ *** 5 stands for the number of functions *** *** --> - <td colspan="2" rowspan="2"> - <th colspan="5" align="center">Functions</td> - <th rowspan="2">Maintainers</td> - <th rowspan="2">Notes</td> - </td> + <td colspan="2" rowspan="2" /> + <th colspan="5" align="center">Functions</th> + <th rowspan="2">Maintainers</th> + <th rowspan="2">Notes</th> </tr> <tr> <th>status</th> # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWUzu5SQADmh/gH4wIAB55/// f+/fSv////5gEoe+7vjK09p1PBr0NDodAAUAOcrp27ejT23t3ddrSQBJxGiqNmaENNU0yammU9Jk 0YmnpqabRqaNGQAMgNAaZAACUSaYAQQnqiZ6KPKaGR6JpgBMmgAAG1Ac0aNDTCAaYE00AZDQxAGj EaGCMgAkJTSaJk0xT9JqT2pontKep6TNR6QAABoAHqAaCKRBBpoACGmamhqZMRMp6nlHqPSeoPUA ABoFShAAgJoUyaE2hikBsieo0yAGgAAFB+iQiPvkkea7QIrV45LFiSRTthq1sY4prz4QR/sFExEr QDrI9s2PHj7ZhnZA6GZhSFQeo+FkoSXalV+sVASmHTBLPL+t6Wr+057hKhWShArSJCkrOjKW9XVk rX6444TPjla0N90TOiTeiScW4KG1aNtqRpZtoiDbE4O9yMppBUJvSaocyAJROJ1xh3V1UauqCwop xjMqtMINRYBkWObFlaGtiedpk8+DnvoEGsgFNAwTbbbbY2DYm03xfsIW/VYRoEXyPe/A4znZkYVV qFzS1N3YQmVWtC7JciI3iji53dc5MjKqmZb0WwdfRwEe/6xju6dm4duubv4yOxv2I9ryNf+69Ufk TGtx9hDPSDuaM2MX3cM1ngxAlh0aCFxC9FeV6rRVrv+ybSYhJ98j6fa3RTIQggMqspLLq8+j2nx5 kGozRBixsbGxsbGxsbBj2lR06v0V4gYEntZuvsNO5AELHdb15vwSCzbjxzxdqXMFiDXuXDbmKg7u lWirYrRTS0IK9IIHAgagbRjmjRLJXAaqhCNlzXRZq9Wr8S99e4r9Ka7iNd92RZGVGF2ynTGc6UWU 6cBmsGM5et7BDgoCJbPO9rrnXOwg5g8QlSBRiBE2fnPvuE5e6sT+/bx6+FIGqA+cHwgD7/yOV9Cc 4Lr921CxgdKe+81t9bMKVQwIIEAfCDCifkqgQQvBuhhEIYBHxXjeO4SDnJfASJlv2/N3Pp47deJl TQUeD6qGxr6RIbxClUDo0VYxPeJ5IXGh5dsoaiyoMEHirk6d1Hw8c2VPEHQZuLm1z0tdUY4RMoIO ru0yFkSPxOzWGN4QIbr3pTGyv00fsEo6uSSSSSSNySSSSSSkhGJfs821BpSEN2YNobKYbdpbPyiH bgFIdkXXxBlW0pJK0SE1VXs5NMtc8rIpg+9itTXFItIl9wJZDO+nCsMGjPK6qtXReZGF8pcpcZZm LVNqyJdImczhijNdVSRL8WrVjlJfKQo0bsVzK+BKKkNWaXs5DOzNi0kvvfewd1VzhcoybP48EWWc Iuh93pCrl0oUmkRwRnxSUwwRCURlIaqFi2CtEnWlLV464s1fd1ud+8P2d5jxhMtEV8NWcji9FUFE KwHqKdkQURHu2ZDDffS2OzXbnte3WohgWIK17cFuaWsuVjhSJgvZdJC7JD4Rs+zCatlUbs0Umnas MmOFnbs/8hz8ePCPHSLuz6fLbGmfV5SXsLSH2I9HRmo5tHCryRRe9XkqwW2VVavf1hpnr7FW3s6+ u2HO3Plheuetod02Qg1YcYrgIQBnbVhUdpa6DK0ibi+t5DZQRrx124Wm0NFNsWyjO0uhyrIZrI4U XuOebB2kvjmoVUTo3Ys0db6qbSJTlzYrRbkr621bSXy2ajfwVyvSrXb794XYt4Vd3dc0mzqiuUOF UkqxRkoozbrl53xVb6NIYFjax5DclcaTE+Kog6tf/IN2rPDRaXVqjevzdqVkVpQ84RuzVkKKELYx FMNGK9DCTBLZ3ZrpklVMKPNZZe8MXmuX+fnZo2OrZoqo2haL70YGcoNWzB36Vib0fNHrzfMyW4X2 k5q4OKsUYOS5s16erNq6OGq9yiDgYU0IH+uqSNRxLp+FJiG2z0ORGZSZjLBZlsqXd46YIpV6tJCs paHpfcxlaUYsELG1xJWZsKL49Wndq39PU9Vd43v6sUdHK6HDrjuzkZd4a83TdhdzMnsT4MWGDhfJ G7GQ69XdzUaOzzk6sXJonc8rM2ajZw8rOyr0k3R9fnDz31r45WjpffdW7RW/2xFcMWHR582DuwUd Xtu82NdPGMKWmx3U2W83N0Z9JGtzCuC7h5JZiuY5vajLDlmpbVdLOzNZmv4ddkX8YPRspNEY6QvN V8no1b4aMWLq697NGjc3cmjRebrkdujh0YwsjGHl5WrYupa7euCNtJhI2S0MbrV7a5KWYq3yJlSR O1zmyZW0VwmrZujBRybLlzLjKGLwi+rfD2YIv82rOFtlJc3cUquYOmCjiavBHcsdGjJR48dWzybs VFDosxx6NWbQvvz+jzhj8XGnXFJ1jCbEMbP1iwco5pe1pwxzNTfsVNyogi7gq0ucDDJs7KJk5qsa sXZZTwd2TNVtDG9e46OGzt2zvZL3HZnpJ1ZKuIko4XOjqcmDZ36r1b1oVRS2nbU42rhEy5VizKS7 BKLNl0vuYMGa61bXyLQ3Zt1r1WTVHWy+dOTh3bNIb6VpV3LKrKyVdlxzxZs3D2bvTdixckbDTc17 MVlVHJRm5rKsmb8suifCF+TPRlhXTuvptfCl3ApuLmkgm6539L1zLAhZvijvaSzLK5c4wyUhuzaL 8epOTJkq2aOzRizdl/PG9RbB8pMZI6PJ2c1zo4aSfPnDzemztJpmqs3WUcm70h9sPw+39P9ehrSS ZhL4JmVLEWjOoUgbRWPuPASII9kfAmJArnDmMhMjCFUAJ8xIRPt+sjgJ4CH5QfeTczgikUJsnaIi pJb0Szo43cqJEFzTabTYm02m02Ni/D2fGIhGA2JcJlEoErEkCUVid8xKBpiIIiBPZlvBAvxYju/V 5e7asywbQDbATEPs4MR/fd9umFEj9Q2GKV/v7/a2fsmf1R9Wl2HVUaKSSOrOnO/jdoILmy4P+s+i jER0JbkkmQSUSObnu5xtjTbbbG0F4eOiHDrijq7yRfKuniqHsHYdpoSCCISQoyfofi/Ks0xZrlVX 8L8X4NGi9eufi0eFjwkS5QsSInrYaj7kTkO+05PJehmdHWbjM2wFcUMesEHUaDH0CmMV7n5Ao5+f 1QnKxcJ7s/XHX6byNjmmyP+0W5xciqMt/q5039cjZRER7E15R6AgKgEEMdCHqdamSKeEE4IL1t8i eDZvdNMVZX2s2T9KPe+pppiwNl12D7mz2KvesqxcKZrPt8eXC51bOi5q6Pi8r2lxgzbLub6pVxbs jmjIaOZ7/15/+qMo/VFIxmyj9CIrWPWtaPsJGsooynQSNmkjWbQ8jQhb07SuskYiZUbDc1Itg5MG jJwxe1zZqOF7k6n5Mz52LdooyVXvayeS5Ru8mLd+Tu8YJzfDNFL39EKVRSxDzGYR9Qjf8zOsEC6I APDDDgazs3WtiN9eFHiQyIKJUzag7hOzgcCo3FSlZfJHSUEtpBSakZPBrEl7F6vnYoo2bvnUY/NB PquZPoHFxo640sm8QzPElZEGbHL0c6JwLBQ+Xi0VnBnVzlw2lVVttPwGulo2CbTbIg9FDvQr67we U5zswY9XoyaaXlfIEjenyINXaE6kHq6n2WrU65eu2ScMcljzt741a64/JF8Pc+D2uj3vte1V8Xxa tc/H15fHzw7eezcxHliiJE98GGdCx2szA55ZcMo6PWt389Wax6XbjUvYujw6uTsxUdWDR3UMnoj8 Ie6Q9hG7uhHYsEMaOhCkVtNnTUSOq0maSoyCZiRQKUythBpOfbBxxKGpyT5u3nJENiohxMshUTTH XmE8kTYunte6RYCDPlKC71b+rHIwTMyE8tAraCfKkVzaUmX02kb/hfY9cW4i30Eabg1Ag4/tbQE5 ViQtXpCAkmaZ2AXRWO1eMhKubNT43cq+o48b4muqqZUVlwlBzKjkUkJ9y4vYe9T0OS9ixfUlyKvk 1VWlD4vuhk5WUelXLJSyshc3ZtWD4Oj3SH10P2Q90OlC+6uwZqmtgKHNtElmqPVFkpO+JxpzidfN e0d+hDfdCo5THUJ9wIOuOXLH7RPWhh35GBOEmWQULSfGBNtMpuzyJfOjoRq5ISMB5vFVqqQ0oe95 rLY5uuNQn4IDqy6gsBOahUFPBDjWOek61Eb6jF2AE7rhOo1QWdgr7PH2xY2XutNPVHdpM067QsyC YBJiXxMsQQqBDqQ4ptJbkBKsSPM1iX+1wdQ/eUIV8LBL/SJNwWsOBjgJMTvMRdIIUjShwQ20CTKG UluFaxLXNeEi8JUSkuGUEhIICJMQqT5dYkuTjvs1Yw8KIeIaq290mNO9X72GSM0dl+1kd7nxJj6I 0T0vZUkhL+8yhdP7tcZsBBkat6JAl/cxohQz59sYS4TeJWJWJCmfAJd3OTooIOyWq8JAljF+jAJ4 KGmjtEXCMdZgIvzRjSLSOsasHhkYhl6OWkgvBAqEQQisn3iM+J4QcGQHEyA4MgODIoQgODIDiZAc TIDiZE7ywE833rOHAJkE2yMRYKxATnNmVCRehHdBWJWFBVXzx31OAlKBfiIhgViEBgVmaG90bUiI vQyp0idiGA19f06uXTglV7bW/c4isxUxKhJujPpJEZ+iK4IwY+5aEa/Z1zioVrfKaJ0BQK7P05LD mh2iWu9DdoW/uQ+ihqEzFKVyiBOIneJyRalDNkAS9GjvaLuzmJYWCWAkCUfhg2uLt7eMk7m0TihI vY7sJWtlxcWkK1J9ClySXnP5Ir5XTMtzxznngur9al4RaQ3d+TWJ5iZUNgkKs1LckYbZaI5528z9 aMLhGcyjKUSKUI7oqkl2UwS0xnJ5TE+1C+tV2GUCVgkCRfFL/qEy6fQkl1G+ShoUM5TeEvwqBOhD Aiz6hLRJLwwwR0XsaphqYgkJYHnBEEgQbhKZiS7+swp5xHmQM77196VxS4dRy+qEaMVULXX/cjoS xFLockO6uSPZX58ZxijTZkkiYs0UuM7kb/Z3oqhuj48T6ZdEy2IqRydJcY36+LU5SNm1zTgVoFdB IJaMEgTFCLiNYlrF/eJUJRAnuQ4ZezwQ5XhKTZ8gL4nrEbjII1Ht4cpRjqemK5O7Q9iNJshG228q xyZ9YhMSquIiJAaRWIJD6xLGhATIh7UPihITv7BMWYTHJMeBCXfBHwvDuQ3CZXMJiaewe3QZ3zQ3 KHx+mSlLIfkJCL9fFCy4TYpAm9c6ExJiWIdqHmJtQwo6UNUtAngEQRvQh7P3D0M2/Z6LY/+LuSKc KEgmd3KSAA==
_______________________________________________ Dvc-dev mailing list [email protected] https://mail.gna.org/listinfo/dvc-dev
