12 commits

Author	SHA1	Message	Date
Chong Yidong	a2b6e5d60b	Refresh Dired and VC-dir buffers after vc-pull and vc-merge. ... * 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.	2011-01-29 16:19:21 -05:00
Chong Yidong	9bfe578343	Convert vc-bzr-async-command into a general vc-do-async-command facility. ... * 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.	2011-01-28 18:10:55 -05:00
Deniz Dogan	27bbeb296e	* vc/vc-bzr.el (vc-bzr-diff): Don't pass --diff-options unless ... there are some diff switches.	2011-01-27 18:51:06 +01:00
Glenn Morris	73b0cd5003	Convert consecutive FSF copyright years to ranges.	2011-01-24 20:08:28 -08:00
Glenn Morris	362b9d483c	Merge from emacs-23 branch.	2011-01-15 12:03:38 -08:00
Glenn Morris	b0a8e46b53	vc-bzr fix for bug #7792. ... * 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.	2011-01-05 21:14:54 -08:00
Glenn Morris	2b40459776	Misc vc-bzr.el. ... * 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.	2010-12-10 18:54:07 -08:00
Chong Yidong	3d92f44ea0	Always issue a full prompt in vc-merge-branch operation. ... * 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.	2010-11-23 10:13:43 -05:00
Chong Yidong	2c3160c54e	Initial support for unified DVCS pull and merge. ... * 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.	2010-11-22 20:15:08 -05:00
Chong Yidong	bd78fa1d54	Add "Package:" file headers to denote built-in packages.	2010-08-29 12:17:13 -04:00
Juri Linkov	9766adfbca	* lisp/finder.el (finder-known-keywords): Add keyword "vc" ... 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".	2010-06-11 22:09:57 +03:00
Juri Linkov	56b2854f30	Move version control related files to the "vc" subdirectory. ... * 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.	2010-06-11 21:51:00 +03:00

Renamed from lisp/vc-bzr.el (Browse further)