Committed revision 252 to http://bzr.xsteve.at/dvc/
Merged from Michael Olson: Added xgit-remove, xgit-revert. Improved error
reporting for failed dvc commands
------------------------------------------------------------
revno: 241.1.30
merged: [EMAIL PROTECTED]
committer: Michael W. Olson <[EMAIL PROTECTED]>
branch nick: mwolson
timestamp: Sun 2007-09-09 00:55:23 -0400
message:
xgit: Rename xgit-revert to xgit-revert-file
* lisp/xgit.el (xgit-revert-file): Rename from xgit-revert, since the
"git revert" command does something different.
(xgit-revert-files): Document that this only touches uncommitted
changes, as opposed to committed changes.
------------------------------------------------------------
revno: 241.1.29
merged: [EMAIL PROTECTED]
committer: Michael W. Olson <[EMAIL PROTECTED]>
branch nick: mwolson
timestamp: Sun 2007-09-09 00:50:38 -0400
message:
CONTRIBUTORS: Bookkeeping
------------------------------------------------------------
revno: 241.1.28
merged: [EMAIL PROTECTED]
committer: Michael W. Olson <[EMAIL PROTECTED]>
branch nick: mwolson
timestamp: Sat 2007-09-08 17:11:48 -0400
message:
Change order of active-dvc values in dvc-current-active-dvc
* lisp/dvc-register.el (dvc-current-active-dvc): Look at
dvc-temp-current-active-dvc before dvc-buffer-current-active-dvc,
because let-bound values should take precedence of buffer-local ones.
------------------------------------------------------------
revno: 241.1.27
merged: [EMAIL PROTECTED]
committer: Michael W. Olson <[EMAIL PROTECTED]>
branch nick: mwolson
timestamp: Sat 2007-09-08 17:07:01 -0400
message:
Remove unnecessary variable dvc-revlist-refresh-fn
* lisp/dvc-revlist.el (dvc-revlist-refresh-fn): Remove.
(dvc-revlist-mode): Don't set dvc-buffer-refresh-function.
(dvc-revlist-generic-refresh): Remove.
(dvc-build-revision-list): Set dvc-buffer-refresh-function here.
------------------------------------------------------------
revno: 241.1.26
merged: [EMAIL PROTECTED]
committer: Michael W. Olson <[EMAIL PROTECTED]>
branch nick: mwolson
timestamp: Sat 2007-09-08 17:00:59 -0400
message:
Fix handling of dvc executable name in default :finish and :error
functions
* lisp/dvc-core.el (dvc-current-executable): New function that returns
the name of the executable for the current dvc backend.
(dvc-default-error-function, dvc-default-killed-function)
(dvc-default-finish-function)
(dvc-finish-function-without-buffer-switch): Use it.
(dvc-run-dvc-async, dvc-run-dvc-sync): Set dvc-temp-current-active-dvc.
* lisp/dvc-register.el (dvc-current-active-dvc): Mention
dvc-temp-current-active-dvc and dvc-buffer-current-active-dvc in
dosctring.
------------------------------------------------------------
revno: 241.1.25
merged: [EMAIL PROTECTED]
committer: Michael W. Olson <[EMAIL PROTECTED]>
branch nick: mwolson
timestamp: Sat 2007-09-08 16:23:14 -0400
message:
xgit: Simplify some code, make xgit-revert-files handle newly-added files
* lisp/xgit.el (xgit-add): Call xgit-add-files, to avoid code
duplication.
(xgit-status): Simplify the code by capturing the lambda just once.
(xgit-split-out-added-files): New function that takes a list of files
and returns a 2-element list. First element is a list of added files,
and the second element is the remainder.
(xgit-revert): Call xgit-revert-files, to avoid code duplication.
(xgit-revert-files): Handle case where some of the files were added to
the tree, but have not yet been committed. These files must be
manually removed from the index.
------------------------------------------------------------
revno: 241.1.24
merged: [EMAIL PROTECTED]
committer: Michael W. Olson <[EMAIL PROTECTED]>
branch nick: mwolson
timestamp: Sat 2007-09-08 15:05:15 -0400
message:
Rename things from git-* to xgit-*, misc. fixes
* lisp/xgit-log.el (xgit-log-since): Fix customization type.
* lisp/xgit.el (xgit-add, xgit-remove, xgit-apply-mbox): Use
dvc-confirm-read-file-name.
(xgit-parse-diff): Remove TODO comment. Make detection of added or
removed files work with git.
(xgit-show-filter-filename-func): Rename from
git-show-filter-filename-func.
(xgit-show-filter-filename-not-quilt): Rename from
git-show-filter-filename-not-quilt.
(xgit-changed-files): Rename from git-changed-files.
(xgit-show): Use the new names.
(xgit-describe-regexp): Rename from git-describe-regexp.
(xgit-describe-tag?): Rename from git-describe-tag?.
(xgit-describe): Use the new names.
(xgit-do-annotate): Rename from git-annotate.
(xgit-annotate): Use the new name.
------------------------------------------------------------
revno: 241.1.23
merged: [EMAIL PROTECTED]
committer: Michael W. Olson <[EMAIL PROTECTED]>
branch nick: mwolson
timestamp: Sat 2007-09-08 14:13:37 -0400
message:
CONTRIBUTORS: Contact people who need to assign changes
------------------------------------------------------------
revno: 241.1.22
merged: [EMAIL PROTECTED]
committer: Michael W. Olson <[EMAIL PROTECTED]>
branch nick: mwolson
timestamp: Sat 2007-09-08 13:59:58 -0400
message:
Merge from Stephen
------------------------------------------------------------
revno: 241.1.21
merged: [EMAIL PROTECTED]
committer: Michael W. Olson <[EMAIL PROTECTED]>
branch nick: mwolson
timestamp: Sat 2007-09-08 13:58:21 -0400
message:
xgit: Add xgit-remove and xgit-revert, and make xgit-revert-files work
* lisp/xgit.el: Mention that this needs git version 1.5.0 or later.
(xgit-remove): New interactive command that removes a single file.
(xgit-remove-files): Use "--" before filenames for maximum safety.
(xgit-restore): Remove.
(xgit-revert): New interactive command that reverts changes made to a
single file.
(xgit-revert-files): Rewrite to work with git rather than cogito.
_______________________________________________
Dvc-dev mailing list
[email protected]
https://mail.gna.org/listinfo/dvc-dev
