aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/vc.el
Commit message (Collapse)AuthorAgeFilesLines
...
* (vc-maybe-resolve-conflicts): Always call vc-resolve-conflictsStefan Monnier2002-10-071-90/+3
| | | | | in case some other package redefined it. (vc-resolve-conflicts): Make it into an alias for smerge-ediff.
* (vc-log-mode-map): Explicitly inherit from text-mode.Stefan Monnier2002-10-051-76/+13
| | | | | | | | (vc-maybe-resolve-conflicts): Don't check smerge-mode and smerge-ediff. (vc-print-log): Don't check log-view-mode. (vc-default-show-log-entry): Don't check log-view-goto-rev. (vc-log-mode): Remove. (vc-log-edit): Don't check log-edit.
* (vc-default-show-log-entry): Fix typo.Markus Rost2002-10-051-2/+2
|
* (vc-print-log): Unconditionally use `show-log-entry'.Stefan Monnier2002-10-031-7/+8
| | | | (vc-default-show-log-entry): New fun.
* (vc-workfile-unchanged-p, vc-default-workfile-unchanged-p): Moved toAndré Spiegel2002-09-041-16/+1
| | | | vc-hooks.el.
* (vc-next-action-on-file): Preserve find-file-literally.André Spiegel2002-07-221-6/+7
|
* Improve comment of vc-BACKEND-workfile-unchanged-p.André Spiegel2002-07-191-2/+3
|
* (vc-default-comment-history): Hard code *vc*.Stefan Monnier2002-07-161-46/+48
| | | | | | | | | | This is because print-log always prints there now. (vc-annotate-font-lock-keywords): New var. (vc-annotate-mode): Use it. Set truncate-lines as well. (vc-annotate-display-select): Unify the two error reports. (vc-annotate-offset): New var. (vc-annotate-lines): New fun extracted from vc-annotate-display. (vc-annotate-display): Use it, via font-lock.
* (vc-next-action-on-file): Ignore buffer-read-only while comparing toAndré Spiegel2002-07-161-5/+9
| | | | | | | file on disk. Fix the case when claiming the lock on a file that has unlocked changes. (vc-log-mode): Don't mention vc-toggle-read-only in the doc string.
* (vc-branch-part): Add autoload cookie. This function canGerd Moellmann2002-03-061-1/+2
| | | | | be called from vc-rcs-find-most-recent-rev when visiting a file checked into RCS in a CVS sandbox.
* (vc-transfer-file): Use `make-temp-file' instead of `make-temp-name'.André Spiegel2002-03-051-5/+4
| | | | | (vc-default-update-changelog): Remove conditional use of `make-temp-name'.
* (vc-update): New function.André Spiegel2002-02-281-1/+29
|
* (vc-revert-buffer): If the buffer is not saved, prompt the user to doAndré Spiegel2002-02-281-1/+4
| | | | that first.
* (vc-diff-switches-list): Fix prev change, making the functionAndré Spiegel2002-02-251-2/+2
| | | | consistent with the others that take a backend name as a symbol.
* Patch by Jonathan Kamens <[email protected]>.André Spiegel2002-02-211-7/+20
| | | | | | | | | (vc-default-init-version): Update documentation to indicate that the backend can override the default init version. (vc-register): Use the backend init-version function, if it exists, to determine the initial version of a file. (vc-diff-switches-list): Don't symbol-quote backend, since it's already a symbol. Don't fail if vc-BACKEND-diff-switches isn't bound.
* (vc-branch-part): Return nil if there's no `.'André Spiegel2002-01-051-28/+35
| | | | | | | | | | (vc-default-previous-version): Renamed from vc-previous-version. New args BACKEND and FILE. Return nil for revision numbers without a `.' (vc-version-diff): Call vc-BACKEND-previous-version. (vc-steal-lock): Steal lock before composing mail, so that no mail is sent when the stealing goes wrong. And we'll actually see the error in that case now. (vc-finish-steal): Removed.
* Doc fixes.Pavel Janík2001-12-201-3/+3
|
* (vc-next-action-on-file): Use insert instead of insert-string.Pavel Janík2001-11-261-3/+2
|
* (vc-find-version): New function.André Spiegel2001-11-261-5/+9
| | | | (vc-version-other-window): Redefined in terms of the above.
* (with-vc-properties): Don't bind `filename' locally.André Spiegel2001-11-231-21/+26
| | | | | (with-vc-file, edit-vc-file): Use `make-symbol' for local bindings to avoid name clashes. Fix `lisp-indent-function' property for both.
* Documentation fixes.André Spiegel2001-11-151-86/+110
|
* * vc.el (vc-print-log): Bind `inhibit-read-only' to t before andSam Steingold2001-11-121-47/+48
| | | | | | | | | | set-buffer-modified-p to nil after `vc-exec-after'. * log-view.el (log-view-mode-map): Bind "q", "z", "m" and "d". (log-view-mode): Make read-only. (log-view-current-file): Do final `expand-file-name' in the current `default-directory'. (log-view-current-tag): Take an optional `where' arg. (log-view-diff): New user command.
* Add John David Smith to credits.André Spiegel2001-11-091-2/+3
| | | | (vc-clear-context): Fill obarray with 0, not nil.
* # Doc fix, completing prev change.André Spiegel2001-10-291-8/+10
|
* Mention vc-*-switches in backend API documentation.André Spiegel2001-10-291-8/+11
| | | | (vc-annotate): Adapt doc string to recent change.
* (vc-diff-switches): Doc rewritten.André Spiegel2001-10-221-3/+6
|
* Change scaling algorithm for vc-annotate.André Spiegel2001-10-221-94/+196
| | | | | | | | | | | | | | | | | | | | | From JD Smith <[email protected]>. (vc-annotate-display-default): Accept colormap scaling ratio (now deprecated). (vc-annotate-display-autoscale): Added. (vc-annotate-add-menu): New autoscaling menu options "Span to Oldest" and "Span Oldest->Newest". Easymenu support added for toggle menus driven by customize variable `vc-annotate-display-mode'. (vc-annotate-display-select): Added. (vc-annotate): Changed temp-buffer-show-function to `vc-annotate-display-select'. (vc-annotate-display): Removed arguments BUFFER and BACKEND. Added argument OFFSET. Instead of backend function, calls now generic `vc-annotate-difference'. (vc-annotate-difference): Added as generic function instead of backend-specific function. No longer takes argument POINT, but instead accepts a time OFFSET. (vc-default-annotate-current-time): Added.
* (diff-switches): Remove duplicate definition.André Spiegel2001-10-211-5/+1
|
* (vc-diff-internal, vc-coding-system-for-diff, vc-default-diff-tree):André Spiegel2001-10-211-30/+75
| | | | | | | | | New functions. (vc-version-diff): Use them. As a result, coding systems are now set up properly for all sorts of diffs, and tree diffs can now also be done locally. (vc-diff): With a prefix argument, don't require that it's called from a buffer under version control.
* (vc-checkin): Use vc-delete-automatic-version-backups.Stefan Monnier2001-09-241-3/+3
|
* Doc fixStefan Monnier2001-09-221-2/+2
|
* (vc-annotate): Use current workfile version explicitly as a default,André Spiegel2001-09-171-15/+17
| | | | suggested by Gustav Hallberg <[email protected]>.
* (vc-annotate): Rewrote doc string.André Spiegel2001-09-101-6/+21
|
* Add Keywords header.Gerd Moellmann2001-09-041-1/+2
|
* (vc-revert-file): Call the backend even if the FILE'sAndré Spiegel2001-08-281-6/+9
| | | | | contents can be reverted locally; pass new arg CONTENTS-DONE down to the backend.
* (vc-transfer-file): Fix malformed autoload cookie.Gerd Moellmann2001-08-071-2/+2
|
* #Document prev change.André Spiegel2001-07-301-2/+4
|
* (vc-checkout-hook): New hook.André Spiegel2001-07-301-2/+11
| | | | (vc-checkout): Run it.
* (vc-switch-backend): Fix autoload cookie.Gerd Moellmann2001-07-301-2/+2
|
* (vc-do-command): Autoload.Stefan Monnier2001-07-161-4/+2
|
* (vc-prefix-map): Moved back to vc-hooks.el.Stefan Monnier2001-07-111-379/+359
| | | | (vc-dired-mode-map): Fix the madness.
* (vc-next-action-on-file): Only force buffer+file to writableStefan Monnier2001-05-031-6/+6
| | | | if both the buffer and the file are read-only.
* (vc-do-command): If the destination buffer is already current, don'tAndré Spiegel2001-03-101-22/+27
| | | | | | | | | set it up and don't erase it. Updated doc string to reflect that. (vc-version-diff): When doing a single file diff, don't switch to the *vc-diff* buffer before the command. This is to preserve local variable bindings that might affect the diff command. (vc-print-log): Don't switch to the *vc* buffer before the command, so that local variable bindings are preserved.
* (vc-default-workfile-unchanged-p, vc-default-latest-on-branch-p): AddAndré Spiegel2001-02-261-3/+3
| | | | missing BACKEND argument.
* Copyright up-date.Dave Love2001-02-011-2/+2
|
* (vc-diff-switches): New user option.André Spiegel2001-02-011-1/+27
| | | | | (vc-version-diff): Use it. (vc-diff-switches-list): New macro.
* Added documentation for backend interface.André Spiegel2001-01-101-94/+256
|
* (vc-default-latest-on-branch-p): New function, replaces constantAndré Spiegel2001-01-081-1/+6
| | | | implementations in backends.
* Undo prev change.André Spiegel2000-11-201-0/+14
|
* (vc-workfile-unchanged-p, vc-default-workfile-unchanged-p): Moved toAndré Spiegel2000-11-191-15/+1
| | | | vc-hooks.el.