summaryrefslogtreecommitdiff
path: root/lisp/vc/vc-bzr.el
Commit message (Collapse)AuthorAgeFilesLines
...
* Add another vc-bzr testGlenn Morris2012-04-101-1/+5
| | | | | | * lisp/vc/vc-bzr.el (vc-bzr-status): Avoid condition-case-unless-debug. * test/automated/vc-bzr.el (vc-bzr-test-faulty-bzr-autoloads): New test.
* * lisp/vc/vc-bzr.el (vc-bzr-status): Handle all errors, not just file-errors.Glenn Morris2012-04-101-42/+45
| | | | Ref: http://lists.gnu.org/archive/html/help-gnu-emacs/2012-04/msg00145.html
* Use internal sha1 in vc-bzrGlenn Morris2012-04-101-24/+7
| | | | | | | | | | * lisp/vc/vc-bzr.el (vc-bzr-sha1-program, sha1-program): Remove. These were only added in 24.1 when sha1.el was removed in favor of an internal sha1 implementation. Frankly, I can't see why the internal sha1 wasn't immediately used here. (vc-bzr-sha1): Use internal sha1. (Comments): Remove reference to abandoned upstream bug report that contains no extra information.
* Tweak previous vz-bzr change yet againGlenn Morris2012-03-221-1/+2
|
* Tweak previous vc-bzr changeGlenn Morris2012-03-221-2/+1
|
* Use bzr status --no-classify when supported (bug#6724)Glenn Morris2012-03-221-2/+24
| | | | | * lisp/vc/vc-bzr.el (vc-bzr-status-switches): New option. (vc-bzr-command): If running "status", pass vc-bzr-status-switches.
* Standardize possessive apostrophe usage in manuals, docs, and commentsGlenn Morris2012-02-281-2/+2
| | | | Ref: http://lists.gnu.org/archive/html/emacs-devel/2012-02/msg00649.html
* Add custom groups for VC backends, for consistency with vc-bzr.Chong Yidong2012-02-251-1/+1
| | | | | | | | | | | | | | | Callers changed. * vc/vc-arch.el (vc-arch): * vc/vc-cvs.el (vc-cvs): * vc/vc-git.el (vc-git): * vc/vc-hg.el (vc-hg): * vc/vc-mtn.el (vc-mtn): * vc/vc-rcs.el (vc-rcs): * vc/vc-sccs.el (vc-sccs): * vc/vc-svn.el (vc-svn): New customization group. Fixes: debbugs:10871
* Add 2012 to FSF copyright years for Emacs filesGlenn Morris2012-01-051-1/+1
|
* * vc-bzr.el (vc-bzr-rename-file): Don't pass ~ to Bzr in filename arg.Chong Yidong2011-12-211-1/+4
|
* Give some autoloaded things doc-strings.Glenn Morris2011-11-241-1/+2
| | | | | | | | | | | * lisp/lpr.el (lpr-windows-system, lpr-lp-system): * lisp/mail/binhex.el (binhex-begin-line): * lisp/progmodes/grep.el (grep-history, grep-find-history): * lisp/textmodes/flyspell.el: * lisp/vc/pcvs-defs.el (cvs-global-menu): * lisp/vc/vc-bzr.el (vc-bzr-admin-checkout-format-file): * lisp/vc/vc-mtn.el (vc-mtn-admin-dir, vc-mtn-admin-format): * lisp/vc/vc-cvs.el (vc-cvs-registered): Give them basic doc-strings.
* Fix bug#9935Juanma Barranquero2011-11-021-2/+2
| | | | | * lisp/vc/vc-bzr.el: Accept status with more than 9 shelves. Reported by Colin D Bennett <colin@gibibit.com>.
* * lisp/vc/vc-bzr.el (vc-bzr-after-dir-status): Ignore ignored files.Glenn Morris2011-10-191-2/+2
| | | | Fixes: debbugs:9726
* Capitalize non-function content words in menu item strings.Juri Linkov2011-09-181-5/+5
| | | | | | | | | | | | | | | | | | | * lisp/buff-menu.el (Buffer-menu-mode-map): * lisp/dired.el (dired-mode-map): * lisp/emacs-lisp/lisp-mode.el (emacs-lisp-mode-map) (lisp-interaction-mode-map): * lisp/emacs-lisp/package.el (package-menu-mode-map): * lisp/epa.el (epa-key-list-mode-map): * lisp/menu-bar.el (menu-bar-showhide-tool-bar-menu) (menu-bar-options-menu): * lisp/outline.el (outline-mode-menu-bar-map): * lisp/vc/vc-bzr.el (vc-bzr-shelve-menu-map, vc-bzr-extra-menu-map): * lisp/vc/vc-dir.el (vc-dir-menu-map): * lisp/vc/vc-git.el (vc-git-stash-menu-map, vc-git-extra-menu-map): Capitalize non-function content words in menu item strings. * lisp/dired.el (dired-mode-map): Add menu item for `image-dired-dired-toggle-marked-thumbs'.
* * lisp/vc/vc-bzr.el (vc-bzr-revision-keywords): Remove svn, it's onlyStefan Monnier2011-07-081-1/+1
| | | | provided by a particular plugin.
* * lisp/vc/vc-bzr.el (vc-bzr-revision-keywords): Update.Stefan Monnier2011-07-011-2/+16
| | | | (vc-bzr-revision-completion-table): Add support for annotate and date.
* Implement primitive `sha1' and remove sha1.elLeo Liu2011-05-241-3/+9
|
* lisp/vc/vc-bzr.el (vc-bzr-state): Handle bzr 2.3.0 (follow-up to bug#8170).Juanma Barranquero2011-03-121-2/+7
|
* * lisp/vc/vc-bzr.el (vc-bzr-after-dir-status): Handle bzr 2.3.0. (Bug#8170)Glenn Morris2011-03-041-32/+34
|
* vc-bzr fix for bug#8025.Glenn Morris2011-03-021-5/+18
| | | | | * lisp/vc/vc-bzr.el (vc-bzr-state-heuristic): Handle dirstate entries with no parents.
* Improvements to vc-bzr conffile handling and pull/merge support.Chong Yidong2011-02-191-26/+53
| | | | | | | | | | | | | | | | | * vc/vc-bzr.el (vc-bzr--branch-conf): Function deleted. (vc-bzr-branch-conf): New function, similar to vc-bzr--branch-conf but returning an alist. Ignore comments in bzr conffile. (vc-bzr-pull, vc-bzr-merge-branch): Use vc-bzr-branch-conf. (vc-bzr-error-regex-alist): New var. (vc-bzr-merge-branch): Use it to highlight the pull/merge buffer. * progmodes/compile.el (compilation--flush-directory-cache): Handle the case where cdr of compilation--flush-directory-cache points to no buffer, which can occur if we previously switched to compilation-mode in a pregenerated buffer. * vc/vc-dispatcher.el (vc-do-async-command): Bind inhibit-read-only to t.
* Add Log View toggle and log format customization for Git and Hg.Chong Yidong2011-02-131-0/+1
| | | | | | | | | | | | | | | | | | | | | * lisp/vc/vc-git.el (vc-git-root-log-format): New option for customizing log format. (vc-git-print-log, vc-git-log-outgoing, vc-git-log-incoming) (vc-git-log-view-mode): Use it. (vc-git-expanded-log-entry): New function. (vc-git-log-view-mode): Use it. Truncate lines in root log. * lisp/vc/vc-hg.el (vc-hg-root-log-template): New option for customizing log format. (vc-hg-print-log): Use it. (vc-hg-expanded-log-entry): New function. (vc-hg-log-view-mode): Use vc-hg-root-log-template and vc-hg-expanded-log-entry. Truncate lines in root log. * lisp/vc/vc-bzr.el (vc-bzr-log-view-mode): Truncate lines in root log. * lisp/vc/log-view.el (log-view-mode-menu): Add log-view-toggle-entry-display.
* Bind RET in Log View mode to a command that toggles a more detailed display.Chong Yidong2011-02-131-0/+15
| | | | | | | | | | | | | | | | | | | * lisp/vc/log-view.el: New command log-view-toggle-entry-display for toggling log entries between concise and detailed forms. (log-view-toggle-entry-display): New command. (log-view-mode-map): Bind RET to it. (log-view-expanded-log-entry-function): New variable. (log-view-current-entry, log-view-inside-comment-p) (log-view-current-tag): New functions. (log-view-toggle-mark-entry): Use log-view-current-entry and log-view-end-of-defun instead of searching directly with log-view-message-re. (log-view-end-of-defun): Likewise. Add optional ARG for compatibility with end-of-defun. (log-view-end-of-defun): Ignore comments and VC buttons. * lisp/vc/vc-bzr.el (vc-bzr-expanded-log-entry): New function. (vc-bzr-log-view-mode): Use log-view-expanded-log-entry-function.
* Refresh Dired and VC-dir buffers after vc-pull and vc-merge.Chong Yidong2011-01-291-6/+9
| | | | | | | | | | | | | | | | * vc/vc-dispatcher.el (vc-set-async-update): New function for updating Dired or VC-dir buffers after async command completes. * vc/vc-bzr.el (vc-bzr-async-command): Return the process buffer. (vc-bzr-pull, vc-bzr-merge-branch): Use vc-set-async-update. * vc/vc-git.el (vc-git-merge-branch): Add FETCH_HEAD to branch completions if it exists. Use vc-set-async-update. (vc-git-pull): Use vc-set-async-update. * vc/vc-hg.el (vc-hg-pull): Fix default-contents arg to read-shell-command. Use vc-set-async-update. (vc-hg-merge-branch): Use vc-set-async-update.
* Convert vc-bzr-async-command into a general vc-do-async-command facility.Chong Yidong2011-01-281-29/+18
| | | | | | | | | * vc/vc-dispatcher.el (vc-do-async-command): New function. * vc/vc-bzr.el (vc-bzr-async-command): Convert into a wrapper for vc-do-async-command. * vc/vc-bzr.el (vc-bzr-pull, vc-bzr-merge-branch): Callers changed.
* * vc/vc-bzr.el (vc-bzr-diff): Don't pass --diff-options unlessDeniz Dogan2011-01-271-12/+16
| | | | there are some diff switches.
* Convert consecutive FSF copyright years to ranges.Glenn Morris2011-01-241-1/+1
|
* Merge from emacs-23 branch.Glenn Morris2011-01-151-1/+1
|
* vc-bzr fix for bug #7792.Glenn Morris2011-01-051-5/+8
| | | | | | * lisp/vc/vc-bzr.el (vc-bzr-annotate-command, vc-bzr-annotate-time) (vc-bzr-annotate-extract-revision-at-line): Handle authors with embedded spaces.
* Misc vc-bzr.el.Glenn Morris2010-12-101-23/+34
| | | | | | | | | | | | * lisp/vc/vc-bzr.el (vc-bzr-state-heuristic): Also check that the executable state of the file matches. (Bug#7544) (vc-bzr-register, vc-bzr-checkin) (vc-bzr-annotate-extract-revision-at-line): Doc fixes. (vc-directory-exclusion-list): Remove unnecessary eval-after-load. Comment changes: Remove outdated comments about defunct upstream. Set maintainer to FSF.
* Always issue a full prompt in vc-merge-branch operation.Chong Yidong2010-11-231-26/+33
| | | | | | | | | * vc/vc.el (vc-merge): Remove optional arg PROMPT. Always prompt for a merge location. * vc/vc-bzr.el (vc-bzr-pull): Remove unused var. (vc-bzr-merge-branch): Always prompt. (vc-bzr-async-command): Use the full branch filename.
* Initial support for unified DVCS pull and merge.Chong Yidong2010-11-221-0/+93
| | | | | | | | | | | | | * lisp/vc/vc-bzr.el (vc-bzr-admin-branchconf, vc-bzr-history): New vars. (vc-bzr--branch-conf, vc-bzr-async-command, vc-bzr-pull) (vc-bzr-merge-branch): New functions, implementing merge-branch and pull operations. * lisp/vc/vc.el (vc-merge): Use vc-BACKEND-merge-branch if available. Accept optional prefix arg meaning to prompt for a command. (vc-update): Use vc-BACKEND-pull if available. Accept optional prefix arg meaning to prompt for a command. (vc-pull): Alias for vc-update.
* Add "Package:" file headers to denote built-in packages.Chong Yidong2010-08-291-1/+2
|
* * lisp/finder.el (finder-known-keywords): Add keyword "vc"Juri Linkov2010-06-111-1/+1
| | | | | | | | | for version control. * add-log.el, cvs-status.el, diff.el, diff-mode.el, ediff.el, * emerge.el, log-edit.el, log-view.el, pcvs.el, smerge-mode.el, * vc-annotate.el, vc-bzr.el, vc-dir.el, vc-dispatcher.el, vc-git.el, * vc-hg.el, vc-mtn.el, vc.el: Add keyword "vc".
* Move version control related files to the "vc" subdirectory.Juri Linkov2010-06-111-0/+1057
* 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.
generated by cgit v1.2.3 (git 2.39.1) at 2025-04-16 18:13:37 +0000