| Commit message (Collapse) | Author | Age | Files | Lines |
... | |
|
|
|
|
| |
in case some other package redefined it.
(vc-resolve-conflicts): Make it into an alias for smerge-ediff.
|
|
|
|
|
|
|
|
| |
(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): New fun.
|
|
|
|
| |
vc-hooks.el.
|
| |
|
| |
|
|
|
|
|
|
|
|
|
|
| |
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.
|
|
|
|
|
|
|
| |
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.
|
|
|
|
|
| |
be called from vc-rcs-find-most-recent-rev when visiting a file
checked into RCS in a CVS sandbox.
|
|
|
|
|
| |
(vc-default-update-changelog): Remove conditional use of
`make-temp-name'.
|
| |
|
|
|
|
| |
that first.
|
|
|
|
| |
consistent with the others that take a backend name as a symbol.
|
|
|
|
|
|
|
|
|
| |
(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-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.
|
| |
|
| |
|
|
|
|
| |
(vc-version-other-window): Redefined in terms of the above.
|
|
|
|
|
| |
(with-vc-file, edit-vc-file): Use `make-symbol' for local bindings to
avoid name clashes. Fix `lisp-indent-function' property for both.
|
| |
|
|
|
|
|
|
|
|
|
|
| |
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.
|
|
|
|
| |
(vc-clear-context): Fill obarray with 0, not nil.
|
| |
|
|
|
|
| |
(vc-annotate): Adapt doc string to recent change.
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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.
|
| |
|
|
|
|
|
|
|
|
|
| |
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.
|
| |
|
| |
|
|
|
|
| |
suggested by Gustav Hallberg <[email protected]>.
|
| |
|
| |
|
|
|
|
|
| |
contents can be reverted locally; pass new arg CONTENTS-DONE
down to the backend.
|
| |
|
| |
|
|
|
|
| |
(vc-checkout): Run it.
|
| |
|
| |
|
|
|
|
| |
(vc-dired-mode-map): Fix the madness.
|
|
|
|
| |
if both the buffer and the file are read-only.
|
|
|
|
|
|
|
|
|
| |
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.
|
|
|
|
| |
missing BACKEND argument.
|
| |
|
|
|
|
|
| |
(vc-version-diff): Use it.
(vc-diff-switches-list): New macro.
|
| |
|
|
|
|
| |
implementations in backends.
|
| |
|
|
|
|
| |
vc-hooks.el.
|