aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
authorEric S. Raymond2014-12-11 23:29:41 -0500
committerEric S. Raymond2014-12-11 23:29:41 -0500
commitbe6dff68be9ad15245896b0b7868369c6e3716ac (patch)
tree43ec023798ef828e69bd5c06e4b2b87af553287b /lisp
parentea8b9df12e38775600e850b8a57add2cf523bde5 (diff)
downloademacs-be6dff68be9ad15245896b0b7868369c6e3716ac.tar.gz
emacs-be6dff68be9ad15245896b0b7868369c6e3716ac.zip
latest-on-branch-p is no longer a public method
* vc/vc-dav.el, vc/vc-git.el, vc/vc-hg.el, vc/vc-src.el, vc/vc.el: latest-on-branch-p is no longer a public method.
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog3
-rw-r--r--lisp/vc/vc-dav.el4
-rw-r--r--lisp/vc/vc-git.el1
-rw-r--r--lisp/vc/vc-hg.el1
-rw-r--r--lisp/vc/vc-src.el1
-rw-r--r--lisp/vc/vc.el38
6 files changed, 12 insertions, 36 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5916f2996e3..75effaa865d 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
12014-12-12 Eric S. Raymond <esr@snark.thyrsus.com> 12014-12-12 Eric S. Raymond <esr@snark.thyrsus.com>
2 2
3 * vc/vc-dav.el, vc/vc-git.el, vc/vc-hg.el, vc/vc-src.el,
4 vc/vc.el: latest-on-branch-p is no longer a public method.
5
3 * vc/vc.el, vc/vc-hg.el, vc/vc-git.el, vc/vc-hooks.el, 6 * vc/vc.el, vc/vc-hg.el, vc/vc-git.el, vc/vc-hooks.el,
4 vc/vc-mtn.el, vc/vc-rcs.el, vc/vc-sccs.el, vc/vc-src.el: rrollback 7 vc/vc-mtn.el, vc/vc-rcs.el, vc/vc-sccs.el, vc/vc-src.el: rrollback
5 method removed, to be replaced in the future by uncommit. 8 method removed, to be replaced in the future by uncommit.
diff --git a/lisp/vc/vc-dav.el b/lisp/vc/vc-dav.el
index 4271cf7d1b3..4c3fe6abff7 100644
--- a/lisp/vc/vc-dav.el
+++ b/lisp/vc/vc-dav.el
@@ -147,10 +147,6 @@ It should return a status of either 0 (no differences found), or
147 147
148;;; Unimplemented functions 148;;; Unimplemented functions
149;; 149;;
150;; vc-dav-latest-on-branch-p(URL)
151;; Return non-nil if the current workfile version of FILE is the
152;; latest on its branch. There are no branches in webdav yet.
153;;
154;; vc-dav-mode-line-string(url) 150;; vc-dav-mode-line-string(url)
155;; Return a dav-specific mode line string for URL. Are there any 151;; Return a dav-specific mode line string for URL. Are there any
156;; specific states that we want exposed? 152;; specific states that we want exposed?
diff --git a/lisp/vc/vc-git.el b/lisp/vc/vc-git.el
index b5e92bb50ac..c41dde1b3db 100644
--- a/lisp/vc/vc-git.el
+++ b/lisp/vc/vc-git.el
@@ -52,7 +52,6 @@
52;; * state (file) OK 52;; * state (file) OK
53;; - dir-status-files (dir files uf) OK 53;; - dir-status-files (dir files uf) OK
54;; * working-revision (file) OK 54;; * working-revision (file) OK
55;; - latest-on-branch-p (file) NOT NEEDED
56;; * checkout-model (files) OK 55;; * checkout-model (files) OK
57;; - mode-line-string (file) OK 56;; - mode-line-string (file) OK
58;; STATE-CHANGING FUNCTIONS 57;; STATE-CHANGING FUNCTIONS
diff --git a/lisp/vc/vc-hg.el b/lisp/vc/vc-hg.el
index 90370839921..0d9f9f182fa 100644
--- a/lisp/vc/vc-hg.el
+++ b/lisp/vc/vc-hg.el
@@ -47,7 +47,6 @@
47;; - dir-extra-headers (dir) OK 47;; - dir-extra-headers (dir) OK
48;; - dir-printer (fileinfo) OK 48;; - dir-printer (fileinfo) OK
49;; * working-revision (file) OK 49;; * working-revision (file) OK
50;; - latest-on-branch-p (file) ??
51;; * checkout-model (files) OK 50;; * checkout-model (files) OK
52;; - mode-line-string (file) NOT NEEDED 51;; - mode-line-string (file) NOT NEEDED
53;; STATE-CHANGING FUNCTIONS 52;; STATE-CHANGING FUNCTIONS
diff --git a/lisp/vc/vc-src.el b/lisp/vc/vc-src.el
index 6ba8b8c809f..539437d185c 100644
--- a/lisp/vc/vc-src.el
+++ b/lisp/vc/vc-src.el
@@ -35,7 +35,6 @@
35;; - dir-extra-headers (dir) NOT NEEDED 35;; - dir-extra-headers (dir) NOT NEEDED
36;; - dir-printer (fileinfo) ?? 36;; - dir-printer (fileinfo) ??
37;; * working-revision (file) OK 37;; * working-revision (file) OK
38;; - latest-on-branch-p (file) ??
39;; * checkout-model (files) OK 38;; * checkout-model (files) OK
40;; - mode-line-string (file) NOT NEEDED 39;; - mode-line-string (file) NOT NEEDED
41;; STATE-CHANGING FUNCTIONS 40;; STATE-CHANGING FUNCTIONS
diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el
index c6721cb511f..07a3394ad94 100644
--- a/lisp/vc/vc.el
+++ b/lisp/vc/vc.el
@@ -52,9 +52,9 @@
52 52
53;; This mode is fully documented in the Emacs user's manual. 53;; This mode is fully documented in the Emacs user's manual.
54;; 54;;
55;; Supported version-control systems presently include CVS, RCS, SRC, GNU 55;; Supported version-control systems presently include CVS, RCS, SRC,
56;; Arch, Subversion, Bzr, Git, Mercurial, Monotone and SCCS 56;; GNU Subversion, Bzr, Git, Mercurial, Monotone and SCCS (or its free
57;; (or its free replacement, CSSC). 57;; replacement, CSSC).
58;; 58;;
59;; If your site uses the ChangeLog convention supported by Emacs, the 59;; If your site uses the ChangeLog convention supported by Emacs, the
60;; function `log-edit-comment-to-change-log' could prove a useful checkin hook, 60;; function `log-edit-comment-to-change-log' could prove a useful checkin hook,
@@ -180,13 +180,6 @@
180;; head or tip revision. Should return "0" for a file added but not yet 180;; head or tip revision. Should return "0" for a file added but not yet
181;; committed. 181;; committed.
182;; 182;;
183;; - latest-on-branch-p (file)
184;;
185;; Return non-nil if the working revision of FILE is the latest revision
186;; on its branch (many VCSes call this the 'tip' or 'head' revision).
187;; The default implementation always returns t, which means that
188;; working with non-current revisions is not supported by default.
189;;
190;; * checkout-model (files) 183;; * checkout-model (files)
191;; 184;;
192;; Indicate whether FILES need to be "checked out" before they can be 185;; Indicate whether FILES need to be "checked out" before they can be
@@ -604,6 +597,11 @@
604;; 597;;
605;; - The rollback method (implemented by RCS and SCCS only) is gone. See 598;; - The rollback method (implemented by RCS and SCCS only) is gone. See
606;; the to-do note on uncommit. 599;; the to-do note on uncommit.
600;;
601;; - latest-on-branch-p is no longer a public method. It was to be used
602;; for implementing rollback. RCS keeps its implementation (the only one)
603;; for internal use.
604
607 605
608;;; Todo: 606;;; Todo:
609 607
@@ -635,16 +633,6 @@
635;; 633;;
636;; - Add the ability to list tags and branches. 634;; - Add the ability to list tags and branches.
637;; 635;;
638;;;; Internal cleanups:
639;;
640;; - Another important thing: merge all the status-like backend
641;; operations. We should remove dir-status-files and state and
642;; replace them with just `status' which takes a fileset and a
643;; continuation (like dir-status-files) and returns a buffer in
644;; which the process(es) are run (or nil if it worked
645;; synchronously). Hopefully we can define the old operations in
646;; term of this one.
647;;
648;;;; Unify two different versions of the amend capability 636;;;; Unify two different versions of the amend capability
649;; 637;;
650;; - Some back ends (SCCS/RCS/SVN/SRC), have an amend capability that can 638;; - Some back ends (SCCS/RCS/SVN/SRC), have an amend capability that can
@@ -1462,9 +1450,7 @@ After check-out, runs the normal hook `vc-checkout-hook'."
1462 (signal (car err) (cdr err)))) 1450 (signal (car err) (cdr err))))
1463 `((vc-state . ,(if (or (eq (vc-checkout-model backend (list file)) 'implicit) 1451 `((vc-state . ,(if (or (eq (vc-checkout-model backend (list file)) 'implicit)
1464 nil) 1452 nil)
1465 (if (vc-call-backend backend 'latest-on-branch-p file) 1453 'up-to-date
1466 'up-to-date
1467 'needs-update)
1468 'edited)) 1454 'edited))
1469 (vc-checkout-time . ,(nth 5 (file-attributes file)))))) 1455 (vc-checkout-time . ,(nth 5 (file-attributes file))))))
1470 (vc-resynch-buffer file t t) 1456 (vc-resynch-buffer file t t)
@@ -2737,12 +2723,6 @@ log entries should be gathered."
2737The default is to return nil always." 2723The default is to return nil always."
2738 nil) 2724 nil)
2739 2725
2740(defun vc-default-latest-on-branch-p (_backend _file)
2741 "Return non-nil if FILE is the latest on its branch.
2742This default implementation always returns non-nil, which means that
2743editing non-current revisions is not supported by default."
2744 t)
2745
2746(defun vc-default-find-revision (backend file rev buffer) 2726(defun vc-default-find-revision (backend file rev buffer)
2747 "Provide the new `find-revision' op based on the old `checkout' op. 2727 "Provide the new `find-revision' op based on the old `checkout' op.
2748This is only for compatibility with old backends. They should be updated 2728This is only for compatibility with old backends. They should be updated