Committed revision 190 to http://bzr.xsteve.at/dvc/
Merged the patches mentioned on the mailing list (2007-06-14.. 2007-06-18) from
Michael Olsons branch
------------------------------------------------------------
revno: 189.1.8
merged: [EMAIL PROTECTED]
committer: Michael W. Olson <[EMAIL PROTECTED]>
branch nick: mwolson
timestamp: Mon 2007-06-18 07:54:41 -0400
message:
Apply missed hunk of backspace patch by [EMAIL PROTECTED]
* lisp/dvc-diff.el (dvc-diff-unmark-file): Apply missed hunk from an
earlier patch by [EMAIL PROTECTED]
------------------------------------------------------------
revno: 189.1.7
merged: [EMAIL PROTECTED]
committer: Michael W. Olson <[EMAIL PROTECTED]>
branch nick: mwolson
timestamp: Mon 2007-06-18 07:52:25 -0400
message:
Merge from Christian Ohler
------------------------------------------------------------
revno: 163.2.42
merged: [EMAIL PROTECTED]
committer: Christian Ohler <[EMAIL PROTECTED]>
branch nick: dev
timestamp: Mon 2007-06-18 12:23:54 +0200
message:
Various minor fixes.
* lisp/dvc-diff.el (dvc-diff-no-changes): Don't redraw the entire
frame
every time we detect a tree with no changes. Also fixed unknown
variable (untested).
* lisp/xmtn-ids.el (xmtn--get-base-revision-hash-id): Now errors when
tree has no base revision.
(xmtn--get-base-revision-hash-id-or-null): New function.
* lisp/xmtn-dvc.el (xmtn--status-using-inventory): Correctly handle
trees
with no base revision. Call `dvc-diff-no-changes' if tree has no
changes.
------------------------------------------------------------
revno: 163.2.41
merged: [EMAIL PROTECTED]
committer: Christian Ohler <[EMAIL PROTECTED]>
branch nick: dev
timestamp: Mon 2007-06-18 11:16:55 +0200
message:
xmtn: Some minor fixes to `xmtn-dvc-status'.
* lisp/xmtn-dvc.el (xmtn--status-using-inventory): Call
`accept-process-output' after killing subprocess in an attempt to
make
sure the sentinels have a chance to run.
(xmtn--status-process-entry): Display a non-empty name for the
renamed
root directory after mtn pivot_root, too.
------------------------------------------------------------
revno: 163.2.40
merged: [EMAIL PROTECTED]
committer: Christian Ohler <[EMAIL PROTECTED]>
branch nick: dev
timestamp: Mon 2007-06-18 10:57:43 +0200
message:
* lisp/xmtn-dvc.el (xmtn--get-corresponding-path): Fixed typos.
------------------------------------------------------------
revno: 163.2.39
merged: [EMAIL PROTECTED]
committer: Christian Ohler <[EMAIL PROTECTED]>
branch nick: dev
timestamp: Mon 2007-06-18 10:29:05 +0200
message:
Merged from Michael Olson.
------------------------------------------------------------
revno: 163.2.38
merged: [EMAIL PROTECTED]
committer: Christian Ohler <[EMAIL PROTECTED]>
branch nick: dev
timestamp: Mon 2007-06-18 00:50:48 +0200
message:
Merged from Mathieu Moy.
------------------------------------------------------------
revno: 163.2.37
merged: [EMAIL PROTECTED]
committer: Christian Ohler <[EMAIL PROTECTED]>
branch nick: dev
timestamp: Mon 2007-06-18 00:42:21 +0200
message:
Merged from Stefan Reichoer.
------------------------------------------------------------
revno: 163.2.36
merged: [EMAIL PROTECTED]
committer: Christian Ohler <[EMAIL PROTECTED]>
branch nick: dev
timestamp: Mon 2007-06-18 00:39:05 +0200
message:
xmtn: Use mtn automate inventory if available as basic_io. Various
other fixes.
* lisp/dvc-core.el (dvc-kill-process-maybe): Factored out
`dvc-processes-related-to-buffer'. Fixed typos.
(dvc-processes-related-to-buffer): New function.
* lisp/xmtn-run.el (xmtn--make-version-check-form): Replaced
(mainline)
version specifier with (mainline> X Y).
(xmtn--*command-version-cached-for-executable*): New variable.
* lisp/xmtn-dvc.el (xmtn--tree-consistent-p-future): New function.
(xmtn--status-using-inventory): New function.
------------------------------------------------------------
revno: 163.2.35
merged: [EMAIL PROTECTED]
committer: Christian Ohler <[EMAIL PROTECTED]>
branch nick: dev
timestamp: Sun 2007-06-17 22:29:15 +0200
message:
* lisp/xmtn-run.el (xmtn--latest-mtn-release): Monotone 0.35 has been
released.
------------------------------------------------------------
revno: 163.2.34
merged: [EMAIL PROTECTED]
committer: Christian Ohler <[EMAIL PROTECTED]>
branch nick: dev
timestamp: Thu 2007-06-14 20:06:20 +0200
message:
* www/index.html: xmtn does not implement pull yet.
------------------------------------------------------------
revno: 163.2.33
merged: [EMAIL PROTECTED]
committer: Christian Ohler <[EMAIL PROTECTED]>
branch nick: dev
timestamp: Thu 2007-06-14 16:58:18 +0200
message:
* www/index.html: Changes to wording and structure.
------------------------------------------------------------
revno: 163.2.32
merged: [EMAIL PROTECTED]
committer: Christian Ohler <[EMAIL PROTECTED]>
branch nick: dev
timestamp: Thu 2007-06-14 16:49:32 +0200
message:
* docs/CONTRIBUTORS: Added myself.
------------------------------------------------------------
revno: 163.2.31
merged: [EMAIL PROTECTED]
committer: Christian Ohler <[EMAIL PROTECTED]>
branch nick: dev
timestamp: Thu 2007-06-14 16:47:51 +0200
message:
Merged from Stefan Reichoer.
------------------------------------------------------------
revno: 163.2.30
merged: [EMAIL PROTECTED]
committer: Christian Ohler <[EMAIL PROTECTED]>
branch nick: dev
timestamp: Wed 2007-05-16 14:09:03 +0200
message:
Indentation fix.
* lisp/dvc-buffers.el (dvc-buffers-tree-remove): Fixed indentation.
------------------------------------------------------------
revno: 163.2.29
merged: [EMAIL PROTECTED]
committer: Christian Ohler <[EMAIL PROTECTED]>
branch nick: dev
timestamp: Fri 2007-05-11 22:17:15 +0200
message:
* lisp/xgit-dvc.el: Require `xgit', not `cg', which no longer exists.
------------------------------------------------------------
revno: 163.2.28
merged: [EMAIL PROTECTED]
committer: Christian Ohler <[EMAIL PROTECTED]>
branch nick: dev
timestamp: Fri 2007-05-11 22:15:07 +0200
message:
Merged from Stefan Reichoer.
------------------------------------------------------------
revno: 163.2.27
merged: [EMAIL PROTECTED]
committer: Christian Ohler <[EMAIL PROTECTED]>
branch nick: dev
timestamp: Wed 2007-05-09 22:32:45 +0200
message:
Merged from Stefan Reichoer.
------------------------------------------------------------
revno: 163.2.26
merged: [EMAIL PROTECTED]
committer: Christian Ohler <[EMAIL PROTECTED]>
branch nick: dev
timestamp: Wed 2007-05-09 22:30:27 +0200
message:
Some minor cleanup.
* lisp/dvc-unified.el (dvc-tree-root): Fixed typo in message.
(dvc-create-unified-command): Removed indentation setting for macro
that no longer exists.
------------------------------------------------------------
revno: 189.1.6
merged: [EMAIL PROTECTED]
committer: Michael W. Olson <[EMAIL PROTECTED]>
branch nick: mwolson
timestamp: Sun 2007-06-17 22:46:26 -0400
message:
Merge from Masatake YAMATO
------------------------------------------------------------
revno: 189.2.3
merged: [EMAIL PROTECTED]
committer: Masatake YAMATO <[EMAIL PROTECTED]>
branch nick: dvc
timestamp: Sun 2007-06-17 23:45:34 +0900
message:
(dvc-about): Don't use name DVC+.
------------------------------------------------------------
revno: 189.2.2
merged: [EMAIL PROTECTED]
committer: Masatake YAMATO <[EMAIL PROTECTED]>
branch nick: dvc
timestamp: Fri 2007-06-15 21:40:05 +0900
message:
(bzr-parse-status): Ignore `*' appended to file names listed in
`bzr status' output.
------------------------------------------------------------
revno: 189.2.1
merged: [EMAIL PROTECTED]
committer: Masatake YAMATO <[EMAIL PROTECTED]>
branch nick: dvc
timestamp: Fri 2007-06-15 20:54:45 +0900
message:
Update CONTRIBUTORS.
------------------------------------------------------------
revno: 189.1.5
merged: [EMAIL PROTECTED]
committer: Michael W. Olson <[EMAIL PROTECTED]>
branch nick: sr
timestamp: Sun 2007-06-17 22:37:58 -0400
message:
Apply backspace patch from [EMAIL PROTECTED]
* lisp/dvc-diff.el (dvc-diff-mode-map): Bind backspace to
dvc-diff-unmark-file-up.
(dvc-diff-unmark-file): Handle new "up" argument.
(dvc-diff-unmark-file-up): New function that unmarks the file under
point and moves up.
------------------------------------------------------------
revno: 189.1.4
merged: [EMAIL PROTECTED]
committer: Michael W. Olson <[EMAIL PROTECTED]>
branch nick: sr
timestamp: Sun 2007-06-17 22:31:18 -0400
message:
Merge from moy
------------------------------------------------------------
revno: 176.1.2
merged: [EMAIL PROTECTED]
committer: Matthieu Moy <[EMAIL PROTECTED]>
branch nick: moy
timestamp: Sat 2007-06-16 16:28:59 +0200
message:
merge from upstream
------------------------------------------------------------
revno: 176.1.1
merged: [EMAIL PROTECTED]
committer: Matthieu Moy <[EMAIL PROTECTED]>
branch nick: moy
timestamp: Sat 2007-06-16 16:28:18 +0200
message:
Fixed trivial typo (argument name didn't match variable use)
------------------------------------------------------------
revno: 189.1.3
merged: [EMAIL PROTECTED]
committer: Michael W. Olson <[EMAIL PROTECTED]>
branch nick: sr
timestamp: Sun 2007-06-17 22:27:15 -0400
message:
Apply patch from O'hara Takuzo
* lisp/xgit-annotate.el (xgit-annotate-font-lock-keywords): Remove.
(xgit-annotate-info-regexp): Use "[[:blank:]]" rather than "\\s-".
(xgit-annotate-revision-regexp): Revert previous change.
(xgit-annotate-show-rev): Use xgit-annotate-revision-regexp.
------------------------------------------------------------
revno: 189.1.2
merged: [EMAIL PROTECTED]
committer: Michael W. Olson <[EMAIL PROTECTED]>
branch nick: sr
timestamp: Sun 2007-06-17 22:21:35 -0400
message:
Add autoload for bzr-submit-patch
* lisp/bzr-submit.el (bzr-submit-patch): Add autoload cookie.
------------------------------------------------------------
revno: 189.1.1
merged: [EMAIL PROTECTED]
committer: Michael W. Olson <[EMAIL PROTECTED]>
branch nick: sr
timestamp: Sun 2007-06-17 22:20:41 -0400
message:
Get xgit-status mostly working
* lisp/xgit.el (xgit-status-line-regexp, xgit-status-untracked-regexp)
(xgit-status-renamed-regexp): New variables used to match parts of the
xgit-status output.
(xgit-parse-status-sort): New function that sorts the xgit-status lines
according to status rather than just filename.
(xgit-parse-status): Rewrite to search forward for regexps, rather than
use split-string. All of the status types I've tried so far are
recognized properly and sorted.
(xgit-status): Even if git returned a non-zero status, it still can
have lines to parse, such as files which have not been added yet.
_______________________________________________
Dvc-dev mailing list
[email protected]
https://mail.gna.org/listinfo/dvc-dev
