view etc/images/lock.xpm @ 111350:8027e412df98

Backport VC improvements from trunk. * vc/log-edit.el (log-edit-rewrite-fixes): New var. (log-edit-author): New dynamic var. (log-edit-changelog-ours-p, log-edit-insert-changelog-entries): Use it to return the author if different from committer. (log-edit-insert-changelog): Use them to add Author: and Fixes headers. * vc/vc-hooks.el (vc-default-mode-line-string): Doc fix. * vc/vc.el (vc-deduce-backend): New fun. Handle diff buffers. (vc-root-diff, vc-print-root-log, vc-log-incoming) (vc-log-outgoing): Use it. (vc-diff-internal): Set diff-vc-backend. * vc/diff-mode.el (diff-vc-backend): New var. * vc/vc.el (vc-diff-internal): Set `revert-buffer-function' buffer-locally to lambda that re-runs the vc diff command. (Bug#6447) * vc/log-view.el (log-view-mode-map): Bind revert-buffer. Make 'g' (AKA revert-buffer) rerun VC log, log-incoming and log-outgoing commands. * vc/vc.el (vc-log-internal-common): Add a new argument and use it to create a buffer local revert-buffer-function variable. (vc-print-log-internal, vc-log-incoming, vc-log-outgoing): Pass a revert-buffer-function lambda. Improve VC create/retrieve tag/branch. * vc.el (vc-create-tag): Do not read the directory name for VCs with repository revision granularity. Adjust the tag/branch prompt. Reset VC properties. (vc-retrieve-tag): Do not read the directory name for VCs with repository revision granularity. Reset VC properties. Add optional support for resetting VC properties. * vc-dispatcher.el (vc-resynch-window): Add new optional argument, call vc-file-clearprops when true. (vc-resynch-buffer): Add new optional argument, pass it down. (vc-resynch-buffers-in-directory): Likewise. Improve support for special markup in the VC commit message. * vc-mtn.el (vc-mtn-checkin): Support Author: and Date: markup. * vc-hg.el (vc-hg-checkin): Add support for Date:. * vc-git.el (vc-git-checkin): * vc-bzr.el (vc-bzr-checkin): Likewise. Add support for vc-log-incoming, improve vc-log-outgoing for Git. * vc-git.el (vc-git-log-view-mode): Fix font lock for incoming/outgoing logs. (vc-git-log-outgoing, vc-git-log-incoming): New functions. * vc-git.el (vc-git-log-outgoing): Use the same format as the short log. (vc-git-log-incoming): Likewise. Run "git fetch" before the log command Add bindings for vc-log-incoming and vc-log-outgoing. * vc-hooks.el (vc-prefix-map): Add bindings for vc-log-incoming and vc-log-outgoing. * vc-dir.el (vc-dir-menu-map): Add menu bindings for vc-log-incoming and vc-log-outgoing. Improve state updating for VC tag commands. * vc.el (vc-create-tag, vc-retrieve-tag): Call vc-resynch-buffer to update the state of all buffers in the directory. * vc-dir.el (vc-dir): Don't pop-up-windows. (Bug#6204) * vc.el (vc-checkin, vc-modify-change-comment): Adjust to new vc-start/finish-logentry. (vc-find-conflicted-file): New command. (vc-transfer-file): Adjust to new vc-checkin. (vc-next-action): Improve scoping. * vc-git.el (vc-git-checkin): Use log-edit-extract-headers. (vc-git-commits-coding-system): Rename from git-commits-coding-system. * vc-dispatcher.el (vc-log-edit): Shorten names for log-edit-show-files. * vc-bzr.el (vc-bzr-checkin): Use log-edit-extract-headers. (vc-bzr-conflicted-files): New function. * log-edit.el (log-edit-summary, log-edit-header) (log-edit-unknown-header): New faces. (log-edit-headers-alist): New var. (log-edit-header-contents-regexp): New const. (log-edit-match-to-eoh): New function. (log-edit-font-lock-keywords): Use them. (log-edit): Insert a "Summary:" header as default. (log-edit-mode): Mark font-lock rules as case-insensitive. (log-edit-done): Cleanup headers. (log-edit-extract-headers): New function to replace it. * vc-dispatcher.el (vc-finish-logentry): Don't mess so badly with the windows/frames. * vc-bzr.el (vc-bzr-shelve-apply): Don't use *vc-bzr-shelve*. * vc-dir.el (vc-dir-kill-line): New command. (vc-dir-mode-map): Bind it to C-k. (vc-dir-headers): Abbreviate the working dir. * vc-git.el (vc-git-revision-table): Include remote branches. New VC methods: vc-log-incoming and vc-log-outgoing. * vc.el (vc-print-log-setup-buttons, vc-log-internal-common) (vc-incoming-outgoing-internal, vc-log-incoming, vc-log-outgoing): New functions. (vc-print-log-internal): Just call vc-log-internal-common. (vc-log-view-type): New permanent local variable. * vc-hooks.el (vc-menu-map): Bind vc-log-incoming and vc-log-outgoing. * vc-bzr.el (vc-bzr-log-view-mode): Use vc-log-view-type instead of the dynamic bound vc-short-log. (vc-bzr-log-incoming, vc-bzr-log-outgoing): New functions. * vc-git.el (vc-git-log-outgoing): New function. (vc-git-log-view-mode): Use vc-log-view-type instead of the dynamic bound vc-short-log. * vc-hg.el (vc-hg-log-view-mode): Use vc-log-view-type instead of the dynamic bound vc-short-log. Highlight the tag. (vc-hg-log-incoming, vc-hg-log-outgoing): New functions. (vc-hg-outgoing, vc-hg-incoming, vc-hg-outgoing-mode): (vc-hg-incoming-mode): Remove. (vc-hg-extra-menu-map): Do not bind vc-hg-incoming and vc-hg-outgoing. Fix default-directory for vc-root-diff. * vc.el (vc-root-diff): Bind default-directory to the root directory for the diff command. * vc-hg.el (vc-hg-push, vc-hg-pull): Use `apply' when calling `vc-hg-command' with a list of flags. * vc-bzr.el (vc-bzr-log-edit-mode): Add --fixes support to log-edit-before-checkin-process. * vc.el (vc-modify-change-comment): Pass MODE to vc-start-logentry. * vc-bzr.el, vc-hg.el (log-edit-mode): Declare. * vc-dispatcher.el (vc-start-logentry): Doc fix. (log-view-process-buffer, log-edit-extra-flags): Declare. Add special markup processing for commit logs. * log-edit.el (log-edit): Add new argument MODE. Use that mode when non-nil instead of the log-view-mode. * vc.el (vc-default-log-edit-mode): New function. * vc-dispatcher.el (vc-log-edit): Add a mode argument, pass it to log-edit. Support for shelving snapshots and for showing shelves. * vc-bzr.el (vc-bzr-shelve-show, vc-bzr-shelve-show-at-point) (vc-bzr-shelve-apply-and-keep-at-point, vc-bzr-shelve-snapshot): New functions. (vc-bzr-shelve-map, vc-bzr-shelve-menu-map) (vc-bzr-extra-menu-map): Map them.

