Commit graph

59 commits

Author SHA1 Message Date
Jonathan Kamens
b3a90ce59f Add the function vc-p4-init-version, which always returns "1".
Add a fixed version of vc-register which uses vc-p4-init-version.

Add a fixed version of vc-mode-line which sets vc-mode to nil if a
file isn't under version control, so that the VC information is
removed from the mode line of a reverted file.

Fixv vc-p4-register so that it doesn't complain if the specified
revision is "1" or if the specified comment is an empty string.

Fix vc-p4-revert so that it does the right thing if the file being
reverted was added but not yet submitted (i.e., it isn't yet actually
in the repository).

Fix vc-p4-diff so that it does the right thing with a newly added file
(i.e., diffs the file against /dev/null).

[git-p4: depot-paths = "//guest/Ben_Key/vc-p4/,//guest/jonathan_kamens/vc-p4/,//guest/magnus_henoch/vc-p4/": change = 1253]
2002-01-09 06:15:24 -08:00
Jonathan Kamens
f985840e8b Update the coument documenting vc-p4-annotate-command.
[git-p4: depot-paths = "//guest/Ben_Key/vc-p4/,//guest/jonathan_kamens/vc-p4/,//guest/magnus_henoch/vc-p4/": change = 1233]
2002-01-07 10:02:47 -08:00
Jonathan Kamens
60618b6ef4 When doing an annotation, if the user called the annotate function
with a prefix argument, then prompt for the starting date for the
annotation.  Note that this requires a version of p4pr.perl that
supports the --after option.

[git-p4: depot-paths = "//guest/Ben_Key/vc-p4/,//guest/jonathan_kamens/vc-p4/,//guest/magnus_henoch/vc-p4/": change = 1225]
2002-01-06 16:38:16 -08:00
Jonathan Kamens
3b5d63dd57 Compatibility with the current version of vc.el in CVS at
:pserver:anoncvs@subversions.gnu.org:/cvsroot/emacs.

[git-p4: depot-paths = "//guest/Ben_Key/vc-p4/,//guest/jonathan_kamens/vc-p4/,//guest/magnus_henoch/vc-p4/": change = 1223]
2002-01-06 11:23:04 -08:00
Jonathan Kamens
bf07af865c Set ediff-default-variant even when doing merges with an ancestor.
[git-p4: depot-paths = "//guest/Ben_Key/vc-p4/,//guest/jonathan_kamens/vc-p4/,//guest/magnus_henoch/vc-p4/": change = 1218]
2002-01-06 04:39:26 -08:00
Jonathan Kamens
96df41611e Fix a parenthesization error in the code for repairing some vc.el
functions.

[git-p4: depot-paths = "//guest/Ben_Key/vc-p4/,//guest/jonathan_kamens/vc-p4/,//guest/magnus_henoch/vc-p4/": change = 1216]
2002-01-05 22:13:56 -08:00
Jonathan Kamens
d128cfaad4 Fix a minor working error in a comment.
[git-p4: depot-paths = "//guest/Ben_Key/vc-p4/,//guest/jonathan_kamens/vc-p4/,//guest/magnus_henoch/vc-p4/": change = 1215]
2002-01-05 20:23:05 -08:00
Jonathan Kamens
5206f5e427 Add comments telling people where these files can be retrieved
from.

[git-p4: depot-paths = "//guest/Ben_Key/vc-p4/,//guest/jonathan_kamens/vc-p4/,//guest/magnus_henoch/vc-p4/": change = 1214]
2002-01-05 19:55:28 -08:00
Jonathan Kamens
b69b02ad08 Initial version of Emacs 21 VC support for Perforce.
[git-p4: depot-paths = "//guest/Ben_Key/vc-p4/,//guest/jonathan_kamens/vc-p4/,//guest/magnus_henoch/vc-p4/": change = 1213]
2002-01-05 19:45:11 -08:00