summaryrefslogtreecommitdiff
path: root/lisp/vc-bzr.el
Commit message (Collapse)AuthorAgeFilesLines
* Move version control related files to the "vc" subdirectory.Juri Linkov2010-06-111-1057/+0
| | | | | | | | | | | | * add-log.el, cvs-status.el, diff.el, diff-mode.el, ediff-diff.el, * ediff.el, ediff-help.el, ediff-hook.el, ediff-init.el, * ediff-merg.el, ediff-mult.el, ediff-ptch.el, ediff-util.el, * ediff-vers.el, ediff-wind.el, emerge.el, log-edit.el, log-view.el, * pcvs-defs.el, pcvs.el, pcvs-info.el, pcvs-parse.el, pcvs-util.el, * smerge-mode.el, vc-annotate.el, vc-arch.el, vc-bzr.el, vc-cvs.el, * vc-dav.el, vc-dir.el, vc-dispatcher.el, vc.el, vc-git.el, * vc-hg.el, vc-hooks.el, vc-mtn.el, vc-rcs.el, vc-sccs.el, vc-svn.el: Move files to the "vc" subdirectory.
* Improve support for special markup in the VC commit message.Dan Nicolaescu2010-06-081-0/+1
| | | | | | | * lisp/vc-mtn.el (vc-mtn-checkin): Add support for Author: and Date: markup. * lisp/vc-hg.el (vc-hg-checkin): Add support for Date:. * lisp/vc-git.el (vc-git-checkin): * lisp/vc-bzr.el (vc-bzr-checkin): Likewise.
* Merge from emacs-23Stefan Monnier2010-05-311-3/+5
|\
| * * lisp/vc-bzr.el (vc-bzr-revision-completion-table): ApplyStefan Monnier2010-05-311-3/+5
| | | | | | | | `file-directory-p' to the filename part rather than to the whole text.
* | vc-bzr.el (vc-bzr-checkin): Undo spurious `async' arg change.Stefan Monnier2010-04-201-1/+1
| |
* | Make the log-edit comments use RFC822 format throughout.Stefan Monnier2010-04-201-19/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-hg.el (vc-hg-log-edit-mode): Remove. (vc-hg-checkin): Remove extra arg. Use log-edit-extract-headers. * vc-git.el (vc-git-log-edit-mode): Remove. (vc-git-checkin): Remove extra arg. 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-start-logentry): Remove argument `extra'. (vc-finish-logentry): Remove extra args. * vc-bzr.el (vc-bzr-log-edit-mode): Remove. (vc-bzr-checkin): Remove extra arg. Use log-edit-extract-headers. (vc-bzr-conflicted-files): New function. * log-edit.el (log-edit-extra-flags) (log-edit-before-checkin-process): Remove. (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-view-process-buffer): Remove. (log-edit-extract-headers): New function to replace it.
* | * vc-bzr: Use standard *vc* and *vc-diff* buffers.Stefan Monnier2010-04-191-6/+6
| | | | | | | | | | | | (vc-bzr-shelve-show, vc-bzr-shelve-apply) (vc-bzr-shelve-apply-and-keep, vc-bzr-shelve-snapshot): Don't use *vc-bzr-shelve*.
* | Add new VC methods: vc-log-incoming and vc-log-outgoing.Dan Nicolaescu2010-04-061-3/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * vc.el (vc-print-log-setup-buttons): New function split out from vc-print-log-internal. (vc-log-internal-common): New function, a parametrized version of vc-print-log-internal. (vc-print-log-internal): Just call vc-log-internal-common with the right arguments. (vc-incoming-outgoing-internal): (vc-log-incoming, vc-log-outgoing): New functions. (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.
* | * vc-bzr.el (vc-bzr-log-edit-mode): Add --fixes support toGlenn Morris2010-03-231-3/+5
| | | | | | | | log-edit-before-checkin-process.
* | * vc-bzr.el, vc-hg.el (log-edit-mode): Declare.Glenn Morris2010-03-231-0/+1
| |
* | Add special markup processing for commit logs.Dan Nicolaescu2010-03-191-2/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * log-edit.el (log-edit-extra-flags): New variable. (log-edit): Add new argument MODE. Use that mode when non-nil instead of the log-view-mode. (log-view-process-buffer): New function. * vc.el: Document that the checkin method takes optional arguments. Document new backend specific method: log-view-mode. (vc-default-log-edit-mode): New function. (vc-checkin): Use a backend specific log-view-mode. Pass extra arguments to the checkin method. (vc-modify-change-comment): Pass a dummy extra argument. * vc-dispatcher.el (vc-log-edit): Add a mode argument, pass it to log-edit. (vc-start-logentry): Add a mode argument, pass it to vc-log-edit. (vc-finish-logentry): Process the log buffer before passing it down. Pass log-edit-extra-flags. * vc-bzr.el (vc-bzr-checkin): Pass extra arguments to the commit command. (log-edit-extra-flags, log-edit-before-checkin-process): New declarations. * vc-hg.el (vc-hg-checkin): Pass extra arguments to the commit command. (log-edit-extra-flags, log-edit-before-checkin-process): New declarations. (vc-hg-log-edit-mode): New derived mode. * vc-arch.el (vc-arch-checkin): * vc-cvs.el (vc-cvs-checkin): * vc-git.el (vc-git-checkin): * vc-mtn.el (vc-mtn-checkin): * vc-rcs.el (vc-rcs-checkin): * vc-sccs.el (vc-sccs-checkin): * vc-svn.el (vc-svn-checkin): Add an optional ignored argument.
* | Add support for shelving snapshots and for showing shelves.Dan Nicolaescu2010-03-111-18/+47
|/ | | | | | | | * 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.
* 2010-02-17 Mark A. Hershberger <mah@everybody.org>Mark A. Hershberger2010-02-171-1/+1
| | | | | | | * vc-bzr.el: fix typo in Known Bugs section. * isearch.el (isearch-update-post-hook): New hook (isearch-update): Use the new hook.
* * vc-bzr.el (vc-bzr-dir-extra-headers): Disable the pending merges header.Dan Nicolaescu2010-02-051-2/+6
|
* (vc-bzr-dir-extra-headers): Add a header when aDan Nicolaescu2010-01-311-18/+32
| | | | pending merge is detected.
* (vc-bzr-after-dir-status): Match another renaming indicator.Dan Nicolaescu2010-01-291-1/+2
|
* (vc-bzr-print-log): Use the more compact --line optionDan Nicolaescu2010-01-241-2/+2
| | | | | for the short log. (vc-bzr-log-view-mode): Adjust regexp for the above change.
* working version of vc-bzr-revision-tableMark A. Hershberger2010-01-251-0/+13
|
* Fix comment for bug#5345.Juanma Barranquero2010-01-131-2/+3
|
* Add 2010 to copyright years.Glenn Morris2010-01-131-1/+1
|
* Fix bug#5345: password asked when visiting files on a lightweight checkout.Juanma Barranquero2010-01-091-0/+5
| | | | | * vc-bzr.el (vc-bzr-working-revision): On Windows and MS-DOS, accept URLs with a leading triple slash in the file: scheme.
* (vc-bzr-after-dir-status): Ignore pending merges.Dan Nicolaescu2010-01-061-1/+2
|
* (vc-bzr-working-revision): Fix looking for a revisionDan Nicolaescu2010-01-051-3/+13
| | | | in a lightweight checkout.
* (vc-bzr-diff): Obey vc-disable-async-diff.Dan Nicolaescu2010-01-041-1/+2
|
* (vc-bzr-shelve-map): Change binding for vc-bzr-shelve-apply-at-point.Dan Nicolaescu2010-01-031-7/+7
| | | | | | (vc-bzr-shelve-menu-map): (vc-bzr-dir-extra-headers): Improve menu and tooltip text. (vc-bzr-shelve-apply): Make prompt more explicit.
* (vc-bzr-log-view-mode): Also highlight the author.Dan Nicolaescu2010-01-031-1/+1
|
* (vc-bzr-state-heuristic): Make it work for lightweightDan Nicolaescu2010-01-031-6/+15
| | | | checkouts. (Bug#618)
* Make vc-dir work on subdirectories of the bzr root.Dan Nicolaescu2009-12-281-8/+18
| | | | | | | * vc-bzr.el (vc-bzr-after-dir-status): Add new argument. Return file names relative to it. (vc-bzr-dir-status, vc-bzr-dir-status-files): Pass the bzr root relative directory to vc-bzr-after-dir-status.
* (vc-bzr-log-view-mode): Fix short log regexp.Dan Nicolaescu2009-12-281-1/+1
|
* Fix short log parsing and fontification.Dan Nicolaescu2009-12-091-2/+2
| | | | | * vc-bzr.el (vc-bzr-log-view-mode): Match dot in revision number. Fix fontification for the [merge] label.
* * vc-bzr.el (vc-bzr-annotate-command): More elegant form for lastChong Yidong2009-12-071-2/+1
| | | | change. Suggested by David Kastrup.
* Support showing a single log entry from vc-annotate.Dan Nicolaescu2009-12-071-4/+9
| | | | | | | | | | | | | | | | | | | | * vc.el (print-log): Add a new argument: START-REVISION. (vc-print-log-internal): Add a new optional argument and pass it to the backend. (vc-print-log, vc-print-root-log): Adjust callers. * vc-annotate.el (vc-annotate-show-log-revision-at-line): If a buffer already displays the requested log entry, use it. Otherwise display only the log entry in question. * vc-svn.el (vc-svn-print-log): * vc-mtn.el (log-view-file-re): * vc-hg.el (vc-hg-state): * vc-git.el (vc-git-print-log): Add support for new argument START-REVISION. (vc-git-show-log-entry): Return t on success. * vc-bzr.el (vc-bzr-print-log): Add support new argument START-REVISION. (vc-bzr-show-log-entry): Return t on success. * vc-rcs.el (vc-rcs-print-log): * vc-sccs.el (vc-sccs-print-log): * vc-cvs.el (vc-cvs-print-log): Add new argument, ignore it.
* * vc-bzr.el (vc-bzr-annotate-command): Handle the case where theChong Yidong2009-12-061-1/+2
| | | | author field is too short.
* * vc-bzr.el (vc-bzr-annotate-command): Show author in annotation.Chong Yidong2009-12-061-6/+10
| | | | | | Handle empty author field (Bug#4144). Suggested by Óscar Fuentes. (vc-bzr-annotate-time, vc-bzr-annotate-extract-revision-at-line): Update annotation regexp.
* (vc-bzr-dir-extra-headers): Fix typo.Dan Nicolaescu2009-12-031-1/+1
|
* Add support for bzr shelve/unshelve.Dan Nicolaescu2009-12-031-0/+117
| | | | | | | | | | * vc-bzr.el (vc-bzr-shelve-map, vc-bzr-shelve-menu-map) (vc-bzr-extra-menu-map): New variables. (vc-bzr-extra-menu, vc-bzr-extra-status-menu, vc-bzr-shelve) (vc-bzr-shelve-apply, vc-bzr-shelve-list) (vc-bzr-shelve-get-at-point, vc-bzr-shelve-delete-at-point) (vc-bzr-shelve-apply-at-point, vc-bzr-shelve-menu): New functions. (vc-bzr-dir-extra-headers): Display shelves.
* (vc-bzr-print-log): Deal with nil arguments better.Dan Nicolaescu2009-12-031-5/+6
|
* (vc-bzr-annotate-command): Make operation asynchronous.Stefan Monnier2009-11-261-16/+23
|
* * vc.el (vc-log-show-limit): New variable.Dan Nicolaescu2009-11-151-2/+3
| | | | | | | | | | | | | | | | | | | (vc-print-log, vc-print-root-log): Add new argument LIMIT. Set it when using a prefix argument. (vc-print-log-internal): Add new argument LIMIT. * vc-svn.el (vc-svn-print-log): * vc-mtn.el (vc-mtn-print-log): * vc-hg.el (vc-hg-print-log): * vc-bzr.el (vc-bzr-print-log): Add new optional argument LIMIT, pass it to the log command when set. Make the BUFFER argument non-optional. * vc-sccs.el (vc-sccs-print-log): * vc-rcs.el (vc-rcs-print-log): * vc-git.el (vc-git-print-log): * vc-cvs.el (vc-cvs-print-log): Add new optional argument LIMIT, ignore it. Make the BUFFER argument non-optional
* (vc-bzr-revision-keywords): New var.Stefan Monnier2009-10-301-10/+20
| | | | | (vc-bzr-revision-completion-table): Use it to fix completion of "s:" to "submit:".
* * minibuffer.el (completion-table-with-terminator): Properly implementStefan Monnier2009-10-211-7/+3
| | | | | | | | | | | | | | | | boundaries, in case `terminator' appears in the suffix. (completion--embedded-envvar-table): Don't return boundaries if there's no valid completion. Simplify. (completion-file-name-table): New completion table extracted from completion--file-name-table. (completion--file-name-table): Use it. (read-file-name-predicate): Declare obsolete. (read-file-name): Use the pred arg i.s.o read-file-name-predicate. * vc-bzr.el (vc-bzr-revision-completion-table): Use the new completion-file-name-table, and use the `pred' argument. * files.el (locate-file-completion-table): Use the `pred' arg rather than read-file-name-predicate. (abbreviate-file-name): Use \` rather than ^ for BOS.
* * vc.el (top): print-log method now takes an optional SHORTLOGDan Nicolaescu2009-09-141-8/+18
| | | | | | | | | | | | | | | | | | | argument. Add a new method: root. * vc-hooks.el (vc-prefix-map, vc-menu-map): Add bindings for vc-print-root-log and vc-print-root-diff. * vc-bzr.el (vc-bzr-log-view-mode, vc-bzr-print-log): * vc-git.el (vc-git-print-log, vc-git-log-view-mode): * vc-hg.el (vc-hg-print-log, vc-hg-log-view-mode): Add support for short logs. * vc-cvs.el (vc-cvs-print-log): * vc-mtn.el (vc-mtn-print-log): * vc-rcs.el (vc-rcs-print-log): * vc-sccs.el (vc-sccs-print-log): * vc-svn.el (vc-svn-print-log): Add an optional argument shortlog that is ignored for now.
* * vc.el (vc-default-prettify-state-info): Remove function, unused.Dan Nicolaescu2009-08-261-8/+0
| | | | * vc-bzr.el (vc-bzr-prettify-state-info): Remove function, unused.
* * vc-bzr.el (vc-bzr-sha1, vc-bzr-revision-completion-table):Michael Albinus2009-08-251-2/+4
| | | | Let-bind `process-file-side-effects' with nil.
* (vc-bzr-print-log): Pass multiple arguments to bzr log.Dan Nicolaescu2009-07-271-11/+6
| | | | (vc-bzr-log-view-mode): Adjust log-view-file-re.
* (vc-bzr-state-heuristic): Fallback on vc-bzr-state in caseStefan Monnier2009-05-171-45/+50
| | | | of any kind of error (e.g. when "sha1sum" is not found).
* * vc-bzr.el (vc-bzr-log-view-mode): Fix last fix.Chong Yidong2009-04-071-1/+1
|
* * vc-bzr.el (vc-bzr-log-view-mode): Tweak log-view-message-re (Bug#2872).Chong Yidong2009-04-071-1/+1
|
* (vc-bzr-working-revision): Add support for lightweightDan Nicolaescu2009-03-231-9/+50
| | | | | | checkouts. (Bug#2157) (vc-bzr-after-dir-status): Ignore a warning for bzr status. (vc-bzr-dir-extra-headers): Add headers for lightweight checkouts.
* (vc-bzr-working-revision): Recognize a newer branchDan Nicolaescu2009-02-041-3/+5
| | | | format. Use when instead of if.
generated by cgit v1.2.3 (git 2.39.1) at 2025-04-21 04:48:13 +0000