Status of VC Bazaar support?

Status of VC Bazaar support?

[Chong Yidong]

Currently, files.texi in the Emacs manual has the following line after
the paragraph on supported VC systems:

@comment Omitting bzr because support is very scratchy and incomplete.

Is the bzr support still incomplete, or has it improved since this was
written?

Status of VC Bazaar support?

[Chong Yidong]

The Emacs manual has the following line in files.texi, within the node
that explains what version control systems are supported in VC:

@comment Omitting bzr because support is very scratchy and incomplete.

Is the Bazaar support as incomplete as this comment implies?  Does
anyone on this list use VC with Bazaar?

Re: Status of VC Bazaar support?

[Magnus Henoch]

Chong Yidong <cyd@stupidchicken.com> writes:

> Is the Bazaar support as incomplete as this comment implies?  Does
> anyone on this list use VC with Bazaar?

As bzr is to become the official VCS of Emacs, I have started to use it
for various toy projects.  So far VC has not let me down; I can commit,
get diffs and read logs, just like with CVS and Git.

Maybe that comment refers to baz (aka Bazaar 1, GNU Arch, tla;
"vc-arch")?  If so, I agree with it.  In my local tree I have an
implementation of vc-dir for arch, which I should clean up and commit.
vc-arch still lacks log display and the ability to ask for a GPG key
passphrase.  (dvc does both of these)

Magnus

Re: Status of VC Bazaar support?

[Christian Faulhammer]

[-- Attachment #1: Type: text/plain, Size: 549 bytes --]

Hi,

Chong Yidong <cyd@stupidchicken.com>:

> Currently, files.texi in the Emacs manual has the following line after
> the paragraph on supported VC systems:
> 
> @comment Omitting bzr because support is very scratchy and incomplete.
> 
> Is the bzr support still incomplete, or has it improved since this was
> written?

 It is quite usable, so I think it has improved.

V-Li


-- 
Christian Faulhammer, Gentoo Lisp project
<URL:http://www.gentoo.org/proj/en/lisp/>, #gentoo-lisp on FreeNode

<URL:http://www.faulhammer.org/>

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 197 bytes --]

Re: Status of VC Bazaar support?

[Christian Faulhammer]

[-- Attachment #1: Type: text/plain, Size: 703 bytes --]

Hi,

Chong Yidong <cyd@stupidchicken.com>:

> Currently, files.texi in the Emacs manual has the following line after
> the paragraph on supported VC systems:
> 
> @comment Omitting bzr because support is very scratchy and incomplete.
> 
> Is the bzr support still incomplete, or has it improved since this was
> written?

 I just noticed today the following:
When calling vc-dir on a bzr repository one gets:

"VC backend : Bzr
Working dir: /tmp/bzr/
Extra      : Please add backend specific headers here.  It's easy! "

V-Li


-- 
Christian Faulhammer, Gentoo Lisp project
<URL:http://www.gentoo.org/proj/en/lisp/>, #gentoo-lisp on FreeNode

<URL:http://www.faulhammer.org/>

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 197 bytes --]

Re: Status of VC Bazaar support?

[Chong Yidong]

Christian Faulhammer <opfer@gentoo.org> writes:

>  I just noticed today the following:
> When calling vc-dir on a bzr repository one gets:
>
> "VC backend : Bzr
> Working dir: /tmp/bzr/
> Extra      : Please add backend specific headers here.  It's easy! "

Could someone please add backend specific headers there?

:-P

Re: Status of VC Bazaar support?

[Dan Nicolaescu]

Christian Faulhammer <opfer@gentoo.org> writes:

  > Hi,
  > 
  > Chong Yidong <cyd@stupidchicken.com>:
  > 
  > > Currently, files.texi in the Emacs manual has the following line after
  > > the paragraph on supported VC systems:
  > > 
  > > @comment Omitting bzr because support is very scratchy and incomplete.
  > > 
  > > Is the bzr support still incomplete, or has it improved since this was
  > > written?
  > 
  >  I just noticed today the following:
  > When calling vc-dir on a bzr repository one gets:
  > 
  > "VC backend : Bzr
  > Working dir: /tmp/bzr/
  > Extra      : Please add backend specific headers here.  It's easy! "

Someone that uses bzr needs to decide what kind of info is useful to
have in the bzr specific headers. 

Probably some of the output of "bzr info" needs to go there.

To do that, implement a function called `vc-bzr-dir-extra-headers'.
Look in the other vc-*.el files for examples how to do that.

Re: Status of VC Bazaar support?

[Christian Faulhammer]

[-- Attachment #1.1: Type: text/plain, Size: 966 bytes --]

Hi,

Dan Nicolaescu <dann@ics.uci.edu>:

> Christian Faulhammer <opfer@gentoo.org> writes:
>   >  I just noticed today the following:
>   > When calling vc-dir on a bzr repository one gets:
>   > 
>   > "VC backend : Bzr
>   > Working dir: /tmp/bzr/
>   > Extra      : Please add backend specific headers here.  It's
>   > easy! "
> 
> Someone that uses bzr needs to decide what kind of info is useful to
> have in the bzr specific headers. 
> 
> Probably some of the output of "bzr info" needs to go there.
> 
> To do that, implement a function called `vc-bzr-dir-extra-headers'.
> Look in the other vc-*.el files for examples how to do that.

 Attached is a patch for a first inclusion.  I don't know if it is a