/* XPM */
static char * stock_lock_xpm[] = {
"24 24 200 2",
"  	c None",
". 	c #000000",
"+ 	c #212121",
"@ 	c #9E9E9E",
"# 	c #E6E6E6",
"$ 	c #E7E7E7",
"% 	c #C8C8C8",
"& 	c #A0A0A0",
"* 	c #131313",
"= 	c #5F5F5F",
"- 	c #EDEDED",
"; 	c #D6D6D6",
"> 	c #D5D5D5",
", 	c #DDDDDD",
"' 	c #D8D8D8",
") 	c #A1A1A1",
"! 	c #3C3C3C",
"~ 	c #353535",
"{ 	c #EFEFEF",
"] 	c #CFCFCF",
"^ 	c #4C4C4C",
"/ 	c #141414",
"( 	c #6A6A6A",
"_ 	c #D0D0D0",
": 	c #B2B2B2",
"< 	c #454545",
"[ 	c #E2E2E2",
"} 	c #292929",
"| 	c #0F0F0F",
"1 	c #949494",
"2 	c #E9E9E9",
"3 	c #C3C3C3",
"4 	c #1C1C1C",
"5 	c #E1E1E1",
"6 	c #272727",
"7 	c #DEDEDE",
"8 	c #B6B6B6",
"9 	c #B7B6B6",
"0 	c #150902",
"a 	c #2E2419",
"b 	c #251D15",
"c 	c #616160",
"d 	c #5E5A56",
"e 	c #29211A",
"f 	c #15100C",
"g 	c #2F251B",
"h 	c #1D1710",
"i 	c #4A392B",
"j 	c #656361",
"k 	c #565352",
"l 	c #392B1D",
"m 	c #322110",
"n 	c #0C0500",
"o 	c #EFDBBF",
"p 	c #EDD9C0",
"q 	c #E9D5BE",
"r 	c #E7D2B9",
"s 	c #E5D0B3",
"t 	c #DCC09D",
"u 	c #D9BE99",
"v 	c #DABE99",
"w 	c #D7BB95",
"x 	c #D5B68E",
"y 	c #D2AF85",
"z 	c #CFA77C",
"A 	c #9A5E1B",
"B 	c #F0DABF",
"C 	c #E4C6A0",
"D 	c #D6AF80",
"E 	c #D3AC7B",
"F 	c #D0A570",
"G 	c #C99F68",
"H 	c #C69B64",
"I 	c #C69C64",
"J 	c #C89D66",
"K 	c #C79C65",
"L 	c #C39860",
"M 	c #C09256",
"N 	c #BC8645",
"O 	c #B67C36",
"P 	c #985E1A",
"Q 	c #EED8BC",
"R 	c #E3C39C",
"S 	c #D3AA7B",
"T 	c #CFA670",
"U 	c #CA9F68",
"V 	c #C89E66",
"W 	c #C89F68",
"X 	c #C49961",
"Y 	c #C09358",
"Z 	c #BC8746",
"` 	c #B77D39",
" .	c #EED8BB",
"..	c #E2C29B",
"+.	c #D6AE7F",
"@.	c #CA9E6D",
"#.	c #C69861",
"$.	c #BF925A",
"%.	c #BB8E56",
"&.	c #BD8E56",
"*.	c #BD9058",
"=.	c #BC8F58",
"-.	c #B9884E",
";.	c #B48145",
">.	c #BA8442",
",.	c #B47834",
"'.	c #975C1A",
").	c #EFDABE",
"!.	c #E4C49D",
"~.	c #D7B080",
"{.	c #DAB685",
"].	c #D4B07C",
"^.	c #D0A971",
"/.	c #CEA46B",
"(.	c #CDA46D",
"_.	c #CCA66D",
":.	c #CCA46B",
"<.	c #CA9F63",
"[.	c #C79858",
"}.	c #B9813F",
"|.	c #B37834",
"1.	c #975D1A",
"2.	c #EFD8BB",
"3.	c #E0C199",
"4.	c #D3AA7A",
"5.	c #C89B67",
"6.	c #C3965F",
"7.	c #BC8E56",
"8.	c #BA8B52",
"9.	c #BA8C54",
"0.	c #BB8D55",
"a.	c #BA8C55",
"b.	c #B6864C",
"c.	c #B47F43",
"d.	c #BA833F",
"e.	c #B37934",
"f.	c #9B601E",
"g.	c #E3C29C",
"h.	c #D9B484",
"i.	c #D4AE77",
"j.	c #CFA770",
"k.	c #CBA36B",
"l.	c #CCA46C",
"m.	c #CA9D61",
"n.	c #C69856",
"o.	c #BA813E",
"p.	c #B27733",
"q.	c #A36B2F",
"r.	c #EDD6B8",
"s.	c #E1BD94",
"t.	c #D1A874",
"u.	c #B7874E",
"v.	c #B48349",
"w.	c #B5844C",
"x.	c #B5884D",
"y.	c #B48146",
"z.	c #B27A3C",
"A.	c #B67D3A",
"B.	c #B07530",
"C.	c #A67137",
"D.	c #EED8BA",
"E.	c #E0C099",
"F.	c #D8B37F",
"G.	c #D2AD76",
"H.	c #CEA66F",
"I.	c #CCA46D",
"J.	c #CCA56D",
"K.	c #C99D61",
"L.	c #C69858",
"M.	c #B9803D",
"N.	c #B67D38",
"O.	c #AB783F",
"P.	c #EED5B7",
"Q.	c #DFC096",
"R.	c #D2A776",
"S.	c #CEA46E",
"T.	c #C89D65",
"U.	c #C49960",
"V.	c #C1955C",
"W.	c #C2955C",
"X.	c #C2965C",
"Y.	c #C09155",
"Z.	c #BC8A4B",
"`.	c #BE8A4C",
" +	c #A9773C",
".+	c #AC8C65",
"++	c #CFA772",
"@+	c #C49256",
"#+	c #C08D51",
"$+	c #BA8849",
"%+	c #B78342",
"&+	c #B48240",
"*+	c #B68241",
"=+	c #B88544",
"-+	c #BB8949",
";+	c #BC8748",
">+	c #BA874A",
",+	c #B98548",
"'+	c #B27B3B",
")+	c #6D4215",
"                                                ",
"                                                ",
"                    . . . . .                   ",
"                . + @ # $ % & *                 ",
"              . = - # ; > , ' ) ! .             ",
"              ~ { ] ^ . . / ( _ : <             ",
"            . [ ' } .       | ( % 1 .           ",
"            * 2 3 .           4 5 @ .           ",
"            6 7 8 .           . $ 9 .           ",
"        0 a b c d e f g b h b i j k l m n       ",
"        . o p q r s t u u v u w x y z A .       ",
"        . B C D E F G H I J K L M N O P .       ",
"        . Q R D S T U I V W V X Y Z ` A .       ",
"        .  ...+.@.#.$.%.&.*.=.-.;.>.,.'..       ",
"        . ).!.~.{.].^./.(._.:.<.[.}.|.1..       ",
"        . 2.3.4.5.6.7.8.9.0.a.b.c.d.e.f..       ",
"        . Q g.+.h.i.j.:.k.l.k.m.n.o.p.q..       ",
"        . r.s.t.#.*.u.v.w.x.b.y.z.A.B.C..       ",
"        . D.E.S F.G.H.:.I.J.l.K.L.M.N.O..       ",
"        . P.Q.R.S.T.U.V.W.X.X.Y.Z.>.`. +.       ",
"        . .+++@+#+$+%+&+*+=+-+;+>+,+'+)+.       ",
"          . . . . . . . . . . . . . . .         ",
"                                                ",
"                                                "};