1. 04 Mar, 2011 1 commit
  2. 03 Mar, 2011 1 commit
  3. 19 Feb, 2011 1 commit
    • Chong Yidong's avatar
      Improvements to vc-bzr conffile handling and pull/merge support. · 3ab713fd
      Chong Yidong authored
      * vc/vc-bzr.el (vc-bzr--branch-conf): Function deleted.
      (vc-bzr-branch-conf): New function, similar to vc-bzr--branch-conf
      but returning an alist.  Ignore comments in bzr conffile.
      (vc-bzr-pull, vc-bzr-merge-branch): Use vc-bzr-branch-conf.
      (vc-bzr-error-regex-alist): New var.
      (vc-bzr-merge-branch): Use it to highlight the pull/merge buffer.
      
      * progmodes/compile.el (compilation--flush-directory-cache):
      Handle the case where cdr of compilation--flush-directory-cache
      points to no buffer, which can occur if we previously switched to
      compilation-mode in a pregenerated buffer.
      
      * vc/vc-dispatcher.el (vc-do-async-command): Bind
      inhibit-read-only to t.
      3ab713fd
  4. 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
  5. 13 Feb, 2011 1 commit
    • Chong Yidong's avatar
      Bind RET in Log View mode to a command that toggles a more detailed display. · d4eb88c7
      Chong Yidong authored
      * lisp/vc/log-view.el: New command log-view-toggle-entry-display for
      toggling log entries between concise and detailed forms.
      (log-view-toggle-entry-display): New command.
      (log-view-mode-map): Bind RET to it.
      (log-view-expanded-log-entry-function): New variable.
      (log-view-current-entry, log-view-inside-comment-p)
      (log-view-current-tag): New functions.
      (log-view-toggle-mark-entry): Use log-view-current-entry and
      log-view-end-of-defun instead of searching directly with
      log-view-message-re.
      (log-view-end-of-defun): Likewise.  Add optional ARG for
      compatibility with end-of-defun.
      (log-view-end-of-defun): Ignore comments and VC buttons.
      
      * lisp/vc/vc-bzr.el (vc-bzr-expanded-log-entry): New function.
      (vc-bzr-log-view-mode): Use log-view-expanded-log-entry-function.
      d4eb88c7
  6. 29 Jan, 2011 1 commit
    • 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
  7. 28 Jan, 2011 1 commit
  8. 27 Jan, 2011 1 commit
  9. 25 Jan, 2011 1 commit
  10. 06 Jan, 2011 1 commit
    • Glenn Morris's avatar
      vc-bzr fix for bug #7792. · b0a8e46b
      Glenn Morris authored
      * lisp/vc/vc-bzr.el (vc-bzr-annotate-command, vc-bzr-annotate-time)
      (vc-bzr-annotate-extract-revision-at-line):
      Handle authors with embedded spaces.
      b0a8e46b
  11. 11 Dec, 2010 1 commit
    • Glenn Morris's avatar
      Misc vc-bzr.el. · 2b404597
      Glenn Morris authored
      * lisp/vc/vc-bzr.el (vc-bzr-state-heuristic): Also check that the executable
      state of the file matches.  (Bug#7544)
      (vc-bzr-register, vc-bzr-checkin)
      (vc-bzr-annotate-extract-revision-at-line): Doc fixes.
      (vc-directory-exclusion-list): Remove unnecessary eval-after-load.
      
      Comment changes:
      Remove outdated comments about defunct upstream.
      Set maintainer to FSF.
      2b404597
  12. 23 Nov, 2010 2 commits
    • Chong Yidong's avatar
      Always issue a full prompt in vc-merge-branch operation. · 3d92f44e
      Chong Yidong authored
      * vc/vc.el (vc-merge): Remove optional arg PROMPT.  Always prompt
      for a merge location.
      
      * vc/vc-bzr.el (vc-bzr-pull): Remove unused var.
      (vc-bzr-merge-branch): Always prompt.
      (vc-bzr-async-command): Use the full branch filename.
      3d92f44e
    • Chong Yidong's avatar
      Initial support for unified DVCS pull and merge. · 2c3160c5
      Chong Yidong authored
      * lisp/vc/vc-bzr.el (vc-bzr-admin-branchconf, vc-bzr-history): New vars.
      (vc-bzr--branch-conf, vc-bzr-async-command, vc-bzr-pull)
      (vc-bzr-merge-branch): New functions, implementing merge-branch
      and pull operations.
      
      * lisp/vc/vc.el (vc-merge): Use vc-BACKEND-merge-branch if available.
      Accept optional prefix arg meaning to prompt for a command.
      (vc-update): Use vc-BACKEND-pull if available.  Accept optional
      prefix arg meaning to prompt for a command.
      (vc-pull): Alias for vc-update.
      2c3160c5
  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 1 commit
  16. 01 Jun, 2010 1 commit
  17. 21 Apr, 2010 2 commits
    • Stefan Monnier's avatar
    • 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
  18. 19 Apr, 2010 1 commit
  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. 24 Mar, 2010 2 commits
  21. 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
  22. 12 Mar, 2010 1 commit
  23. 17 Feb, 2010 1 commit
  24. 06 Feb, 2010 1 commit
  25. 01 Feb, 2010 1 commit
  26. 29 Jan, 2010 1 commit
  27. 25 Jan, 2010 2 commits
  28. 13 Jan, 2010 2 commits
  29. 09 Jan, 2010 1 commit
  30. 06 Jan, 2010 1 commit
  31. 05 Jan, 2010 2 commits
  32. 04 Jan, 2010 2 commits