trivial change, but if not: I don't have papers filed to the FSF.

V-Li

-- 
Christian Faulhammer, Gentoo Lisp project
<URL:http://www.gentoo.org/proj/en/lisp/>, #gentoo-lisp on FreeNode

<URL:http://www.faulhammer.org/>

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.2: bzr-status-headers.patch --]
[-- Type: text/x-patch; name=bzr-status-headers.patch, Size: 1244 bytes --]

--- /usr/portage/distfiles/cvs-src/emacs/lisp/vc-bzr.el	2008-10-12 19:57:10.000000000 +0200
+++ /usr/share/emacs/23.0.60/lisp/vc-bzr.el	2008-10-31 21:26:20.000000000 +0100
@@ -664,6 +664,19 @@
   (apply 'vc-bzr-command "status" (current-buffer) 'async dir "-v" "-S" files)
   (vc-exec-after
    `(vc-bzr-after-dir-status (quote ,update-function))))
+
+(defun vc-bzr-status-extra-headers (dir)
+  (let ((str (with-output-to-string
+               (with-current-buffer standard-output
+                 (vc-bzr--call '(t nil) "info")))))
+    (concat
+     (propertize "Branch root: " 'face 'font-lock-type-face)
+     (propertize
+		 (if (and (string-match "branch root: \\(.+\\)$" str) (string-match "\\." (match-string 1 str)))
+		     "Current directory"
+		   (match-string 1 str))
+       'face 'font-lock-variable-name-face))))
+
 ;;; Revision completion
 
 (defun vc-bzr-revision-completion-table (files)
@@ -723,5 +736,9 @@
   '(add-to-list 'vc-directory-exclusion-list vc-bzr-admin-dirname t))
 
 (provide 'vc-bzr)
+
+(defun vc-bzr--call (buffer command &rest args)
+  (apply 'process-file "bzr" nil buffer nil command args))
+
 ;; arch-tag: 8101bad8-4e92-4e7d-85ae-d8e08b4e7c06
 ;;; vc-bzr.el ends here

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 197 bytes --]

Re: Status of VC Bazaar support?

[Christian Faulhammer]

[-- Attachment #1.1: Type: text/plain, Size: 463 bytes --]

Hi,

Dan Nicolaescu <dann@ics.uci.edu>:
> To do that, implement a function called `vc-bzr-dir-extra-headers'.
> Look in the other vc-*.el files for examples how to do that.

I provided the wrong patch as I just noticed...Parent branch is the
more meaningful property compared to branch root.

V-Li

-- 
Christian Faulhammer, Gentoo Lisp project
<URL:http://www.gentoo.org/proj/en/lisp/>, #gentoo-lisp on FreeNode

<URL:http://www.faulhammer.org/>

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.2: bzr-headers.patch --]
[-- Type: text/x-patch; name=bzr-headers.patch, Size: 1201 bytes --]

--- /usr/portage/distfiles/cvs-src/emacs/lisp/vc-bzr.el	2008-10-12 19:57:10.000000000 +0200
+++ /usr/share/emacs/23.0.60/lisp/vc-bzr.el	2008-10-31 23:22:29.000000000 +0100
@@ -664,6 +664,18 @@
   (apply 'vc-bzr-command "status" (current-buffer) 'async dir "-v" "-S" files)
   (vc-exec-after
    `(vc-bzr-after-dir-status (quote ,update-function))))
+
+(defun vc-bzr-status-extra-headers (dir)
+  (let ((str (with-output-to-string
+               (with-current-buffer standard-output
+                 (vc-bzr--call '(t nil) "info")))))
+    (concat
+     (propertize "Parent branch: " 'face 'font-lock-type-face)
+     (propertize 
+      (if (string-match "parent branch: \\(.+\\)$" str)
+	  (match-string 1 str)
+	"None")
+       'face 'font-lock-variable-name-face))))
 ;;; Revision completion
 
 (defun vc-bzr-revision-completion-table (files)
@@ -722,6 +734,9 @@
 (eval-after-load "vc"
   '(add-to-list 'vc-directory-exclusion-list vc-bzr-admin-dirname t))
 
+(defun vc-bzr--call (buffer command &rest args)
+  (apply 'process-file "bzr" nil buffer nil command args))
+
 (provide 'vc-bzr)
 ;; arch-tag: 8101bad8-4e92-4e7d-85ae-d8e08b4e7c06
 ;;; vc-bzr.el ends here

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 197 bytes --]

Re: Status of VC Bazaar support?

[Richard M. Stallman]

Your change just barely qualifies as trivial.

Re: Status of VC Bazaar support?

[Chong Yidong]

> I provided the wrong patch as I just noticed...Parent branch is the
> more meaningful property compared to branch root.

+(defun vc-bzr-status-extra-headers (dir)
+  (let ((str (with-output-to-string
+               (with-current-buffer standard-output
+                 (vc-bzr--call '(t nil) "info")))))
...
+(defun vc-bzr--call (buffer command &rest args)
+  (apply 'process-file "bzr" nil buffer nil command args))
+

Shouldn't you use `vc-bzr-command' here?

Re: Status of VC Bazaar support?

[Chong Yidong]

Christian Faulhammer <opfer@gentoo.org> writes:

> I provided the wrong patch as I just noticed...Parent branch is the
> more meaningful property compared to branch root.

I've checked in a tweaked version of your patch.  Thanks!