1
0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-11-23 07:19:15 +00:00
Commit Graph

350 Commits

Author SHA1 Message Date
André Spiegel
2807bd9194 (vc-binary-assoc, vc-binary-suffixes): Removed; these were
accidentally left over.
2003-02-19 19:00:51 +00:00
Juanma Barranquero
bf142f280f (vc-annotate-display, vc-checkout-carefully): Add obsolescence declaration and
remove redundant info from docstring.
2003-02-05 23:13:21 +00:00
Juanma Barranquero
f1180544bb Trailing whitespace deleted. 2003-02-04 12:29:42 +00:00
André Spiegel
4279775b92 (vc-next-action-on-file): Use t argument to vc-checkout in
order to get the latest version on the current branch.  Update
documentation of vc-BACKEND-checkout to explain this.
2002-12-26 14:04:21 +00:00
André Spiegel
570050dc43 Add comment to prev change. 2002-11-03 15:08:29 +00:00
André Spiegel
62c2e775ec (vc-dired-move): Adapt dired-move-to-filename-regexp to its current
version in dired.el.
2002-11-03 14:48:37 +00:00
André Spiegel
685e7bcac0 (vc-dired-reformat-line): Simplified. Handles text properties
correctly now.
2002-10-14 15:13:59 +00:00
André Spiegel
b9a35ba58a (vc-dired-reformat-line): As a temporary fix, remove all text
properties from the reformatted line.
2002-10-11 09:36:00 +00:00
Stefan Monnier
fd8160f74d (vc-find-version): Use the new backend op `find-version'.
(vc-default-find-version): Provide the new backend op `find-version'
in terms of the old `checkout' op.
2002-10-08 15:31:43 +00:00
Stefan Monnier
1168d6c273 (vc-resolve-conflicts); Typo. 2002-10-07 16:50:43 +00:00
Stefan Monnier
edc37d1214 (vc-maybe-resolve-conflicts): Always call vc-resolve-conflicts
in case some other package redefined it.
(vc-resolve-conflicts): Make it into an alias for smerge-ediff.
2002-10-07 16:24:42 +00:00
Stefan Monnier
928ef6d986 (vc-log-mode-map): Explicitly inherit from text-mode.
(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.
2002-10-05 16:35:28 +00:00
Markus Rost
48e9072d7e (vc-default-show-log-entry): Fix typo. 2002-10-05 03:01:29 +00:00
Stefan Monnier
02e43de8af (vc-print-log): Unconditionally use `show-log-entry'.
(vc-default-show-log-entry): New fun.
2002-10-03 22:43:01 +00:00
André Spiegel
fd4ca8fb12 (vc-workfile-unchanged-p, vc-default-workfile-unchanged-p): Moved to
vc-hooks.el.
2002-09-04 20:47:08 +00:00
André Spiegel
b4c4047461 (vc-next-action-on-file): Preserve find-file-literally. 2002-07-22 18:52:04 +00:00
André Spiegel
655388b5d4 Improve comment of vc-BACKEND-workfile-unchanged-p. 2002-07-19 13:20:02 +00:00
Stefan Monnier
f66a6225b9 (vc-default-comment-history): Hard code *vc*.
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.
2002-07-16 20:44:23 +00:00
André Spiegel
165e43b6c7 (vc-next-action-on-file): Ignore buffer-read-only while comparing to
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.
2002-07-16 17:47:33 +00:00
Gerd Moellmann
a10cd56195 (vc-branch-part): Add autoload cookie. This function can
be called from vc-rcs-find-most-recent-rev when visiting a file
checked into RCS in a CVS sandbox.
2002-03-06 13:51:28 +00:00
André Spiegel
c1b1b3936b (vc-transfer-file): Use make-temp-file' instead of make-temp-name'.
(vc-default-update-changelog): Remove conditional use of
`make-temp-name'.
2002-03-05 13:14:11 +00:00
André Spiegel
9f30fc99a4 (vc-update): New function. 2002-02-28 13:01:48 +00:00
André Spiegel
d607ebcc09 (vc-revert-buffer): If the buffer is not saved, prompt the user to do
that first.
2002-02-28 10:00:44 +00:00
André Spiegel
4e5f52e5b9 (vc-diff-switches-list): Fix prev change, making the function
consistent with the others that take a backend name as a symbol.
2002-02-25 22:00:51 +00:00
André Spiegel
b470cb6584 Patch by Jonathan Kamens <jik@kamens.brookline.ma.us>.
(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.
2002-02-21 21:00:35 +00:00
André Spiegel
869131a593 (vc-branch-part): Return nil if there's no `.'
(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.
2002-01-05 17:15:20 +00:00
Pavel Janík
0ff9b955fe Doc fixes. 2001-12-20 18:59:32 +00:00
Pavel Janík
f4f34b33e1 (vc-next-action-on-file): Use insert instead of insert-string. 2001-11-26 16:17:17 +00:00
André Spiegel
ac0aae44d9 (vc-find-version): New function.
(vc-version-other-window): Redefined in terms of the above.
2001-11-26 16:07:50 +00:00
André Spiegel
169f0cae92 (with-vc-properties): Don't bind `filename' locally.
(with-vc-file, edit-vc-file): Use `make-symbol' for local bindings to
avoid name clashes.  Fix `lisp-indent-function' property for both.
2001-11-23 10:11:29 +00:00
André Spiegel
6f1ecae403 Documentation fixes. 2001-11-15 10:31:17 +00:00
Sam Steingold
99cb8c8b26 * vc.el (vc-print-log): Bind `inhibit-read-only' to t before and
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.
2001-11-12 23:01:17 +00:00
André Spiegel
fd828872b1 Add John David Smith to credits.
(vc-clear-context): Fill obarray with 0, not nil.
2001-11-09 14:55:52 +00:00
André Spiegel
3f19e41228 # Doc fix, completing prev change. 2001-10-29 12:26:15 +00:00
André Spiegel
ecd50f6599 Mention vc-*-switches in backend API documentation.
(vc-annotate): Adapt doc string to recent change.
2001-10-29 12:21:26 +00:00
André Spiegel
b453817c99 (vc-diff-switches): Doc rewritten. 2001-10-22 12:13:29 +00:00
André Spiegel
7566514145 Change scaling algorithm for vc-annotate.
From JD Smith <jdsmith@astro.cornell.edu>.
(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.
2001-10-22 07:54:03 +00:00
André Spiegel
e98b08246c (diff-switches): Remove duplicate definition. 2001-10-21 23:31:45 +00:00
André Spiegel
2c87edc17b (vc-diff-internal, vc-coding-system-for-diff, vc-default-diff-tree):
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.
2001-10-21 12:15:22 +00:00
Stefan Monnier
ab750f9c19 (vc-checkin): Use vc-delete-automatic-version-backups. 2001-09-24 22:30:31 +00:00
Stefan Monnier
eb407e67eb Doc fix 2001-09-22 20:04:21 +00:00
André Spiegel
08eab195a7 (vc-annotate): Use current workfile version explicitly as a default,
suggested by Gustav Hallberg <gustav@virtutech.se>.
2001-09-17 09:59:41 +00:00
André Spiegel
1cec418c1e (vc-annotate): Rewrote doc string. 2001-09-10 17:51:04 +00:00
Gerd Moellmann
284b3043c0 Add Keywords header. 2001-09-04 12:54:14 +00:00
André Spiegel
bbfc07d319 (vc-revert-file): Call the backend even if the FILE's
contents can be reverted locally; pass new arg CONTENTS-DONE
down to the backend.
2001-08-28 17:02:59 +00:00
Gerd Moellmann
21b5029601 (vc-transfer-file): Fix malformed autoload cookie. 2001-08-07 14:48:30 +00:00
André Spiegel
133a84aa60 #Document prev change. 2001-07-30 18:25:58 +00:00
André Spiegel
7cad930dbd (vc-checkout-hook): New hook.
(vc-checkout): Run it.
2001-07-30 15:01:49 +00:00
Gerd Moellmann
76e5906daf (vc-switch-backend): Fix autoload cookie. 2001-07-30 08:18:04 +00:00
Stefan Monnier
a84b80ba4a (vc-do-command): Autoload. 2001-07-16 14:19:17 +00:00