1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-23 14:10:28 -08:00
Commit graph

1175 commits

Author SHA1 Message Date
Eric S. Raymond
2f4f920079 VC API simplification: remove ability to set initial revision.
This hasn't made any sense since RCS, and was a dumb stunt then.

* vc/vc.el and all backends: API simplification; init-revision is
gone, and vc-registered functions no longer take an initial-revision
argument.
2014-12-01 06:23:10 -05:00
Glenn Morris
9402d80f25 * lisp/vc/vc-filewise.el: Comment fixes. 2014-11-29 13:38:29 -08:00
Glenn Morris
741f5e15dd * lisp/vc/vc-src.el: Fix copy-pasted :version tags. 2014-11-29 13:34:29 -08:00
Paul Eggert
0cce3623b1 Merge branch 'emacs-24'. 2014-11-28 23:07:16 -08:00
Ted Zlatanov
ba4502fe14 Merge branch 'emacs-24'
Conflicts:
	nt/addsection.c
	nt/inc/ms-w32.h
	src/w32.c
2014-11-26 21:31:11 -05:00
Simon Leinen
4e0f8f7b2d Fix for vc-filewise.el unresolved-call glitch. 2014-11-26 13:22:35 -05:00
Simon Leinen
181b12e7fd Fix up autoloads in vc-rcs.el and vc-sccs.el. 2014-11-26 13:10:26 -05:00
Eric S. Raymond
873bc1329f Minor typo fixes in vc-src.el. 2014-11-25 16:44:02 -05:00
Sam Steingold
27f46ae31c Remove a spurious comma
* lisp/vc/vc-hooks.el (vc-directory-exclusion-list):
Fix a trivial typo (bug#19171).
2014-11-24 15:54:07 -05:00
Stefan Monnier
b3b0b0971d * lisp/vc/vc-hooks.el (vc-state-base-face): Don't override
mode-line-inactive.
2014-11-24 12:26:01 -05:00
Dmitry Gutov
5ceb233b2d Fixes: debbugs:18579
* lisp/vc/vc-hg.el (vc-hg-dir-status-files): Include ignored files.
2014-11-24 04:11:36 +02:00
Dmitry Gutov
7aac8f171b Fixes: debbugs:18579
* lisp/vc/vc-bzr.el (vc-bzr-after-dir-status): Don't skip ignored
files.
2014-11-24 03:44:42 +02:00
Michael Albinus
b559a60382 Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs 2014-11-22 12:38:21 +01:00
Michael Albinus
cd22fd754b Propagate remote process environment.
* net/tramp-sh.el (tramp-sh-handle-start-file-process)
(tramp-sh-handle-process-file): Propagate `process-environment'.

* vc/vc-hg.el (vc-hg-state): No special handling for remote files;
Tramp propagates environment variables now.
2014-11-22 12:37:04 +01:00
Eric S. Raymond
cec2396625 Unbreak the build.
I don't really understand why this reversion works, but it will do until I can
actually comprehend the bizarre hairball that is Emacs bootstrapping.
2014-11-22 06:32:48 -05:00
Eric S. Raymond
e9b1902634 Revert "More movement of master-related code to vc-filewise.el."
Must unbreak the build.  Which is way too complicated...
2014-11-22 06:03:57 -05:00
Eric S. Raymond
4fe5b7c0bb More movement of master-related code to vc-filewise.el.
Goes with my 2014-11-22 lisp/ChangeLog entry.
2014-11-22 05:21:09 -05:00
Eric S. Raymond
354a07b570 Isolating support code for the file-granularity back ends: the easy part.
* vc-filewise.el: New file to isolate code used only by the
file-oriented back ends (SCCS/RCS/CVS/SRC) which should not live in
vc.el and certainly not in vc-hooks.el.
2014-11-22 00:31:20 -05:00
Eric S. Raymond
af46a2a43f Rename vc-name to vc-master-rename.
* vc-hooks.el, vc-rcs.el, vc-sccs.el: vc-name -> vc-master-name.  This
is preaparatory to isolating all the 'master' functions used only by
the file-oriented back ends.  With this done first, the substantive
diffs will be easier to read.
2014-11-22 00:10:31 -05:00
Eric S. Raymond
e14c4354cf Fix bug that produced spurious nil state. 2014-11-21 07:29:51 -05:00
Eli Zaretskii
04ed420021 Use "~1" instead of "^" in vc-git.el to specify the parent of a Git commit.
lisp/vc/vc-git.el (vc-git-previous-revision): Use "~1" instead of
 "^", since the latter is a special character for MS-Windows system
 shells.
2014-11-21 12:34:59 +02:00
Eli Zaretskii
f9b9251f8c Use correct encoding to communicate with Git.
lisp/vc/vc-git.el (vc-git-command, vc-git--call): Bind
 coding-system-for-read and coding-system-for-write to
 vc-git-commits-coding-system.
2014-11-21 12:26:35 +02:00
Eli Zaretskii
a131037e97 Fix bug #19084 with 'C-x v +' in *vc-change-log* buffers.
lisp/vc/vc.el (vc-deduce-fileset): Support invocation from
 *vc-change-log* buffer.
2014-11-21 12:14:32 +02:00
Ulrich Mueller
a2c0a14c32 Fix bug #19136 with a typo in a vc.el comment.
lisp/vc/vc.el: Fix a typo in the commentary.
2014-11-21 11:21:50 +02:00
Eric S. Raymond
f9c0081e98 Clean up after SRC support merge (typo fixes). 2014-11-20 22:44:07 -05:00
Eric S. Raymond
1e81f67690 Support for SRC in VC mode. 2014-11-20 17:57:22 -05:00
Eric S. Raymond
e7e9dbccb0 Remove editable argument from VC's backend checkout methods.
Alters vc/vc-bzr.el, vc/vc-cvs.el, vc/vc-dav.el, vc/vc-git.el,
vc/vc-hg.el, vc/vc-mtn.el, vc/vc-rcs.el, vc/vc-sccs.el,
vc/vc-svn.el, vc/vc.el.

where this matters (which is only in SCCS and RCS) files are now always
checked out editable. This may actually have been dynamically true
already - it looks like the vc-next-action code evolved past visiting
the other case. Tested with RCS.
2014-11-20 03:52:24 -05:00
Eric S. Raymond
f83109f0fa Remove never-used rev argument from VC's backend checkin methods.
Alters vc/vc-arch.el, vc/vc-bzr.el, vc/vc-cvs.el, vc/vc-dav.el,
vc/vc-git.el, vc/vc-hg.el, vc/vc-mtn.el, vc/vc-rcs.el,
vc/vc-sccs.el, vc/vc-svn.el, vc/vc.el.

Only the RCS, SCCS, and CVS back ends tried to do anything with it,
and that code was never exercised. Chiseling away the cruft of
decades...
2014-11-20 02:37:06 -05:00
Eli Zaretskii
2fa082c003 Fix VC documentation related to switching branches.
lisp/vc/vc.el (vc-retrieve-tag): Doc fix.

 doc/emacs/maintaining.texi (Switching Branches): Mention "C-x v r".
 Correct commands for switching branches in various VCSs.
2014-11-19 20:35:17 +02:00
Eli Zaretskii
e9917c08dc Fix bug #19101 with log-view-mode set in the wrong buffer.
lisp/vc/vc.el (vc-log-internal-common): Turn on log-view-mode in the
 correct buffer.  (Bug#19101)
2014-11-19 18:11:05 +02:00
Rüdiger Sonderfeld
6ffab21f41 vc-git: Support `diff-switches'.
Fix bug#19099.
* lisp/vc/vc-git.el (vc-git-diff): Use "difftool -x diff" with
  `diff-switches' if `vc-git-diff-switches' is nil.
2014-11-19 12:09:57 +01:00
Eli Zaretskii
67a22c6062 Don't assume "bzr log" uses --long format by default.
lisp/vc/vc-bzr.el (vc-bzr-print-log, vc-bzr-expanded-log-entry):
 Don't assume --long is the default for "bzr log", always specify
 it explicitly, in case the user defined an alias for 'log' that
 uses some other format.
2014-11-17 19:36:29 +02:00
Oscar Fuentes
d409545938 Add faces for the VC modeline state indicator
* lisp/vc/vc-hooks.el:
(vc-state-faces, vc-state-base-face)
(vc-up-to-date-state, vc-needs-update-state)
(vc-locked-state, vc-locally-added-state)
(vc-conflict-state, vc-removed-state)
(vc-missing-state, vc-edited-state):
New faces.
(vc-default-mode-line-string): Use them
2014-11-16 06:16:41 +01:00
Michael Albinus
260cedec96 Backport: Fixes: debbugs:18940
* vc/vc-hg.el (vc-hg-state): Disable pager.

Conflicts:
	lisp/ChangeLog
2014-11-15 17:52:14 +01:00
Michael Albinus
a85cf0d9fe Fixes: debbugs:18940
* vc/vc-hg.el (vc-hg-state): Disable pager.
2014-11-13 16:26:51 +01:00
Dmitry Gutov
91982ede58 Fix bug#18964
* lisp/vc/vc-dir.el (vc-dir-hide-state): Also hide `ignored' items when
no state is specified.
2014-11-10 03:29:58 +02:00
Glenn Morris
e1418d0e25 * lisp/vc/vc/git.el: Fix previous.
Move new code after vc-git-log-view-mode definition to avoid bootstrap error.
Ref: http://hydra.nixos.org/build/16795500
2014-11-05 18:12:07 -05:00
Stefan Monnier
8b86268b69 * lisp/vc/vc.el (vc-region-history): New command.
(vc-print-log-internal): Use cl-some.
* lisp/vc/vc-git.el (vc-git-region-history): New function.
(vc-git-region-history-mode-map)
(vc-git--log-view-long-font-lock-keywords)
(vc-git-region-history-font-lock-keywords): New vars.
(vc-git-region-history-font-lock): New function.
(vc-git-region-history-mode): New major mode.
2014-11-05 14:59:31 -05:00
Glenn Morris
ddce73d32f Revert previous accidental commit 2014-11-04 21:08:12 -08:00
Glenn Morris
6a278b64f7 Merge from emacs-24; up to 117669 2014-11-04 21:04:30 -08:00
Paul Eggert
123ddec7f8 Simplify use of current-time and friends.
* doc/misc/org.texi (Dynamic blocks):
* lisp/allout-widgets.el (allout-widgets-hook-error-handler):
* lisp/calendar/appt.el (appt-display-message):
* lisp/calendar/icalendar.el (icalendar--convert-float-to-ical):
* lisp/calendar/timeclock.el (timeclock-in, timeclock-when-to-leave)
(timeclock-last-period, timeclock-day-base):
* lisp/eshell/em-ls.el (eshell-ls-file):
* lisp/eshell/esh-util.el (eshell-parse-ange-ls):
* lisp/generic-x.el (named-database-print-serial):
* lisp/net/newst-backend.el (newsticker--get-news-by-url-callback)
(newsticker-get-news, newsticker--sentinel-work)
(newsticker--image-get, newsticker--image-sentinel):
* lisp/net/tramp-sh.el (tramp-get-remote-touch):
* lisp/progmodes/opascal.el (opascal-debug-log):
* lisp/textmodes/remember.el (remember-mail-date)
(remember-store-in-files):
* lisp/vc/vc-annotate.el (vc-annotate-display-autoscale)
(vc-default-annotate-current-time):
* lisp/vc/vc-bzr.el (vc-bzr-shelve-snapshot):
* lisp/vc/vc-cvs.el (vc-cvs-annotate-current-time):
* lisp/vc/vc-rcs.el (vc-rcs-annotate-current-time):
* lisp/url/url-util.el (url-get-normalized-date):
* lisp/erc/erc-backend.el (TOPIC):
* lisp/gnus/gnus-delay.el (gnus-delay-article):
* lisp/gnus/gnus-sum.el (gnus-summary-read-document):
* lisp/gnus/gnus-util.el (gnus-seconds-today, gnus-seconds-month):
* lisp/gnus/message.el (message-make-expires-date):
* lisp/org/org-archive.el (org-archive-subtree)
(org-archive-to-archive-sibling):
* lisp/org/org-clock.el (org-resolve-clocks, org-clock-get-sum-start)
(org-clock-special-range):
* lisp/org/org-timer.el (org-timer-seconds):
* lisp/org/org.el (org-read-date-analyze, org-get-cursor-date):
* lisp/org/ox-html.el (org-html-format-spec):
* lisp/org/ox-icalendar.el (org-icalendar--vtodo):
Omit unnecessary call to current-time.
* lisp/calendar/time-date.el (time-to-seconds) [!float-time]:
* lisp/calendar/timeclock.el (timeclock-time-to-date):
* lisp/vc/vc-annotate.el (vc-annotate-convert-time):
Use current time if arg is nil, to be compatible with float-time.
(time-date--day-in-year): New function, with most of the guts of
the old time-to-day-in-year.
(time-to-day-in-year): Use it.
(time-to-days): Use it, to avoid decoding the same time stamp twice.
* lisp/calendar/timeclock.el (timeclock-update-mode-line):
* lisp/cedet/srecode/args.el (srecode-semantic-handle-:time):
* lisp/gnus/gnus-util.el (gnus-seconds-year):
* lisp/org/org.el (org-get-cursor-date):
Don't call current-time twice to get the current time stamp,
as this can lead to inconsistent results.
* lisp/completion.el (cmpl-hours-since-origin):
* lisp/erc/erc.el (erc-emacs-time-to-erc-time):
* lisp/ido.el (ido-time-stamp):
* lisp/vc/vc-annotate.el (vc-annotate-convert-time):
Simplify by using float-time.
* lisp/completion.el (save-completions-to-file):
* lisp/url/url-cache.el (url-cache-prune-cache):
Rename local var to avoid confusion.
* lisp/gnus/gnus-util.el (gnus-float-time):
* lisp/net/rcirc.el (rcirc-float-time):
* lisp/org/org-compat.el (org-float-time):
Simplify to an alias because time-to-seconds now behaves like float-time
with respect to nil arg.
* lisp/subr.el (progress-reporter-do-update):
Don't call float-time unless needed.
* lisp/erc/erc.el (erc-current-time): Simplify by using erc-emacs-time-to-erc-time.
* lisp/org/org-clock.el (org-clock-get-table-data): Omit unnecessary, lossy
conversion from floating point to Emacs time and back.
(org-resolve-clocks): Prefer two-argument floor.
2014-10-28 18:42:51 -07:00
Daniel Colascione
be5722e930 Stop vc from burying buffers sometimes
* vc/vc-dispatcher.el (vc-resynch-window): Tell view-mode not to
change window configuration when we turn it off.
2014-10-21 17:05:13 +01:00
Santiago Payà i Miralta
739ba4636b * lisp/vc/vc-hg.el (vc-hg-log-graph): New var.
(vc-hg-print-log): Use it.
(vc-hg-root-log-format): Include branch name and bookmarks; ignore
graph output.

Fixes: debbugs:17515
2014-10-20 20:14:07 -04:00
Juri Linkov
4ede14b986 * lisp/vc/diff-mode.el (diff-refine-changed): Rename from
`diff-refine-change' for consistency with `diff-changed'.
(diff-refine-change): Add obsolete face alias. 
* lisp/vc/smerge-mode.el (smerge-refined-changed): Rename from
`smerge-refined-change'.
(smerge-refined-change): Add obsolete face alias.
[Backport]

Fixes: debbugs:10181
2014-10-20 20:11:58 -04:00
Glenn Morris
79a90058ec Merge from emacs-24; up to 2014-07-16T17:06:12Z!rgm@gnu.org 2014-10-03 08:44:46 -07:00
Dmitry Gutov
c799337f12 Fix vc-svn-ignore
* lisp/vc/vc-svn.el (vc-svn-ignore-completion-table): Implement.
(vc-svn-ignore): Use it.

Fixes: debbugs:18619
2014-10-03 17:15:05 +04:00
Stefan Monnier
f0db348816 * lisp/vc/vc-svn.el (vc-svn-after-dir-status): Fix the non-remote regexp,
similarly to Roger's 2010-06-12 change for the remote change.

Fixes: debbugs:18605
2014-10-02 20:42:28 -04:00
Stefan Monnier
cbdc06f3be Rename 24.5 to 25.1
Except where we expect to backport the corresponding change.
2014-09-29 14:14:08 -04:00
Juri Linkov
b8e352d077 * lisp/vc/add-log.el (change-log-next-buffer): Don't create an empty
buffer "ChangeLog" when the current buffer doesn't match ChangeLog.[0-9].
Return the current buffer if no files match the default pattern
ChangeLog.[0-9].  Signal "end of multi" when file is nil.

Fixes: debbugs:18547
2014-09-25 23:55:58 +03:00
Glenn Morris
c04714f7c8 Merge from emacs-24; up to 2014-07-08T06:24:07Z!eggert@cs.ucla.edu 2014-09-07 23:00:58 -07:00