Matthieu Moy | 6 Aug 15:10
Picon
Picon
Favicon

a major mode to edit log messages in xgit [Rev 556 in moy]

New revision in http://www-verimag.imag.fr/~moy/bzr/dvc/moy/
------------------------------------------------------------
revno: 556
revision-id: matthieu.moy <at> imag.fr-20090806131043-3bwbvtpldq4hcvls
parent: stefan <at> xsteve.at-20090709210006-hrz9bfxxh7d2tli7
committer: Matthieu Moy <Matthieu.Moy <at> imag.fr>
branch nick: moy
timestamp: Thu 2009-08-06 15:10:43 +0200
message:
  a major mode to edit log messages in xgit

=== modified file 'lisp/dvc-log.el'
--- a/lisp/dvc-log.el	2009-01-09 16:43:44 +0000
+++ b/lisp/dvc-log.el	2009-08-06 13:10:43 +0000
@@ -142,7 +142,7 @@
           (set-buffer-modified-p nil))
         (rename-buffer buffer-name)
         (setq dvc-partner-buffer start-buffer)
-        (dvc-log-edit-mode)))))
+        (dvc-call "log-edit-mode")))))

 (defun dvc-log-edit-abort ()
   "Abort the current log edit."

=== added file 'lisp/xgit-log-edit.el'
--- a/lisp/xgit-log-edit.el	1970-01-01 00:00:00 +0000
+++ b/lisp/xgit-log-edit.el	2009-08-06 13:10:43 +0000
@@ -0,0 +1,72 @@
+;;; xgit-log-edit.el --- Major mode to edit commit messages for git
+
(Continue reading)

Matthieu Moy | 6 Aug 15:11
Picon
Picon
Favicon

a major mode to edit log messages in xgit [Rev 556 in moy]

New revision in http://www-verimag.imag.fr/~moy/bzr/dvc/moy/
------------------------------------------------------------
revno: 556
revision-id: matthieu.moy <at> imag.fr-20090806131043-3bwbvtpldq4hcvls
parent: stefan <at> xsteve.at-20090709210006-hrz9bfxxh7d2tli7
committer: Matthieu Moy <Matthieu.Moy <at> imag.fr>
branch nick: moy
timestamp: Thu 2009-08-06 15:10:43 +0200
message:
  a major mode to edit log messages in xgit

=== modified file 'lisp/dvc-log.el'
--- a/lisp/dvc-log.el	2009-01-09 16:43:44 +0000
+++ b/lisp/dvc-log.el	2009-08-06 13:10:43 +0000
@@ -142,7 +142,7 @@
           (set-buffer-modified-p nil))
         (rename-buffer buffer-name)
         (setq dvc-partner-buffer start-buffer)
-        (dvc-log-edit-mode)))))
+        (dvc-call "log-edit-mode")))))

 (defun dvc-log-edit-abort ()
   "Abort the current log edit."

=== added file 'lisp/xgit-log-edit.el'
--- a/lisp/xgit-log-edit.el	1970-01-01 00:00:00 +0000
+++ b/lisp/xgit-log-edit.el	2009-08-06 13:10:43 +0000
@@ -0,0 +1,72 @@
+;;; xgit-log-edit.el --- Major mode to edit commit messages for git
+
(Continue reading)

Matthieu Moy | 6 Aug 15:26
Picon
Picon
Favicon

a major mode to edit log messages in xgit [Rev 556 in moy]

New revision in http://www-verimag.imag.fr/~moy/bzr/dvc/moy/
------------------------------------------------------------
revno: 556
revision-id: matthieu.moy <at> imag.fr-20090806131738-n2rtlkkx7tl2dn3m
parent: stefan <at> xsteve.at-20090709210006-hrz9bfxxh7d2tli7
committer: Matthieu Moy <Matthieu.Moy <at> imag.fr>
branch nick: moy
timestamp: Thu 2009-08-06 15:17:38 +0200
message:
  a major mode to edit log messages in xgit

=== modified file 'lisp/dvc-log.el'
--- a/lisp/dvc-log.el	2009-01-09 16:43:44 +0000
+++ b/lisp/dvc-log.el	2009-08-06 13:17:38 +0000
@@ -142,7 +142,7 @@
           (set-buffer-modified-p nil))
         (rename-buffer buffer-name)
         (setq dvc-partner-buffer start-buffer)
