1. 16 Apr, 2012 1 commit
  2. 13 Mar, 2012 1 commit
  3. 25 Feb, 2012 1 commit
    • Chong Yidong's avatar
      Add custom groups for VC backends, for consistency with vc-bzr. · 67b0de11
      Chong Yidong authored
      Callers changed.
      
      * vc/vc-arch.el (vc-arch):
      * vc/vc-cvs.el (vc-cvs):
      * vc/vc-git.el (vc-git):
      * vc/vc-hg.el (vc-hg):
      * vc/vc-mtn.el (vc-mtn):
      * vc/vc-rcs.el (vc-rcs):
      * vc/vc-sccs.el (vc-sccs):
      * vc/vc-svn.el (vc-svn): New customization group.
      
      Fixes: debbugs:10871
      67b0de11
  4. 05 Jan, 2012 1 commit
  5. 19 Dec, 2011 1 commit
  6. 15 Mar, 2011 1 commit
    • Stefan Monnier's avatar
      Fix misuse of quote in `case'. · 0adf5618
      Stefan Monnier authored
      * lisp/progmodes/ruby-mode.el (ruby-backward-sexp):
      * lisp/progmodes/ebrowse.el (ebrowse-draw-file-member-info):
      * lisp/play/gamegrid.el (gamegrid-make-face):
      * lisp/play/bubbles.el (bubbles--grid-width, bubbles--grid-height)
      (bubbles--colors, bubbles--shift-mode, bubbles--initialize-images):
      * lisp/notifications.el (notifications-notify):
      * lisp/net/xesam.el (xesam-search-engines):
      * lisp/net/quickurl.el (quickurl-list-insert):
      * lisp/vc/vc-hg.el (vc-hg-dir-printer): Fix use of case.
      * lisp/gnus/auth-source.el (auth-source-netrc-create):
      * lisp/gnus/message.el (message-yank-original): Fix use of `case'.
      * lisp/org/org-src.el (org-src-switch-to-buffer):
      * lisp/org/org-plot.el (org-plot/gnuplot-script, org-plot/gnuplot):
      * lisp/org/org-mouse.el (org-mouse-agenda-type):
      * lisp/org/org-freemind.el (org-freemind-node-to-org):
      * lisp/org/ob-sql.el (org-babel-execute:sql):
      * lisp/org/ob-exp.el (org-babel-exp-do-export, org-babel-exp-code):
      * lisp/org/ob-ref.el (org-babel-ref-resolve): Fix use of case.
      0adf5618
  7. 10 Mar, 2011 1 commit
  8. 14 Feb, 2011 1 commit
    • Chong Yidong's avatar
      Add Log View toggle and log format customization for Git and Hg. · 33f6cf7b
      Chong Yidong authored
      * lisp/vc/vc-git.el (vc-git-root-log-format): New option for
      customizing log format.
      (vc-git-print-log, vc-git-log-outgoing, vc-git-log-incoming)
      (vc-git-log-view-mode): Use it.
      (vc-git-expanded-log-entry): New function.
      (vc-git-log-view-mode): Use it.  Truncate lines in root log.
      
      * lisp/vc/vc-hg.el (vc-hg-root-log-template): New option for
      customizing log format.
      (vc-hg-print-log): Use it.
      (vc-hg-expanded-log-entry): New function.
      (vc-hg-log-view-mode): Use vc-hg-root-log-template and
      vc-hg-expanded-log-entry.  Truncate lines in root log.
      
      * lisp/vc/vc-bzr.el (vc-bzr-log-view-mode): Truncate lines in root log.
      
      * lisp/vc/log-view.el (log-view-mode-menu): Add
      log-view-toggle-entry-display.
      33f6cf7b
  9. 03 Feb, 2011 1 commit
  10. 29 Jan, 2011 2 commits
    • Chong Yidong's avatar
      Refresh Dired and VC-dir buffers after vc-pull and vc-merge. · a2b6e5d6
      Chong Yidong authored
      * vc/vc-dispatcher.el (vc-set-async-update): New function for
      updating Dired or VC-dir buffers after async command completes.
      
      * vc/vc-bzr.el (vc-bzr-async-command): Return the process buffer.
      (vc-bzr-pull, vc-bzr-merge-branch): Use vc-set-async-update.
      
      * vc/vc-git.el (vc-git-merge-branch): Add FETCH_HEAD to branch
      completions if it exists.  Use vc-set-async-update.
      (vc-git-pull): Use vc-set-async-update.
      
      * vc/vc-hg.el (vc-hg-pull): Fix default-contents arg to
      read-shell-command.  Use vc-set-async-update.
      (vc-hg-merge-branch): Use vc-set-async-update.
      a2b6e5d6
    • Chong Yidong's avatar
      Rudimentary support for vc-pull and vc-merge in Git and Mercurial. · 659114fd
      Chong Yidong authored
      * lisp/vc/vc.el (vc-pull): Make vc-update an alias for this, instead of
      the other way around.
      
      * lisp/vc/vc-git.el (vc-git-branches, vc-git-pull)
      (vc-git-merge-branch): New functions.
      (vc-git-history): New var.
      
      * lisp/vc/vc-hg.el (vc-hg-history): New var.
      (vc-hg-pull): Perform default pull if called via Lisp by vc-pull.
      (vc-hg-merge-branch): New function.
      659114fd
  11. 25 Jan, 2011 1 commit
  12. 15 Jan, 2011 1 commit
  13. 29 Aug, 2010 1 commit
  14. 11 Jun, 2010 2 commits
    • Juri Linkov's avatar
      * lisp/finder.el (finder-known-keywords): Add keyword "vc" · 9766adfb
      Juri Linkov authored
      for version control.
      
      * add-log.el, cvs-status.el, diff.el, diff-mode.el, ediff.el,
      * emerge.el, log-edit.el, log-view.el, pcvs.el, smerge-mode.el,
      * vc-annotate.el, vc-bzr.el, vc-dir.el, vc-dispatcher.el, vc-git.el,
      * vc-hg.el, vc-mtn.el, vc.el: Add keyword "vc".
      9766adfb
    • Juri Linkov's avatar
      Move version control related files to the "vc" subdirectory. · 56b2854f
      Juri Linkov authored
      * add-log.el, cvs-status.el, diff.el, diff-mode.el, ediff-diff.el,
      * ediff.el, ediff-help.el, ediff-hook.el, ediff-init.el,
      * ediff-merg.el, ediff-mult.el, ediff-ptch.el, ediff-util.el,
      * ediff-vers.el, ediff-wind.el, emerge.el, log-edit.el, log-view.el,
      * pcvs-defs.el, pcvs.el, pcvs-info.el, pcvs-parse.el, pcvs-util.el,
      * smerge-mode.el, vc-annotate.el, vc-arch.el, vc-bzr.el, vc-cvs.el,
      * vc-dav.el, vc-dir.el, vc-dispatcher.el, vc.el, vc-git.el,
      * vc-hg.el, vc-hooks.el, vc-mtn.el, vc-rcs.el, vc-sccs.el, vc-svn.el:
      Move files to the "vc" subdirectory.
      56b2854f
  15. 09 Jun, 2010 2 commits
  16. 21 Apr, 2010 1 commit
    • Stefan Monnier's avatar
      Make the log-edit comments use RFC822 format throughout. · e97a42c1
      Stefan Monnier authored
      * vc.el (vc-checkin, vc-modify-change-comment):
      Adjust to new vc-start/finish-logentry.
      (vc-find-conflicted-file): New command.
      (vc-transfer-file): Adjust to new vc-checkin.
      (vc-next-action): Improve scoping.
      
      * vc-hg.el (vc-hg-log-edit-mode): Remove.
      (vc-hg-checkin): Remove extra arg.  Use log-edit-extract-headers.
      
      * vc-git.el (vc-git-log-edit-mode): Remove.
      (vc-git-checkin): Remove extra arg.  Use log-edit-extract-headers.
      (vc-git-commits-coding-system): Rename from git-commits-coding-system.
      
      * vc-dispatcher.el (vc-log-edit): Shorten names for log-edit-show-files.
      (vc-start-logentry): Remove argument `extra'.
      (vc-finish-logentry): Remove extra args.
      
      * vc-bzr.el (vc-bzr-log-edit-mode): Remove.
      (vc-bzr-checkin): Remove extra arg.  Use log-edit-extract-headers.
      (vc-bzr-conflicted-files): New function.
      
      * log-edit.el (log-edit-extra-flags)
      (log-edit-before-checkin-process): Remove.
      (log-edit-summary, log-edit-header, log-edit-unknown-header): New faces.
      (log-edit-headers-alist): New var.
      (log-edit-header-contents-regexp): New const.
      (log-edit-match-to-eoh): New function.
      (log-edit-font-lock-keywords): Use them.
      (log-edit): Insert a "Summary:" header as default.
      (log-edit-mode): Mark font-lock rules as case-insensitive.
      (log-edit-done): Cleanup headers.
      (log-view-process-buffer): Remove.
      (log-edit-extract-headers): New function to replace it.
      e97a42c1
  17. 20 Apr, 2010 1 commit
  18. 17 Apr, 2010 2 commits
  19. 07 Apr, 2010 1 commit
    • Dan Nicolaescu's avatar
      Add new VC methods: vc-log-incoming and vc-log-outgoing. · 31527c56
      Dan Nicolaescu authored
      * vc.el (vc-print-log-setup-buttons): New function split out from
      vc-print-log-internal.
      (vc-log-internal-common): New function, a parametrized version of
      vc-print-log-internal.
      (vc-print-log-internal): Just call vc-log-internal-common with the
      right arguments.
      (vc-incoming-outgoing-internal):
      (vc-log-incoming, vc-log-outgoing): New functions.
      (vc-log-view-type): New permanent local variable.
      
      * vc-hooks.el (vc-menu-map): Bind vc-log-incoming and vc-log-outgoing.
      
      * vc-bzr.el (vc-bzr-log-view-mode): Use vc-log-view-type instead
      of the dynamic bound vc-short-log.
      (vc-bzr-log-incoming, vc-bzr-log-outgoing): New functions.
      
      * vc-git.el (vc-git-log-outgoing): New function.
      (vc-git-log-view-mode): Use vc-log-view-type instead
      of the dynamic bound vc-short-log.
      
      * vc-hg.el (vc-hg-log-view-mode): Use vc-log-view-type instead
      of the dynamic bound vc-short-log.  Highlight the tag.
      (vc-hg-log-incoming, vc-hg-log-outgoing): New functions.
      (vc-hg-outgoing, vc-hg-incoming, vc-hg-outgoing-mode):
      (vc-hg-incoming-mode): Remove.
      (vc-hg-extra-menu-map): Do not bind vc-hg-incoming and vc-hg-outgoing.
      31527c56
  20. 02 Apr, 2010 1 commit
  21. 24 Mar, 2010 1 commit
  22. 19 Mar, 2010 1 commit
    • Dan Nicolaescu's avatar
      Add special markup processing for commit logs. · 09158997
      Dan Nicolaescu authored
      * log-edit.el (log-edit-extra-flags): New variable.
      (log-edit): Add new argument MODE.  Use that mode when non-nil
      instead of the log-view-mode.
      (log-view-process-buffer): New function.
      
      * vc.el: Document that the checkin method takes optional
      arguments.  Document new backend specific method: log-view-mode.
      (vc-default-log-edit-mode): New function.
      (vc-checkin): Use a backend specific log-view-mode.
      Pass extra arguments to the checkin method.
      (vc-modify-change-comment): Pass a dummy extra argument.
      
      * vc-dispatcher.el (vc-log-edit): Add a mode argument, pass it to
      log-edit.
      (vc-start-logentry): Add a mode argument, pass it to vc-log-edit.
      (vc-finish-logentry): Process the log buffer before passing it
      down.  Pass log-edit-extra-flags.
      
      * vc-bzr.el (vc-bzr-checkin): Pass extra arguments to the commit
      command.
      (log-edit-extra-flags, log-edit-before-checkin-process): New declarations.
      
      * vc-hg.el (vc-hg-checkin): Pass extra arguments to the commit
      command.
      (log-edit-extra-flags, log-edit-before-checkin-process): New declarations.
      (vc-hg-log-edit-mode): New derived mode.
      
      * vc-arch.el (vc-arch-checkin):
      * vc-cvs.el (vc-cvs-checkin):
      * vc-git.el (vc-git-checkin):
      * vc-mtn.el (vc-mtn-checkin):
      * vc-rcs.el (vc-rcs-checkin):
      * vc-sccs.el (vc-sccs-checkin):
      * vc-svn.el (vc-svn-checkin): Add an optional ignored argument.
      09158997
  23. 13 Jan, 2010 1 commit
  24. 30 Dec, 2009 2 commits
  25. 14 Dec, 2009 2 commits
  26. 07 Dec, 2009 1 commit
    • Dan Nicolaescu's avatar
      Support showing a single log entry from vc-annotate. · 662c5698
      Dan Nicolaescu authored
      * vc.el (print-log): Add a new argument: START-REVISION.
      (vc-print-log-internal): Add a new optional argument and
      pass it to the backend.
      (vc-print-log, vc-print-root-log): Adjust callers.
      * vc-annotate.el (vc-annotate-show-log-revision-at-line): If a
      buffer already displays the requested log entry, use it.
      Otherwise display only the log entry in question.
      * vc-svn.el (vc-svn-print-log):
      * vc-mtn.el (log-view-file-re):
      * vc-hg.el (vc-hg-state):
      * vc-git.el (vc-git-print-log): Add support for new argument START-REVISION.
      (vc-git-show-log-entry): Return t on success.
      * vc-bzr.el (vc-bzr-print-log): Add support new argument START-REVISION.
      (vc-bzr-show-log-entry): Return t on success.
      * vc-rcs.el (vc-rcs-print-log):
      * vc-sccs.el (vc-sccs-print-log):
      * vc-cvs.el (vc-cvs-print-log): Add new argument, ignore it.
      662c5698
  27. 18 Nov, 2009 1 commit
  28. 15 Nov, 2009 1 commit
    • Dan Nicolaescu's avatar
      * vc.el (vc-log-show-limit): New variable. · 6616006b
      Dan Nicolaescu authored
      (vc-print-log, vc-print-root-log): Add new argument LIMIT.  Set it
      when using a prefix argument.
      (vc-print-log-internal): Add new argument LIMIT.
      
      * vc-svn.el (vc-svn-print-log):
      * vc-mtn.el (vc-mtn-print-log):
      * vc-hg.el (vc-hg-print-log):
      * vc-bzr.el (vc-bzr-print-log): Add new optional argument LIMIT,
      pass it to the log command when set. Make the BUFFER argument
      non-optional.
      
      * vc-sccs.el (vc-sccs-print-log):
      * vc-rcs.el (vc-rcs-print-log):
      * vc-git.el (vc-git-print-log):
      * vc-cvs.el (vc-cvs-print-log): Add new optional argument LIMIT,
      ignore it.  Make the BUFFER argument non-optional
      6616006b
  29. 28 Oct, 2009 1 commit
  30. 19 Oct, 2009 1 commit
    • Dan Nicolaescu's avatar
      Make vc-annotate work through copies and renames. · d1e4c403
      Dan Nicolaescu authored
      * vc-annotate.el (vc-annotate-extract-revision-at-line): Return
      the file name too.
      (vc-annotate-revision-at-line)
      (vc-annotate-find-revision-at-line)
      (vc-annotate-revision-previous-to-line)
      (vc-annotate-show-log-revision-at-line): Update to get the file
      name from vc-annotate-extract-revision-at-line.
      (vc-annotate-show-diff-revision-at-line-internal): Change the
      argument to mean whether to show a file diff or not.  Get the file
      name from vc-annotate-extract-revision-at-line.
      (vc-annotate-show-diff-revision-at-line): Update
      vc-annotate-show-diff-revision-at-line call.
      (vc-annotate-warp-revision): Add an optional file argument.
      
      * vc-git.el (vc-git-annotate-command): Pass -C -C to the blame command.
      (vc-git-annotate-extract-revision-at-line): Also return the file
      name if found.
      
      * vc-hg.el (vc-hg-annotate-command): Pass --follow to the annotate
      command.  Remove unused code.
      (vc-hg-annotate-re): Update to match --follow output.
      (vc-hg-annotate-extract-revision-at-line): Also return the file
      name if found.
      
      * vc.el: Update annotate-extract-revision-at-line documentation.
      d1e4c403
  31. 05 Oct, 2009 1 commit
  32. 22 Sep, 2009 3 commits