summaryrefslogtreecommitdiff
path: root/lisp/vc-arch.el
Commit message (Collapse)AuthorAgeFilesLines
* (vc-arch-trim-make-sentinel): Use a closure.Stefan Monnier2008-07-221-5/+9
| | | | (vc-arch-trim-one-revlib): Delete temp directories as well.
* Remove assumption about what nil means as a first arument to vc-do-command.Eric S. Raymond2008-05-101-1/+1
|
* Switch to recommended form of GPLv3 permissions notice.Glenn Morris2008-05-061-6/+4
|
* Clean up vc*-revision-granularity and vc*-checkout-model.Eric S. Raymond2008-05-021-2/+5
|
* Fix some comments to remove references to vc-dired.Eric S. Raymond2008-05-021-1/+1
|
* Change 'needs-patch to 'needs-update.Eric S. Raymond2008-05-011-1/+1
|
* Merge from emacs--rel--22Miles Bader2008-01-221-3/+5
|\ | | | | | | Revision: emacs@sv.gnu.org/emacs--devo--0--patch-1006
| * * vc-arch.el (vc-arch-delete-rej-if-obsolete): Remove theDan Nicolaescu2008-01-151-3/+5
| | | | | | | | | | | | after-save-hook so that it is not called multiple times. * vc-svn.el (vc-svn-resolve-when-done): Likewise.
* | * smerge-mode.el (smerge-start-session): Rename from smerge-auto.Dan Nicolaescu2008-01-161-1/+1
| | | | | | | | | | | | | | | | * pcvs.el (cvs-revert-if-needed): * vc.el (vc-maybe-resolve-conflicts): Rename callers. * vc-svn.el (vc-svn-find-file-hook): * vc-arch.el (vc-arch-find-file-hook): Undo previous change.
* | * smerge-mode.el (smerge-auto): New function.Dan Nicolaescu2008-01-141-1/+1
| | | | | | | | | | | | | | | | * vc-svn.el (vc-svn-find-file-hook): * vc-arch.el (vc-arch-find-file-hook): * pcvs.el (cvs-revert-if-needed): * vc.el (vc-maybe-resolve-conflicts): Use it instead of vc-mode. (top-level): Add a Todo list.
* | Merge from emacs--rel--22Miles Bader2008-01-081-1/+1
|\ \ | |/ | | | | Revision: emacs@sv.gnu.org/emacs--devo--0--patch-987
| * Add 2008 to copyright years.Glenn Morris2008-01-071-1/+1
| |
| * * vc-arch.el (vc-arch-extra-menu-map): New var and fun.Dan Nicolaescu2007-09-181-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * vc-hooks.el (vc-menu-entry): New var. (vc-mode-line-map): Use it so that this menu also uses the extra-menu. (menu-bar-tools-menu): Add the VC menu here rather than in menu-bar.el. (vc-menu-map): Declare and initialize in one step. * menu-bar.el (vc-menu-map): Don't setup any more. Instead, just create the proper spot in the menu. * vc.el: Document new VC operation `extra-menu'. * vc-hooks.el (vc-default-extra-menu, vc-menu-map-filter): New function.
| * * vc-git.el: (vc-directory-exclusion-list, vc-handled-backends):Dan Nicolaescu2007-07-301-0/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove. (vc-git-revision-completion-table): Enable. * vc-hooks.el (vc-handled-backends): Add GIT and HG. * vc.el (vc-directory-exclusion-list): Add .git and .hg. * vc-hg.el (vc-hg-revision-completion-table): Re-enable. * diff-mode.el (diff-mode-menu): New entries. * diff-mode.el (diff-beginning-of-file-and-junk): New function. (diff-file-kill): Use it. (diff-beginning-of-hunk): Add arg `try-harder' using it. (diff-restrict-view, diff-find-source-location, diff-refine-hunk): Use it so they find the hunk even when we're in the file header. * vc.el: Add new VC operation `revision-completion-table'. (vc-default-revision-completion-table): New function. (vc-version-diff, vc-version-other-window): Use it to provide completion of revision names if the backend provides it. * vc-arch.el (vc-arch--version-completion-table) (vc-arch-revision-completion-table): New functions to provide completion of revision names. * vc-cvs.el: Require CL. (vc-cvs-revision-table, vc-cvs-revision-completion-table): New functions to provide completion of revision names. * eval.c (init_eval_once): Bump max_lisp_eval_depth to 400. * vc2-xtra.texi (Customizing VC): Add GIT and HG.
* | * mouse.el (mouse-popup-menubar): Fix typo.Dan Nicolaescu2008-01-041-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * emacs-lisp/bytecomp.el (byte-compile-from-buffer): Move one more form inside with-current-buffer. * progmodes/antlr-mode.el (provide): Move to the end of file. (require): Don't require font-lock and compile. (outline-level, imenu-use-markers, imenu-create-index-function): Move declarations to top level. (cond-emacs-xemacs-macfn): Declare for compiler. * vc-bzr.el (vc-bzr-root): * vc-arch.el (vc-arch-root): Only set a property if the file is managed by this backend. * vc-hg.el (vc-hg-state): Support the new status code for up-to-date.
* | * vc.el (vc-diff-internal): Make the *vc-diff* buffer read only.Dan Nicolaescu2007-11-101-1/+1
| | | | | | | | | | | | | | | | | | * vc-svn.el (vc-svn-print-log, vc-svn-diff): * vc-mcvs.el (vc-mcvs-print-log, vc-mcvs-annotate-command): * vc-cvs.el (vc-cvs-print-log, vc-cvs-diff) (vc-cvs-annotate-command): * vc-arch.el (vc-arch-diff): Remove test to check if start-process is bound, it always is.
* | (vc-arch-revision-completion-table): Make it work when theStefan Monnier2007-10-201-3/+3
| | | | | | | | arg is a list of files.
* | Terminology cleanup.Eric S. Raymond2007-10-101-7/+7
| |
* | (vc-arch-checkin): Fix typo.Stefan Monnier2007-09-071-1/+1
| |
* | (vc-arch-extra-menu-map): New var and fun.Stefan Monnier2007-08-211-6/+10
| | | | | | | | (vc-arch-find-file-not-found-hook): Remove, it's now the default.
* | Merge from emacs--rel--22Miles Bader2007-07-261-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | Patches applied: * emacs--rel--22 (patch 70-73) - Update from CVS 2007-07-25 Glenn Morris <rgm@gnu.org> * Relicense all FSF files to GPLv3 or later. Revision: emacs@sv.gnu.org/emacs--devo--0--patch-828
| * Switch license to GPLv3 or later.Glenn Morris2007-07-251-1/+1
| |
* | (vc-arch-diff): Fix last change.Stefan Monnier2007-07-201-24/+29
| |
* | Put the lower half (the back-end) of NewVC in place. This commitEric S. Raymond2007-07-181-18/+21
| | | | | | | | | | makes only the minimum changes needed to get the old vc.el logic working with the new back ends.
* | (vc-arch-complete): Remove.Stefan Monnier2007-07-101-11/+3
| | | | | | | | (vc-arch-revision-completion-table): Use complete-with-action.
* | (vc-arch-add-tagline): Do a slightly cleaner job.Stefan Monnier2007-06-261-1/+135
| | | | | | | | | | | | | | | | | | (vc-arch-complete, vc-arch--version-completion-table) (vc-arch-revision-completion-table): New functions to provide completion of revision names. (vc-arch-trim-find-least-useful-rev, vc-arch-trim-make-sentinel) (vc-arch-trim-one-revlib, vc-arch-trim-revlib): New functions to let the user trim the revlib.
* | (vc-arch-command): Remove bzr. It's a different program.Stefan Monnier2007-06-131-1/+1
| |
* | (vc-arch-command): Also try "baz" and "bzr".Sam Steingold2007-06-121-1/+1
|/
* (vc-with-current-file-buffer): New macro.Stefan Monnier2007-03-281-1/+14
| | | | (vc-arch-file-source-p): Use it to avoid infloop.
* (vc-arch-file-id): Move with-current-buffer inside the if.Richard M. Stallman2007-01-281-2/+2
|
* Add 2007 to copyright years.Glenn Morris2007-01-211-1/+1
|
* (vc-arch-find-version): New function.Stefan Monnier2006-12-271-0/+14
|
* Update years in copyright notice; nfc.Thien-Thi Nguyen2006-02-061-1/+1
|
* Update years in copyright notice; nfc.Thien-Thi Nguyen2005-08-061-2/+1
|
* Update FSF's address.Lute Kamstra2005-07-041-2/+2
|
* (vc-arch-checkin, vc-arch-diff): Follow error conventions.Juanma Barranquero2005-06-141-3/+3
|
* (vc-arch-diff): Don't diff asynchronously if vc-disable-async-diff isAndré Spiegel2005-01-091-1/+1
| | | | t.
* (vc-arch-workfile-version): Fix last change.Stefan Monnier2005-01-021-1/+1
|
* (vc-arch-workfile-version): Handle the empty-branch case.Stefan Monnier2005-01-021-2/+2
|
* (vc-arch-workfile-version): Don't burp if the patch-log directory is missing.Stefan Monnier2004-10-171-2/+2
|
* (vc-arch-root, vc-arch-registered): Use vc-find-root.Stefan Monnier2004-09-131-24/+8
|
* (vc-arch-state): Fix parsing for `names' method.Stefan Monnier2004-09-081-3/+7
|
* (vc-arch-workfile-version): Handle the special case before the first commit.Stefan Monnier2004-09-071-3/+6
|
* (vc-arch-mode-line-rewrite): Add :group 'vc.Kim F. Storm2004-06-291-1/+2
|
* (vc-arch-state): Don't assume the file exists.Stefan Monnier2004-06-011-1/+1
|
* (vc-arch-diff): Add optional `buffer' arg.Stefan Monnier2004-05-281-2/+2
|
* (vc-arch-root): Be a bit more careful.Stefan Monnier2004-04-121-14/+22
| | | | | | | (vc-arch-register): Save the buffer if we modified it. (vc-arch-delete-rej-if-obsolete): Save excursion. (vc-arch-find-file-hook): Use the simpler after-save-hook. (vc-arch-responsible-p, vc-arch-init-version): New functions.
* Require CL for `case'.Stefan Monnier2004-03-231-1/+1
|
* (vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.Stefan Monnier2004-03-231-21/+169
| | | | | | | | | | | | (vc-arch-diff3-rej-p): Be a bit more flexible in what we accept. (vc-arch-mode-line-string): Accept `added' state. (vc-arch-state): Use inode-sigs if available. (vc-arch-add-tagline): Rename from vc-arch-add-tag. Copy&delete existing id file if any. Fallback if uuidgen is absent. (vc-arch-tagline-re): New var. (vc-arch-file-source-p, vc-arch-file-id, vc-arch-tagging-method): New funs. (vc-arch-find-file-not-found-hook, vc-arch-register): New backend ops. (vc-arch-registered): Try our best guess using vc-arch-file-source-p.
* (vc-arch-workfile-version, vc-arch-mode-line-rewrite):Stefan Monnier2004-03-181-4/+21
| | | | | Take sealed revisions into account. (vc-arch-checkin): Extract a summary line from the message.