-        (dvc-log-edit-mode)))))
+        (dvc-call "log-edit-mode")))))

 (defun dvc-log-edit-abort ()
   "Abort the current log edit."

=== added file 'lisp/xgit-log-edit.el'
--- a/lisp/xgit-log-edit.el	1970-01-01 00:00:00 +0000
+++ b/lisp/xgit-log-edit.el	2009-08-06 13:17:38 +0000
@@ -0,0 +1,72 @@
+;;; xgit-log-edit.el --- Major mode to edit commit messages for git
+
(Continue reading)

Matthieu Moy | 6 Aug 15:17
Picon
Picon
Favicon

a major mode to edit log messages in xgit [Rev 556 in moy]

New revision in http://www-verimag.imag.fr/~moy/bzr/dvc/moy/
------------------------------------------------------------
revno: 556
revision-id: matthieu.moy <at> imag.fr-20090806131738-n2rtlkkx7tl2dn3m
parent: stefan <at> xsteve.at-20090709210006-hrz9bfxxh7d2tli7
committer: Matthieu Moy <Matthieu.Moy <at> imag.fr>
branch nick: moy
timestamp: Thu 2009-08-06 15:17:38 +0200
message:
  a major mode to edit log messages in xgit

=== modified file 'lisp/dvc-log.el'
--- a/lisp/dvc-log.el	2009-01-09 16:43:44 +0000
+++ b/lisp/dvc-log.el	2009-08-06 13:17:38 +0000
@@ -142,7 +142,7 @@
           (set-buffer-modified-p nil))
         (rename-buffer buffer-name)
         (setq dvc-partner-buffer start-buffer)
-        (dvc-log-edit-mode)))))
+        (dvc-call "log-edit-mode")))))

 (defun dvc-log-edit-abort ()
   "Abort the current log edit."

=== added file 'lisp/xgit-log-edit.el'
--- a/lisp/xgit-log-edit.el	1970-01-01 00:00:00 +0000
+++ b/lisp/xgit-log-edit.el	2009-08-06 13:17:38 +0000
@@ -0,0 +1,72 @@
+;;; xgit-log-edit.el --- Major mode to edit commit messages for git
+
(Continue reading)

Matthieu Moy | 6 Aug 15:18
Picon
Picon
Favicon

a major mode to edit log messages in xgit [Rev 556 in moy]

New revision in http://www-verimag.imag.fr/~moy/bzr/dvc/moy/
------------------------------------------------------------
revno: 556
revision-id: matthieu.moy <at> imag.fr-20090806131738-n2rtlkkx7tl2dn3m
parent: stefan <at> xsteve.at-20090709210006-hrz9bfxxh7d2tli7
committer: Matthieu Moy <Matthieu.Moy <at> imag.fr>
branch nick: moy
timestamp: Thu 2009-08-06 15:17:38 +0200
message:
  a major mode to edit log messages in xgit

=== modified file 'lisp/dvc-log.el'
--- a/lisp/dvc-log.el	2009-01-09 16:43:44 +0000
+++ b/lisp/dvc-log.el	2009-08-06 13:17:38 +0000
@@ -142,7 +142,7 @@
           (set-buffer-modified-p nil))
         (rename-buffer buffer-name)
         (setq dvc-partner-buffer start-buffer)
