1. 16 Jun, 2008 1 commit
  2. 15 Jun, 2008 1 commit
    • Dan Nicolaescu's avatar
      * log-view.el (log-view-diff-changeset): New function. · 6653c6b7
      Dan Nicolaescu authored
      (log-view-mode-map, log-view-mode-menu): Bind it.
      (log-view-per-file-logs, log-view-vc-fileset)
      (log-view-vc-backend): New variables.
      (log-view-find-revision, log-view-modify-change-comment)
      (log-view-annotate-version): Throw an error if the log is for more
      than one file and we can't find the current file.  Get the current
      file from log-view-vc-fileset if necessary.
      (log-view-diff): Get the current file from log-view-vc-fileset if
      necessary.
      
      * vc.el (vc-print-log): Set log-view-vc-fileset and log-view-vc-backend.
      
      * vc-hg.el (vc-hg-log-view-mode): Call the log method only once.
      (vc-hg-log-view-mode): Declare for compiler.
      (vc-hg-log-view-mode): Set log-view-per-file-logs and
      log-view-file-re.
      (vc-hg-diff): If no file is passed, use default-directory for cwd.
      
      * vc-bzr.el (vc-bzr-log-view-mode): Set log-view-per-file-logs.
      
      * vc-svn.el (vc-svn-log-view-mode): New derived mode.
      6653c6b7
  3. 16 May, 2008 1 commit
  4. 15 May, 2008 1 commit
  5. 10 May, 2008 1 commit
  6. 09 May, 2008 2 commits
    • Eric S. Raymond's avatar
      Remove wash-log from the VC backend API. · 6aa5d910
      Eric S. Raymond authored
      6aa5d910
    • Stefan Monnier's avatar
      * vc.el (vc-mark-resolved): Add `backend' argument. · a749e19d
      Stefan Monnier authored
      (vc-next-action): Pass it the backend.
      (vc-next-action, vc-checkout, vc-mark-resolved, vc-version-diff)
      (vc-merge, vc-rollback, vc-update, vc-transfer-file, vc-delete-file)
      (vc-default-comment-history, vc-default-create-snapshot)
      (vc-default-retrieve-snapshot, vc-default-revert, vc-annotate)
      (vc-annotate-revision-previous-to-line)
      (vc-annotate-show-diff-revision-at-line, vc-annotate-warp-revision):
      * vc-svn.el (vc-svn-checkout):
      * vc-mcvs.el (vc-mcvs-checkout):
      * vc-hooks.el (vc-state, vc-default-workfile-unchanged-p)
      (vc-working-revision, vc-before-save, vc-mode-line):
      Prefer vc-call-backend to vc-call so as not to recompute the backend.
      a749e19d
  7. 07 May, 2008 1 commit
  8. 06 May, 2008 1 commit
  9. 02 May, 2008 1 commit
  10. 01 May, 2008 2 commits
  11. 29 Apr, 2008 1 commit
    • Stefan Monnier's avatar
      Make `checkout-model' apply to filesets. · e0607aaa
      Stefan Monnier authored
      * vc-hooks.el (vc-checkout-model): Rewrite.
      (vc-before-save, vc-after-save): Adjust callers accordingly.
      * vc.el (vc-editable-p, vc-next-action, vc-checkout, vc-update)
      (vc-transfer-file): Adjust callers accordingly.
      * vc-rcs.el (vc-rcs-checkout-model): Adjust arg.
      (vc-rcs-state, vc-rcs-state-heuristic, vc-rcs-receive-file)
      (vc-rcs-checkout, vc-rcs-fetch-master-state): Use vc-rcs-checkout-model
      instead of vc-checkout-model.
      * vc-mcvs.el (vc-mcvs-revert):
      Use vc-mcvs-checkout-model i.s.o vc-checkout-model.
      * vc-cvs.el (vc-cvs-checkout-model): Adjust arg.
      (vc-cvs-revert): Use vc-cvs-checkout-model i.s.o vc-checkout-model.
      * vc-svn.el (vc-svn-checkout-model):
      * vc-hg.el (vc-hg-checkout-model):
      * vc-git.el (vc-git-checkout-model):
      * vc-bzr.el (vc-bzr-checkout-model): Adjust arg.
      e0607aaa
  12. 11 Apr, 2008 2 commits
    • Stefan Monnier's avatar
      b2ee56c9
    • Stefan Monnier's avatar
      Change `dir-status' to not take (and pass) status-buffer. · c1b51374
      Stefan Monnier authored
      (vc-status-create-fileinfo): Make `extra' optional.
      (vc-status-busy): New fun.
      (vc-status-menu-map): Use it.
      (vc-status-crt-marked): Remove.
      (vc-status-update): Rename from vc-status-add-entries.
      Add argument so as to prevent addition of entries.  Rewrite.
      (vc-update-vc-status-buffer): Remove.
      (vc-status-refresh): Don't remove old entries, set them to
      up-to-date instead.  Also do it after the update is complete.
      (vc-status-marked-files): η-reduce.
      c1b51374
  13. 10 Apr, 2008 1 commit
    • Dan Nicolaescu's avatar
      * vc-hooks.el (vc-state): Add new state `conflict'. · 7fbb4797
      Dan Nicolaescu authored
      (vc-after-save): Use when not if.
      (vc-default-mode-line-string): Deal with the conflict state.
      (vc-prefix-map):
      (vc-menu-map): Bind vc-status instead of vc-directory.
      
      * vc.el (vc-editable-p):
      (vc-default-status-printer):
      (vc-next-action): Deal with the conflict state.
      (vc-mark-resolved): New function.
      (vc-status-mode): Fix mode name.
      (vc-default-comment-history): Use when not if.
      (Todo): Add new entries, remove old ones.
      
      * vc-cvs.el (vc-cvs-merge, vc-cvs-merge-news): Set conflict state.
      (vc-cvs-parse-status):
      (vc-cvs-after-dir-status):
      * vc-svn.el (vc-svn-after-dir-status, vc-svn-parse-status):
      Detect the conflict state.
      7fbb4797
  14. 09 Apr, 2008 1 commit
  15. 31 Mar, 2008 1 commit
  16. 29 Mar, 2008 1 commit
    • Dan Nicolaescu's avatar
      * vc.el (vc-status-menu-map, vc-status-mode-map): Bind vc-revert. · 115c0061
      Dan Nicolaescu authored
      (vc-status-refresh): Create a temporary buffer and call the
      `dir-status' backend function from that buffer.
      
      * vc-bzr.el (vc-bzr-dir-status): Don't create a buffer.
      (vc-bzr-after-dir-status): Don't kill the buffer.
      
      * vc-cvs.el (vc-cvs-dir-status): Don't create a buffer.
      (vc-cvs-after-dir-status): Don't kill the buffer.
      
      * vc-git.el (vc-git-dir-status): Don't create a buffer.
      (vc-git-after-dir-status-stage2): Don't kill the buffer.
      
      * vc-hg.el (vc-hg-dir-status): Don't create a buffer.
      (vc-hg-after-dir-status): Don't kill the buffer.
      
      * vc-svn.el (vc-svn-dir-status): Don't create a buffer.
      (vc-svn-after-dir-status): Don't kill the buffer.
      115c0061
  17. 21 Mar, 2008 1 commit
    • Stefan Monnier's avatar
      * vc-hooks.el (vc-default-mode-line-string): Add case for added files. · 45b24b4d
      Stefan Monnier authored
      * vc.el (vc-default-dired-state-info): Use just "modified".
      * vc-cvs.el (vc-cvs-state-heuristic): Turn rev 0 into `added'.
      (vc-cvs-mode-line-string): Make use of the better default.
      (vc-cvs-parse-entry): Use the new `added'.
      (vc-cvs-dired-state-info): Remove.
      * vc-svn.el (vc-svn-dired-state-info): Remove.
      * vc-hg.el (vc-hg-dired-state-info): Remove.
      * vc-git.el (vc-git-dired-state-info): Remove.
      45b24b4d
  18. 29 Feb, 2008 1 commit
    • Dan Nicolaescu's avatar
      * vc.el (vc-status-crt-marked): New variable. · 9b7b3814
      Dan Nicolaescu authored
      (vc-status-mode): Make it local.
      (vc-status-refresh): Use it to save the marked files.
      (vc-update-vc-status-buffer): Use it to restore the marked files.
      
      * vc-svn.el (vc-svn-after-dir-status):
      * vc-hg.el (vc-hg-after-dir-status): Clean up the temporary buffer.
      9b7b3814
  19. 22 Feb, 2008 1 commit
    • Dan Nicolaescu's avatar
      * vc.el (vc-exec-after): Move setting mode-line-process in the · 751c9f00
      Dan Nicolaescu authored
      busy case ...
      (vc-set-mode-line-busy-indicator): ... in this new function.
      (vc-status-refresh): Call vc-set-mode-line-busy-indicator.
      (vc-update-vc-status-buffer): Reset mode-line-process.
      (vc-status-mark-all-files, vc-status-unmark-all-files): Change to
      mark/unmark all the files with the same state as the current one.
      With a prefix argument mark/unmark all files.
      (vc-status-mode-menu): Adjust strings.
      (vc-update-vc-status-buffer): Only do something when the argument
      is not nil.
      (vc-status-kill-dir-status-process): New function.
      (vc-status-mode-map): Bind it.
      (vc-status-process-buffer): New variable.
      (vc-status-mode): Make it local.
      (vc-status-refresh): Set it.
      
      * vc-hg.el (vc-hg-dir-status):
      * vc-git.el (vc-git-dir-status):
      * vc-svn.el (vc-svn-dir-status): Return the buffer in which the
      command is run.
      751c9f00
  20. 20 Feb, 2008 2 commits
  21. 19 Feb, 2008 1 commit
    • Thien-Thi Nguyen's avatar
      Make sure all backends support vc-BACKEND-root. · b038f9fb
      Thien-Thi Nguyen authored
      * vc-hooks.el (vc-find-root): Take optional arg INVERT.
      If non-nil, reverse the sense of the check.
      * vc-rcs.el (vc-rcs-root): New func.
      * vc-cvs.el (vc-cvs-root): New func.
      * vc-svn.el (vc-svn-root): New func.
      b038f9fb
  22. 20 Jan, 2008 1 commit
  23. 19 Jan, 2008 1 commit
  24. 18 Jan, 2008 1 commit
  25. 16 Jan, 2008 1 commit
  26. 15 Jan, 2008 1 commit
  27. 14 Jan, 2008 1 commit
    • Dan Nicolaescu's avatar
      * smerge-mode.el (smerge-auto): New function. · ba463d9e
      Dan Nicolaescu authored
      * vc-svn.el (vc-svn-find-file-hook):
      * vc-arch.el (vc-arch-find-file-hook):
      * pcvs.el (cvs-revert-if-needed):
      * vc.el (vc-maybe-resolve-conflicts): Use it instead of vc-mode.
      (top-level): Add a Todo list.
      ba463d9e
  28. 10 Jan, 2008 1 commit
  29. 07 Jan, 2008 1 commit
  30. 02 Jan, 2008 1 commit
  31. 01 Jan, 2008 3 commits
  32. 29 Dec, 2007 1 commit
    • Eric S. Raymond's avatar
      * vc-svn.el (vc-svn-parse-status): Recognize 'added, 'removed, · 484c1b1f
      Eric S. Raymond authored
      and 'unregistered states.
      
      * vc-hooks.el (vc-state): Added 'removed state to documentation.
      
      * vc-hg (vc-hg-parse-status): Recognize 'added, 'removed,  and
      'up-to-date state.  Deal with the possibility that C for clean
      might change to "=" in the next point release.
      
      * vc-git.el (vc-git-parse-status): Recognize 'removed.
      
      * vc.el (header comment): Better description of new dir-state.
      (vc-compatible-state): Defines which states are mutually
      compatible; usable with 'edited as a test for which can be committed on.
      (vc-dired-hook): Turn off undo in the VC-Dired buffer, a speed tweak.
      (vc-default-dired-state-info): Display 'removed state.
      
      * vc-bzr.el (vc-bzr-dir-state): Recognize 'added.
      484c1b1f
  33. 28 Dec, 2007 2 commits
    • Eric S. Raymond's avatar
      * vc-hooks.el (vc-state): Document new 'ignored and 'unregistered · 722f037f
      Eric S. Raymond authored
      	states. and the new return-value convention.  These are not
      	actually used yet, just set.
      
      	* vc-svn.el (vc-svn-parse-status): Set 'ignored and 'unregistered
      	states when appropriate.
      
      	* vc-hg.el (vc-hg-state,vc-hg-dir-state): Set 'ignored and
      	'unregistered' when appropriate.
      
      	* vc-git.el: Document that we don't set the new states yet.
      
      	* vc.el (vc-dired-state-info): Display 'unregistered and
      	'ignored states.
      
      	* vc-cvs.el (vc-cvs-parse-status): Set the 'ignored state when
      	appropriate.
      
      	* vc-bzr.el (vc-bzr-dir-state): Set 'ignored and
      	'unregistered' when appropriate.
      722f037f
    • Eric S. Raymond's avatar
      * vc-cvs.el, vc-svn.el: Simplify backend dired-state-info · 0f67cc71
      Eric S. Raymond authored
      functions so they don't do work that the default one can do instead
      0f67cc71