From 4893831f692993f625db0ad6b16200a379fc0138 Mon Sep 17 00:00:00 2001 From: "Eric S. Raymond" Date: Mon, 1 Dec 2014 10:57:09 -0500 Subject: Update some documentation changes and todo items. --- lisp/vc/vc-git.el | 2 -- lisp/vc/vc-hg.el | 2 -- lisp/vc/vc-src.el | 1 - lisp/vc/vc.el | 38 ++++++++++++++++++++++++++++++++++---- 4 files changed, 34 insertions(+), 9 deletions(-) diff --git a/lisp/vc/vc-git.el b/lisp/vc/vc-git.el index 0aceb5537cb..805e48831ef 100644 --- a/lisp/vc/vc-git.el +++ b/lisp/vc/vc-git.el @@ -57,7 +57,6 @@ ;; STATE-CHANGING FUNCTIONS ;; * create-repo () OK ;; * register (files &optional rev comment) OK -;; - init-revision (file) NOT NEEDED ;; - responsible-p (file) OK ;; - could-register (file) NOT NEEDED, DEFAULT IS GOOD ;; - receive-file (file rev) NOT NEEDED @@ -92,7 +91,6 @@ ;; - retrieve-tag (dir name update) OK ;; MISCELLANEOUS ;; - make-version-backups-p (file) NOT NEEDED -;; - repository-hostname (dirname) NOT NEEDED ;; - previous-revision (file rev) OK ;; - next-revision (file rev) OK ;; - check-headers () COULD BE SUPPORTED diff --git a/lisp/vc/vc-hg.el b/lisp/vc/vc-hg.el index 9bb79a74e94..bc704e7a03d 100644 --- a/lisp/vc/vc-hg.el +++ b/lisp/vc/vc-hg.el @@ -54,7 +54,6 @@ ;; STATE-CHANGING FUNCTIONS ;; * register (files &optional rev comment) OK ;; * create-repo () OK -;; - init-revision () NOT NEEDED ;; - responsible-p (file) OK ;; - could-register (file) OK ;; - receive-file (file rev) ?? PROBABLY NOT NEEDED @@ -84,7 +83,6 @@ ;; - retrieve-tag (dir name update) OK FIXME UPDATE BUFFERS ;; MISCELLANEOUS ;; - make-version-backups-p (file) ?? -;; - repository-hostname (dirname) ?? ;; - previous-revision (file rev) OK ;; - next-revision (file rev) OK ;; - check-headers () ?? diff --git a/lisp/vc/vc-src.el b/lisp/vc/vc-src.el index 046222304c4..b780161d5dd 100644 --- a/lisp/vc/vc-src.el +++ b/lisp/vc/vc-src.el @@ -71,7 +71,6 @@ ;; - retrieve-tag (dir name update) ?? ;; MISCELLANEOUS ;; - make-version-backups-p (file) ?? -;; - repository-hostname (dirname) NOT NEEDED ;; - previous-revision (file rev) ?? ;; - next-revision (file rev) ?? ;; - check-headers () ?? diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el index 6d45f7fdb0d..ffb6e5dc229 100644 --- a/lisp/vc/vc.el +++ b/lisp/vc/vc.el @@ -601,13 +601,11 @@ ;;; Todo: -;; - Get rid of the "master file" terminology. - ;; - Add key-binding for vc-delete-file. ;;;; New Primitives: ;; -;; - deal with push/pull operations. +;; - deal with push operations. ;; ;;;; Primitives that need changing: ;; @@ -620,10 +618,16 @@ ;; ;;;; Improved branch and tag handling: ;; +;; - Make sure the *vc-dir* buffer is updated after merge-branch operations. +;; ;; - add a generic mechanism for remembering the current branch names, ;; display the branch name in the mode-line. Replace ;; vc-cvs-sticky-tag with that. ;; +;; - Add a primitives for switching to a branch (creating it if required. +;; +;; - Add the ability to list tags and branches. +;; ;;;; Internal cleanups: ;; ;; - vc-expand-dirs should take a backend parameter and only look for @@ -636,8 +640,34 @@ ;; (or nil if it worked synchronously). Hopefully we can define the old ;; 4 operations in term of this one. ;; +;;;; Unify two different versions of the amend capability +;; +;; - Some back ends (SCCS/RCS/SVN/SRC), have an amend capability that can +;; be invoked from log-view. +;; +;; - The git backend supports amending, but in a different +;; way (press `C-c C-e' in log-edit buffer, when making a new commit). +;; +;; - Second, `log-view-modify-change-comment' doesn't seem to support +;; modern backends at all because `log-view-extract-comment' +;; unconditionally calls `log-view-current-file'. This should be easy to +;; fix. +;; +;; - Third, doing message editing in log-view might be a natural way to go +;; about it, but editing any but the last commit (and even it, if it's +;; been pushed) is a dangerous operation in Git, which we shouldn't make +;; too easy for users to perform. +;; +;; There should be a check that the given comment is not reachable +;; from any of the "remote" refs? +;; ;;;; Other ;; +;; - asynchronous checkin and commit, so you can keep working in other +;; buffers while the repo operation happens. +;; +;; - Direct support for stash/shelve. +;; ;; - when a file is in `conflict' state, turn on smerge-mode. ;; ;; - figure out what to do with conflicts that are not caused by the @@ -1154,7 +1184,7 @@ For old-style locking-based version control systems, like RCS: ;; state of each individual file in the fileset, it seems ;; simplest to just check if the file exists. Bug#9781. (when (and (file-exists-p file) (not (file-writable-p file))) - ;; Make the file+buffer read-write. + ;; Make the file-buffer read-write. (unless (y-or-n-p (format "%s is edited but read-only; make it writable and continue? " file)) (error "Aborted")) ;; Maybe we somehow lost permissions on the directory. -- cgit v1.2.1