-        (dvc-log-edit-mode)))))
+        (dvc-call "log-edit-mode")))))

 (defun dvc-log-edit-abort ()
   "Abort the current log edit."

=== added file 'lisp/xgit-log-edit.el'
--- a/lisp/xgit-log-edit.el	1970-01-01 00:00:00 +0000
+++ b/lisp/xgit-log-edit.el	2009-08-06 13:17:38 +0000
@@ -0,0 +1,72 @@
+;;; xgit-log-edit.el --- Major mode to edit commit messages for git
+
(Continue reading)

Samuel Bronson | 6 Aug 23:58
Picon
Gravatar

[MERGE] Fix `bzr-delta' to support strings, like the `dvc-delta' docs say it should.

564 Samuel Bronson	2009-08-06
    Fix `bzr-delta' to support strings, like the `dvc-delta' docs say it should.

563 Samuel Bronson	2009-08-06
    Remove redundant `bzr-revision-id-to-string' calls from `bzr-delta'.

562 Samuel Bronson	2009-08-06
    Replace some occurences of (toggle-read-only 1) with (setq buffer-read-only t).

561 Samuel Bronson	2009-08-06
    Use dvc-prepare-changes-buffer to prepare the buffer for `dvc-dvc-file-diff'.

560 Samuel Bronson	2009-08-06
    Add missing alias `xdarcs-dvc-log-edit-done' for `xdarcs-log-edit-done'.

559 Samuel Bronson	2009-08-06
    Fix some issues identified by checkdoc.

558 Samuel Bronson	2009-08-06
    Add/tweak some debug declarations in dvc-core.el and dvc-lisp.el.

557 Samuel Bronson	2009-08-06
    Remove inapt use of user command `beginning-of-buffer' from bzr.el.

556 Samuel Bronson	2009-07-15
    bzr-export-via-email: Use [MERGE] instead of [PATCH] in subject lines.

    This is necessary for tools like Bundle Buggy to notice our merge requests.
  [Actually, it isn't ... but someone important told me it was at the time...]

(Continue reading)

Matthieu Moy | 8 Aug 17:27
Picon
Picon
Favicon

Correct spelling of Signed-off-by: in xgit log-edit mode. [Rev 557 in moy]

New revision in http://www-verimag.imag.fr/~moy/bzr/dvc/moy/
------------------------------------------------------------
revno: 557
revision-id: matthieu.moy <at> imag.fr-20090808152754-tzinlagjh7qgvzp5
parent: matthieu.moy <at> imag.fr-20090806131738-n2rtlkkx7tl2dn3m
committer: Matthieu Moy <Matthieu.Moy <at> imag.fr>
branch nick: moy
timestamp: Sat 2009-08-08 17:27:54 +0200
message:
  Correct spelling of Signed-off-by: in xgit log-edit mode.

=== modified file 'lisp/xgit-log-edit.el'
--- a/lisp/xgit-log-edit.el	2009-08-06 13:17:38 +0000
+++ b/lisp/xgit-log-edit.el	2009-08-08 15:27:54 +0000
@@ -36,11 +36,11 @@
 (easy-menu-define xgit-log-edit-mode-menu xgit-log-edit-mode-map
   "`xgit-log-edit-mode' menu"
   '("Log"
-    ["Insert Signed-Off-By:"     xgit-log-edit-insert-sob t]
+    ["Insert Signed-off-by:"     xgit-log-edit-insert-sob t]
     ))

 (defvar xgit-log-edit-font-lock-keywords
-  `(("^Signed-Off-By: " . 'dvc-header)
+  `(("^Signed-off-by: " . 'dvc-header)
     ("^#.*$" . 'dvc-comment)
   "Keywords in xgit-log-edit mode."))

@@ -50,7 +50,7 @@
   (re-search-backward "^[^#\n]")
(Continue reading)

Matthieu Moy | 8 Aug 17:28
Picon
Picon
Favicon

Correct spelling of Signed-off-by: in xgit log-edit mode. [Rev 557 in moy]

New revision in http://www-verimag.imag.fr/~moy/bzr/dvc/moy/
------------------------------------------------------------
revno: 557
revision-id: matthieu.moy <at> imag.fr-20090808152754-tzinlagjh7qgvzp5
parent: matthieu.moy <at> imag.fr-20090806131738-n2rtlkkx7tl2dn3m
committer: Matthieu Moy <Matthieu.Moy <at> imag.fr>
branch nick: moy
timestamp: Sat 2009-08-08 17:27:54 +0200
message:
  Correct spelling of Signed-off-by: in xgit log-edit mode.

=== modified file 'lisp/xgit-log-edit.el'
--- a/lisp/xgit-log-edit.el	2009-08-06 13:17:38 +0000
+++ b/lisp/xgit-log-edit.el	2009-08-08 15:27:54 +0000
@@ -36,11 +36,11 @@
 (easy-menu-define xgit-log-edit-mode-menu xgit-log-edit-mode-map
   "`xgit-log-edit-mode' menu"
   '("Log"
-    ["Insert Signed-Off-By:"     xgit-log-edit-insert-sob t]
+    ["Insert Signed-off-by:"     xgit-log-edit-insert-sob t]
     ))

 (defvar xgit-log-edit-font-lock-keywords
-  `(("^Signed-Off-By: " . 'dvc-header)
+  `(("^Signed-off-by: " . 'dvc-header)
     ("^#.*$" . 'dvc-comment)
   "Keywords in xgit-log-edit mode."))

@@ -50,7 +50,7 @@
   (re-search-backward "^[^#\n]")
(Continue reading)

Matthieu Moy | 8 Aug 18:28
Picon
Picon
Favicon

Sorry (was Re: Correct spelling of Signed-off-by: in xgit log-edit mode. [Rev 557 in moy])

Sorry, for the double-posts, I mixed-up my post-commit hook. But the
patches should still be interesting ;-).

--

-- 
Matthieu
Stephen Leake | 10 Aug 01:23
Favicon

rev 522: xmtn-conflicts: store branches in options file, other improvements.

Committed revision 522 to http://stephe-leake.org/dvc

xmtn-conflicts: store branches in options file, other improvements.

  * lisp/dvc-buffers.el (dvc-revert-some-buffers): preserve major mode on
    revert-buffer.

  * lisp/dvc-log.el (dvc-ediff-setup): new function.

  * lisp/dvc-ui.el (tools-menu): Add dvc-missing

  * lisp/dvc-unified.el (dvc-back-end-wrappers): add 'other-frame' to
    add-log-entry.

  * lisp/xmtn-automate.el (xmtn--tree-default-branch): move here from
    xmtn-dvc, so xmtn-conflicts can use it.

  * lisp/xmtn-basic-io.el (xmtn-basic-io-eof): new.

  * lisp/xmtn-conflicts.el (xmtn-conflicts-left-work,
    xmtn-conflicts-right-work): new buffer-local variables.
    (xmtn-conflicts-parse-header): get branches from options file.
    (xmtn-conflicts-read): handle no conflicts case.
    (xmtn-conflicts-resolve-content-file): factor out.
    (xmtn-conflicts-resolve-duplicate_name-ediff): preserve window config.
    (xmtn-conflicts-resolve-map): add clear-resolution, file.
    (xmtn-conflicts-dtrt): Add FIXME: not working.
    (xmtn-conflicts-current-conflict): new function.
    (xmtn-conflicts-path): new function.
    (xmtn-add-log-entry): new function.
(Continue reading)


Gmane